diff --git a/src/front/Components/DesignSystem/Header/Profile/ProfileModal/index.tsx b/src/front/Components/DesignSystem/Header/Profile/ProfileModal/index.tsx index b871b131..72500903 100644 --- a/src/front/Components/DesignSystem/Header/Profile/ProfileModal/index.tsx +++ b/src/front/Components/DesignSystem/Header/Profile/ProfileModal/index.tsx @@ -58,7 +58,6 @@ export default class ProfileModal extends React.Component { Module.getInstance().get().modules.pages.Offices.pages.OfficesInformations.props.path, ]} /> -
diff --git a/src/front/Components/LayoutTemplates/DefaultDocumentTypesDashboard/DocumentTypeListContainer/index.tsx b/src/front/Components/LayoutTemplates/DefaultDocumentTypesDashboard/DocumentTypeListContainer/index.tsx index 97a2e073..85fd9422 100644 --- a/src/front/Components/LayoutTemplates/DefaultDocumentTypesDashboard/DocumentTypeListContainer/index.tsx +++ b/src/front/Components/LayoutTemplates/DefaultDocumentTypesDashboard/DocumentTypeListContainer/index.tsx @@ -34,7 +34,7 @@ export default function DocumentTypeListContainer(props: IProps) { (block: IBlock) => { props.onCloseLeftSide && props.onCloseLeftSide(); console.log("Block selected :", block); - const redirectPath = Module.getInstance().get().modules.pages.DocumentTypes.pages.Edit.props.path; + const redirectPath = Module.getInstance().get().modules.pages.DocumentTypes.pages.DocumentTypesInformations.props.path; router.push(redirectPath.replace("[uid]", block.id)); }, [props, router], diff --git a/src/front/Components/Layouts/DocumentTypes/DocumentTypesEdit/index.tsx b/src/front/Components/Layouts/DocumentTypes/DocumentTypesEdit/index.tsx index 439dbbf3..f1f3c3cc 100644 --- a/src/front/Components/Layouts/DocumentTypes/DocumentTypesEdit/index.tsx +++ b/src/front/Components/Layouts/DocumentTypes/DocumentTypesEdit/index.tsx @@ -5,6 +5,7 @@ import TextAreaField from "@Front/Components/DesignSystem/Form/TextareaField"; import TextField from "@Front/Components/DesignSystem/Form/TextField"; import Typography, { ITypo } from "@Front/Components/DesignSystem/Typography"; import DefaultDocumentTypesDashboard from "@Front/Components/LayoutTemplates/DefaultDocumentTypesDashboard"; +import Module from "@Front/Config/Module"; import { validateOrReject } from "class-validator"; import { DocumentType } from "le-coffre-resources/dist/Admin"; import { useRouter } from "next/router"; @@ -39,12 +40,19 @@ export default function DocumentTypesEdit() { }); await validateOrReject(documentToUpdate, { groups: ["updateDocumentType"] }); const documentTypeUpdated = await DocumentTypes.getInstance().put(documentTypeUid as string, documentToUpdate); - console.log(documentTypeUpdated); + router.push( + Module.getInstance() + .get() + .modules.pages.DocumentTypes.pages.DocumentTypesInformations.props.path.replace( + "[uid]", + documentTypeUpdated.uid ?? "", + ), + ); } catch (e) { console.log(e); } }, - [documentTypeUid], + [documentTypeUid, router], ); return ( diff --git a/src/front/Components/Layouts/DocumentTypes/DocumentTypesInformations/classes.module.scss b/src/front/Components/Layouts/DocumentTypes/DocumentTypesInformations/classes.module.scss index 72fe71da..c471a213 100644 --- a/src/front/Components/Layouts/DocumentTypes/DocumentTypesInformations/classes.module.scss +++ b/src/front/Components/Layouts/DocumentTypes/DocumentTypesInformations/classes.module.scss @@ -1,91 +1,39 @@ @import "@Themes/constants.scss"; .root { - .header { + .document-infos { display: flex; + align-items: flex-start; justify-content: space-between; - align-items: flex-end; - - @media (max-width: $screen-l) { - flex-direction: column; - align-items: flex-start; - gap: 24px; - } - } - - .subtitle { - margin-top: 32px; - } - - .deed-type-container { - margin-top: 32px; - display: flex; - gap: 100px; - justify-content: space-between; + gap: 24px; padding: 24px; + margin-top: 32px; background-color: var(--grey-soft); - @media (max-width: $screen-l) { - gap: 80px; - } - - @media (max-width: $screen-m) { + .left { + display: flex; flex-direction: column; gap: 32px; - } - - .infos { - display: flex; - gap: 100px; - flex: 1; + justify-content: space-between; @media (max-width: $screen-l) { - flex-direction: column; + display: grid; + grid-template-columns: repeat(2, 1fr); gap: 32px; } - .box { - .box-title { - margin-bottom: 8px; - opacity: 0.4; - } + @media (max-width: $screen-s) { + grid-template-columns: repeat(1, 1fr); } - .middle-box { - flex: 1; + .document-infos-row { + display: flex; + flex-direction: column; + gap: 12px; } } - .pencil { - align-self: center; - - @media (max-width: $screen-m) { - align-self: flex-start; - } + .right { } } - - .documents-container { - margin-top: 32px; - padding: 32px 16px; - - border: 1px solid var(--grey); - - .container-title { - } - - .documents { - margin-top: 32px; - } - - .button-container { - margin-top: 32px; - } - } - - .delete-container { - display: flex; - justify-content: center; - margin-top: 32px; - } } diff --git a/src/front/Components/Layouts/DocumentTypes/DocumentTypesInformations/index.tsx b/src/front/Components/Layouts/DocumentTypes/DocumentTypesInformations/index.tsx index 8a000e92..2ada9aa3 100644 --- a/src/front/Components/Layouts/DocumentTypes/DocumentTypesInformations/index.tsx +++ b/src/front/Components/Layouts/DocumentTypes/DocumentTypesInformations/index.tsx @@ -1,89 +1,72 @@ -import ChevronIcon from "@Assets/Icons/chevron.svg"; import PenICon from "@Assets/Icons/pen.svg"; import DocumentTypes from "@Front/Api/LeCoffreApi/Admin/DocumentTypes/DocumentTypes"; -import Button, { EButtonVariant } from "@Front/Components/DesignSystem/Button"; -import Form from "@Front/Components/DesignSystem/Form"; import Typography, { ITypo, ITypoColor } from "@Front/Components/DesignSystem/Typography"; import DefaultDocumentTypesDashboard from "@Front/Components/LayoutTemplates/DefaultDocumentTypesDashboard"; import Module from "@Front/Config/Module"; -import classNames from "classnames"; import { DocumentType } from "le-coffre-resources/dist/Admin"; import Image from "next/image"; import Link from "next/link"; import { useRouter } from "next/router"; -import { useCallback, useEffect, useState } from "react"; +import { useEffect, useState } from "react"; import classes from "./classes.module.scss"; -type IProps = {}; -export default function DocumentTypesInformations(props: IProps) { +export default function DocumentTypesInformations() { const router = useRouter(); let { documentTypeUid } = router.query; - const [documentTypeSelected, setDocumentTypeSelected] = useState(null); + const [documentSelected, setDocumentSelected] = useState(null); useEffect(() => { - async function getDocumentType() { + async function getDocument() { if (!documentTypeUid) return; - const documentType = await DocumentTypes.getInstance().getByUid(documentTypeUid as string); - setDocumentTypeSelected(documentType); + const document = await DocumentTypes.getInstance().getByUid(documentTypeUid as string, { + _count: true, + }); + if (!document) return; + setDocumentSelected(document); } - getDocumentType(); + getDocument(); }, [documentTypeUid]); - const onSubmitHandler = useCallback(async (e: React.FormEvent | null, values: { [key: string]: string }) => {}, []); - return ( - +
-
- Paramétrage des listes de pièces - +
+ Paramétrage des documents
-
- {documentTypeSelected?.name} -
-
-
-
- - Nom du type d'acte +
+
+
+ + Nom du document - {documentTypeSelected?.name} + {documentSelected?.name}
-
- - Description +
+ + Description visible par les collaborateurs de l'office + {documentSelected?.private_description} +
+
+ + Description visible par les clients de l'office + + {documentSelected?.public_description}
-
+
- éditer le type d'acte + edit informations
-
-
-
- Documents paramétrés -
-
- -
-
-
-
- -
);