From 6f641e07cdcd496110c97e81cd3bdba70d6ffb69 Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Wed, 27 Sep 2023 16:17:59 +0200 Subject: [PATCH 01/19] :sparkles: Refacto live votes --- .../SuperAdmin/LiveVotes/LiveVotes.ts | 18 +++++++- .../Api/LeCoffreApi/SuperAdmin/Votes/Votes.ts | 44 ------------------- .../Layouts/Users/UserInformations/index.tsx | 3 +- 3 files changed, 18 insertions(+), 47 deletions(-) delete mode 100644 src/front/Api/LeCoffreApi/SuperAdmin/Votes/Votes.ts diff --git a/src/front/Api/LeCoffreApi/SuperAdmin/LiveVotes/LiveVotes.ts b/src/front/Api/LeCoffreApi/SuperAdmin/LiveVotes/LiveVotes.ts index 394e1b93..8a40af7b 100644 --- a/src/front/Api/LeCoffreApi/SuperAdmin/LiveVotes/LiveVotes.ts +++ b/src/front/Api/LeCoffreApi/SuperAdmin/LiveVotes/LiveVotes.ts @@ -1,4 +1,4 @@ -import { Appointment } from "le-coffre-resources/dist/SuperAdmin"; +import { Appointment, Vote } from "le-coffre-resources/dist/SuperAdmin"; import BaseSuperAdmin from "../BaseSuperAdmin"; @@ -18,6 +18,9 @@ export type LiveVote = { appointment: Appointment; }; +export type IDeleteVotesParams = { + uid: Vote["uid"]; +}; export default class LiveVotes extends BaseSuperAdmin { private static instance: LiveVotes; private readonly baseURl = this.namespaceUrl.concat("/live-votes"); @@ -46,4 +49,17 @@ export default class LiveVotes extends BaseSuperAdmin { return Promise.reject(err); } } + + /** + * @description : Delete a vote + */ + public async delete(body: IDeleteVotesParams): Promise { + const url = new URL(`${this.baseURl}/${body.uid}`); + try { + return await this.deleteRequest(url, body); + } catch (err) { + this.onError(err); + return Promise.reject(err); + } + } } diff --git a/src/front/Api/LeCoffreApi/SuperAdmin/Votes/Votes.ts b/src/front/Api/LeCoffreApi/SuperAdmin/Votes/Votes.ts deleted file mode 100644 index 34907702..00000000 --- a/src/front/Api/LeCoffreApi/SuperAdmin/Votes/Votes.ts +++ /dev/null @@ -1,44 +0,0 @@ -import { Vote } from "le-coffre-resources/dist/SuperAdmin"; - -import BaseSuperAdmin from "../BaseSuperAdmin"; - -// TODO Type get query params -> Where + inclue + orderby -export interface IGetVotessparams { - where?: {}; - include?: {}; - select?: {}; -} - -export type IDeleteVotesParams = { - uid: Vote["uid"]; -}; - -export default class Votes extends BaseSuperAdmin { - private static instance: Votes; - private readonly baseURl = this.namespaceUrl.concat("/votes"); - - private constructor() { - super(); - } - - public static getInstance() { - if (!this.instance) { - return new this(); - } else { - return this.instance; - } - } - - /** - * @description : Create a Votes - */ - public async delete(body: IDeleteVotesParams): Promise { - const url = new URL(this.baseURl + "/" + body.uid); - try { - return await this.deleteRequest(url, body); - } catch (err) { - this.onError(err); - return Promise.reject(err); - } - } -} diff --git a/src/front/Components/Layouts/Users/UserInformations/index.tsx b/src/front/Components/Layouts/Users/UserInformations/index.tsx index 990b3de6..17b9e22b 100644 --- a/src/front/Components/Layouts/Users/UserInformations/index.tsx +++ b/src/front/Components/Layouts/Users/UserInformations/index.tsx @@ -3,7 +3,6 @@ import OfficeRoles from "@Front/Api/LeCoffreApi/Admin/OfficeRoles/OfficeRoles"; import Roles from "@Front/Api/LeCoffreApi/Admin/Roles/Roles"; import LiveVotes from "@Front/Api/LeCoffreApi/SuperAdmin/LiveVotes/LiveVotes"; import Users from "@Front/Api/LeCoffreApi/SuperAdmin/Users/Users"; -import Votes from "@Front/Api/LeCoffreApi/SuperAdmin/Votes/Votes"; import Button, { EButtonVariant } from "@Front/Components/DesignSystem/Button"; import SelectField, { IOption } from "@Front/Components/DesignSystem/Form/SelectField"; import Confirm from "@Front/Components/DesignSystem/Modal/Confirm"; @@ -222,7 +221,7 @@ export default function UserInformations(props: IProps) { const user = JwtService.getInstance().decodeJwt(); const vote = currentAppointment.votes?.find((vote) => vote.voter?.uid === user?.userId); if (!vote) return; - await Votes.getInstance().delete({ uid: vote.uid }); + await LiveVotes.getInstance().delete({ uid: vote.uid }); await getUser(); }, [currentAppointment, getUser]); From 439a0f5bc6029cf06e867fa4916fde1b33fa7faa Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Mon, 2 Oct 2023 10:04:42 +0200 Subject: [PATCH 02/19] :sparkles: Updating ressources --- package-lock.json | 30 +++++++++++++++--------------- package.json | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0b5a1fd9..8fd2491a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -461,9 +461,9 @@ } }, "node_modules/@floating-ui/utils": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.4.tgz", - "integrity": "sha512-qprfWkn82Iw821mcKofJ5Pk9wgioHicxcQMxx+5zt5GSKoqdWvgG5AxVmpmUUjzTLPVSH5auBrhI93Deayn/DA==" + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.6.tgz", + "integrity": "sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A==" }, "node_modules/@humanwhocodes/config-array": { "version": "0.11.11", @@ -965,9 +965,9 @@ } }, "node_modules/@rushstack/eslint-patch": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.5.0.tgz", - "integrity": "sha512-EF3948ckf3f5uPgYbQ6GhyA56Dmv8yg0+ir+BroRjwdxyZJsekhZzawOecC2rOTPCz173t7ZcR1HHZu0dZgOCw==" + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.5.1.tgz", + "integrity": "sha512-6i/8UoL0P5y4leBIGzvkZdS85RDMG9y1ihZzmTZQ5LdHUYmZ7pKFoj8X0236s3lusPs1Fa5HTQUpwI+UfTcmeA==" }, "node_modules/@swc/helpers": { "version": "0.4.14", @@ -993,9 +993,9 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==" }, "node_modules/@types/prop-types": { - "version": "15.7.7", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.7.tgz", - "integrity": "sha512-FbtmBWCcSa2J4zL781Zf1p5YUBXQomPEcep9QZCfRfQgTxz3pJWiDFLebohZ9fFntX5ibzOkSsrJ0TEew8cAog==" + "version": "15.7.8", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.8.tgz", + "integrity": "sha512-kMpQpfZKSCBqltAJwskgePRaYRFukDkm1oItcAbC3gNELR20XIBcN9VRgg4+m8DKsTfkWeA4m4Imp4DDuWy7FQ==" }, "node_modules/@types/react": { "version": "18.0.28", @@ -1507,9 +1507,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001541", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001541.tgz", - "integrity": "sha512-bLOsqxDgTqUBkzxbNlSBt8annkDpQB9NdzdTbO2ooJ+eC/IQcvDspDc058g84ejCelF7vHUx57KIOjEecOHXaw==", + "version": "1.0.30001542", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001542.tgz", + "integrity": "sha512-UrtAXVcj1mvPBFQ4sKd38daP8dEcXXr5sQe6QNNinaPd0iA/cxg9/l3VrSdL73jgw5sKyuQ6jNgiKO12W3SsVA==", "funding": [ { "type": "opencollective", @@ -4067,9 +4067,9 @@ "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==" }, "node_modules/react-select": { - "version": "5.7.5", - "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.7.5.tgz", - "integrity": "sha512-jgYZa2xgKP0DVn5GZk7tZwbRx7kaVz1VqU41S8z1KWmshRDhlrpKS0w80aS1RaK5bVIXpttgSou7XCjWw1ncKA==", + "version": "5.7.7", + "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.7.7.tgz", + "integrity": "sha512-HhashZZJDRlfF/AKj0a0Lnfs3sRdw/46VJIRd8IbB9/Ovr74+ZIwkAdSBjSPXsFMG+u72c5xShqwLSKIJllzqw==", "dependencies": { "@babel/runtime": "^7.12.0", "@emotion/cache": "^11.4.0", diff --git a/package.json b/package.json index 53e1bb64..bb886725 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "eslint-config-next": "13.2.4", "form-data": "^4.0.0", "jwt-decode": "^3.1.2", - "le-coffre-resources": "git@github.com:smart-chain-fr/leCoffre-resources.git#v2.85", + "le-coffre-resources": "git@github.com:smart-chain-fr/leCoffre-resources.git#v2.88", "next": "13.2.4", "prettier": "^2.8.7", "react": "18.2.0", From f756e12c5f956a4f722fbb0a1e7c2ff371197a42 Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Mon, 2 Oct 2023 11:41:31 +0200 Subject: [PATCH 03/19] :sparkles: Preventing anchoring if not validated --- .../Folder/FolderInformation/index.tsx | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/src/front/Components/Layouts/Folder/FolderInformation/index.tsx b/src/front/Components/Layouts/Folder/FolderInformation/index.tsx index f122a976..4afac6fa 100644 --- a/src/front/Components/Layouts/Folder/FolderInformation/index.tsx +++ b/src/front/Components/Layouts/Folder/FolderInformation/index.tsx @@ -37,6 +37,7 @@ type IState = { hasValidateAnchoring: boolean; isVerifDeleteModalVisible: boolean; isAnchored: boolean | null; + isPreventArchiveModalOpen: boolean; }; class FolderInformationClass extends BasePage { public constructor(props: IPropsClass) { @@ -49,6 +50,7 @@ class FolderInformationClass extends BasePage { hasValidateAnchoring: false, isVerifDeleteModalVisible: false, isAnchored: null, + isPreventArchiveModalOpen: false, }; this.onSelectedFolder = this.onSelectedFolder.bind(this); this.openArchivedModal = this.openArchivedModal.bind(this); @@ -63,6 +65,7 @@ class FolderInformationClass extends BasePage { this.openVerifDeleteFolder = this.openVerifDeleteFolder.bind(this); this.closeVerifDeleteFolder = this.closeVerifDeleteFolder.bind(this); this.verifyAnchorStatus = this.verifyAnchorStatus.bind(this); + this.closePreventArchiveModal = this.closePreventArchiveModal.bind(this); } // TODO: Message if the user has not created any folder yet @@ -174,6 +177,22 @@ class FolderInformationClass extends BasePage { )} + +
+ + Pour valider un dossier, toutes les pièces envoyées par vos clients doivent être validées (vert). Si certains + documents sont en attente (orange), alors, veuillez les valider ou les refuser et veillez à ce qu'aucun document + ne soit encore en demandé au client (gris) + +
+ { ); } + private closePreventArchiveModal() { + this.setState({ + isPreventArchiveModalOpen: false, + }); + } + private async verifyAnchorStatus() { if (!this.state.selectedFolder || !this.state.selectedFolder.uid) return; try { @@ -352,7 +377,11 @@ class FolderInformationClass extends BasePage { } private openArchivedModal(): void { - this.setState({ isArchivedModalOpen: true }); + if (this.everyDocumentValidated() && this.state.isAnchored) { + this.setState({ isArchivedModalOpen: true }); + } else { + this.setState({ isPreventArchiveModalOpen: true }); + } } private closeArchivedModal(): void { From 7ed6d7e1f4ac114b3d00bf4bc00f7dbea0affe97 Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Mon, 2 Oct 2023 11:46:07 +0200 Subject: [PATCH 04/19] :bug: Fixing modal close on other documents --- .../Components/DesignSystem/DepositOtherDocument/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/front/Components/DesignSystem/DepositOtherDocument/index.tsx b/src/front/Components/DesignSystem/DepositOtherDocument/index.tsx index 7b9c165c..7d84c26b 100644 --- a/src/front/Components/DesignSystem/DepositOtherDocument/index.tsx +++ b/src/front/Components/DesignSystem/DepositOtherDocument/index.tsx @@ -71,7 +71,7 @@ export default class DepositOtherDocument extends React.Component {}} + onClose={this.props.onClose!} onAccept={this.onAccept} closeBtn header={"Ajouter un document"} From 6f5134a7b6e2460995d896ea79ffa8b5d040772f Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Mon, 2 Oct 2023 11:54:33 +0200 Subject: [PATCH 05/19] :sparkles: Hiding delete documents when no right to --- src/front/Api/Entities/rule.ts | 3 ++- .../Document/DocumentNotary/index.tsx | 22 ++++++++++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/front/Api/Entities/rule.ts b/src/front/Api/Entities/rule.ts index 06b21bde..ac4a0282 100644 --- a/src/front/Api/Entities/rule.ts +++ b/src/front/Api/Entities/rule.ts @@ -15,5 +15,6 @@ export enum AppRuleNames { officeFolders = "folders", officeRoles = "office-roles", deedTypes = "deed-types", - offices = "offices" + offices = "offices", + documents = "documents", } diff --git a/src/front/Components/DesignSystem/Document/DocumentNotary/index.tsx b/src/front/Components/DesignSystem/Document/DocumentNotary/index.tsx index 5e4bfbf3..db81dbb1 100644 --- a/src/front/Components/DesignSystem/Document/DocumentNotary/index.tsx +++ b/src/front/Components/DesignSystem/Document/DocumentNotary/index.tsx @@ -10,6 +10,8 @@ import Typography, { ITypo } from "../../Typography"; import WarningBadge from "../../WarningBadge"; import classes from "./classes.module.scss"; import { EDocumentStatus } from "le-coffre-resources/dist/Customer/Document"; +import Rules, { RulesMode } from "@Front/Components/Elements/Rules"; +import { AppRuleActions, AppRuleNames } from "@Front/Api/Entities/rule"; type IProps = { folderUid: string; @@ -60,8 +62,11 @@ class DocumentNotaryClass extends React.Component { } else { const archivedFilesLength = documentFiles.filter((file) => file.archived_at).length; const documentFileLength = documentFiles.length - archivedFilesLength; - if(this.props.document.document_status === EDocumentStatus.ASKED || this.props.document.document_status === EDocumentStatus.REFUSED){ - return 'Aucun document déposé'; + if ( + this.props.document.document_status === EDocumentStatus.ASKED || + this.props.document.document_status === EDocumentStatus.REFUSED + ) { + return "Aucun document déposé"; } return `${documentFileLength} documents déposés`; @@ -91,7 +96,18 @@ class DocumentNotaryClass extends React.Component { case EDocumentStatus.DEPOSITED: return ; default: - return trash icon; + return ( + + trash icon + + ); } } From e2cacb8c6f6f1995ea38820d5207ccc2e4202b64 Mon Sep 17 00:00:00 2001 From: OxSaitama Date: Mon, 2 Oct 2023 15:44:44 +0200 Subject: [PATCH 06/19] refacto logout url --- src/front/Components/DesignSystem/LogOutButton/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/front/Components/DesignSystem/LogOutButton/index.tsx b/src/front/Components/DesignSystem/LogOutButton/index.tsx index adf35eab..a2ca2042 100644 --- a/src/front/Components/DesignSystem/LogOutButton/index.tsx +++ b/src/front/Components/DesignSystem/LogOutButton/index.tsx @@ -13,7 +13,7 @@ export default function LogOut() { const disconnect = async() => { await UserStore.instance.disconnect(); - router.push(`https://qual-connexion.idnot.fr/user/auth/logout?post_logout_redirect_uri=${variables.FRONT_APP_HOST}/login`); + router.push(`https://qual-connexion.idnot.fr/user/auth/logout?sourceURL=${variables.FRONT_APP_HOST}`); }; return ( From 79bc99c8aab73f7f1f85438ec8db31fca66dfbd7 Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Mon, 2 Oct 2023 15:50:43 +0200 Subject: [PATCH 07/19] :sparkles: New anchoring --- .../Folder/FolderInformation/index.tsx | 69 +++++++++++-------- 1 file changed, 40 insertions(+), 29 deletions(-) diff --git a/src/front/Components/Layouts/Folder/FolderInformation/index.tsx b/src/front/Components/Layouts/Folder/FolderInformation/index.tsx index 4afac6fa..e07138ca 100644 --- a/src/front/Components/Layouts/Folder/FolderInformation/index.tsx +++ b/src/front/Components/Layouts/Folder/FolderInformation/index.tsx @@ -13,7 +13,7 @@ import { OfficeFolder } from "le-coffre-resources/dist/Notary"; import { EDocumentStatus } from "le-coffre-resources/dist/Notary/Document"; import Link from "next/link"; import { NextRouter, useRouter } from "next/router"; -import { ChangeEvent } from "react"; +import { ChangeEvent, useCallback, useEffect, useState } from "react"; import Image from "next/image"; import ValidateAnchoringGif from "@Front/Assets/images/validate_anchoring.gif"; @@ -21,12 +21,21 @@ import BasePage from "../../Base"; import classes from "./classes.module.scss"; import ClientSection from "./ClientSection"; import CheckBox from "@Front/Components/DesignSystem/CheckBox"; +import Loader from "@Front/Components/DesignSystem/Loader"; + +enum AnchorStatus { + "VERIFIED_ON_CHAIN" = "VERIFIED_ON_CHAIN", + "ANCHORING" = "ANCHORING", + "NOT_ANCHORED" = "NOT_ANCHORED", + "FETCHING" = "FETCHING", +} type IProps = {}; type IPropsClass = IProps & { router: NextRouter; selectedFolderUid: string; + isAnchored: AnchorStatus; }; type IState = { @@ -36,7 +45,6 @@ type IState = { isValidateModalVisible: boolean; hasValidateAnchoring: boolean; isVerifDeleteModalVisible: boolean; - isAnchored: boolean | null; isPreventArchiveModalOpen: boolean; }; class FolderInformationClass extends BasePage { @@ -49,7 +57,6 @@ class FolderInformationClass extends BasePage { isValidateModalVisible: false, hasValidateAnchoring: false, isVerifDeleteModalVisible: false, - isAnchored: null, isPreventArchiveModalOpen: false, }; this.onSelectedFolder = this.onSelectedFolder.bind(this); @@ -64,7 +71,6 @@ class FolderInformationClass extends BasePage { this.openValidateModal = this.openValidateModal.bind(this); this.openVerifDeleteFolder = this.openVerifDeleteFolder.bind(this); this.closeVerifDeleteFolder = this.closeVerifDeleteFolder.bind(this); - this.verifyAnchorStatus = this.verifyAnchorStatus.bind(this); this.closePreventArchiveModal = this.closePreventArchiveModal.bind(this); } @@ -116,12 +122,18 @@ class FolderInformationClass extends BasePage { {this.everyDocumentValidated() && ( <> - {this.state.isAnchored === null && ( + {this.props.isAnchored === AnchorStatus.NOT_ANCHORED && ( )} - {this.state.isAnchored === true && ( + {this.props.isAnchored === AnchorStatus.ANCHORING && ( + + )} + {this.props.isAnchored === AnchorStatus.VERIFIED_ON_CHAIN && ( - +
- +
{ currentNumber={this.getCompletionNumber()} />
- {this.doesFolderHaveCustomer() && } + {this.doesFolderHaveCustomer() && } - {!this.doesFolderHaveCustomer() && } + {!this.doesFolderHaveCustomer() && }
- {this.everyDocumentValidated() && ( + {this.everyDocumentValidated() && !this.props.isLoading && ( <> {this.props.isAnchored === AnchorStatus.NOT_ANCHORED && ( )} @@ -245,13 +241,6 @@ class FolderInformationClass extends BasePage { ); } - public override async componentDidMount() { - const selectedFolder = await this.getFolder(); - this.setState({ - selectedFolder, - }); - } - private closePreventArchiveModal() { this.setState({ isPreventArchiveModalOpen: false, @@ -311,8 +300,8 @@ class FolderInformationClass extends BasePage { } private async anchorFolder() { - if (!this.state.selectedFolder?.uid) return; - return await OfficeFolderAnchors.getInstance().post(this.state.selectedFolder.uid); + if (!this.props.selectedFolder?.uid) return; + return await OfficeFolderAnchors.getInstance().post(this.props.selectedFolder.uid); } private async downloadAnchoringProof(uid?: string) { @@ -325,7 +314,7 @@ class FolderInformationClass extends BasePage { a.style.display = "none"; a.href = url; // the filename you want - a.download = `anchoring_proof_${this.state.selectedFolder?.folder_number}_${this.state.selectedFolder?.name}.pdf`; + a.download = `anchoring_proof_${this.props.selectedFolder?.folder_number}_${this.props.selectedFolder?.name}.pdf`; document.body.appendChild(a); a.click(); window.URL.revokeObjectURL(url); @@ -335,21 +324,21 @@ class FolderInformationClass extends BasePage { } private everyDocumentValidated(): boolean { - if (!this.state.selectedFolder?.documents) return false; + if (!this.props.selectedFolder?.documents) return false; return ( - this.state.selectedFolder?.documents?.length >= 1 && - this.state.selectedFolder?.documents.every((document) => document.document_status === EDocumentStatus.VALIDATED) + this.props.selectedFolder?.documents?.length >= 1 && + this.props.selectedFolder?.documents.every((document) => document.document_status === EDocumentStatus.VALIDATED) ); } private async deleteFolder() { - if (!this.state.selectedFolder?.uid) return; - await Folders.getInstance().delete(this.state.selectedFolder.uid); + if (!this.props.selectedFolder?.uid) return; + await Folders.getInstance().delete(this.props.selectedFolder.uid); this.props.router.push(Module.getInstance().get().modules.pages.Folder.props.path); } private getCompletionNumber() { - const documents = this.state.selectedFolder?.documents; + const documents = this.props.selectedFolder?.documents; if (!documents) return 0; const totalDocuments = documents.length; const refusedDocuments = documents.filter((document) => document.document_status === EDocumentStatus.REFUSED).length ?? 0; @@ -363,12 +352,8 @@ class FolderInformationClass extends BasePage { } private doesFolderHaveCustomer(): boolean { - if (!this.state.selectedFolder?.customers) return false; - return this.state.selectedFolder?.customers!.length > 0; - } - - private onSelectedFolder(folder: OfficeFolder): void { - this.setState({ selectedFolder: folder }); + if (!this.props.selectedFolder?.customers) return false; + return this.props.selectedFolder?.customers!.length > 0; } private openArchivedModal(): void { @@ -388,15 +373,38 @@ class FolderInformationClass extends BasePage { } private async onArchivedModalAccepted() { - if (!this.state.selectedFolder) return; - const ressourceFolder = OfficeFolder.hydrate(this.state.selectedFolder); + if (!this.props.selectedFolder) return; + const ressourceFolder = OfficeFolder.hydrate(this.props.selectedFolder); ressourceFolder.archived_description = this.state.inputArchivedDescripton; - await Folders.getInstance().archive(this.state.selectedFolder.uid ?? "", ressourceFolder); + await Folders.getInstance().archive(this.props.selectedFolder.uid ?? "", ressourceFolder); this.closeArchivedModal(); this.props.router.push(Module.getInstance().get().modules.pages.Folder.props.path); } +} - private async getFolder(): Promise { +export default function FolderInformation(props: IProps) { + const router = useRouter(); + const [isAnchored, setIsAnchored] = useState(AnchorStatus.NOT_ANCHORED); + const [isLoading, setIsLoading] = useState(true); + const [selectedFolder, setSelectedFolder] = useState(null); + + let { folderUid } = router.query; + folderUid = folderUid as string; + + const verifyAnchorStatus = useCallback(async () => { + if (!folderUid) return; + setIsLoading(true); + try { + const anchorStatus = await OfficeFolderAnchors.getInstance().get(folderUid as string); + setIsAnchored(anchorStatus.status === "VERIFIED_ON_CHAIN" ? AnchorStatus.VERIFIED_ON_CHAIN : AnchorStatus.ANCHORING); + } catch (e) { + setIsAnchored(AnchorStatus.NOT_ANCHORED); + } + setIsLoading(false); + }, [folderUid]); + + const getFolder = useCallback(async () => { + if (!folderUid) return; const query = { q: { deed: { include: { deed_type: true } }, @@ -426,30 +434,28 @@ class FolderInformationClass extends BasePage { }, }; - const folder = await Folders.getInstance().getByUid(this.props.selectedFolderUid, query); - return folder; - } -} - -export default function FolderInformation(props: IProps) { - const router = useRouter(); - const [isAnchored, setIsAnchored] = useState(AnchorStatus.FETCHING); - let { folderUid } = router.query; - folderUid = folderUid as string; - - const verifyAnchorStatus = useCallback(async () => { - if (!folderUid) return; - try { - const anchorStatus = await OfficeFolderAnchors.getInstance().get(folderUid as string); - setIsAnchored(anchorStatus.status === "VERIFIED_ON_CHAIN" ? AnchorStatus.VERIFIED_ON_CHAIN : AnchorStatus.ANCHORING); - } catch (e) { - setIsAnchored(AnchorStatus.NOT_ANCHORED); + const folder = await Folders.getInstance().getByUid(folderUid as string, query); + if (folder) { + setSelectedFolder(folder); } }, [folderUid]); useEffect(() => { verifyAnchorStatus(); - }, [folderUid, verifyAnchorStatus]); + getFolder(); + }, [verifyAnchorStatus, getFolder]); - return ; + useEffect(() => { + setIsLoading(true); + }, [folderUid]); + return ( + + ); } From 1fa331e3292775a1ce3a3d4c91f90af652ec635d Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Mon, 2 Oct 2023 16:03:28 +0200 Subject: [PATCH 09/19] :bug: Forgot console log --- src/front/Components/Layouts/Folder/FolderInformation/index.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/front/Components/Layouts/Folder/FolderInformation/index.tsx b/src/front/Components/Layouts/Folder/FolderInformation/index.tsx index 4c4bdfc7..828443ae 100644 --- a/src/front/Components/Layouts/Folder/FolderInformation/index.tsx +++ b/src/front/Components/Layouts/Folder/FolderInformation/index.tsx @@ -75,8 +75,6 @@ class FolderInformationClass extends BasePage { // TODO: Message if the user has not created any folder yet // TODO: get the selected folder from the api in componentDidMount public override render(): JSX.Element { - console.log("Loading : ", this.props.isLoading); - console.log("Anchor status : ", this.props.isAnchored); const redirectPathEditCollaborators = Module.getInstance() .get() .modules.pages.Folder.pages.EditCollaborators.props.path.replace("[folderUid]", this.props.selectedFolderUid); From f9511af1a040d61c70a5ee60068694a14ab4edb1 Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Mon, 2 Oct 2023 16:08:46 +0200 Subject: [PATCH 10/19] :bug: Fix loader behind files --- src/front/Components/DesignSystem/FilePreview/index.tsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/front/Components/DesignSystem/FilePreview/index.tsx b/src/front/Components/DesignSystem/FilePreview/index.tsx index 9e99150c..81046eff 100644 --- a/src/front/Components/DesignSystem/FilePreview/index.tsx +++ b/src/front/Components/DesignSystem/FilePreview/index.tsx @@ -17,9 +17,11 @@ export default class FilePreview extends React.Component { if (this.props.fileName) type = this.props.fileName.split(".").pop(); return (
-
- -
+ {!this.props.href && ( +
+ +
+ )} {this.props.href && ( <> From 1dfed0d6d926a7477911fec1dafa3d88bc886021 Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Mon, 2 Oct 2023 16:14:41 +0200 Subject: [PATCH 11/19] :bug: Fix order by folders --- src/front/Api/LeCoffreApi/Customer/Folders/Folders.ts | 1 + src/front/Components/Layouts/SelectFolder/index.tsx | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/src/front/Api/LeCoffreApi/Customer/Folders/Folders.ts b/src/front/Api/LeCoffreApi/Customer/Folders/Folders.ts index 27bfd731..eb53449a 100644 --- a/src/front/Api/LeCoffreApi/Customer/Folders/Folders.ts +++ b/src/front/Api/LeCoffreApi/Customer/Folders/Folders.ts @@ -7,6 +7,7 @@ export interface IGetFoldersParams { q?: { select?: {}; where?: {}; + orderBy?: {}[]; include?: {}; }; } diff --git a/src/front/Components/Layouts/SelectFolder/index.tsx b/src/front/Components/Layouts/SelectFolder/index.tsx index 7650cc05..7d59f914 100644 --- a/src/front/Components/Layouts/SelectFolder/index.tsx +++ b/src/front/Components/Layouts/SelectFolder/index.tsx @@ -29,6 +29,11 @@ export default function SelectFolder() { }, }, }, + orderBy: [ + { + created_at: "desc", + }, + ], }, }); setFolders(folders); From d8c5deeb7528694d81216107e2b3590823acd6b9 Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Mon, 2 Oct 2023 16:23:01 +0200 Subject: [PATCH 12/19] :sparkles: Add a loader to folders --- .../FolderInformation/classes.module.scss | 12 + .../Folder/FolderInformation/index.tsx | 230 +++++++++--------- 2 files changed, 133 insertions(+), 109 deletions(-) diff --git a/src/front/Components/Layouts/Folder/FolderInformation/classes.module.scss b/src/front/Components/Layouts/Folder/FolderInformation/classes.module.scss index ce30f22f..f84b215e 100644 --- a/src/front/Components/Layouts/Folder/FolderInformation/classes.module.scss +++ b/src/front/Components/Layouts/Folder/FolderInformation/classes.module.scss @@ -99,3 +99,15 @@ } } } + +.loader-container { + display: flex; + flex: 1; + align-items: center; + justify-content: center; + height: 100%; + .loader { + width: 40px; + height: 40px; + } +} diff --git a/src/front/Components/Layouts/Folder/FolderInformation/index.tsx b/src/front/Components/Layouts/Folder/FolderInformation/index.tsx index 828443ae..61548236 100644 --- a/src/front/Components/Layouts/Folder/FolderInformation/index.tsx +++ b/src/front/Components/Layouts/Folder/FolderInformation/index.tsx @@ -80,109 +80,124 @@ class FolderInformationClass extends BasePage { .modules.pages.Folder.pages.EditCollaborators.props.path.replace("[folderUid]", this.props.selectedFolderUid); return ( -
- {this.props.selectedFolder ? ( -
-
-
-
- Informations du dossier + {!this.props.isLoading && ( +
+ {this.props.selectedFolder ? ( +
+
+
+
+ Informations du dossier +
+ + +
- - - -
- -
- -
-
- +
+ +
+
+ +
+ {this.doesFolderHaveCustomer() && }
- {this.doesFolderHaveCustomer() && } -
- {!this.doesFolderHaveCustomer() && } + {!this.doesFolderHaveCustomer() && } -
- - {this.everyDocumentValidated() && !this.props.isLoading && ( - <> - {this.props.isAnchored === AnchorStatus.NOT_ANCHORED && ( - - )} - {this.props.isAnchored === AnchorStatus.ANCHORING && ( - - )} - {this.props.isAnchored === AnchorStatus.VERIFIED_ON_CHAIN && ( - - )} - - )} - {!this.doesFolderHaveCustomer() && ( - - - - )} -
- -
- Souhaitez-vous vraiment archiver le dossier ? +
+ + {this.everyDocumentValidated() && !this.props.isLoading && ( + <> + {this.props.isAnchored === AnchorStatus.NOT_ANCHORED && ( + + )} + {this.props.isAnchored === AnchorStatus.ANCHORING && ( + + )} + {this.props.isAnchored === AnchorStatus.VERIFIED_ON_CHAIN && ( + + )} + + )} + {!this.doesFolderHaveCustomer() && ( + + + + )}
- - - -
- Cette action sera irréversible. -
- -
- ) : ( -
- Informations du dossier -
- - Sélectionnez un dossier - + +
+ Souhaitez-vous vraiment archiver le dossier ? +
+ + + +
+ Cette action sera irréversible. +
+
+ ) : ( +
+ Informations du dossier +
+ + Sélectionnez un dossier + +
+
+ )} +
+ )} + {this.props.isLoading && ( +
+
+
- )} -
+
+ )} { - if (!folderUid) return; - setIsLoading(true); - try { - const anchorStatus = await OfficeFolderAnchors.getInstance().get(folderUid as string); - setIsAnchored(anchorStatus.status === "VERIFIED_ON_CHAIN" ? AnchorStatus.VERIFIED_ON_CHAIN : AnchorStatus.ANCHORING); - } catch (e) { - setIsAnchored(AnchorStatus.NOT_ANCHORED); - } - setIsLoading(false); - }, [folderUid]); - const getFolder = useCallback(async () => { if (!folderUid) return; + setIsLoading(true); const query = { q: { deed: { include: { deed_type: true } }, @@ -435,13 +439,21 @@ export default function FolderInformation(props: IProps) { const folder = await Folders.getInstance().getByUid(folderUid as string, query); if (folder) { setSelectedFolder(folder); + + try { + const anchorStatus = await OfficeFolderAnchors.getInstance().get(folderUid as string); + setIsAnchored(anchorStatus.status === "VERIFIED_ON_CHAIN" ? AnchorStatus.VERIFIED_ON_CHAIN : AnchorStatus.ANCHORING); + } catch (e) { + setIsAnchored(AnchorStatus.NOT_ANCHORED); + } } + + setIsLoading(false); }, [folderUid]); useEffect(() => { - verifyAnchorStatus(); getFolder(); - }, [verifyAnchorStatus, getFolder]); + }, [getFolder]); useEffect(() => { setIsLoading(true); From e741db098d0e3ec4fa0fb809437d52fb334b356c Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Mon, 2 Oct 2023 16:25:01 +0200 Subject: [PATCH 13/19] :bug: Fixing useEffect --- .../Components/Layouts/Folder/FolderInformation/index.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/front/Components/Layouts/Folder/FolderInformation/index.tsx b/src/front/Components/Layouts/Folder/FolderInformation/index.tsx index 61548236..f2d0100c 100644 --- a/src/front/Components/Layouts/Folder/FolderInformation/index.tsx +++ b/src/front/Components/Layouts/Folder/FolderInformation/index.tsx @@ -452,12 +452,10 @@ export default function FolderInformation(props: IProps) { }, [folderUid]); useEffect(() => { + setIsLoading(true); getFolder(); }, [getFolder]); - useEffect(() => { - setIsLoading(true); - }, [folderUid]); return ( Date: Mon, 2 Oct 2023 16:30:47 +0200 Subject: [PATCH 14/19] refacto app host url --- src/pages/_app.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index b5ff011d..31e20063 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -47,7 +47,7 @@ const MyApp = (({ instance.BACK_API_HOST = backApiHost ?? "api.stg.lecoffre.smart-chain.fr"; instance.BACK_API_ROOT_URL = backApiRootUrl ?? "/api"; instance.BACK_API_VERSION = backApiVersion ?? "/v1"; - instance.FRONT_APP_HOST = frontAppHost ?? "app.stg.lecoffre.smart-chain.fr"; + instance.FRONT_APP_HOST = frontAppHost ?? "https://app.stg.lecoffre.smart-chain.fr"; instance.IDNOT_BASE_URL = idNotBaseUrl ?? "https://qual-connexion.idnot.fr"; instance.IDNOT_AUTHORIZE_ENDPOINT = idNotAuthorizeEndpoint ?? "/IdPOAuth2/authorize/idnot_idp_v1"; instance.IDNOT_CLIENT_ID = idNotClientId ?? "4501646203F3EF67"; From e71516d4f3967fbe1578c9e1a3d71283ad0e2cc8 Mon Sep 17 00:00:00 2001 From: OxSaitama Date: Mon, 2 Oct 2023 22:49:43 +0200 Subject: [PATCH 15/19] fix update collaborators --- .../Layouts/Folder/UpdateFolderCollaborators/index.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/front/Components/Layouts/Folder/UpdateFolderCollaborators/index.tsx b/src/front/Components/Layouts/Folder/UpdateFolderCollaborators/index.tsx index 02245906..081c1c24 100644 --- a/src/front/Components/Layouts/Folder/UpdateFolderCollaborators/index.tsx +++ b/src/front/Components/Layouts/Folder/UpdateFolderCollaborators/index.tsx @@ -9,7 +9,8 @@ import Typography, { ITypo } from "@Front/Components/DesignSystem/Typography"; import BackArrow from "@Front/Components/Elements/BackArrow"; import DefaultNotaryDashboard from "@Front/Components/LayoutTemplates/DefaultNotaryDashboard"; import Module from "@Front/Config/Module"; -import User, { OfficeFolder } from "le-coffre-resources/dist/Notary"; +import User from "le-coffre-resources/dist/Notary/User"; +import { OfficeFolder } from "le-coffre-resources/dist/Notary"; import Link from "next/link"; import { NextRouter, useRouter } from "next/router"; From 360386dd88ffe5b3c4ba6acf91bd6ff259f2d600 Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Tue, 3 Oct 2023 10:05:42 +0200 Subject: [PATCH 16/19] :sparkles: Auto refresh anchoring --- .../Folder/FolderInformation/index.tsx | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/front/Components/Layouts/Folder/FolderInformation/index.tsx b/src/front/Components/Layouts/Folder/FolderInformation/index.tsx index f2d0100c..804c8aa7 100644 --- a/src/front/Components/Layouts/Folder/FolderInformation/index.tsx +++ b/src/front/Components/Layouts/Folder/FolderInformation/index.tsx @@ -37,6 +37,7 @@ type IPropsClass = IProps & { isAnchored: AnchorStatus; isLoading: boolean; selectedFolder: OfficeFolder | null; + getAnchoringStatus: () => Promise; }; type IState = { @@ -314,7 +315,8 @@ class FolderInformationClass extends BasePage { private async anchorFolder() { if (!this.props.selectedFolder?.uid) return; - return await OfficeFolderAnchors.getInstance().post(this.props.selectedFolder.uid); + await OfficeFolderAnchors.getInstance().post(this.props.selectedFolder.uid); + this.props.getAnchoringStatus(); } private async downloadAnchoringProof(uid?: string) { @@ -404,6 +406,16 @@ export default function FolderInformation(props: IProps) { let { folderUid } = router.query; folderUid = folderUid as string; + const getAnchoringStatus = useCallback(async () => { + if (!folderUid) return; + try { + const anchorStatus = await OfficeFolderAnchors.getInstance().get(folderUid as string); + setIsAnchored(anchorStatus.status === "VERIFIED_ON_CHAIN" ? AnchorStatus.VERIFIED_ON_CHAIN : AnchorStatus.ANCHORING); + } catch (e) { + setIsAnchored(AnchorStatus.NOT_ANCHORED); + } + }, [folderUid]); + const getFolder = useCallback(async () => { if (!folderUid) return; setIsLoading(true); @@ -439,17 +451,11 @@ export default function FolderInformation(props: IProps) { const folder = await Folders.getInstance().getByUid(folderUid as string, query); if (folder) { setSelectedFolder(folder); - - try { - const anchorStatus = await OfficeFolderAnchors.getInstance().get(folderUid as string); - setIsAnchored(anchorStatus.status === "VERIFIED_ON_CHAIN" ? AnchorStatus.VERIFIED_ON_CHAIN : AnchorStatus.ANCHORING); - } catch (e) { - setIsAnchored(AnchorStatus.NOT_ANCHORED); - } + getAnchoringStatus(); } setIsLoading(false); - }, [folderUid]); + }, [folderUid, getAnchoringStatus]); useEffect(() => { setIsLoading(true); @@ -464,6 +470,7 @@ export default function FolderInformation(props: IProps) { isAnchored={isAnchored} isLoading={isLoading} selectedFolder={selectedFolder} + getAnchoringStatus={getAnchoringStatus} /> ); } From 44b75b7f7af743ad3a6ecc0b392bde749a6ad0eb Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Tue, 3 Oct 2023 11:39:42 +0200 Subject: [PATCH 17/19] :sparkles: Refacto get anchors on page swap --- package-lock.json | 16 ++++----- package.json | 2 +- .../OfficeFolderAnchors.ts | 36 ++++++++++++++----- .../DesignSystem/Header/Navigation/index.tsx | 25 ++++++++++++- .../Folder/FolderInformation/index.tsx | 2 +- 5 files changed, 62 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8fd2491a..c29f24b2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "eslint-config-next": "13.2.4", "form-data": "^4.0.0", "jwt-decode": "^3.1.2", - "le-coffre-resources": "git@github.com:smart-chain-fr/leCoffre-resources.git#v2.85", + "le-coffre-resources": "git@github.com:smart-chain-fr/leCoffre-resources.git#v2.89", "next": "13.2.4", "prettier": "^2.8.7", "react": "18.2.0", @@ -394,9 +394,9 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.9.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.0.tgz", - "integrity": "sha512-zJmuCWj2VLBt4c25CfBIbMZLGLyhkvs7LznyVX5HfpzeocThgIj5XQK4L+g3U36mMcx8bPMhGyPpwCATamC4jQ==", + "version": "4.9.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.1.tgz", + "integrity": "sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA==", "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } @@ -1507,9 +1507,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001542", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001542.tgz", - "integrity": "sha512-UrtAXVcj1mvPBFQ4sKd38daP8dEcXXr5sQe6QNNinaPd0iA/cxg9/l3VrSdL73jgw5sKyuQ6jNgiKO12W3SsVA==", + "version": "1.0.30001543", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001543.tgz", + "integrity": "sha512-qxdO8KPWPQ+Zk6bvNpPeQIOH47qZSYdFZd6dXQzb2KzhnSXju4Kd7H1PkSJx6NICSMgo/IhRZRhhfPTHYpJUCA==", "funding": [ { "type": "opencollective", @@ -3361,7 +3361,7 @@ } }, "node_modules/le-coffre-resources": { - "resolved": "git+ssh://git@github.com/smart-chain-fr/leCoffre-resources.git#0e1663716a698cc584a89e5e2a03b72113702d55", + "resolved": "git+ssh://git@github.com/smart-chain-fr/leCoffre-resources.git#a100398ef5c1984ba74cb1c8c182648315accc3e", "license": "MIT", "dependencies": { "class-transformer": "^0.5.1", diff --git a/package.json b/package.json index bb886725..7d306a4d 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "eslint-config-next": "13.2.4", "form-data": "^4.0.0", "jwt-decode": "^3.1.2", - "le-coffre-resources": "git@github.com:smart-chain-fr/leCoffre-resources.git#v2.88", + "le-coffre-resources": "git@github.com:smart-chain-fr/leCoffre-resources.git#v2.89", "next": "13.2.4", "prettier": "^2.8.7", "react": "18.2.0", diff --git a/src/front/Api/LeCoffreApi/Notary/OfficeFolderAnchors/OfficeFolderAnchors.ts b/src/front/Api/LeCoffreApi/Notary/OfficeFolderAnchors/OfficeFolderAnchors.ts index 4aa3bb4b..52735f61 100644 --- a/src/front/Api/LeCoffreApi/Notary/OfficeFolderAnchors/OfficeFolderAnchors.ts +++ b/src/front/Api/LeCoffreApi/Notary/OfficeFolderAnchors/OfficeFolderAnchors.ts @@ -1,9 +1,15 @@ import { ContentType } from "@Front/Api/BaseApiService"; import BaseNotary from "../BaseNotary"; +import { OfficeFolderAnchor } from "le-coffre-resources/dist/Notary"; +export interface IGetAnchorsParams { + where?: {}; + include?: {}; + select?: {}; +} export default class OfficeFolderAnchors extends BaseNotary { private static instance: OfficeFolderAnchors; - private readonly baseURl = this.namespaceUrl.concat("/anchors"); + private readonly baseUrl = this.namespaceUrl.concat("/anchors"); private constructor() { super(); @@ -17,20 +23,34 @@ export default class OfficeFolderAnchors extends BaseNotary { } } - public async get(uid: string): Promise { - const url = new URL(this.baseURl.concat(`/${uid}`)); + public async get(q?: IGetAnchorsParams): Promise { + const url = new URL(this.baseUrl); + if (q) { + const query = { q }; + Object.entries(query).forEach(([key, value]) => url.searchParams.set(key, JSON.stringify(value))); + } try { - return await this.getRequest(url); + return await this.getRequest(url); } catch (err) { this.onError(err); return Promise.reject(err); } } - public async post(uid: string): Promise { - const url = new URL(this.baseURl.concat(`/${uid}`)); + public async getByUid(uid: string): Promise { + const url = new URL(this.baseUrl.concat(`/${uid}`)); try { - return await this.postRequest(url, {}); + return await this.getRequest(url); + } catch (err) { + this.onError(err); + return Promise.reject(err); + } + } + + public async post(uid: string): Promise { + const url = new URL(this.baseUrl.concat(`/${uid}`)); + try { + return await this.postRequest(url, {}); } catch (err) { this.onError(err); return Promise.reject(err); @@ -38,7 +58,7 @@ export default class OfficeFolderAnchors extends BaseNotary { } public async download(uid: string): Promise { - const url = new URL(this.baseURl.concat(`/download/${uid}`)); + const url = new URL(this.baseUrl.concat(`/download/${uid}`)); try { return await this.getRequest(url, undefined, ContentType.PDF, `${uid}.pdf`); } catch (err) { diff --git a/src/front/Components/DesignSystem/Header/Navigation/index.tsx b/src/front/Components/DesignSystem/Header/Navigation/index.tsx index 37b9b84c..f51975a1 100644 --- a/src/front/Components/DesignSystem/Header/Navigation/index.tsx +++ b/src/front/Components/DesignSystem/Header/Navigation/index.tsx @@ -8,10 +8,33 @@ import { AppRuleActions, AppRuleNames } from "@Front/Api/Entities/rule"; import { usePathname } from "next/navigation"; import Notifications from "@Front/Api/LeCoffreApi/Notary/Notifications/Notifications"; import Toasts from "@Front/Stores/Toasts"; +import OfficeFolderAnchors from "@Front/Api/LeCoffreApi/Notary/OfficeFolderAnchors/OfficeFolderAnchors"; export default function Navigation() { const pathname = usePathname(); + const getAnchoringStatus = useCallback(async () => { + const anchors = await OfficeFolderAnchors.getInstance().get({ + where: { + status: { + not: "VERIFIED_ON_CHAIN", + }, + }, + include: { + folder: true, + }, + }); + + try { + for (const anchor of anchors) { + await OfficeFolderAnchors.getInstance().getByUid(anchor.folder?.uid as string); + } + } catch (e) { + console.log(e); + } + }, []); + const getNotifications = useCallback(async () => { + await getAnchoringStatus(); const notifications = await Notifications.getInstance().get({ where: { read: false, @@ -24,7 +47,7 @@ export default function Navigation() { redirectUrl: notification.notification.redirection_url, }); }); - }, []); + }, [getAnchoringStatus]); useEffect(() => { getNotifications(); diff --git a/src/front/Components/Layouts/Folder/FolderInformation/index.tsx b/src/front/Components/Layouts/Folder/FolderInformation/index.tsx index 804c8aa7..9c116b19 100644 --- a/src/front/Components/Layouts/Folder/FolderInformation/index.tsx +++ b/src/front/Components/Layouts/Folder/FolderInformation/index.tsx @@ -409,7 +409,7 @@ export default function FolderInformation(props: IProps) { const getAnchoringStatus = useCallback(async () => { if (!folderUid) return; try { - const anchorStatus = await OfficeFolderAnchors.getInstance().get(folderUid as string); + const anchorStatus = await OfficeFolderAnchors.getInstance().getByUid(folderUid as string); setIsAnchored(anchorStatus.status === "VERIFIED_ON_CHAIN" ? AnchorStatus.VERIFIED_ON_CHAIN : AnchorStatus.ANCHORING); } catch (e) { setIsAnchored(AnchorStatus.NOT_ANCHORED); From 4cf0bdb1e8499cf160e7ffdb8d3c309d427ba7bc Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Tue, 3 Oct 2023 15:06:22 +0200 Subject: [PATCH 18/19] =?UTF-8?q?:sparkles:=20Refacto=20types=20de=20fichi?= =?UTF-8?q?ers=20=C3=A0=20demander?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParameterDocuments/classes.module.scss | 11 ++ .../AskDocuments/ParameterDocuments/index.tsx | 159 ++++++++++++++++++ .../Folder/AskDocuments/classes.module.scss | 6 - .../Layouts/Folder/AskDocuments/index.tsx | 100 ++--------- 4 files changed, 181 insertions(+), 95 deletions(-) create mode 100644 src/front/Components/Layouts/Folder/AskDocuments/ParameterDocuments/classes.module.scss create mode 100644 src/front/Components/Layouts/Folder/AskDocuments/ParameterDocuments/index.tsx diff --git a/src/front/Components/Layouts/Folder/AskDocuments/ParameterDocuments/classes.module.scss b/src/front/Components/Layouts/Folder/AskDocuments/ParameterDocuments/classes.module.scss new file mode 100644 index 00000000..4ed9ba68 --- /dev/null +++ b/src/front/Components/Layouts/Folder/AskDocuments/ParameterDocuments/classes.module.scss @@ -0,0 +1,11 @@ +.add-document-form-container { + display: flex; + flex-direction: column; + gap: 24px; + + .radiobox-container { + > :not(:last-child) { + margin-bottom: 16px; + } + } +} diff --git a/src/front/Components/Layouts/Folder/AskDocuments/ParameterDocuments/index.tsx b/src/front/Components/Layouts/Folder/AskDocuments/ParameterDocuments/index.tsx new file mode 100644 index 00000000..1425919d --- /dev/null +++ b/src/front/Components/Layouts/Folder/AskDocuments/ParameterDocuments/index.tsx @@ -0,0 +1,159 @@ +import Confirm from "@Front/Components/DesignSystem/Modal/Confirm"; +import classes from "./classes.module.scss"; +import TextField from "@Front/Components/DesignSystem/Form/TextField"; +import TextAreaField from "@Front/Components/DesignSystem/Form/TextareaField"; +import { ChangeEvent, useCallback, useEffect, useState } from "react"; +import DocumentTypes from "@Front/Api/LeCoffreApi/Notary/DocumentTypes/DocumentTypes"; +import { DocumentType, OfficeFolder } from "le-coffre-resources/dist/Notary"; +import Deeds from "@Front/Api/LeCoffreApi/Notary/Deeds/Deeds"; +import MultiSelect from "@Front/Components/DesignSystem/MultiSelect"; +import { IOption } from "@Front/Components/DesignSystem/Form/SelectField"; +import { MultiValue } from "react-select"; +import RadioBox from "@Front/Components/DesignSystem/RadioBox"; +import Typography, { ITypo } from "@Front/Components/DesignSystem/Typography"; + +type IProps = { + isCreateDocumentModalVisible: boolean; + closeModal: () => void; + folder: OfficeFolder; +}; + +export default function ParameterDocuments(props: IProps) { + const [visibleDescription, setVisibleDescription] = useState(""); + const [documentName, setDocumentName] = useState(""); + + const [addOrEditDocument, setAddOrEditDocument] = useState<"add" | "edit">("edit"); + + const [selectedDocuments, setSelectedDocuments] = useState([]); + const [formattedOptions, setFormattedOptions] = useState([]); + + const getAvailableDocuments = useCallback(async () => { + const documents = await DocumentTypes.getInstance().get({}); + + const formattedOptions: IOption[] = documents + .filter((document) => { + return !props.folder.deed?.document_types?.some((documentType) => documentType.uid === document.uid); + }) + .map((document) => { + return { + label: document.name, + value: document.uid, + }; + }); + setFormattedOptions(formattedOptions); + }, [props.folder.deed?.document_types]); + + const onVisibleDescriptionChange = (event: ChangeEvent) => { + setVisibleDescription(event.target.value); + }; + + const onDocumentNameChange = (event: ChangeEvent) => { + setDocumentName(event.target.value); + }; + + const onDocumentChangeHandler = useCallback((values: MultiValue) => { + setSelectedDocuments(values as IOption[]); + }, []); + + const handleClose = useCallback(() => { + setFormattedOptions([]); + setSelectedDocuments([]); + setAddOrEditDocument("edit"); + setVisibleDescription(""); + setDocumentName(""); + props.closeModal(); + }, [props]); + + const addDocument = useCallback(async () => { + if (addOrEditDocument === "add") { + try { + const documentType = await DocumentTypes.getInstance().post({ + name: documentName, + private_description: visibleDescription, + office: { + uid: props.folder.office!.uid!, + }, + public_description: visibleDescription, + }); + + const oldDocumentsType = props.folder.deed?.document_types!; + await Deeds.getInstance().put(props.folder.deed?.uid!, { + document_types: [...oldDocumentsType, documentType], + }); + + //await this.loadData(); + handleClose(); + } catch (e) { + console.error(e); + } + } else { + try { + const oldDocumentsType = props.folder.deed?.document_types!; + await Deeds.getInstance().put(props.folder.deed?.uid!, { + document_types: [ + ...oldDocumentsType, + ...selectedDocuments.map((document) => DocumentType.hydrate({ uid: document.value as string })), + ], + }); + + //await this.loadData(); + handleClose(); + } catch (e) { + console.error(e); + } + } + }, [addOrEditDocument, documentName, handleClose, props, selectedDocuments, visibleDescription]); + + const selectEditMode = () => { + setAddOrEditDocument("edit"); + }; + + const selectAddMode = () => { + setAddOrEditDocument("add"); + }; + + useEffect(() => { + getAvailableDocuments(); + }, [getAvailableDocuments, props.folder]); + + return ( + +
+
+ + Document existant + + + + Créer un document + +
+ {addOrEditDocument === "add" && ( + <> + + + + )} + {addOrEditDocument === "edit" && ( + + )} +
+ + ); +} diff --git a/src/front/Components/Layouts/Folder/AskDocuments/classes.module.scss b/src/front/Components/Layouts/Folder/AskDocuments/classes.module.scss index 6afe823c..e52073a2 100644 --- a/src/front/Components/Layouts/Folder/AskDocuments/classes.module.scss +++ b/src/front/Components/Layouts/Folder/AskDocuments/classes.module.scss @@ -37,10 +37,4 @@ .buttons-container { margin-top: 32px; } - - .add-document-form-container { - display: flex; - flex-direction: column; - gap: 24px; - } } diff --git a/src/front/Components/Layouts/Folder/AskDocuments/index.tsx b/src/front/Components/Layouts/Folder/AskDocuments/index.tsx index c77eb4ba..1bfc9132 100644 --- a/src/front/Components/Layouts/Folder/AskDocuments/index.tsx +++ b/src/front/Components/Layouts/Folder/AskDocuments/index.tsx @@ -1,15 +1,10 @@ import PlusIcon from "@Assets/Icons/plus.svg"; -import Deeds from "@Front/Api/LeCoffreApi/Notary/Deeds/Deeds"; import Documents from "@Front/Api/LeCoffreApi/Notary/Documents/Documents"; -import DocumentTypes from "@Front/Api/LeCoffreApi/Notary/DocumentTypes/DocumentTypes"; import Folders from "@Front/Api/LeCoffreApi/Notary/Folders/Folders"; import Button, { EButtonVariant } from "@Front/Components/DesignSystem/Button"; import CheckBox from "@Front/Components/DesignSystem/CheckBox"; import Form from "@Front/Components/DesignSystem/Form"; import { IOption } from "@Front/Components/DesignSystem/Form/SelectField"; -import TextAreaField from "@Front/Components/DesignSystem/Form/TextareaField"; -import TextField from "@Front/Components/DesignSystem/Form/TextField"; -import Confirm from "@Front/Components/DesignSystem/Modal/Confirm"; import Typography, { ITypo, ITypoColor } from "@Front/Components/DesignSystem/Typography"; import BackArrow from "@Front/Components/Elements/BackArrow"; import DefaultNotaryDashboard from "@Front/Components/LayoutTemplates/DefaultNotaryDashboard"; @@ -20,6 +15,7 @@ import React from "react"; import BasePage from "../../Base"; import classes from "./classes.module.scss"; +import ParameterDocuments from "./ParameterDocuments"; type IProps = {}; type IPropsClass = IProps & { @@ -29,8 +25,6 @@ type IPropsClass = IProps & { }; type IState = { isCreateDocumentModalVisible: boolean; - documentName: string; - visibleDescription: string; documentTypes: IOption[]; folder: OfficeFolder | null; }; @@ -41,8 +35,6 @@ class AskDocumentsClass extends BasePage { this.state = { isCreateDocumentModalVisible: false, - documentName: "", - visibleDescription: "", documentTypes: [], folder: null, }; @@ -50,11 +42,6 @@ class AskDocumentsClass extends BasePage { this.onFormSubmit = this.onFormSubmit.bind(this); this.closeModal = this.closeModal.bind(this); this.openModal = this.openModal.bind(this); - this.cancel = this.cancel.bind(this); - this.onVisibleDescriptionChange = this.onVisibleDescriptionChange.bind(this); - this.onDocumentNameChange = this.onDocumentNameChange.bind(this); - this.addDocument = this.addDocument.bind(this); - this.canAddDocument = this.canAddDocument.bind(this); } public override render(): JSX.Element { @@ -101,25 +88,14 @@ class AskDocumentsClass extends BasePage {
- -
- - -
-
+ {this.state.folder && ( + + )} ); } @@ -128,6 +104,8 @@ class AskDocumentsClass extends BasePage { this.loadData(); } + private cancel() {} + private async loadData() { try { const folder = await Folders.getInstance().getByUid(this.props.folderUid, { @@ -186,72 +164,16 @@ class AskDocumentsClass extends BasePage { return documentTypesOptions; } - private canAddDocument() { - if (this.state.documentName === "" || this.state.visibleDescription === "") { - return false; - } - return true; - } - - private async addDocument() { - try { - const documentType = await DocumentTypes.getInstance().post({ - name: this.state.documentName, - private_description: this.state.visibleDescription, - office: { - uid: this.state.folder?.office!.uid!, - }, - public_description: this.state.visibleDescription, - }); - - const oldDocumentsType = this.state.folder?.deed?.document_types!; - await Deeds.getInstance().put(this.state.folder?.deed?.uid!, { - document_types: [...oldDocumentsType, documentType], - }); - - await this.loadData(); - this.setState({ - isCreateDocumentModalVisible: false, - documentName: "", - visibleDescription: "", - }); - } catch (e) { - console.error(e); - } - } - - private onVisibleDescriptionChange(e: React.ChangeEvent) { - this.setState({ - visibleDescription: e.target.value, - }); - } - - private onDocumentNameChange(e: React.ChangeEvent) { - this.setState({ - documentName: e.target.value, - }); - } - - private cancel() { - this.setState({ - visibleDescription: "", - documentName: "", - }); - } - private openModal() { this.setState({ isCreateDocumentModalVisible: true, - visibleDescription: "", - documentName: "", }); } private closeModal() { + this.loadData(); this.setState({ isCreateDocumentModalVisible: false, - visibleDescription: "", - documentName: "", }); } From 15ec6037c19d538999517621d615ef710a5d6a43 Mon Sep 17 00:00:00 2001 From: OxSaitama Date: Tue, 3 Oct 2023 16:56:32 +0200 Subject: [PATCH 19/19] refacto notifications redirection --- .../Components/DesignSystem/Header/Navigation/index.tsx | 7 ++++--- .../Toasts/ToastsContainer/ToastElement/index.tsx | 6 ++++-- .../DesignSystem/Toasts/ToastsContainer/index.tsx | 8 ++++++-- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/front/Components/DesignSystem/Header/Navigation/index.tsx b/src/front/Components/DesignSystem/Header/Navigation/index.tsx index f51975a1..6134b4a8 100644 --- a/src/front/Components/DesignSystem/Header/Navigation/index.tsx +++ b/src/front/Components/DesignSystem/Header/Navigation/index.tsx @@ -34,7 +34,7 @@ export default function Navigation() { }, []); const getNotifications = useCallback(async () => { - await getAnchoringStatus(); + //await getAnchoringStatus(); const notifications = await Notifications.getInstance().get({ where: { read: false, @@ -47,11 +47,12 @@ export default function Navigation() { redirectUrl: notification.notification.redirection_url, }); }); - }, [getAnchoringStatus]); + }, []); useEffect(() => { + getAnchoringStatus(); getNotifications(); - }, [pathname, getNotifications]); + }, [pathname, getNotifications, getAnchoringStatus]); return (
diff --git a/src/front/Components/DesignSystem/Toasts/ToastsContainer/ToastElement/index.tsx b/src/front/Components/DesignSystem/Toasts/ToastsContainer/ToastElement/index.tsx index 1a5661c0..8474ef5e 100644 --- a/src/front/Components/DesignSystem/Toasts/ToastsContainer/ToastElement/index.tsx +++ b/src/front/Components/DesignSystem/Toasts/ToastsContainer/ToastElement/index.tsx @@ -108,10 +108,12 @@ class ToastElementClass extends React.Component { }, 200); } - private handleClick(e: React.MouseEvent) { + private async handleClick(e: React.MouseEvent) { + console.log('redirectUrl', this.props.toast.redirectUrl); if (this.props.toast.redirectUrl) { - this.props.router.push(this.props.toast.redirectUrl); this.onClose(e); + await this.props.router.push(this.props.toast.redirectUrl); + this.props.router.reload(); } } } diff --git a/src/front/Components/DesignSystem/Toasts/ToastsContainer/index.tsx b/src/front/Components/DesignSystem/Toasts/ToastsContainer/index.tsx index dc5edd46..f323974a 100644 --- a/src/front/Components/DesignSystem/Toasts/ToastsContainer/index.tsx +++ b/src/front/Components/DesignSystem/Toasts/ToastsContainer/index.tsx @@ -8,7 +8,7 @@ type IProps = {}; type IState = { toastList: IToast[]; }; -export default class ToastsContainer extends React.Component { +export class ToastsContainerClass extends React.Component { private removeOnChange = () => {}; public constructor(props: IProps) { @@ -25,7 +25,7 @@ export default class ToastsContainer extends React.Component {
0 && classes["open"])}> <> {this.state.toastList.map((toast) => { - return ; + return ; })}
@@ -44,3 +44,7 @@ export default class ToastsContainer extends React.Component { this.setState({ toastList }); } } + +export default function ToastsContainer(props: IProps) { + return ; +};