Merge branch 'staging' into preprod

This commit is contained in:
Vins 2024-11-12 10:20:31 +01:00
commit fde6297e70
9 changed files with 81 additions and 9 deletions

View File

@ -33,5 +33,12 @@
@media screen and (max-width: $screen-s) { @media screen and (max-width: $screen-s) {
display: none; display: none;
} }
.text {
max-height: 60px;
overflow-y: auto;
white-space: normal;
word-break: break-all;
}
} }
} }

View File

@ -93,7 +93,7 @@ export default function ContactBox(props: IProps) {
<Typography typo={ETypo.TEXT_MD_REGULAR} color={ETypoColor.COLOR_NEUTRAL_700}> <Typography typo={ETypo.TEXT_MD_REGULAR} color={ETypoColor.COLOR_NEUTRAL_700}>
Note dossier Note dossier
</Typography> </Typography>
<Typography typo={ETypo.TEXT_LG_REGULAR} color={ETypoColor.COLOR_NEUTRAL_950}> <Typography typo={ETypo.TEXT_LG_REGULAR} type="span" color={ETypoColor.COLOR_NEUTRAL_950} className={classes["text"]}>
{note?.content ?? "-"} {note?.content ?? "-"}
</Typography> </Typography>
</div> </div>

View File

@ -30,7 +30,8 @@ export default function DepositDocumentComponent(props: IProps) {
const addFile = useCallback( const addFile = useCallback(
(file: File) => { (file: File) => {
const formData = new FormData(); const formData = new FormData();
formData.append("file", file, file.name); const safeFileName = file.name.normalize("NFD").replace(/[\u0300-\u036f]/g, "");
formData.append("file", file, safeFileName);
const query = JSON.stringify({ document: { uid: document.uid } }); const query = JSON.stringify({ document: { uid: document.uid } });
formData.append("q", query); formData.append("q", query);
return Files.getInstance() return Files.getInstance()

View File

@ -18,6 +18,7 @@ import NotificationBox from "@Front/Components/DesignSystem/NotificationBox";
import ContactBox from "./ContactBox"; import ContactBox from "./ContactBox";
import DocumentsNotary from "@Front/Api/LeCoffreApi/Customer/DocumentsNotary/DocumentsNotary"; import DocumentsNotary from "@Front/Api/LeCoffreApi/Customer/DocumentsNotary/DocumentsNotary";
import { EDocumentNotaryStatus } from "le-coffre-resources/dist/Notary/DocumentNotary"; import { EDocumentNotaryStatus } from "le-coffre-resources/dist/Notary/DocumentNotary";
// import DepositOtherDocument from "@Front/Components/DesignSystem/DepositOtherDocument";
import Tag, { ETagColor } from "@Front/Components/DesignSystem/Tag"; import Tag, { ETagColor } from "@Front/Components/DesignSystem/Tag";
import DefaultCustomerDashboard from "@Front/Components/LayoutTemplates/DefaultCustomerDashboard"; import DefaultCustomerDashboard from "@Front/Components/LayoutTemplates/DefaultCustomerDashboard";
@ -36,6 +37,7 @@ export default function ClientDashboard(props: IProps) {
const [customer, setCustomer] = useState<Customer | null>(null); const [customer, setCustomer] = useState<Customer | null>(null);
const [folder, setFolder] = useState<OfficeFolderNotary | null>(null); const [folder, setFolder] = useState<OfficeFolderNotary | null>(null);
const [documentsNotary, setDocumentsNotary] = useState<DocumentNotary[]>([]); const [documentsNotary, setDocumentsNotary] = useState<DocumentNotary[]>([]);
// const [isAddDocumentModalVisible, setIsAddDocumentModalVisible] = useState<boolean>(false);
const fetchFolderAndCustomer = useCallback(async () => { const fetchFolderAndCustomer = useCallback(async () => {
let jwt: ICustomerJwtPayload | undefined; let jwt: ICustomerJwtPayload | undefined;
@ -120,6 +122,34 @@ export default function ClientDashboard(props: IProps) {
[documentsNotary], [documentsNotary],
); );
// const onCloseModalAddDocument = useCallback(() => {
// setIsAddDocumentModalVisible(false);
// fetchFolderAndCustomer();
// }, [fetchFolderAndCustomer]);
// const onOpenModalAddDocument = useCallback(() => {
// setIsAddDocumentModalVisible(true);
// }, []);
// const renderBox = useCallback(() => {
// console.log(folder!.office!.uid);
// return (
// <DepositOtherDocument
// folder_uid={folderUid!}
// customer_uid={customer!.uid!}
// open={isAddDocumentModalVisible}
// onClose={onCloseModalAddDocument}
// document={Document.hydrate<Document>({
// document_type: DocumentType.hydrate<DocumentType>({
// name: "Autres documents",
// office: folder!.office!,
// }),
// })}
// />
// );
// }, [customer, folderUid, isAddDocumentModalVisible, onCloseModalAddDocument]);
return ( return (
<DefaultCustomerDashboard> <DefaultCustomerDashboard>
<div className={classes["root"]}> <div className={classes["root"]}>
@ -206,6 +236,18 @@ export default function ClientDashboard(props: IProps) {
))} ))}
</div> </div>
</div> </div>
<Typography typo={ETypo.TITLE_H3}>Documents supplémentaires (facultatif)</Typography>
<Typography typo={ETypo.TEXT_MD_REGULAR} className={classes["text"]}>
Vous souhaitez envoyer d'autres documents à votre notaire ?
</Typography>
{/* <Button
variant={EButtonVariant.PRIMARY}
styletype={EButtonstyletype.OUTLINED}
className={classes["button"]}
onClick={onOpenModalAddDocument}>
Ajouter d'autres documents
</Button>
{isAddDocumentModalVisible && renderBox()} */}
</div> </div>
</DefaultCustomerDashboard> </DefaultCustomerDashboard>
); );

View File

@ -18,4 +18,11 @@
.delete-button { .delete-button {
margin: auto; margin: auto;
} }
.text {
max-height: 60px;
overflow-y: auto;
white-space: normal;
word-wrap: break-word;
}
} }

View File

@ -98,7 +98,7 @@ export default function ClientBox(props: IProps) {
<Typography typo={ETypo.TEXT_MD_REGULAR} color={ETypoColor.COLOR_NEUTRAL_700}> <Typography typo={ETypo.TEXT_MD_REGULAR} color={ETypoColor.COLOR_NEUTRAL_700}>
Note client Note client
</Typography> </Typography>
<Typography typo={ETypo.TEXT_LG_REGULAR} color={ETypoColor.COLOR_NEUTRAL_950}> <Typography typo={ETypo.TEXT_LG_REGULAR} type="span" color={ETypoColor.COLOR_NEUTRAL_950} className={classes["text"]}>
{customerNote?.content ?? "-"} {customerNote?.content ?? "-"}
</Typography> </Typography>
</div> </div>

View File

@ -129,7 +129,7 @@ export default function InformationSection(props: IProps) {
<Typography typo={ETypo.TEXT_MD_REGULAR} color={ETypoColor.COLOR_NEUTRAL_700}> <Typography typo={ETypo.TEXT_MD_REGULAR} color={ETypoColor.COLOR_NEUTRAL_700}>
Note du dossier Note du dossier
</Typography> </Typography>
<Typography typo={ETypo.TEXT_LG_REGULAR} className={classes["text"]}> <Typography typo={ETypo.TEXT_LG_REGULAR} type="span" className={classes["text"]}>
{folder?.description} {folder?.description}
</Typography> </Typography>
</div> </div>
@ -158,7 +158,7 @@ export default function InformationSection(props: IProps) {
<Typography typo={ETypo.TEXT_MD_REGULAR} color={ETypoColor.COLOR_NEUTRAL_700}> <Typography typo={ETypo.TEXT_MD_REGULAR} color={ETypoColor.COLOR_NEUTRAL_700}>
Note du dossier Note du dossier
</Typography> </Typography>
<Typography typo={ETypo.TEXT_LG_REGULAR} className={classes["text"]}> <Typography typo={ETypo.TEXT_LG_REGULAR} type="span" className={classes["text"]}>
{folder?.description} {folder?.description}
</Typography> </Typography>
</div> </div>

View File

@ -34,7 +34,7 @@ export default function MyAccount() {
}, []); }, []);
return ( return (
<DefaultDoubleSidePage title={"Mon Compte"} image={backgroundImage}> <DefaultDoubleSidePage title={"Mon Compte"} image={backgroundImage} showHeader={true}>
<div className={classes["root"]}> <div className={classes["root"]}>
<div className={classes["title-container"]}> <div className={classes["title-container"]}>
<Typography typo={ETypo.TITLE_H1} color={ETypoColor.TEXT_PRIMARY}> <Typography typo={ETypo.TITLE_H1} color={ETypoColor.TEXT_PRIMARY}>
@ -47,7 +47,14 @@ export default function MyAccount() {
<Form className={classes["form"]}> <Form className={classes["form"]}>
<TextField name="name" label="Nom" placeholder="Nom" defaultValue={user?.contact?.last_name} readonly canCopy /> <TextField name="name" label="Nom" placeholder="Nom" defaultValue={user?.contact?.last_name} readonly canCopy />
<TextField name="surname" label="Prénom" placeholder="Prénom" defaultValue={user?.contact?.first_name} readonly canCopy /> <TextField
name="surname"
label="Prénom"
placeholder="Prénom"
defaultValue={user?.contact?.first_name}
readonly
canCopy
/>
<TextField name="email" label="E-mail" placeholder="E-mail" defaultValue={user?.contact?.email} readonly canCopy /> <TextField name="email" label="E-mail" placeholder="E-mail" defaultValue={user?.contact?.email} readonly canCopy />
<TextField <TextField
name="phone" name="phone"
@ -72,7 +79,14 @@ export default function MyAccount() {
readonly readonly
canCopy canCopy
/> />
<TextField name="crpcen" label="CRPCEN" placeholder="CRPCEN" defaultValue={user?.office_membership?.crpcen} readonly canCopy /> <TextField
name="crpcen"
label="CRPCEN"
placeholder="CRPCEN"
defaultValue={user?.office_membership?.crpcen}
readonly
canCopy
/>
<TextField <TextField
name="cp_address" name="cp_address"
label="Adresse" label="Adresse"

View File

@ -44,7 +44,8 @@ export default class PageNotFound extends BasePage {
<HelpBox <HelpBox
title="Vous avez des questions ?" title="Vous avez des questions ?"
description="Notre équipe de support est là pour vous aider." description="Notre équipe de support est là pour vous aider."
button={{ text: "Contactez le support" }} //Button with onclick that redirect to a custom url
button={{ text: "Contactez le support", onClick: () => window.open("https://tally.so/r/mBGaNY") }}
/> />
</div> </div>
</DefaultDoubleSidePage> </DefaultDoubleSidePage>