Correctifs sur le filtre avancé par type / sous-type de bordereau (#3594

)
MTES-MCT · Sep 20, 2024 · c5018e6 · c5018e6
1 parent 408bd92
commit c5018e6
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 32 deletions.
diff --git a/front/src/Apps/Dashboard/dashboardUtils.tsx b/front/src/Apps/Dashboard/dashboardUtils.tsx
@@ -91,30 +91,24 @@ const bsdTypeFilterSelectOptions = [
     ]
   },
   {
-    value: BsdType.Bsdasri,
-    label: bsd_type_option_bsdasri,
+    value: BsdType.Bsda,
+    label: bsd_type_option_bsda,
     options: [
       {
         value: BsdSubType.Initial,
         label: bsd_sub_type_option_initial
       },
-      {
-        value: BsdSubType.Synthesis,
-        label: bsd_sub_type_option_synthesis
-      },
       {
         value: BsdSubType.Gathering,
         label: bsd_sub_type_option_gathering
-      }
-    ]
-  },
-  {
-    value: BsdType.Bsvhu,
-    label: bsd_type_option_bsvhu,
-    options: [
+      },
       {
-        value: BsdSubType.Initial,
-        label: bsd_sub_type_option_initial
+        value: BsdSubType.Reshipment,
+        label: bsd_sub_type_option_reshipment
+      },
+      {
+        value: BsdSubType.Collection_2710,
+        label: bsd_sub_type_option_collection_2710
       }
     ]
   },
@@ -141,36 +135,30 @@ const bsdTypeFilterSelectOptions = [
     ]
   },
   {
-    value: BsdType.Bsda,
-    label: bsd_type_option_bsda,
+    value: BsdType.Bsvhu,
+    label: bsd_type_option_bsvhu
+  },
+  {
+    value: BsdType.Bsdasri,
+    label: bsd_type_option_bsdasri,
     options: [
       {
         value: BsdSubType.Initial,
         label: bsd_sub_type_option_initial
       },
       {
-        value: BsdSubType.Gathering,
-        label: bsd_sub_type_option_gathering
-      },
-      {
-        value: BsdSubType.Reshipment,
-        label: bsd_sub_type_option_reshipment
+        value: BsdSubType.Synthesis,
+        label: bsd_sub_type_option_synthesis
       },
       {
-        value: BsdSubType.Collection_2710,
-        label: bsd_sub_type_option_collection_2710
+        value: BsdSubType.Gathering,
+        label: bsd_sub_type_option_gathering
       }
     ]
   },
   {
     value: BsdType.Bspaoh,
-    label: bsd_type_option_bspaoh,
-    options: [
-      {
-        value: BsdSubType.Initial,
-        label: bsd_sub_type_option_initial
-      }
-    ]
+    label: bsd_type_option_bspaoh
   }
 ];
 

diff --git a/front/src/Apps/common/Components/SelectWithSubOptions/SelectWithSubOptions.tsx b/front/src/Apps/common/Components/SelectWithSubOptions/SelectWithSubOptions.tsx
@@ -77,6 +77,7 @@ const SelectWithSubOptions = ({
 
             {/* Option's potential sub-options */}
             {option.options &&
+              optionIsAlreadySelected &&
               mapOptions(
                 option.options,
                 [...parentPaths, option.value],