From 9000820089f045517e9e67260dfdaff54d843aa3 Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Thu, 4 May 2023 14:01:01 +0200 Subject: [PATCH] :bug: Fixing build --- .../Layouts/DesignSystem/dummyData.ts | 4 +- .../Components/Layouts/DesignSystem/index.tsx | 2 +- .../Layouts/Folder/CreateFolder/index.tsx | 9 ++--- .../FolderInformation/ClientSection/index.tsx | 1 + .../FolderInformation/ClientSection/index.tsx | 39 +++++++++++++++++-- 5 files changed, 44 insertions(+), 11 deletions(-) diff --git a/src/front/Components/Layouts/DesignSystem/dummyData.ts b/src/front/Components/Layouts/DesignSystem/dummyData.ts index a5254e11..c3c249f6 100644 --- a/src/front/Components/Layouts/DesignSystem/dummyData.ts +++ b/src/front/Components/Layouts/DesignSystem/dummyData.ts @@ -84,7 +84,7 @@ export const docType: DocumentType = { public_description: "Acte de naissance public description", private_description: "Acte de naissance private description", archived_at: new Date(), - // office: office, + office: office, }; export const identityDocType: DocumentType = { @@ -95,7 +95,7 @@ export const identityDocType: DocumentType = { public_description: "Carte d'identité public description", private_description: "Carte d'identité private description", archived_at: new Date(), - // office: office, + office: office, }; export const customer: Customer = { diff --git a/src/front/Components/Layouts/DesignSystem/index.tsx b/src/front/Components/Layouts/DesignSystem/index.tsx index 37765476..5af6c6ae 100644 --- a/src/front/Components/Layouts/DesignSystem/index.tsx +++ b/src/front/Components/Layouts/DesignSystem/index.tsx @@ -239,7 +239,7 @@ export default class DesignSystem extends BasePage { Notary Documents
- + {return}} onOpen={() => {return}}/>
diff --git a/src/front/Components/Layouts/Folder/CreateFolder/index.tsx b/src/front/Components/Layouts/Folder/CreateFolder/index.tsx index b75ee47d..5249d8e2 100644 --- a/src/front/Components/Layouts/Folder/CreateFolder/index.tsx +++ b/src/front/Components/Layouts/Folder/CreateFolder/index.tsx @@ -137,12 +137,11 @@ class CreateFolderClass extends BasePage { const deedTypes = await DeedTypes.getInstance().get({ q: {} }); // TODO SETUP userStore and get the user's office membership -> Replace IwJ70M471c by the user's office membership uid - const usersMock = await Users.getInstance().get({ q: { include: { office_membership: true } } }); + const usersMock = await Users.getInstance().get( { include: { office_membership: true } }); const userMock = usersMock[0]; // ------------------- - const collaborators = await Users.getInstance().get({ - q: { where: { office_membership: { uid: userMock?.office_membership.uid } }, include: { contact: true } }, - }); + const collaborators = await Users.getInstance().get( { where: { office_membership: { uid: userMock?.office_membership.uid } }, include: { contact: true } }, + ); this.setState({ deedTypes, deedTypesOptions: this.mapDeedOptions(deedTypes), @@ -223,7 +222,7 @@ class CreateFolderClass extends BasePage { /** * MOCK DATA */ - const usersMock = await Users.getInstance().get({ q: { include: { office_membership: true } } }); + const usersMock = await Users.getInstance().get( { include: { office_membership: true }}); const userMock = usersMock[0]; // ----- if (!selectedDeedTypeUid) return; diff --git a/src/front/Components/Layouts/Folder/FolderInformation/ClientSection/index.tsx b/src/front/Components/Layouts/Folder/FolderInformation/ClientSection/index.tsx index 8b04e681..9a709763 100644 --- a/src/front/Components/Layouts/Folder/FolderInformation/ClientSection/index.tsx +++ b/src/front/Components/Layouts/Folder/FolderInformation/ClientSection/index.tsx @@ -90,6 +90,7 @@ export default class ClientSection extends React.Component { openedCustomer: index, }); } + private doesFolderHaveCustomer(): boolean { if (!this.props.folder?.office_folder_has_customers) return false; return this.props.folder?.office_folder_has_customers!.length > 0; diff --git a/src/front/Components/Layouts/FolderArchived/FolderInformation/ClientSection/index.tsx b/src/front/Components/Layouts/FolderArchived/FolderInformation/ClientSection/index.tsx index 15924744..23250620 100644 --- a/src/front/Components/Layouts/FolderArchived/FolderInformation/ClientSection/index.tsx +++ b/src/front/Components/Layouts/FolderArchived/FolderInformation/ClientSection/index.tsx @@ -7,9 +7,21 @@ import UserFolder from "@Front/Components/DesignSystem/UserFolder"; type IProps = { folder: IDashBoardFolder; }; -type IState = {}; +type IState = { + openedCustomer: string; +}; export default class ClientSection extends React.Component { + public constructor(props: IProps) { + super(props); + this.state = { + openedCustomer: "", + }; + + this.selectUserFolder = this.selectUserFolder.bind(this); + this.closeUserFolder = this.closeUserFolder.bind(this); + } + public override render(): JSX.Element { return (
@@ -29,14 +41,35 @@ export default class ClientSection extends React.Component { } private renderCustomerFolders() { - const output = this.props.folder.office_folder_has_customers?.map((folderHasCustomer, key) => { + const output = this.props.folder.office_folder_has_customers?.map((folderHasCustomer) => { if (!folderHasCustomer.customer) return null; // TODO : Les documents ASKED fonctionne mais les autres documents ne doivcent etre seulement ceux qui correspondent au folder - return ; + return ( + + ); }); return output ?? null; } + private closeUserFolder() { + this.setState({ + openedCustomer: "", + }); + } + + private selectUserFolder(index: string) { + this.setState({ + openedCustomer: index, + }); + } + private doesFolderHaveCustomer(): boolean { return this.props.folder.office_folder_has_customers !== undefined; }