front: sort tracks in track occupancy diagram

Author: Akctarus

front/src/modules/simulationResult/components/SpaceTimeChartWrapper/useTrackOccupancy.ts

@@ -43,9 +43,40 @@ type DeployedWaypoint = {
   loading?: boolean;
 };
 
-const NO_TRACK_SPECIFIED_ID = '__no_track_specified__';
 const NO_TRACK_SPECIFIED_SYMBOL = '[ ]';
 
+// Extracts the first integer (including negative) from a string, or null if none is found
+function extractFirstNumber(s: string): number | null {
+  const match = s.match(/-?\d+/);
+  return match ? parseInt(match[0], 10) : null;
+}
+
+//Sorts tracks for display in the track occupancy diagram.
+function sortTracks(infraTracks: Track[], virtualTracks: Track[]): Track[] {
+  const ncTrack = virtualTracks.find((t) => t.id === NO_TRACK_SPECIFIED_SYMBOL);
+  const otherVirtual = virtualTracks.filter((t) => t.id !== NO_TRACK_SPECIFIED_SYMBOL);
+
+  // First pass: alphabetical sort as the stable base (tracks without a name sort last)
+  otherVirtual.sort((a, b) => {
+    if (!a.name && !b.name) return 0;
+    if (!a.name) return 1;
+    if (!b.name) return -1;
+    return a.name.localeCompare(b.name);
+  });
+
+  const withNumbers: Track[] = [];
+  const withoutNumbers: Track[] = [];
+  for (const track of otherVirtual) {
+    if (track.name && extractFirstNumber(track.name) !== null) withNumbers.push(track);
+    else withoutNumbers.push(track);
+  }
+
+  // Numeric sort (Array.sort is stable, so alphabetical order is preserved for equal values)
+  withNumbers.sort((a, b) => extractFirstNumber(a.name!)! - extractFirstNumber(b.name!)!);
+
+  return [...infraTracks, ...withNumbers, ...withoutNumbers, ...(ncTrack ? [ncTrack] : [])];
+}
+
 type StationLabel = { type?: 'label'; label: string } | { type: 'requestedPoint' };
 function extractStationLabel(
   stationLabel: StationLabel | undefined,
@@ -210,7 +241,7 @@ const useTrackOccupancy = ({
           const { local_track_name: localTrackName, trains } = trackItem;
           let trackId: string;
           if (!localTrackName) {
-            trackId = NO_TRACK_SPECIFIED_ID;
+            trackId = NO_TRACK_SPECIFIED_SYMBOL;
           } else {
             const mappedTrackId = waypointId
               ? localTrackNameToTrackIdRef.current.get(waypointId)?.get(localTrackName)
@@ -329,7 +360,7 @@ const useTrackOccupancy = ({
         }
         const virtualTracks: Track[] = [...virtualTrackIds].map((id) => ({
           id,
-          name: id === NO_TRACK_SPECIFIED_ID ? NO_TRACK_SPECIFIED_SYMBOL : id,
+          name: id === NO_TRACK_SPECIFIED_SYMBOL ? NO_TRACK_SPECIFIED_SYMBOL : id,
         }));
 
         res.push({
@@ -346,7 +377,7 @@ const useTrackOccupancy = ({
             };
           }),
           loading: opState.zones.type === 'loading',
-          tracks: [...infraTracks, ...virtualTracks],
+          tracks: sortTracks(infraTracks, virtualTracks),
         });
       }
     });