4nk/lecoffre-front
4
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

add roles and rules label

Browse Source
This commit is contained in:
OxSaitama 2023-08-17 11:48:18 +02:00
parent 804e0d5976
commit d6d0839f35
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -24,7 +24,7 @@
"eslint-config-next": "13.2.4",
"form-data": "^4.0.0",
"jwt-decode": "^3.1.2",
"le-coffre-resources": "git@github.com:smart-chain-fr/leCoffre-resources.git#v2.66",
"le-coffre-resources": "git@github.com:smart-chain-fr/leCoffre-resources.git#v2.68",
"next": "13.2.4",
"prettier": "^2.8.7",
"react": "18.2.0",

8
src/front/Components/Layouts/Roles/RolesInformations/index.tsx
View File

@ -6,7 +6,7 @@ import Form from "@Front/Components/DesignSystem/Form";
import Confirm from "@Front/Components/DesignSystem/Modal/Confirm";
import Typography, { ITypo } from "@Front/Components/DesignSystem/Typography";
import DefaultRoleDashboard from "@Front/Components/LayoutTemplates/DefaultRoleDashboard";
import { Role, Rule } from "le-coffre-resources/dist/Admin";
import { OfficeRole, Rule } from "le-coffre-resources/dist/Admin";
import { useRouter } from "next/router";
import { useCallback, useEffect, useState } from "react";
import React from "react";
@ -21,7 +21,7 @@ export default function RolesInformations(props: IProps) {
const router = useRouter();
let { roleUid } = router.query;
const [roleSelected, setRoleSelected] = useState<Role | null>(null);
const [roleSelected, setRoleSelected] = useState<OfficeRole | null>(null);
const [rulesCheckboxes, setRulesCheckboxes] = useState<RuleCheckbox[]>([]);
const [selectAll, setSelectAll] = useState<boolean>(false);
@ -56,7 +56,7 @@ export default function RolesInformations(props: IProps) {
}
return { ...rule, checked: false };
})
.sort((ruleA, ruleB) => (ruleA.name < ruleB.name ? 1 : -1))
.sort((ruleA, ruleB) => (ruleA.label < ruleB.label ? 1 : -1))
.sort((rule) => (rule.checked ? -1 : 1));
const selectAll = rulesCheckboxes.every((rule) => rule.checked);
@ -134,7 +134,7 @@ export default function RolesInformations(props: IProps) {
{rulesCheckboxes.map((rule) => (
<div className={classes["right"]} key={rule.uid}>
<CheckBox
option={{ label: rule.name, value: rule.uid }}
option={{ label: rule.label, value: rule.uid }}
checked={rule.checked}
onChange={handleRuleChange}
/>

6
src/front/Components/Layouts/Users/UserInformations/index.tsx
View File

@ -182,9 +182,9 @@ export default function UserInformations(props: IProps) {
setRoleModalOpened(false);
setSelectedOption({
value: userSelected?.office_role ? userSelected?.office_role?.uid : userSelected?.role?.uid,
label: userSelected?.office_role ? userSelected?.office_role?.name : userSelected?.role?.name!,
label: userSelected?.office_role ? userSelected?.office_role?.name : userSelected?.role?.label!,
});
}, [userSelected?.office_role, userSelected?.role?.name, userSelected?.role?.uid]);
}, [userSelected?.office_role, userSelected?.role?.label, userSelected?.role?.uid]);
const changeRole = useCallback(async () => {
await Users.getInstance().put(
@ -271,7 +271,7 @@ export default function UserInformations(props: IProps) {
onChange={handleRoleChange}
selectedOption={{
value: userSelected?.office_role ? userSelected?.office_role?.uid : userSelected?.role?.uid,
label: userSelected?.office_role ? userSelected?.office_role?.name : userSelected?.role?.name!,
label: userSelected?.office_role ? userSelected?.office_role?.name : userSelected?.role?.label!,
}}
/>
</div>