fix: retours Ariane

BaseAdresseNationale · Jul 12, 2024 · d9b3789 · d9b3789
1 parent 2910ec7
commit d9b3789
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/components/signalement/numero/signalement-update-numero.tsx b/components/signalement/numero/signalement-update-numero.tsx
@@ -114,7 +114,7 @@ function SignalementUpdateNumero({
               isMapMarker: true,
               isDisabled: true,
               color: "warning",
-              label: `${position.type} - ${numero}${suffixe ? suffixe : ""}`,
+              label: `${numero}${suffixe ? suffixe : ""} - ${position.type}`,
               longitude: position.point.coordinates[0],
               latitude: position.point.coordinates[1],
               type: position.type as unknown as Position.type,

diff --git a/components/signalement/signalement-list.tsx b/components/signalement/signalement-list.tsx
@@ -19,6 +19,7 @@ import { getSignalementLabel } from "@/lib/utils/signalement";
 interface SignalementListProps {
   signalements: any[];
   selectedSignalements: string[];
+  setSelectedSignalements: (ids: string[]) => void;
   onSelect: (id: string) => void;
   onIgnore: (id: string) => void;
   onToggleSelect: (ids: string[]) => void;
@@ -27,6 +28,7 @@ interface SignalementListProps {
 function SignalementList({
   signalements,
   selectedSignalements,
+  setSelectedSignalements,
   onSelect,
   onIgnore,
   onToggleSelect,
@@ -59,8 +61,8 @@ function SignalementList({
           <Checkbox
             checked={isAllSelected}
             onChange={() =>
-              onToggleSelect(
-                isAllSelected ? [] : signalements.map(({ _id }) => _id)
+              setSelectedSignalements(
+                isAllSelected ? [] : signalements.map(({ id }) => id)
               )
             }
           />

diff --git a/pages/bal/[balId]/signalements/index.tsx b/pages/bal/[balId]/signalements/index.tsx
@@ -124,17 +124,11 @@ function SignalementsPage({
   };
 
   const handleToggleSelect = (ids: string[]) => {
-    if (ids.length === signalements.length) {
-      setSelectedSignalements(ids);
-    } else if (ids.length === 0) {
-      setSelectedSignalements([]);
-    } else {
-      for (const id of ids) {
-        if (!selectedSignalements.includes(id)) {
-          setSelectedSignalements([...selectedSignalements, id]);
-        } else {
-          setSelectedSignalements(selectedSignalements.filter((s) => s !== id));
-        }
+    for (const id of ids) {
+      if (!selectedSignalements.includes(id)) {
+        setSelectedSignalements([...selectedSignalements, id]);
+      } else {
+        setSelectedSignalements(selectedSignalements.filter((s) => s !== id));
       }
     }
   };
@@ -215,6 +209,7 @@ function SignalementsPage({
           signalements={signalements}
           selectedSignalements={selectedSignalements}
           onSelect={handleSelectSignalement}
+          setSelectedSignalements={setSelectedSignalements}
           onToggleSelect={handleToggleSelect}
           onIgnore={handleIgnoreSignalement}
         />