From a09df106841dcf1a73801bb43b288c858b0b3a21 Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Tue, 23 Jul 2024 16:32:35 +0200 Subject: [PATCH 1/3] :sparkles: Fix redirect logo --- src/front/Components/DesignSystem/Header/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/front/Components/DesignSystem/Header/index.tsx b/src/front/Components/DesignSystem/Header/index.tsx index e746dafb..7e67d618 100644 --- a/src/front/Components/DesignSystem/Header/index.tsx +++ b/src/front/Components/DesignSystem/Header/index.tsx @@ -72,7 +72,7 @@ class HeaderClass extends React.Component {
- + logo
From 67465429c1b8c2f032aae9f11bbf0e7bc71a52ea Mon Sep 17 00:00:00 2001 From: Max S Date: Tue, 23 Jul 2024 16:46:26 +0200 Subject: [PATCH 2/3] revert commit --- .../DefaultNotaryDashboard/index.tsx | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/front/Components/LayoutTemplates/DefaultNotaryDashboard/index.tsx b/src/front/Components/LayoutTemplates/DefaultNotaryDashboard/index.tsx index d2bc08f1..449e7d7d 100644 --- a/src/front/Components/LayoutTemplates/DefaultNotaryDashboard/index.tsx +++ b/src/front/Components/LayoutTemplates/DefaultNotaryDashboard/index.tsx @@ -146,21 +146,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 5c5191a7d819f45066eab83a31679439849553e9 Mon Sep 17 00:00:00 2001 From: Max S Date: Tue, 23 Jul 2024 17:00:24 +0200 Subject: [PATCH 3/3] redirect to first folder on page Folder --- .../DefaultNotaryDashboard/index.tsx | 2 -- src/front/Components/Layouts/Folder/index.tsx | 22 +++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/front/Components/LayoutTemplates/DefaultNotaryDashboard/index.tsx b/src/front/Components/LayoutTemplates/DefaultNotaryDashboard/index.tsx index 449e7d7d..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; diff --git a/src/front/Components/Layouts/Folder/index.tsx b/src/front/Components/Layouts/Folder/index.tsx index d9f7b1d9..d4d5da21 100644 --- a/src/front/Components/Layouts/Folder/index.tsx +++ b/src/front/Components/Layouts/Folder/index.tsx @@ -13,10 +13,14 @@ import Link from "next/link"; import { useCallback, useEffect, useState } from "react"; import classes from "./classes.module.scss"; +import Folders from "@Front/Api/LeCoffreApi/Notary/Folders/Folders"; +import EFolderStatus from "le-coffre-resources/dist/Customer/EFolderStatus"; +import { useRouter } from "next/router"; export default function Folder() { const [_folder, setFolder] = useState(null); const [_isArchivedModalOpen, _setIsArchivedModalOpen] = useState(true); + const router = useRouter(); const [activeUser, setActiveUser] = useState(); const onSelectedFolder = useCallback((folder: OfficeFolder): void => { @@ -37,6 +41,24 @@ export default function Folder() { }); }, []); + useEffect(() => { + Folders.getInstance() + .get({ + q: { + where: { status: EFolderStatus.LIVE }, + }, + }) + .then((folders) => { + console.log(folders); + if (folders.length > 0) + router.push( + Module.getInstance() + .get() + .modules.pages.Folder.pages.FolderInformation.props.path.replace("[folderUid]", folders[0]?.uid ?? ""), + ); + }); + }, [router]); + return (