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..f2d0100c 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,17 +439,23 @@ export default function FolderInformation(props: IProps) { const folder = await Folders.getInstance().getByUid(folderUid as string, query); if (folder) { setSelectedFolder(folder); - } - }, [folderUid]); - useEffect(() => { - verifyAnchorStatus(); - getFolder(); - }, [verifyAnchorStatus, getFolder]); + 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(() => { setIsLoading(true); - }, [folderUid]); + getFolder(); + }, [getFolder]); + return (