Merge branch 'main' into deploy

davwheat · Jul 15, 2024 · 8a59a47 · 8a59a47
2 parents 7e96c4e + 6fb92dd
commit 8a59a47
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/.github/workflows/upload_audio_to_r2.yml b/.github/workflows/upload_audio_to_r2.yml
@@ -1,4 +1,4 @@
-name: Smoketest
+name: Upload to R2
 
 on:
   push:

diff --git a/src/components/AmeyLiveTrainAnnouncements.tsx b/src/components/AmeyLiveTrainAnnouncements.tsx
@@ -459,7 +459,7 @@ export function LiveTrainAnnouncements<SystemKeys extends string>({
                 value: r.crsCode,
                 label: r.name,
               }
-            }),
+            }).concat(system.ADDITIONAL_STATIONS.map(s => ({ value: s.value, label: s.title }))),
           ] as [string, Option[]]
         }),
       ),
@@ -469,20 +469,16 @@ export function LiveTrainAnnouncements<SystemKeys extends string>({
   // Ignore duplicates
   const allSupportedStations = useMemo(
     () =>
-      Array.from(
-        new Set(
-          Object.values(perSystemSupportedStations)
-            .concat(
-              Object.values<AmeyPhil>(systems)
-                .map(s => s.ADDITIONAL_STATIONS)
-                .flat()
-                .filter(o => o.value.length === 3)
-                .map(o => ({ value: o.value, label: o.title })),
-            )
+      Object.values(perSystemSupportedStations)
+        .concat(
+          Object.values<AmeyPhil>(systems)
+            .map(s => s.ADDITIONAL_STATIONS)
             .flat()
-            .map(s => s.value),
-        ),
-      ),
+            .filter(o => o.value.length === 3)
+            .map(o => ({ value: o.value, label: o.title })),
+        )
+        .flat()
+        .filter((s, i, arr) => arr.findIndex(s2 => s2.value === s.value) === i),
     [perSystemSupportedStations],
   )