Get merkle proof when generating certificate

src/front/Components/Layouts/Folder/AddClientToFolder/index.tsx

@@ -156,7 +156,6 @@ export default function AddClientToFolder(props: IProps) {
 	);
 
 	const loadCustomers = useCallback(async () => {
-		LoaderService.getInstance().show();
 		CustomerService.getCustomers().then(async (processes: any[]) => {
 			const availableCustomers: any[] = processes.map((process: any) => process.processData);
 
@@ -177,8 +176,6 @@ export default function AddClientToFolder(props: IProps) {
 			setExistingCustomers(existingCustomers);
 			setIsLoaded(true);
 			setSelectedOption(selectedOption);
-
-			LoaderService.getInstance().hide();
 		});
 	}, [folderUid, getFolderPreSelectedCustomers]);
 

src/front/Components/Layouts/Folder/AskDocuments/index.tsx

@@ -17,7 +17,6 @@ import backgroundImage from "@Assets/images/background_refonte.svg";
 
 import FolderService from "src/common/Api/LeCoffreApi/sdk/FolderService";
 import DocumentService from "src/common/Api/LeCoffreApi/sdk/DocumentService";
-import LoaderService from "src/common/Api/LeCoffreApi/sdk/Loader/LoaderService";
 import { DocumentData } from "../FolderInformation/ClientView/DocumentTables/types";
 
 export default function AskDocuments() {
@@ -60,8 +59,8 @@ export default function AskDocuments() {
 		) => {
 			try {
 				// TODO: review
-				LoaderService.getInstance().show();
 				const documentAsked: [] = values["document_types"] as [];
+
 				for (let i = 0; i < documentAsked.length; i++) {
 					const documentTypeUid = documentAsked[i];
 					if (!documentTypeUid) continue;
@@ -83,6 +82,7 @@ export default function AskDocuments() {
 
 					await DocumentService.createDocument(documentData, validatorId);
 				}
+
 				router.push(
 					Module.getInstance()
 						.get()
@@ -132,13 +132,11 @@ export default function AskDocuments() {
 
 	const loadData = useCallback(async () => {
 		try {
-			LoaderService.getInstance().show();
 			FolderService.getFolderByUid(folderUid as string).then(async (process: any) => {
 				if (process) {
 					const folder: any = process.processData;
 					setFolder(folder);
 					setDocumentTypes(await getAvailableDocuments(folder));
-					LoaderService.getInstance().hide();
 				}
 			});
 		} catch (e) {

src/front/Components/Layouts/Folder/CreateCustomerNote/index.tsx

@@ -17,7 +17,6 @@ import Note from "le-coffre-resources/dist/Customer/Note";
 import FolderService from "src/common/Api/LeCoffreApi/sdk/FolderService";
 import CustomerService from "src/common/Api/LeCoffreApi/sdk/CustomerService";
 import NoteService from "src/common/Api/LeCoffreApi/sdk/NoteService";
-import LoaderService from "src/common/Api/LeCoffreApi/sdk/Loader/LoaderService";
 
 type IProps = {};
 
@@ -84,8 +83,6 @@ class CreateCustomerNoteClass extends BasePage<IPropsClass, IState> {
 		const customer = await Customers.getInstance().getByUid(this.props.customerUid);
 		*/
 
-		LoaderService.getInstance().show();
-
 		const folder: any = await FolderService.getFolderByUid(this.props.folderUid).then((process: any) => {
 			if (process) {
 				const folder: any = process.processData;
@@ -100,8 +97,6 @@ class CreateCustomerNoteClass extends BasePage<IPropsClass, IState> {
 			}
 		});
 
-		LoaderService.getInstance().hide();
-
 		//get the note of the folder that has customer_uid = this.props.customer.uid
 		// const folderNote = folder.notes?.find((note) => note.customer?.uid === this.props.customerUid);
 		// this.setState({ note, folder: note.office_folder || null, customer: note.customer || null });
@@ -126,7 +121,6 @@ class CreateCustomerNoteClass extends BasePage<IPropsClass, IState> {
 			};
 			const validatorId: string = '884cb36a346a79af8697559f16940141f068bdf1656f88fa0df0e9ecd7311fb8:0';
 
-			LoaderService.getInstance().show();
 			NoteService.createNote(noteData, validatorId).then(() => {
 				this.props.router.push(this.backwardPath);
 			});

src/front/Components/Layouts/Folder/FolderInformation/ClientView/DocumentTables/DeleteAskedDocumentModal/index.tsx

@@ -4,7 +4,6 @@ import Typography, { ETypo } from "@Front/Components/DesignSystem/Typography";
 import React, { useCallback } from "react";
 
 import DocumentService from "src/common/Api/LeCoffreApi/sdk/DocumentService";
-import LoaderService from "src/common/Api/LeCoffreApi/sdk/Loader/LoaderService";
 
 type IProps = {
 	documentUid: string;
@@ -17,8 +16,7 @@ export default function DeleteAskedDocumentModal(props: IProps) {
 	const { isOpen, onClose, documentUid, onDeleteSuccess } = props;
 
 	const onDelete = useCallback(
-		() => {
+		() =>
-			LoaderService.getInstance().show();
 			new Promise<void>(
 				(resolve: () => void) => {
 					DocumentService.getDocumentByUid(documentUid).then((process: any) => {
@@ -29,10 +27,8 @@ export default function DeleteAskedDocumentModal(props: IProps) {
 				})
 				.then(() => onDeleteSuccess(documentUid))
 				.then(() => ToasterService.getInstance().success({ title: "Succès !", description: "Le document a été supprimé avec succès." }))
-				.then(() => LoaderService.getInstance().hide())
 				.then(onClose)
-				.catch((error) => console.warn(error));
+				.catch((error) => console.warn(error)),
-		},
 		[documentUid, onClose, onDeleteSuccess],
 	);
 

src/front/Components/Layouts/Folder/FolderInformation/ClientView/DocumentTables/DeleteSentDocumentModal/index.tsx

@@ -1,11 +1,9 @@
+import DocumentsNotary from "@Front/Api/LeCoffreApi/Notary/DocumentsNotary/DocumentsNotary";
 import Modal from "@Front/Components/DesignSystem/Modal";
 import { ToasterService } from "@Front/Components/DesignSystem/Toaster";
 import Typography, { ETypo } from "@Front/Components/DesignSystem/Typography";
 import React, { useCallback } from "react";
 
-import DocumentService from "src/common/Api/LeCoffreApi/sdk/DocumentService";
-import LoaderService from "src/common/Api/LeCoffreApi/sdk/Loader/LoaderService";
-
 type IProps = {
 	documentUid: string;
 	isOpen: boolean;
@@ -17,18 +15,13 @@ export default function DeleteSentDocumentModal(props: IProps) {
 	const { isOpen, onClose, documentUid, onDeleteSuccess } = props;
 
 	const onDelete = useCallback(
-		() => {
+		() =>
-			LoaderService.getInstance().show();
+			DocumentsNotary.getInstance()
-			DocumentService.getDocumentByUid(documentUid).then((process: any) => {
+				.delete(documentUid)
-				if (process) {
+				.then(() => onDeleteSuccess(documentUid))
-					DocumentService.updateDocument(process, { isDeleted: 'true' })
+				.then(() => ToasterService.getInstance().success({ title: "Succès !", description: "Le document a été supprimé avec succès." }))
-						.then(() => onDeleteSuccess(documentUid))
+				.then(onClose)
-						.then(() => ToasterService.getInstance().success({ title: "Succès !", description: "Le document a été supprimé avec succès." }))
+				.catch((error) => console.warn(error)),
-						.then(() => LoaderService.getInstance().hide())
-						.then(onClose);
-				}
-			});
-		},
 		[documentUid, onClose, onDeleteSuccess],
 	);
 

src/front/Components/Layouts/Folder/FolderInformation/ClientView/DocumentTables/index.tsx

@@ -1,3 +1,4 @@
+import DocumentsNotary from "@Front/Api/LeCoffreApi/Notary/DocumentsNotary/DocumentsNotary";
 import FilesNotary from "@Front/Api/LeCoffreApi/Notary/FilesNotary/Files";
 import CircleProgress from "@Front/Components/DesignSystem/CircleProgress";
 import IconButton from "@Front/Components/DesignSystem/IconButton";
@@ -23,7 +24,6 @@ import DeleteSentDocumentModal from "./DeleteSentDocumentModal";
 import DocumentService from "src/common/Api/LeCoffreApi/sdk/DocumentService";
 import DocumentTypeService from "src/common/Api/LeCoffreApi/sdk/DocumentTypeService";
 import FileService from "src/common/Api/LeCoffreApi/sdk/FileService";
-import LoaderService from "src/common/Api/LeCoffreApi/sdk/Loader/LoaderService";
 import FolderService from "src/common/Api/LeCoffreApi/sdk/FolderService";
 import PdfService, { CertificateData, Metadata } from "@Front/Services/PdfService";
 import MessageBus from "src/sdk/MessageBus";
@@ -58,13 +58,14 @@ export default function DocumentTables(props: IProps) {
 
 	const fetchDocuments = useCallback(
 		() => {
-			LoaderService.getInstance().show();
+			setDocuments([]);
+
 			DocumentService.getDocuments().then(async (processes: any[]) => {
 				if (processes.length > 0) {
 					let documents: any[] = processes.map((process: any) => process.processData);
 
 					// FilterBy folder.uid & depositor.uid
-					documents = documents.filter((document: any) => document.folder.uid === folderUid && document.depositor && document.depositor.uid === customerUid);
+					documents = documents.filter((document: any) => document.folder.uid === folderUid && document.depositor.uid === customerUid);
 
 					console.log('[DocumentTables] fetchDocuments: all documents for this folder/customer:', documents.map(doc => ({
 						uid: doc.uid,
@@ -88,45 +89,24 @@ export default function DocumentTables(props: IProps) {
 				} else {
 					setDocuments([]);
 				}
-				LoaderService.getInstance().hide();
+			})
-			});
 		},
 		[customerUid, folderUid],
 	);
 
 	const fetchDocumentsNotary = useCallback(
-		() => {
+		() =>
-			LoaderService.getInstance().show();
+			DocumentsNotary.getInstance()
-			DocumentService.getDocuments().then(async (processes: any[]) => {
+				.get({ where: { folder: { uid: folderUid }, customer: { uid: customerUid } }, include: { files: true } })
-				if (processes.length > 0) {
+				.then(setDocumentsNotary)
-					let documents: any[] = processes.map((process: any) => process.processData);
+				.catch(console.warn),
-
-					// FilterBy folder.uid & customer.uid
-					documents = documents.filter((document: any) => document.folder.uid === folderUid && document.customer && document.customer.uid === customerUid);
-
-					for (const document of documents) {
-						if (document.files && document.files.length > 0) {
-							const files: any[] = [];
-							for (const file of document.files) {
-								files.push((await FileService.getFileByUid(file.uid)).processData);
-							}
-							document.files = files;
-						}
-					}
-
-					setDocumentsNotary(documents);
-				} else {
-					setDocumentsNotary([]);
-				}
-				LoaderService.getInstance().hide();
-			});
-		},
 		[customerUid, folderUid],
 	);
 
 	useEffect(() => {
+		// TODO: review
 		fetchDocuments();
-		fetchDocumentsNotary();
+		//fetchDocumentsNotary();
 	}, [fetchDocuments, fetchDocumentsNotary]);
 
 	const openDeleteAskedDocumentModal = useCallback(

src/front/Components/Layouts/Folder/FolderInformation/index.tsx

@@ -135,7 +135,7 @@ export default function FolderInformation(props: IProps) {
 						if (processes.length > 0) {
 							const documents: any[] = processes.map((process: any) => process.processData);
 							for (const customer of folder.customers) {
-								customer.documents = documents.filter((document: any) => document.depositor && document.depositor.uid === customer.uid);
+								customer.documents = documents.filter((document: any) => document.depositor.uid === customer.uid);
 							}
 						}
 						resolve();

src/front/Components/Layouts/Folder/SendDocuments/index.tsx

@@ -1,5 +1,6 @@
 import backgroundImage from "@Assets/images/background_refonte.svg";
-import { EDocumentNotaryStatus } from "le-coffre-resources/dist/Notary/DocumentNotary";
+import DocumentsNotary from "@Front/Api/LeCoffreApi/Notary/DocumentsNotary/DocumentsNotary";
+import Folders from "@Front/Api/LeCoffreApi/Notary/Folders/Folders";
 import Button, { EButtonstyletype, EButtonVariant } from "@Front/Components/DesignSystem/Button";
 import DragAndDrop from "@Front/Components/DesignSystem/DragAndDrop";
 import Form from "@Front/Components/DesignSystem/Form";
@@ -18,11 +19,6 @@ import React, { useCallback, useEffect, useMemo, useState } from "react";
 
 import classes from "./classes.module.scss";
 
-import LoaderService from "src/common/Api/LeCoffreApi/sdk/Loader/LoaderService";
-import FolderService from "src/common/Api/LeCoffreApi/sdk/FolderService";
-import DocumentService from "src/common/Api/LeCoffreApi/sdk/DocumentService";
-import FileService from "src/common/Api/LeCoffreApi/sdk/FileService";
-
 enum EClientSelection {
 	ALL_CLIENTS = "all_clients",
 	SELECTED_CLIENTS = "selected_clients",
@@ -63,64 +59,6 @@ export default function SendDocuments() {
 					throw new Error("No clients selected");
 				}
 
-				LoaderService.getInstance().show();
-				for (const selectedClient of selectedClients) {
-					for (const file of files) {
-						await new Promise<void>((resolve: () => void) => {
-							const reader = new FileReader();
-							reader.onload = (event) => {
-								if (event.target?.result) {
-									const arrayBuffer = event.target.result as ArrayBuffer;
-									const uint8Array = new Uint8Array(arrayBuffer);
-
-									const fileBlob: any = {
-										type: file.type,
-										data: uint8Array
-									};
-
-									const fileData: any = {
-										file_blob: fileBlob,
-										file_name: file.name
-									};
-									const validatorId: string = '884cb36a346a79af8697559f16940141f068bdf1656f88fa0df0e9ecd7311fb8:0';
-
-									FileService.createFile(fileData, validatorId).then((processCreated: any) => {
-										const fileUid: string = processCreated.processData.uid;
-
-										const documentData: any = {
-											folder: {
-												uid: folderUid as string
-											},
-											customer: {
-												uid: selectedClient as string
-											},
-											files: [
-												{
-													uid: fileUid
-												}
-											],
-											document_status: EDocumentNotaryStatus.SENT
-										};
-
-										DocumentService.createDocument(documentData, validatorId).then(() => resolve());
-									});
-								}
-							};
-							reader.readAsArrayBuffer(file);
-						});
-					}
-				}
-				LoaderService.getInstance().hide();
-
-				router.push(
-					Module.getInstance()
-						.get()
-						.modules.pages.Folder.pages.FolderInformation.props.path.replace("[folderUid]", folderUid as string),
-				);
-				setIsSending(false);
-				ToasterService.getInstance().success({ title: "Succès !", description: "Votre document a été envoyée avec succès." });
-
-				/*
 				await Promise.all(
 					selectedClients.map(async (customer) => {
 						const promises = files.map(async (file) => {
@@ -145,7 +83,6 @@ export default function SendDocuments() {
 				);
 				setIsSending(false);
 				ToasterService.getInstance().success({ title: "Succès !", description: "Votre document a été envoyée avec succès." });
-				*/
 			} catch (error) {
 				setIsSending(false);
 				console.warn("Error while sending files: ", error);
@@ -155,14 +92,18 @@ export default function SendDocuments() {
 	);
 
 	const fetchFolder = useCallback(async () => {
-		LoaderService.getInstance().show();
+		Folders.getInstance()
-		FolderService.getFolderByUid(folderUid as string).then((process: any) => {
+			.getByUid(folderUid as string, {
-			if (process) {
+				q: {
-				const folder: any = process.processData;
+					customers: {
-				setFolder(folder);
+						include: {
-				LoaderService.getInstance().hide();
+							contact: true,
-			}
+						},
-		});
+					},
+				},
+			})
+			.then((folder) => setFolder(folder))
+			.catch((e) => console.warn(e));
 	}, [folderUid]);
 
 	const onClientSelectionChange = useCallback(

src/front/Components/Layouts/Folder/UpdateCustomerNote/index.tsx

@@ -13,7 +13,6 @@ import classes from "./classes.module.scss";
 import Note from "le-coffre-resources/dist/Customer/Note";
 
 import NoteService from "src/common/Api/LeCoffreApi/sdk/NoteService";
-import LoaderService from "src/common/Api/LeCoffreApi/sdk/Loader/LoaderService";
 
 type IProps = {};
 
@@ -68,7 +67,6 @@ class UpdateCustomerNoteClass extends BasePage<IPropsClass, IState> {
 	}
 
 	public override async componentDidMount() {
-		LoaderService.getInstance().show();
 		NoteService.getNoteByUid(this.props.noteUid).then((process: any) => {
 			if (process) {
 				const note: any = process.processData;
@@ -82,17 +80,15 @@ class UpdateCustomerNoteClass extends BasePage<IPropsClass, IState> {
 						.get()
 						.modules.pages.Folder.pages.FolderInformation.props.path.replace("[folderUid]", note.folder?.uid!),
 				});
-
-				LoaderService.getInstance().hide();
 			}
 		});
 	}
 
 	private async onFormSubmit(e: React.FormEvent<HTMLFormElement> | null, values: { [key: string]: string }) {
 		try {
-			LoaderService.getInstance().show();
 			NoteService.getNoteByUid(this.props.noteUid).then((process: any) => {
 				if (process) {
+
 					NoteService.updateNote(process, { content: values["content"] }).then(() => {
 						this.props.router.push(this.state.backwardPath);
 					});

src/front/Components/Layouts/Folder/UpdateFolderMetadata/index.tsx

@@ -49,6 +49,7 @@ export default function UpdateFolderMetadata() {
 			setValidationError(validationErrors as ValidationError[]);
 			return;
 		}
+
 		try {
 			LoaderService.getInstance().show();
 			FolderService.getFolderByUid(folderUid).then((process: any) => {