From 5b75031d59f6f45f10a0eaf3a69e47463e9c77db Mon Sep 17 00:00:00 2001 From: Max S Date: Tue, 23 Jul 2024 16:44:11 +0200 Subject: [PATCH 1/2] revert redirect --- .../DefaultNotaryDashboard/index.tsx | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/front/Components/LayoutTemplates/DefaultNotaryDashboard/index.tsx b/src/front/Components/LayoutTemplates/DefaultNotaryDashboard/index.tsx index d2bc08f1..da2d01dc 100644 --- a/src/front/Components/LayoutTemplates/DefaultNotaryDashboard/index.tsx +++ b/src/front/Components/LayoutTemplates/DefaultNotaryDashboard/index.tsx @@ -15,8 +15,6 @@ import Image, { StaticImageData } from "next/image"; import React, { ReactNode } from "react"; import classes from "./classes.module.scss"; -import Module from "@Front/Config/Module"; -import router from "next/router"; type IProps = { title: string; @@ -146,21 +144,6 @@ export default class DefaultNotaryDashboard extends React.Component 0) - this.props.isArchived - ? router.push( - Module.getInstance() - .get() - .modules.pages.Folder.pages.FolderArchived.pages.FolderInformation.props.path.replace( - "[folderUid]", - folders[0]?.uid ?? "", - ), - ) - : router.push( - Module.getInstance() - .get() - .modules.pages.Folder.pages.FolderInformation.props.path.replace("[folderUid]", folders[0]?.uid ?? ""), - ); this.setState({ folders: folders }); } public override componentWillUnmount() { From 6f16d05463611bd20cc3884ff021a5b13576064d Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Wed, 24 Jul 2024 17:11:26 +0200 Subject: [PATCH 2/2] :sparkles: NEw componnt --- .../FolderListContainer/index.tsx | 1 + .../DeedTypeListContainer/index.tsx | 54 ++++++------------- 2 files changed, 17 insertions(+), 38 deletions(-) diff --git a/src/front/Components/DesignSystem/FolderListContainer/index.tsx b/src/front/Components/DesignSystem/FolderListContainer/index.tsx index 6b8c3e46..53df5b74 100644 --- a/src/front/Components/DesignSystem/FolderListContainer/index.tsx +++ b/src/front/Components/DesignSystem/FolderListContainer/index.tsx @@ -64,6 +64,7 @@ export default function FolderListContainer(props: IProps) { const [blocks, setBlocks] = React.useState(getBlocks(folders)); const onSelectedFolder = (block: IBlock) => { + props.onCloseLeftSide && props.onCloseLeftSide(); const folder = folders.find((folder) => folder.uid === block.id); if (!folder) return; props.onSelectedFolder && props.onSelectedFolder(folder); diff --git a/src/front/Components/LayoutTemplates/DefaultDeedTypeDashboard/DeedTypeListContainer/index.tsx b/src/front/Components/LayoutTemplates/DefaultDeedTypeDashboard/DeedTypeListContainer/index.tsx index 6dc34c85..4386d52d 100644 --- a/src/front/Components/LayoutTemplates/DefaultDeedTypeDashboard/DeedTypeListContainer/index.tsx +++ b/src/front/Components/LayoutTemplates/DefaultDeedTypeDashboard/DeedTypeListContainer/index.tsx @@ -1,15 +1,12 @@ import DeedTypes from "@Front/Api/LeCoffreApi/Admin/DeedTypes/DeedTypes"; -import Button from "@Front/Components/DesignSystem/Button"; -import SearchBar from "@Front/Components/DesignSystem/SearchBar"; import Module from "@Front/Config/Module"; import { DeedType } from "le-coffre-resources/dist/Admin"; -import Link from "next/link"; import { useRouter } from "next/router"; -import React, { useCallback, useState } from "react"; +import React, { useCallback } from "react"; import classes from "./classes.module.scss"; import { IBlock } from "@Front/Components/DesignSystem/SearchBlockList/BlockList/Block"; -import BlockList from "@Front/Components/DesignSystem/SearchBlockList/BlockList"; +import SearchBlockList from "@Front/Components/DesignSystem/SearchBlockList"; type IProps = { deedTypes: DeedType[]; @@ -18,20 +15,9 @@ 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) => { - const filteredUsers = props.deedTypes.filter((deedType) => { - return deedType.name?.toLowerCase().includes(input.toLowerCase()); - }); - setFilteredUsers(filteredUsers); - }, - [props.deedTypes], - ); - const onSelectedBlock = useCallback( (block: IBlock) => { props.onCloseLeftSide && props.onCloseLeftSide(); @@ -43,28 +29,20 @@ export default function DeedListContainer(props: IProps) { return (
-
-
- -
-
- { - return { - primaryText: deed.name, - id: deed.uid!, - selected: deedTypeUid === deed.uid, - }; - })} - onSelectedBlock={onSelectedBlock} - /> -
-
-
- - - -
+ { + return { + primaryText: deed.name, + id: deed.uid!, + selected: deedTypeUid === deed.uid, + }; + })} + onSelectedBlock={onSelectedBlock} + bottomButton={{ + link: Module.getInstance().get().modules.pages.DeedTypes.pages.Create.props.path, + text: "Créer un type d'acte", + }} + />
); }