Fix filtredNominalVoltages

Signed-off-by: Ayoub LABIDI <[email protected]>

Author: ayolab

src/components/network/network-map-panel.tsx

@@ -69,6 +69,7 @@ import SelectionCreationPanel from './selection-creation-panel/selection-creatio
 import { useEquipmentMenu } from '../../hooks/use-equipment-menu';
 import useEquipmentDialogs from 'hooks/use-equipment-dialogs';
 import { getNominalVoltageColor } from 'utils/colors';
+import { getNominalVoltageIntervalName } from './utils/nominal-voltage-filter-utils';
 
 const INITIAL_POSITION = [0, 0] as const;
 const INITIAL_ZOOM = 9;
@@ -184,9 +185,7 @@ export const NetworkMapPanel = forwardRef<NetworkMapPanelRef, NetworkMapPanelPro
 
         const { snackError } = useSnackMessage();
 
-        const [filteredNominalVoltages, setFilteredNominalVoltages] = useState<number[]>(
-            mapState?.filteredNominalVoltages ?? []
-        );
+        const [filteredNominalVoltages, setFilteredNominalVoltages] = useState<number[]>([]);
         const [geoData, setGeoData] = useState<GeoData>();
         const geoDataRef = useRef<any>();
 
@@ -1246,23 +1245,46 @@ export const NetworkMapPanel = forwardRef<NetworkMapPanelRef, NetworkMapPanelPro
         );
 
         // Set up filteredNominalVoltages once at map initialization
-        // TODO: how do we must manage case where voltages change (like when changing node), as filters are already initialized?
         const nominalVoltagesFromMapEquipments = mapEquipments?.getNominalVoltages();
+        const hasInitializedFilters = useRef(false);
+
         useEffect(() => {
+            // Only initialize once when mapEquipments are loaded
             if (
                 nominalVoltagesFromMapEquipments !== undefined &&
                 nominalVoltagesFromMapEquipments.length > 0 &&
-                filteredNominalVoltages.length === 0 &&
-                !mapState?.filteredNominalVoltages // Only initialize if no saved map state exists
+                !hasInitializedFilters.current
             ) {
-                handleFilteredNominalVoltagesChange(nominalVoltagesFromMapEquipments);
+                hasInitializedFilters.current = true;
+
+                // Check if we have saved state to restore
+                if (mapState?.filteredNominalVoltages && mapState.filteredNominalVoltages.length > 0) {
+                    // Get intervals from saved voltages
+                    const savedIntervals = new Set(
+                        mapState.filteredNominalVoltages
+                            .map((v) => getNominalVoltageIntervalName(v))
+                            .filter((interval): interval is string => interval !== undefined)
+                    );
+
+                    // Filter current voltages by matching intervals
+                    const voltagesMatchingIntervals = nominalVoltagesFromMapEquipments.filter((v) => {
+                        const interval = getNominalVoltageIntervalName(v);
+                        return interval && savedIntervals.has(interval);
+                    });
+
+                    if (voltagesMatchingIntervals.length > 0) {
+                        // Restore voltages from matching intervals
+                        setFilteredNominalVoltages(voltagesMatchingIntervals);
+                    } else {
+                        // No matching intervals found, initialize with all
+                        setFilteredNominalVoltages(nominalVoltagesFromMapEquipments);
+                    }
+                } else {
+                    // No saved state, initialize with all voltages
+                    setFilteredNominalVoltages(nominalVoltagesFromMapEquipments);
+                }
             }
-        }, [
-            filteredNominalVoltages,
-            handleFilteredNominalVoltagesChange,
-            nominalVoltagesFromMapEquipments,
-            mapState?.filteredNominalVoltages,
-        ]);
+        }, [nominalVoltagesFromMapEquipments, mapState?.filteredNominalVoltages]);
 
         function renderNominalVoltageFilter() {
             return (

src/components/network/nominal-voltage-filter.tsx

@@ -64,17 +64,17 @@ export default function NominalVoltageFilter({
             const vlListValues = nominalVoltages.filter(
                 (vnom) => getNominalVoltageIntervalName(vnom) === interval.name
             );
-            return { ...interval, vlListValues, isChecked: true };
+            // Check if all voltages in this interval are present in filteredNominalVoltages
+            const isChecked = vlListValues.length > 0 && vlListValues.every((v) => filteredNominalVoltages.includes(v));
+            return { ...interval, vlListValues, isChecked };
         });
         setVoltageLevelIntervals(newIntervals);
-    }, [nominalVoltages]);
+    }, [nominalVoltages, filteredNominalVoltages]);
 
     const handleToggle = useCallback(
         (interval: VoltageLevelValuesInterval) => {
-            let newFiltered: number[];
-
-            // we "inverse" the selection for vlListValues
-            newFiltered = [...filteredNominalVoltages];
+            // Toggle all voltages in this interval
+            const newFiltered = [...filteredNominalVoltages];
             for (const vnom of interval.vlListValues) {
                 const currentIndex = newFiltered.indexOf(vnom);
                 if (currentIndex === -1) {
@@ -83,11 +83,9 @@ export default function NominalVoltageFilter({
                     newFiltered.splice(currentIndex, 1); // previously present, we remove it
                 }
             }
-            setVoltageLevelIntervals((prev) =>
-                prev.map((i) => (i.name === interval.name ? { ...i, isChecked: !i.isChecked } : i))
-            );
 
-            onChange(newFiltered); // update filteredNominalVoltages
+            // Update parent state - the useEffect will handle updating voltageLevelIntervals
+            onChange(newFiltered);
         },
         [filteredNominalVoltages, onChange]
     );