Merge Dev in Staging

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.83",
+				"le-coffre-resources": "git@github.com:smart-chain-fr/leCoffre-resources.git#v2.84",
 				"next": "13.2.4",
 				"prettier": "^2.8.7",
 				"react": "18.2.0",

src/front/Assets/Icons/check_white.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.2251 3.36088C13.4893 3.59571 13.5131 4.00024 13.2783 4.26442L6.4516 11.9444C6.33015 12.0811 6.15607 12.1592 5.97326 12.1592C5.79045 12.1592 5.61637 12.0811 5.49492 11.9444L2.08159 8.10442C1.84676 7.84024 1.87055 7.43571 2.13474 7.20088C2.39892 6.96606 2.80344 6.98985 3.03827 7.25403L5.97326 10.5559L12.3216 3.41403C12.5564 3.14985 12.9609 3.12606 13.2251 3.36088Z" fill="white"/>
+</svg>

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

@@ -18,7 +18,7 @@
 	}
 
 	input[type="checkbox"]::before {
-		content: url("../../../Assets/Icons/check.svg");
+		content: url("../../../Assets/Icons/check_white.svg");
 		place-content: flex-start;
 		display: grid;
 		width: 16px;

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

@@ -5,6 +5,7 @@
 		border: 1px dashed #e7e7e7;
 
 		height: fit-content;
+		margin-top: 16px;
 
 		&[data-drag-over="true"] {
 			border: 1px dashed var(--grey);

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

@@ -39,6 +39,7 @@ type IState = {
 	refusedReason?: string;
 	isShowRefusedReasonModalVisible: boolean;
 	isAddDocumentModalVisible: boolean;
+	isLoading: boolean;
 };
 
 export default class DepositOtherDocument extends React.Component<IProps, IState> {
@@ -54,6 +55,7 @@ export default class DepositOtherDocument extends React.Component<IProps, IState
 			isDragOver: false,
 			refusedReason: "",
 			isShowRefusedReasonModalVisible: false,
+			isLoading: false,
 		};
 
 		this.addDocument = this.addDocument.bind(this);
@@ -65,45 +67,17 @@ export default class DepositOtherDocument extends React.Component<IProps, IState
 		this.onAccept = this.onAccept.bind(this);
 	}
 
-	private async onAccept() {
-		const filesArray = this.state.currentFiles;
-
-		if (!filesArray) return;
-
-		const documentCreated = await Documents.getInstance().post({
-			folder: {
-				uid: this.props.folder_uid,
-			},
-			depositor: {
-				uid: this.props.customer_uid,
-			},
-		});
-
-		console.log(documentCreated);
-
-		filesArray.forEach(async (file) => {
-			const formData = new FormData();
-			formData.append("file", file.file, file.fileName);
-			const query = JSON.stringify({ document: { uid: documentCreated.uid } });
-			formData.append("q", query);
-
-			const newFile = await Files.getInstance().post(formData);
-			console.log(newFile);
-		});
-
-		this.props.onClose!();
-	}
-
 	public override render(): JSX.Element {
 		return (
 			<Confirm
 				isOpen={this.state.isAddDocumentModalVisible}
-				onClose={this.props.onClose!}
+				onClose={() => {}}
 				onAccept={this.onAccept}
 				closeBtn
 				header={"Ajouter un document"}
 				cancelText={"Annuler"}
-				confirmText={"Déposer le document"}>
+				confirmText={this.state.isLoading ? "Chargement..." : "Déposer le document"}
+				canConfirm={!this.state.isLoading}>
 				<div className={classes["modal-content"]}>
 					<div className={classes["container"]}>
 						<Typography typo={ITypo.P_16} className={classes["text"]}>
@@ -140,7 +114,7 @@ export default class DepositOtherDocument extends React.Component<IProps, IState
 										</div>
 									</Typography>
 									<Typography color={ITypoColor.GREY} typo={ITypo.CAPTION_14}>
-										Sélectionnez des TEST documents .jpg, .pdf ou .png
+										Sélectionnez des documents .jpg, .pdf ou .png
 									</Typography>
 								</div>
 							</div>
@@ -187,6 +161,38 @@ export default class DepositOtherDocument extends React.Component<IProps, IState
 
 	public override componentDidMount(): void {}
 
+	private async onAccept() {
+		this.setState({
+			isLoading: true,
+		});
+		const filesArray = this.state.currentFiles;
+
+		if (!filesArray) return;
+
+		const documentCreated = await Documents.getInstance().post({
+			folder: {
+				uid: this.props.folder_uid,
+			},
+			depositor: {
+				uid: this.props.customer_uid,
+			},
+		});
+
+		for (let i = 0; i < filesArray.length; i++) {
+			const formData = new FormData();
+			formData.append("file", filesArray[i]!.file, filesArray[i]!.fileName);
+			const query = JSON.stringify({ document: { uid: documentCreated.uid } });
+			formData.append("q", query);
+			await Files.getInstance().post(formData);
+		}
+
+		this.setState({
+			isLoading: false,
+		});
+
+		this.props.onClose!();
+	}
+
 	private shortName(name: string): string {
 		const maxLength = 20;
 		if (name.length > maxLength) {

src/front/Components/DesignSystem/Header/BurgerMenu/BurgerModal/index.tsx

@@ -92,8 +92,8 @@ export default class BurgerModal extends React.Component<IProps, IState> {
 						mode={RulesMode.NECESSARY}
 						rules={[
 							{
-								action: AppRuleActions.create,
-								name: AppRuleNames.officeRoles,
+								action: AppRuleActions.update,
+								name: AppRuleNames.offices,
 							},
 						]}>
 						<NavigationLink
@@ -123,7 +123,7 @@ export default class BurgerModal extends React.Component<IProps, IState> {
 						/>
 					</Rules>
 					<NavigationLink path={Module.getInstance().get().modules.pages.MyAccount.props.path} text="Mon compte" />
-					<NavigationLink text="CGU" />
+					<NavigationLink target="_blank" path="/CGU_LeCoffre_io.pdf" text="CGU" />
 					<div className={classes["separator"]} />
 					<LogOutButton />
 				</div>

src/front/Components/DesignSystem/Header/NavigationLink/index.tsx

@@ -12,6 +12,7 @@ type IProps = {
 	isEnabled?: boolean;
 	isActive?: boolean;
 	routesActive?: string[];
+	target?: "blank" | "self" | "_blank";
 };
 
 type IPropsClass = IProps;
@@ -25,7 +26,8 @@ class NavigationLinkClass extends React.Component<IPropsClass, IStateClass> {
 			<Link
 				href={this.props.path ?? ""}
 				className={classNames(classes["root"], this.props.isActive && [classes["active"]])}
-				onClick={this.props.onClick}>
+				onClick={this.props.onClick}
+				target={this.props.target}>
 				<div className={classes["content"]}>
 					<Typography typo={this.props.isActive ? ITypo.P_SB_18 : ITypo.NAV_HEADER_18}>{this.props.text}</Typography>
 				</div>

src/front/Components/DesignSystem/Header/Profile/ProfileModal/index.tsx

@@ -66,8 +66,8 @@ export default class ProfileModal extends React.Component<IProps, IState> {
 						mode={RulesMode.NECESSARY}
 						rules={[
 							{
-								action: AppRuleActions.create,
-								name: AppRuleNames.officeRoles,
+								action: AppRuleActions.update,
+								name: AppRuleNames.offices,
 							},
 						]}>
 						<NavigationLink
@@ -96,7 +96,7 @@ export default class ProfileModal extends React.Component<IProps, IState> {
 							]}
 						/>
 					</Rules>
-					<NavigationLink text="CGU" />
+					<NavigationLink target="_blank" path="/CGU_LeCoffre_io.pdf" text="CGU" />
 					<div className={classes["separator"]} />
 					<LogOutButton />
 				</div>

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

@@ -21,6 +21,9 @@
 	}
 
 	.logo-container {
+		> a {
+			cursor: default !important;
+		}
 		.logo {
 			width: 174px;
 			height: 39px;

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

@@ -61,7 +61,7 @@ class HeaderClass extends React.Component<IPropsClass, IState> {
 					<link rel="shortcut icon" href={"/favicon.svg"} />
 				</Head>
 				<div className={classes["logo-container"]}>
-					<Link href={Module.getInstance().get().modules.pages.Home.props.path}>
+					<Link href={"#"}>
 						<Image src={LogoIcon} alt="logo" className={classes["logo"]} />
 					</Link>
 				</div>

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

@@ -24,18 +24,7 @@ export default function ClientDashboard(props: IProps) {
 	const [folder, setFolder] = useState<OfficeFolder | null>(null);
 	const [isAddDocumentModalVisible, setIsAddDocumentModalVisible] = useState<boolean>(false);
 
-	const onCloseModalAddDocument = useCallback(() => {
-		console.log("Closing");
-
-		setIsAddDocumentModalVisible(false);
-	}, []);
-
-	const onOpenModalAddDocument = useCallback(() => {
-		setIsAddDocumentModalVisible(true);
-	}, []);
-
-	useEffect(() => {
-		async function getDocuments() {
+	const getDocuments = useCallback(async () => {
 		let jwt;
 		if (typeof document !== "undefined") {
 			jwt = JwtService.getInstance().decodeJwt();
@@ -62,11 +51,21 @@ export default function ClientDashboard(props: IProps) {
 		setFolder(folder);
 		setDocuments(documentList);
 		setCustomer(actualCustomer);
-		}
-
-		getDocuments();
 	}, [folderUid]);
 
+	const onCloseModalAddDocument = useCallback(() => {
+		setIsAddDocumentModalVisible(false);
+		getDocuments();
+	}, [getDocuments]);
+
+	const onOpenModalAddDocument = useCallback(() => {
+		setIsAddDocumentModalVisible(true);
+	}, []);
+
+	useEffect(() => {
+		getDocuments();
+	}, [folderUid, getDocuments]);
+
 	const renderHeader = useCallback(() => {
 		console.log("Dossier : ", customer);
 		return (
@@ -101,11 +100,9 @@ export default function ClientDashboard(props: IProps) {
 				</a>
 			</div>
 		);
-	}, [customer]);
+	}, [customer, folder?.folder_number, folder?.name, folder?.office?.name]);
 
 	const renderBox = useCallback(() => {
-		console.log(isAddDocumentModalVisible);
-
 		return (
 			<DepositOtherDocument
 				folder_uid={folderUid!}
@@ -114,7 +111,7 @@ export default function ClientDashboard(props: IProps) {
 				onClose={onCloseModalAddDocument}
 				document={Document.hydrate<Document>({
 					document_type: DocumentType.hydrate<DocumentType>({
-						name: "Document annexe",
+						name: "Autres documents",
 					}),
 				})}
 			/>

src/front/Components/Layouts/ClientDashboard/index2.tsx

@@ -71,7 +71,7 @@ export default class ClientDashboard extends Base<IProps, IState> {
 							<DepositDocument
 								document={Document.hydrate<Document>({
 									document_type: DocumentType.hydrate<DocumentType>({
-										name: "Document annexe",
+										name: "Autres documents",
 									}),
 								})}
 							/>

src/front/Components/Layouts/DocumentTypes/DocumentTypesCreate/index.tsx

@@ -29,13 +29,15 @@ export default function DocumentTypesCreate(props: IProps) {
 				});
 				const documentToCreate = DocumentType.hydrate<DocumentType>({
 					...values,
-					office: office
+					office: office,
 				});
 				await validateOrReject(documentToCreate, { groups: ["createDocumentType"] });
 				const documentTypeCreated = await DocumentTypes.getInstance().post(documentToCreate);
 
 				router.push(
-					Module.getInstance().get().modules.pages.DocumentTypes.pages.Edit.props.path.replace("[uid]", documentTypeCreated.uid!),
+					Module.getInstance()
+						.get()
+						.modules.pages.DocumentTypes.pages.DocumentTypesInformations.props.path.replace("[uid]", documentTypeCreated.uid!),
 				);
 			} catch (e) {
 				if (e instanceof Array) {

src/front/Components/Layouts/Folder/FolderInformation/classes.module.scss

@@ -67,7 +67,8 @@
 		}
 
 		@media (max-width: $screen-m) {
-			display: block;
+			display: flex;
+			flex-direction: column;
 
 			.delete-folder {
 				margin-left: 0;

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

@@ -103,11 +103,11 @@ class ViewDocumentsClass extends BasePage<IPropsClass, IState> {
 							)}
 						</div>
 						<div className={classes["footer"]}>
-							{this.state.document?.document_type?.name === "Document d'identité" && (
+							{/* {this.state.document?.document_type?.name === "Document d'identité" && (
 								<div className={classes["ocr-container"]}>
 									<OcrResult percentage={this.state.validatedPercentage} />
 								</div>
-							)}
+							)} */}
 
 							<div className={classes["buttons-container"]}>
 								{this.state.document?.document_status === EDocumentStatus.DEPOSITED && (
@@ -235,20 +235,32 @@ class ViewDocumentsClass extends BasePage<IPropsClass, IState> {
 	private goToPrevious() {
 		const index = this.state.selectedFileIndex - 1;
 		if (this.hasPrevious()) {
-			this.setState({
+			this.setState(
+				{
 					selectedFile: this.state.document!.files![index]!,
 					selectedFileIndex: index,
-			});
+					fileBlob: null,
+				},
+				() => {
+					this.getFilePreview();
+				},
+			);
 		}
 	}
 
 	private goToNext() {
 		if (this.hasNext()) {
 			const index = this.state.selectedFileIndex + 1;
-			this.setState({
+			this.setState(
+				{
 					selectedFile: this.state.document!.files![index]!,
 					selectedFileIndex: index,
-			});
+					fileBlob: null,
+				},
+				() => {
+					this.getFilePreview();
+				},
+			);
 		}
 	}
 

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

@@ -10,6 +10,7 @@ import { useCallback } from "react";
 import classes from "./classes.module.scss";
 import LandingImage from "./landing-connect.jpeg";
 import { FrontendVariables } from "@Front/Config/VariablesFront";
+import Link from "next/link";
 
 export default function Login() {
 	const router = useRouter();
@@ -36,7 +37,9 @@ export default function Login() {
 				<Typography typo={ITypo.P_18}>
 					<div className={classes["forget-password"]}>Vous n'arrivez pas à vous connecter ?</div>
 				</Typography>
+				<Link href="mailto:g.texier@notaires.fr">
 					<Button variant={EButtonVariant.LINE}>Contacter l'administrateur</Button>
+				</Link>
 			</div>
 		</DefaultDoubleSidePage>
 	);

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

@@ -11,6 +11,7 @@ import Typography, { ITypo } from "@Front/Components/DesignSystem/Typography";
 import Button, { EButtonVariant } from "@Front/Components/DesignSystem/Button";
 import Loader from "@Front/Components/DesignSystem/Loader";
 import UserStore from "@Front/Stores/UserStore";
+import Link from "next/link";
 
 export default function LoginCallBack() {
 	const router = useRouter();
@@ -45,7 +46,9 @@ export default function LoginCallBack() {
 				<Typography typo={ITypo.P_18}>
 					<div className={classes["forget-password"]}>Vous n'arrivez pas à vous connecter ?</div>
 				</Typography>
+				<Link href="mailto:g.texier@notaires.fr">
 					<Button variant={EButtonVariant.LINE}>Contacter l'administrateur</Button>
+				</Link>
 			</div>
 		</DefaultDoubleSidePage>
 	);

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

@@ -15,7 +15,7 @@ import Loader from "@Front/Components/DesignSystem/Loader";
 import Customers from "@Front/Api/LeCoffreApi/Id360/Customers/Customers";
 import CustomerStore from "@Front/Stores/CustomerStore";
 import Module from "@Front/Config/Module";
-
+import Link from "next/link";
 
 export default function LoginCallBack() {
 	const router = useRouter();
@@ -31,9 +31,10 @@ export default function LoginCallBack() {
 			const token = await Customers.getInstance().loginCallback(tokenid360);
 			CustomerStore.instance.connect(token.accessToken, token.refreshToken);
 			router.push(Module.getInstance().get().modules.pages.Folder.pages.Select.props.path);
-		}
+		};
 		getReport();
-	}),[router];
+	}),
+		[router];
 
 	return (
 		<DefaultDoubleSidePage title={"Login"} image={LandingImage}>
@@ -48,7 +49,9 @@ export default function LoginCallBack() {
 				<Typography typo={ITypo.P_18}>
 					<div className={classes["forget-password"]}>Vous n'arrivez pas à vous connecter ?</div>
 				</Typography>
+				<Link href="mailto:g.texier@notaires.fr">
 					<Button variant={EButtonVariant.LINE}>Contacter l'administrateur</Button>
+				</Link>
 			</div>
 		</DefaultDoubleSidePage>
 	);

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

@@ -9,6 +9,7 @@ import { useCallback } from "react";
 import Customers from "@Front/Api/LeCoffreApi/Id360/Customers/Customers";
 import classes from "./classes.module.scss";
 import LandingImage from "./landing-connect.jpeg";
+import Link from "next/link";
 
 export default function Login() {
 	const router = useRouter();
@@ -36,7 +37,9 @@ export default function Login() {
 				<Typography typo={ITypo.P_18}>
 					<div className={classes["forget-password"]}>Vous n'arrivez pas à vous connecter ?</div>
 				</Typography>
+				<Link href="mailto:g.texier@notaires.fr">
 					<Button variant={EButtonVariant.LINE}>Contacter l'administrateur</Button>
+				</Link>
 			</div>
 		</DefaultDoubleSidePage>
 	);

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

@@ -90,7 +90,7 @@ export default class MyAccount extends Base<IProps, IState> {
 									/>
 									<TextField
 										name="cp_address"
-										placeholder="Adresse CP"
+										placeholder="Adresse"
 										defaultValue={this.state.user?.office_membership?.address?.address}
 										disabled
 										canCopy

src/front/Components/Layouts/Offices/OfficeInformations/classes.module.scss

@@ -5,18 +5,18 @@
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
+		gap: 16px;
 
 		@media (max-width: $screen-s) {
 			flex-direction: column;
 			align-items: flex-start;
-			gap: 16px;
 		}
 
 		.header-right {
 			display: flex;
 			align-items: center;
 			gap: 16px;
-
+			width: 150px;
 			.round {
 				width: 16px;
 				height: 16px;

src/front/Components/Layouts/Offices/OfficeInformations/index.tsx

@@ -3,7 +3,7 @@ import Typography, { ITypo, ITypoColor } from "@Front/Components/DesignSystem/Ty
 import DefaultOfficeDashboard from "@Front/Components/LayoutTemplates/DefaultOfficeDashboard";
 import User, { Office } from "le-coffre-resources/dist/SuperAdmin";
 import { useRouter } from "next/router";
-import { useEffect, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 
 import classes from "./classes.module.scss";
 
@@ -13,6 +13,8 @@ export default function OfficeInformations(props: IProps) {
 	let { officeUid } = router.query;
 
 	const [officeSelected, setOfficeSelected] = useState<Office | null>(null);
+	const [adminUsers, setAdminUsers] = useState<User[]>([]);
+	const [collaboratorUsers, setCollaboratorUsers] = useState<User[]>([]);
 
 	useEffect(() => {
 		async function getOffice() {
@@ -31,19 +33,49 @@ export default function OfficeInformations(props: IProps) {
 			});
 			if (!office) return;
 			setOfficeSelected(office);
+
+			const adminUsers = office.users?.filter((user) => {
+				if (user.office_role && user.office_role.name === "admin") {
+					return true;
+				}
+				if (!user.office_role && user.role?.name === "admin") {
+					return true;
+				}
+				if (!user.office_role && user.role?.name === "super-admin") {
+					return true;
+				}
+				return false;
+			});
+
+			const collaboratorUsers = office.users?.filter((user) => {
+				if (user.office_role && user.office_role.name === "admin") {
+					return false;
+				}
+				if (!user.office_role && user.role?.name === "admin") {
+					return false;
+				}
+				if (!user.office_role && user.role?.name === "super-admin") {
+					return false;
+				}
+				return true;
+			});
+
+			setAdminUsers(adminUsers!);
+			setCollaboratorUsers(collaboratorUsers!);
 		}
 
 		getOffice();
 	}, [officeUid]);
 
-	const renderUser = (user: User) => (
+	const renderUser = useCallback(
+		(user: User) => (
 			<>
-			<div key={user.uid} className={classes["user-line-desktop"]}>
+				<div key={user.uid + "-" + officeUid} className={classes["user-line-desktop"]}>
 					<Typography typo={ITypo.P_16}>{user.contact?.last_name}</Typography>
 					<Typography typo={ITypo.P_16}>{user.contact?.first_name}</Typography>
 					<Typography typo={ITypo.P_16}>{user.contact?.email}</Typography>
 					<Typography typo={ITypo.P_16}>{user.contact?.phone_number}</Typography>
-				<Typography typo={ITypo.P_16}>{user.office_role ? user.office_role?.name : user.role?.name}</Typography>
+					<Typography typo={ITypo.P_16}>{user.office_role ? user.office_role?.name : "Utilisateur restreint"}</Typography>
 				</div>
 				<div key={user.uid} className={classes["user-line-mobile"]}>
 					<div className={classes["line"]}>
@@ -78,7 +110,10 @@ export default function OfficeInformations(props: IProps) {
 					</div>
 				</div>
 			</>
+		),
+		[officeUid],
 	);
+
 	return (
 		<DefaultOfficeDashboard mobileBackText={"Liste des utilisateurs"}>
 			<div className={classes["root"]}>
@@ -134,20 +169,7 @@ export default function OfficeInformations(props: IProps) {
 									Rôle
 								</Typography>
 							</div>
-							{officeSelected?.users
-								?.filter((user) => {
-									if (user.office_role && user.office_role.name === "admin") {
-										return true;
-									}
-									if (!user.office_role && user.role?.name === "admin") {
-										return true;
-									}
-									if (!user.office_role && user.role?.name === "super-admin") {
-										return true;
-									}
-									return false;
-								})
-								.map((user) => {
+							{adminUsers.map((user) => {
 								return renderUser(user);
 							})}
 						</div>
@@ -174,20 +196,7 @@ export default function OfficeInformations(props: IProps) {
 									Rôle
 								</Typography>
 							</div>
-							{officeSelected?.users
-								?.filter((user) => {
-									if (user.office_role && user.office_role.name === "admin") {
-										return false;
-									}
-									if (!user.office_role && user.role?.name === "admin") {
-										return false;
-									}
-									if (!user.office_role && user.role?.name === "super-admin") {
-										return false;
-									}
-									return true;
-								})
-								.map((user) => {
+							{collaboratorUsers.map((user) => {
 								return renderUser(user);
 							})}
 						</div>

src/front/Components/Layouts/Users/UserInformations/index.tsx

@@ -285,7 +285,10 @@ export default function UserInformations(props: IProps) {
 							<Typography typo={ITypo.P_SB_18}>Attribuer un titre</Typography>
 						</div>
 						<div className={classes["second-line"]}>
+							{!isSuperAdminChecked && (
 								<Switch label="Admin de son office" checked={isAdminChecked} onChange={handleAdminChanged} />
+							)}
+
 							<Switch
 								label="Super-admin LeCoffre.io"
 								checked={isSuperAdminChecked}