Merge Dev in Staging
This commit is contained in:
commit
aa13cb5fd8
@ -99,3 +99,15 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.loader-container {
|
||||
display: flex;
|
||||
flex: 1;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
height: 100%;
|
||||
.loader {
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
}
|
||||
|
@ -80,6 +80,7 @@ class FolderInformationClass extends BasePage<IPropsClass, IState> {
|
||||
.modules.pages.Folder.pages.EditCollaborators.props.path.replace("[folderUid]", this.props.selectedFolderUid);
|
||||
return (
|
||||
<DefaultNotaryDashboard title={"Dossier"} isArchived={false} mobileBackText="Retour aux dossiers">
|
||||
{!this.props.isLoading && (
|
||||
<div className={classes["root"]}>
|
||||
{this.props.selectedFolder ? (
|
||||
<div className={classes["folder-informations"]}>
|
||||
@ -94,9 +95,15 @@ class FolderInformationClass extends BasePage<IPropsClass, IState> {
|
||||
</Button>
|
||||
</Link>
|
||||
</div>
|
||||
<FolderBoxInformation folder={this.props.selectedFolder} type={EFolderBoxInformationType.INFORMATIONS} />
|
||||
<FolderBoxInformation
|
||||
folder={this.props.selectedFolder}
|
||||
type={EFolderBoxInformationType.INFORMATIONS}
|
||||
/>
|
||||
<div className={classes["second-box"]}>
|
||||
<FolderBoxInformation folder={this.props.selectedFolder} type={EFolderBoxInformationType.DESCRIPTION} />
|
||||
<FolderBoxInformation
|
||||
folder={this.props.selectedFolder}
|
||||
type={EFolderBoxInformationType.DESCRIPTION}
|
||||
/>
|
||||
</div>
|
||||
<div className={classes["progress-bar"]}>
|
||||
<QuantityProgressBar
|
||||
@ -183,6 +190,14 @@ class FolderInformationClass extends BasePage<IPropsClass, IState> {
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
{this.props.isLoading && (
|
||||
<div className={classes["loader-container"]}>
|
||||
<div className={classes["loader"]}>
|
||||
<Loader />
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
<Confirm
|
||||
isOpen={this.state.isPreventArchiveModalOpen}
|
||||
onAccept={this.closePreventArchiveModal}
|
||||
@ -389,20 +404,9 @@ export default function FolderInformation(props: IProps) {
|
||||
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;
|
||||
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 (
|
||||
<FolderInformationClass
|
||||
{...props}
|
||||
|
@ -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";
|
||||
|
Loading…
x
Reference in New Issue
Block a user