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

🐛 Small fixes review

Browse Source
This commit is contained in:
Maxime Lalo 2023-07-31 12:41:29 +02:00
parent af95322a94
commit 539373b99a
3 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/front/Components/LayoutTemplates/DefaultRoleDashboard/RoleListContainer/index.tsx
View File

@ -46,7 +46,12 @@ export default function RoleListContainer(props: IProps) {
</div> </div>
<div className={classes["folderlist-container"]}> <div className={classes["folderlist-container"]}>
<BlockList <BlockList
blocks={filteredRoles.map((role) => { blocks={filteredRoles
.filter((role) => {
if (role.name === "admin") return false;
return true;
})
.map((role) => {
return { return {
name: role.name, name: role.name,
id: role.uid!, id: role.uid!,

4
src/front/Components/Layouts/Collaborators/CollaboratorInformations/index.tsx
View File

@ -178,7 +178,9 @@ export default function CollaboratorInformations(props: IProps) {
<SelectField <SelectField
placeholder="Rôle" placeholder="Rôle"
name="role" name="role"
options={availableRoles} options={availableRoles.filter((role) => {
return role.label !== "admin";
})}
selectedOption={selectedOption!} selectedOption={selectedOption!}
onChange={handleRoleChange} onChange={handleRoleChange}
disabled={userSelected?.role?.name === "super-admin"} disabled={userSelected?.role?.name === "super-admin"}

18
src/front/Components/Layouts/Offices/OfficeInformations/index.tsx
View File

@ -142,6 +142,9 @@ export default function OfficeInformations(props: IProps) {
if (!user.office_role && user.role?.name === "admin") { if (!user.office_role && user.role?.name === "admin") {
return true; return true;
} }
if (!user.office_role && user.role?.name === "super-admin") {
return true;
}
return false; return false;
}) })
.map((user) => { .map((user) => {
@ -173,13 +176,16 @@ export default function OfficeInformations(props: IProps) {
</div> </div>
{officeSelected?.users {officeSelected?.users
?.filter((user) => { ?.filter((user) => {
if (user.office_role && user.office_role.name !== "admin") { if (user.office_role && user.office_role.name === "admin") {
return true;
}
if (!user.office_role && user.role?.name !== "admin") {
return true;
}
return false; return false;
}
if (!user.office_role && user.role?.name === "admin") {
return false;
}
if (!user.office_role && user.role?.name === "super-admin") {
return false;
}
return true;
}) })
.map((user) => { .map((user) => {
return renderUser(user); return renderUser(user);