Merge branch 'main' into deploy

davwheat · Sep 22, 2024 · 0e1a540 · 0e1a540
2 parents a343484 + a9b296e
commit 0e1a540
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/components/ImportStateFromRtt.tsx b/src/components/ImportStateFromRtt.tsx
@@ -255,6 +255,11 @@ export default function ImportStateFromRtt({ importStateFromRttService, disabled
                       required
                       value={rttUri}
                       onChange={e => setRttUri(e.target.value)}
+                      onKeyDown={e => {
+                        if (e.key === 'Enter') {
+                          importService()
+                        }
+                      }}
                     />
                   </label>
                 )}

diff --git a/src/data/RttUtils.ts b/src/data/RttUtils.ts
@@ -33,12 +33,14 @@ export class RttUtils {
         if (i === arr.length - 1 && l.destination.some(d => d.tiploc === l.tiploc)) return false
         return true
       })
-      .map(l => ({
-        ...stationItemCompleter(l.crs!),
-        rttPlatform: l.platform ?? null,
-        arrLateness: l.realtimeGbttArrivalLateness ?? null,
-        depLateness: l.realtimeGbttDepartureLateness ?? null,
-      }))
+      .map(l => {
+        return {
+          ...stationItemCompleter(l.crs!),
+          rttPlatform: l.platform ?? null,
+          arrLateness: l.realtimeGbttArrivalLateness ?? null,
+          depLateness: l.realtimeGbttDepartureLateness ?? null,
+        }
+      })
   }
 
   static getEligibleLocations(rttService: RttResponse): CallingAtPointWithRttDetail[] {