Merge branch 'dev' into staging

src/front/Components/DesignSystem/Document/DocumentNotary/index.tsx

@@ -58,7 +58,9 @@ class DocumentNotaryClass extends React.Component<IPropsClass, IState> {
 					return fileName;
 				}
 			} else {
-				return `${documentFiles.length} documents déposés`;
+				const archivedFilesLenght = documentFiles.filter((file) => file.archived_at).length;
+				const documentFileLenght = documentFiles.length - archivedFilesLenght;
+				return `${documentFileLenght} documents déposés`;
 			}
 		} else {
 			return "Aucun document déposé";
@@ -66,7 +68,11 @@ class DocumentNotaryClass extends React.Component<IPropsClass, IState> {
 	}
 
 	private onClick() {
-		if (this.props.document.document_status !== EDocumentStatus.VALIDATED && this.props.document.document_status !== EDocumentStatus.DEPOSITED) return;
+		if (
+			this.props.document.document_status !== EDocumentStatus.VALIDATED &&
+			this.props.document.document_status !== EDocumentStatus.DEPOSITED
+		)
+			return;
 		this.props.router.push(`/folders/${this.props.folderUid}/documents/${this.props.document.uid}`);
 	}
 

src/front/Components/DesignSystem/FolderBoxInformation/classes.module.scss

@@ -8,6 +8,12 @@
 	align-items: center;
 	justify-content: space-between;
 
+	&.single-information {
+		.content {
+			grid-template-columns: 1fr;
+		}
+	}
+
 	.content {
 		display: grid;
 		grid-template-columns: 1fr 1fr 1fr 1fr;
@@ -17,7 +23,6 @@
 		.text-container {
 			display: flex;
 			flex-direction: column;
-			justify-content: space-between;
 
 			> :first-child {
 				margin-bottom: 12px;
@@ -33,9 +38,7 @@
 			grid-template-columns: 1fr;
 		}
 
-		&.single-information {
+
-			grid-template-columns: 1fr;
-		}
 	}
 
 	.edit-icon-container {

src/front/Components/DesignSystem/Select/index.tsx

@@ -22,6 +22,7 @@ export type IOption = {
 	value: unknown;
 	label: string;
 	icon?: ReactNode;
+	description?: string;
 };
 
 type IState = {

src/front/Components/Layouts/DesignSystem/dummyData.ts

@@ -82,8 +82,8 @@ export const docType: DocumentType = {
 	uid: "fezezfazegezrgrezg",
 	created_at: new Date(),
 	updated_at: new Date(),
-	public_description: "Acte de naissance public description",
+	public_description: "",
-	private_description: "Acte de naissance private description",
+	private_description: "",
 	archived_at: new Date(),
 	office: office,
 };

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

@@ -1,4 +1,3 @@
-
 import PlusIcon from "@Assets/Icons/plus.svg";
 import Folders from "@Front/Api/LeCoffreApi/SuperAdmin/Folders/Folders";
 import Button, { EButtonVariant } from "@Front/Components/DesignSystem/Button";
@@ -71,7 +70,7 @@ class AskDocumentsClass extends BasePage<IPropsClass, IState> {
 								{this.state.documentTypes.map((documentType) => (
 									<CheckBox
 										name="document_types"
-										toolTip="Checkbox with tooltip"
+										toolTip={documentType.description}
 										option={documentType}
 										key={documentType.value as string}
 									/>
@@ -172,6 +171,7 @@ class AskDocumentsClass extends BasePage<IPropsClass, IState> {
 			return {
 				label: documentType.document_type!.name!,
 				value: documentType.document_type!.uid!,
+				description: documentType.document_type!.private_description!,
 			};
 		});
 

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

@@ -1,4 +1,3 @@
-
 import ChevronIcon from "@Assets/Icons/chevron.svg";
 import Folders, { IPutFoldersParams } from "@Front/Api/LeCoffreApi/SuperAdmin/Folders/Folders";
 import Button, { EButtonVariant } from "@Front/Components/DesignSystem/Button";
@@ -124,7 +123,7 @@ class FolderInformationClass extends BasePage<IPropsClass, IState> {
 							<Typography typo={ITypo.H1Bis}>Informations du dossier</Typography>
 							<div className={classes["choose-a-folder"]}>
 								<Typography typo={ITypo.P_18} color={ITypoColor.GREY}>
-									Veuillez sélectionner un dossier.
+									Vous n'avez aucun dossier archivés
 								</Typography>
 							</div>
 						</div>

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

@@ -74,7 +74,7 @@ class ViewDocumentsClass extends BasePage<IPropsClass, IState> {
 				{this.state.document && this.state.document.files && this.state.selectedFile && (
 					<div className={classes["root"]}>
 						<Typography typo={ITypo.H1} color={ITypoColor.BLACK} className={classes["title"]}>
-							{this.state.document.document_type?.name}
+							{this.state.document.folder?.name}
 						</Typography>
 						<Typography typo={ITypo.H3} color={ITypoColor.BLACK} className={classes["subtitle"]}>
 							{this.state.document.document_type?.name}
@@ -188,6 +188,7 @@ class ViewDocumentsClass extends BasePage<IPropsClass, IState> {
 			const document = await Documents.getInstance().getByUid(this.props.documentUid, {
 				files: true,
 				document_type: true,
+				folder: true,
 			});
 			this.setState({
 				document,

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

@@ -28,7 +28,7 @@ export default class Folder extends BasePage<IProps, IState> {
 						<Typography typo={ITypo.H1Bis}>Informations du dossier</Typography>
 						<div className={classes["choose-a-folder"]}>
 							<Typography typo={ITypo.P_18} color={ITypoColor.GREY}>
-								Veuillez sélectionner un dossier.
+								Vous n'avez aucun dossier archivés
 							</Typography>
 						</div>
 					</div>

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

@@ -1,4 +1,3 @@
-
 import ChevronIcon from "@Assets/Icons/chevron.svg";
 import Button, { EButtonVariant } from "@Front/Components/DesignSystem/Button";
 import FolderBoxInformation, { EFolderBoxInformationType } from "@Front/Components/DesignSystem/FolderBoxInformation";
@@ -94,7 +93,7 @@ class FolderInformationClass extends BasePage<IPropsClass, IState> {
 							<Typography typo={ITypo.H1Bis}>Informations du dossier</Typography>
 							<div className={classes["choose-a-folder"]}>
 								<Typography typo={ITypo.P_18} color={ITypoColor.GREY}>
-									Veuillez sélectionner un dossier.
+									Vous n'avez aucun dossier archivés
 								</Typography>
 							</div>
 						</div>

src/front/Components/Layouts/FolderArchived/index.tsx

@@ -21,13 +21,17 @@ export default class Folder extends BasePage<IProps, IState> {
 	// TODO: Message if the user has not created any folder yet
 	public override render(): JSX.Element {
 		return (
-			<DefaultNotaryDashboard title={"Dossier"} onSelectedFolder={this.onSelectedFolder} isArchived  mobileBackText={"Liste des dossiers"}>
+			<DefaultNotaryDashboard
+				title={"Dossier"}
+				onSelectedFolder={this.onSelectedFolder}
+				isArchived
+				mobileBackText={"Liste des dossiers"}>
 				<div className={classes["root"]}>
 					<div className={classes["no-folder-selected"]}>
 						<Typography typo={ITypo.H1Bis}>Informations du dossier</Typography>
 						<div className={classes["choose-a-folder"]}>
 							<Typography typo={ITypo.P_18} color={ITypoColor.GREY}>
-								Veuillez sélectionner un dossier.
+								Vous n'avez aucun dossier archivés
 							</Typography>
 						</div>
 					</div>

src/front/Components/Layouts/MyAccount/index.tsx

@@ -25,10 +25,22 @@ export default class MyAccount extends Base<IProps, IState> {
 							</Typography>
 							<Form onSubmit={this.onFormSubmit}>
 								<div className={classes["form-container"]}>
-									<InputField name="name" fakeplaceholder="Nom" type="text" defaultValue={"TEXIER"} disabled />
+									<InputField name="name" fakeplaceholder="Nom" type="text" defaultValue={"BIHR"} disabled />
-									<InputField name="surname" fakeplaceholder="Prénom" type="text" defaultValue={"Gwendal"} disabled />
+									<InputField name="surname" fakeplaceholder="Prénom" type="text" defaultValue={"Nicolas"} disabled />
-									<InputField name="email" fakeplaceholder="E-mail" type="email" defaultValue={"g.texier@notaires.fr"} disabled />
+									<InputField
-									<InputField name="phone" fakeplaceholder="Numéro de téléphone" type="tel" defaultValue={"06 74 83 90 23"} disabled />
+										name="email"
+										fakeplaceholder="E-mail"
+										type="email"
+										defaultValue={"nicolas.bihr@notaires.fr"}
+										disabled
+									/>
+									<InputField
+										name="phone"
+										fakeplaceholder="Numéro de téléphone"
+										type="tel"
+										defaultValue={"06 74 83 90 23"}
+										disabled
+									/>
 								</div>
 							</Form>
 						</div>
@@ -42,12 +54,24 @@ export default class MyAccount extends Base<IProps, IState> {
 										name="office_denomination"
 										fakeplaceholder="Dénomination de l'office"
 										type="text"
-										defaultValue="AP NOTAIRES"
+										defaultValue="Etude Office notarial du Cormier"
+										disabled
+									/>
+									<InputField name="crpcen" fakeplaceholder="CRPCEN" type="number" defaultValue="35137" disabled />
+									<InputField
+										name="cp_address"
+										fakeplaceholder="Adresse CP"
+										defaultValue="2 RUE DE RENNES"
+										type="text"
+										disabled
+									/>
+									<InputField
+										name="city"
+										fakeplaceholder="Ville"
+										type="text"
+										defaultValue="35140 ST AUBIN DU CORMIER"
 										disabled
 									/>
-									<InputField name="crpcen" fakeplaceholder="CRPCEN" type="number" defaultValue="04839284" disabled />
-									<InputField name="cp_address" fakeplaceholder="Adresse CP" defaultValue="4 Avenue de La Forêt" type="text" disabled />
-									<InputField name="city" fakeplaceholder="Ville" type="text" defaultValue="35340 LIFFRE" disabled />
 								</div>
 							</Form>
 						</div>