From 48cb8c607279ae39a5008cb5a635e399c6281b08 Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Mon, 17 Jul 2023 17:43:13 +0200 Subject: [PATCH] :sparkles: Fixing selected --- .../Components/DesignSystem/BlockList/classes.module.scss | 4 ++++ src/front/Components/DesignSystem/BlockList/index.tsx | 3 ++- .../Components/DesignSystem/FolderListContainer/index.tsx | 2 +- .../CollaboratorListContainer/index.tsx | 1 + .../DefaultDeedTypeDashboard/DeedTypeListContainer/index.tsx | 2 ++ .../DefaultRoleDashboard/RoleListContainer/index.tsx | 1 + .../Components/Layouts/DeedTypes/DeedTypesCreate/index.tsx | 2 +- .../Components/Layouts/DeedTypes/DeedTypesEdit/index.tsx | 2 +- 8 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/front/Components/DesignSystem/BlockList/classes.module.scss b/src/front/Components/DesignSystem/BlockList/classes.module.scss index 989c0eca..2e542b94 100644 --- a/src/front/Components/DesignSystem/BlockList/classes.module.scss +++ b/src/front/Components/DesignSystem/BlockList/classes.module.scss @@ -13,6 +13,10 @@ background-color: $grey-medium; } + &[data-selected="true"] { + background-color: $grey-medium; + } + .left-side { display: inline-flex; justify-content: space-between; diff --git a/src/front/Components/DesignSystem/BlockList/index.tsx b/src/front/Components/DesignSystem/BlockList/index.tsx index a61b1ba7..5f00c739 100644 --- a/src/front/Components/DesignSystem/BlockList/index.tsx +++ b/src/front/Components/DesignSystem/BlockList/index.tsx @@ -7,6 +7,7 @@ import Image from "next/image"; export type IBlock = { name: string; id: string; + selected: boolean; }; type IProps = { @@ -25,7 +26,7 @@ export default function BlockList({ blocks, onSelectedBlock }: IProps) { {blocks.map((block) => { return (
-
+
{block.name}
diff --git a/src/front/Components/DesignSystem/FolderListContainer/index.tsx b/src/front/Components/DesignSystem/FolderListContainer/index.tsx index ebecaaa0..2302050b 100644 --- a/src/front/Components/DesignSystem/FolderListContainer/index.tsx +++ b/src/front/Components/DesignSystem/FolderListContainer/index.tsx @@ -85,7 +85,7 @@ class FolderListContainerClass extends React.Component { }); return [...pendingFolders, ...otherFolders].map((folder) => { - return { id: folder.uid!, name: folder.folder_number! + " - " + folder.name! }; + return { id: folder.uid!, name: folder.folder_number! + " - " + folder.name!, selected: false }; }); } private onSelectedFolder(block: IBlock) { diff --git a/src/front/Components/LayoutTemplates/DefaultCollaboratorDashboard/CollaboratorListContainer/index.tsx b/src/front/Components/LayoutTemplates/DefaultCollaboratorDashboard/CollaboratorListContainer/index.tsx index 2b18e1b3..fdad6652 100644 --- a/src/front/Components/LayoutTemplates/DefaultCollaboratorDashboard/CollaboratorListContainer/index.tsx +++ b/src/front/Components/LayoutTemplates/DefaultCollaboratorDashboard/CollaboratorListContainer/index.tsx @@ -51,6 +51,7 @@ export default function CollaboratorListContainer(props: IProps) { return { name: user.contact?.first_name + " " + user.contact?.last_name, id: user.uid!, + selected: false, }; })} onSelectedBlock={onSelectedBlock} diff --git a/src/front/Components/LayoutTemplates/DefaultDeedTypeDashboard/DeedTypeListContainer/index.tsx b/src/front/Components/LayoutTemplates/DefaultDeedTypeDashboard/DeedTypeListContainer/index.tsx index 65e145cc..c239d2d7 100644 --- a/src/front/Components/LayoutTemplates/DefaultDeedTypeDashboard/DeedTypeListContainer/index.tsx +++ b/src/front/Components/LayoutTemplates/DefaultDeedTypeDashboard/DeedTypeListContainer/index.tsx @@ -19,6 +19,7 @@ type IProps = { export default function DeedListContainer(props: IProps) { const [filteredUsers, setFilteredUsers] = useState(props.deedTypes); const router = useRouter(); + const { deedTypeUid } = router.query; const filterDeeds = useCallback( (input: string) => { @@ -51,6 +52,7 @@ export default function DeedListContainer(props: IProps) { return { name: deed.name, id: deed.uid!, + selected: deedTypeUid === deed.uid, }; })} onSelectedBlock={onSelectedBlock} diff --git a/src/front/Components/LayoutTemplates/DefaultRoleDashboard/RoleListContainer/index.tsx b/src/front/Components/LayoutTemplates/DefaultRoleDashboard/RoleListContainer/index.tsx index ab653a46..d5733699 100644 --- a/src/front/Components/LayoutTemplates/DefaultRoleDashboard/RoleListContainer/index.tsx +++ b/src/front/Components/LayoutTemplates/DefaultRoleDashboard/RoleListContainer/index.tsx @@ -48,6 +48,7 @@ export default function RoleListContainer(props: IProps) { return { name: role.name, id: role.uid!, + selected: false, }; })} onSelectedBlock={onSelectedBlock} diff --git a/src/front/Components/Layouts/DeedTypes/DeedTypesCreate/index.tsx b/src/front/Components/Layouts/DeedTypes/DeedTypesCreate/index.tsx index 7bd0898e..274b4205 100644 --- a/src/front/Components/Layouts/DeedTypes/DeedTypesCreate/index.tsx +++ b/src/front/Components/Layouts/DeedTypes/DeedTypesCreate/index.tsx @@ -13,7 +13,7 @@ export default function DeedTypesCreate(props: IProps) { const onSubmitHandler = useCallback(async (e: React.FormEvent | null, values: { [key: string]: string }) => {}, []); return ( - +
Créer un type d'acte diff --git a/src/front/Components/Layouts/DeedTypes/DeedTypesEdit/index.tsx b/src/front/Components/Layouts/DeedTypes/DeedTypesEdit/index.tsx index 651cec28..7b05fc31 100644 --- a/src/front/Components/Layouts/DeedTypes/DeedTypesEdit/index.tsx +++ b/src/front/Components/Layouts/DeedTypes/DeedTypesEdit/index.tsx @@ -34,7 +34,7 @@ export default function DeedTypesEdit() { const onSubmitHandler = useCallback(async (e: React.FormEvent | null, values: { [key: string]: string }) => {}, []); return ( - +
Modifier les informations de l'acte