fix: ne pas afficher les détails quandon crée un nouveau groupe alors…

… que tout était caché
SocialGouv · Feb 8, 2024 · 505434f · 505434f
1 parent e880ad2
commit 505434f
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 1 deletion.
diff --git a/dashboard/src/scenes/organisation/ActionCategoriesSettings.js b/dashboard/src/scenes/organisation/ActionCategoriesSettings.js
@@ -100,6 +100,7 @@ const ActionCategoriesSettings = () => {
       title={<h3 className="tw-mb-0 tw-text-xl tw-font-extrabold">Catégories d'action</h3>}
       data={dataFormatted}
       addButtonCaption="Ajouter un groupe"
+      sectionId='action-categories'
       onAddGroup={onAddGroup}
       onGroupTitleChange={onGroupTitleChange}
       dataItemKey={(cat) => cat}

diff --git a/dashboard/src/scenes/organisation/ConsultationsSettings.js b/dashboard/src/scenes/organisation/ConsultationsSettings.js
@@ -125,6 +125,7 @@ const ConsultationsSettings = () => {
     <DragAndDropSettings
       title={<h3 className="tw-mb-0 tw-text-xl tw-font-extrabold">Consultations</h3>}
       data={dataFormatted}
+      sectionId="consultations"
       addButtonCaption="Ajouter un type de consultations"
       onAddGroup={onAddConsultationType}
       onGroupTitleChange={onConsultationTypeChange}

diff --git a/dashboard/src/scenes/organisation/DragAndDropSettings.js b/dashboard/src/scenes/organisation/DragAndDropSettings.js
@@ -193,11 +193,22 @@ const Group = ({
     setIsEditingGroupTitle(false);
   };
 
+  const isOpened = useMemo(() => {
+    return window.sessionStorage.getItem(`drag-and-drop-setting-${sectionId}-${groupTitle}-open`) === 'true';
+  });
+
   return (
     <>
       <div className={['tw-min-h-full tw-break-all tw-p-1 ', isAlone ? '' : 'tw-basis-1/2 xl:tw-basis-1/3'].join(' ')}>
         <details
-          open
+          open={!!isOpened}
+          onToggle={(e) => {
+            if (e.target.open) {
+              window.sessionStorage.setItem(`drag-and-drop-setting-${sectionId}-${groupTitle}-open`, 'true');
+            } else {
+              window.sessionStorage.removeItem(`drag-and-drop-setting-${sectionId}-${groupTitle}-open`);
+            }
+          }}
           key={groupTitle}
           id={groupTitle}
           data-group={groupTitle}

diff --git a/dashboard/src/scenes/organisation/MedicalFileSettings.js b/dashboard/src/scenes/organisation/MedicalFileSettings.js
@@ -59,6 +59,7 @@ const MedicalFileSettings = () => {
     <DragAndDropSettings
       title={<h3 className="tw-mb-0 tw-text-xl tw-font-extrabold">Dossier médical</h3>}
       data={dataFormatted}
+      sectionId='medical-file'
       dataItemKey={(cat) => cat.name}
       ItemComponent={MedicalFileCustomField}
       NewItemComponent={AddField}

diff --git a/dashboard/src/scenes/organisation/ObservationsSettings.js b/dashboard/src/scenes/organisation/ObservationsSettings.js
@@ -57,6 +57,7 @@ const ObservationsSettings = () => {
     <DragAndDropSettings
       title={<h3 className="tw-mb-0 tw-text-xl tw-font-extrabold">Observations de territoire</h3>}
       data={dataFormatted}
+      sectionId="customFieldsObs"
       dataItemKey={(cat) => cat.name}
       ItemComponent={ObservationCustomField}
       NewItemComponent={AddField}

diff --git a/dashboard/src/scenes/organisation/PersonCustomFieldsSettings.js b/dashboard/src/scenes/organisation/PersonCustomFieldsSettings.js
@@ -115,6 +115,7 @@ const PersonCustomFieldsSettings = () => {
       data={dataFormatted}
       addButtonCaption="Ajouter un groupe de champs personnalisés"
       onAddGroup={onAddGroup}
+      sectionId="customFieldsPersons"
       onGroupTitleChange={onGroupTitleChange}
       dataItemKey={(cat) => cat.name}
       ItemComponent={ConsultationCustomField}

diff --git a/dashboard/src/scenes/organisation/ServicesSettings.js b/dashboard/src/scenes/organisation/ServicesSettings.js
@@ -102,6 +102,7 @@ const ServicesSettings = () => {
       data={dataFormatted}
       addButtonCaption="Ajouter un groupe"
       onAddGroup={onAddGroup}
+      sectionId="services"
       onGroupTitleChange={onGroupTitleChange}
       dataItemKey={(cat) => cat}
       ItemComponent={Service}

diff --git a/dashboard/src/scenes/organisation/StructuresCategoriesSettings.js b/dashboard/src/scenes/organisation/StructuresCategoriesSettings.js
@@ -39,6 +39,7 @@ const StructuresCategoriesSettings = () => {
     <DragAndDropSettings
       title="Catégories de structures"
       data={dataFormatted}
+      sectionId="structuresGroupedCategories"
       dataItemKey={(cat) => cat}
       ItemComponent={Category}
       NewItemComponent={AddCategory}