fix(board): fetch departures with correct start time (#1734)

* fix(board): fetch departures with correct start time * chore(): remove unused hooks * fix(board): fetch deps with offset in quays
entur · Nov 20, 2024 · 0a17d79 · 0a17d79
1 parent 504bd4d
commit 0a17d79
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 71 deletions.
diff --git a/tavla/src/Board/scenarios/QuayTile/index.tsx b/tavla/src/Board/scenarios/QuayTile/index.tsx
@@ -6,7 +6,6 @@ import { TableHeader } from '../Table/components/TableHeader'
 import { isNotNullOrUndefined } from 'utils/typeguards'
 import { TileLoader } from 'Board/components/TileLoader'
 import { useQuery } from 'hooks/useQuery'
-import { addMinutesToDate, formatDateToISO } from 'utils/time'
 
 export function QuayTile({
     placeId,
@@ -23,11 +22,8 @@ export function QuayTile({
             quayId: placeId,
             whitelistedLines,
             whitelistedTransportModes,
-            startTime: formatDateToISO(
-                addMinutesToDate(new Date(), offset ?? 0),
-            ),
         },
-        { poll: true },
+        { poll: true, offset: offset ?? 0 },
     )
 
     if (!data) {

diff --git a/tavla/src/Board/scenarios/StopPlaceTile/index.tsx b/tavla/src/Board/scenarios/StopPlaceTile/index.tsx
@@ -5,7 +5,6 @@ import { Tile } from 'components/Tile'
 import { TableHeader } from '../Table/components/TableHeader'
 import { TileLoader } from 'Board/components/TileLoader'
 import { useQuery } from 'hooks/useQuery'
-import { addMinutesToDate, formatDateToISO } from 'utils/time'
 
 export function StopPlaceTile({
     placeId,
@@ -22,11 +21,8 @@ export function StopPlaceTile({
             stopPlaceId: placeId,
             whitelistedTransportModes,
             whitelistedLines,
-            startTime: formatDateToISO(
-                addMinutesToDate(new Date(), offset ?? 0),
-            ),
         },
-        { poll: true },
+        { poll: true, offset: offset },
     )
 
     if (!data) {

diff --git a/tavla/src/Shared/graphql/utils.ts b/tavla/src/Shared/graphql/utils.ts
@@ -1,17 +1,22 @@
 import { CLIENT_NAME, GRAPHQL_ENDPOINTS, TEndpointNames } from 'assets/env'
 import { TypedDocumentString } from './index'
+import { formatDateToISO, addMinutesToDate } from 'utils/time'
 
 export async function fetcher<Data, Variables>([
     query,
     variables,
     endpointName,
-]: [TypedDocumentString<Data, Variables>, Variables, TEndpointNames]) {
+    offset,
+]: [TypedDocumentString<Data, Variables>, Variables, TEndpointNames, number]) {
+    const startTime = formatDateToISO(addMinutesToDate(new Date(), offset))
+    const mergedVariables = { ...variables, startTime }
+
     return fetch(GRAPHQL_ENDPOINTS[endpointName], {
         headers: {
             'Content-Type': 'application/json',
             'ET-Client-Name': CLIENT_NAME,
         },
-        body: JSON.stringify({ query, variables }),
+        body: JSON.stringify({ query, variables: mergedVariables }),
         method: 'POST',
     })
         .then((res) => {
@@ -24,6 +29,7 @@ export async function fetcher<Data, Variables>([
 
 type TFetchQueryOptions = {
     endpoint: TEndpointNames
+    offset?: number
 }
 
 export async function fetchQuery<Data, Variables>(
@@ -35,5 +41,10 @@ export async function fetchQuery<Data, Variables>(
         endpoint: 'journey-planner',
         ...options,
     }
-    return fetcher([query, variables, mergedOptions.endpoint])
+    return fetcher([
+        query,
+        variables,
+        mergedOptions.endpoint,
+        mergedOptions.offset ?? 0,
+    ])
 }
diff --git a/tavla/src/Shared/hooks/useHash.ts b/tavla/src/Shared/hooks/useHash.ts
diff --git a/tavla/src/Shared/hooks/useQuery.ts b/tavla/src/Shared/hooks/useQuery.ts
@@ -6,6 +6,7 @@ import useSWR from 'swr'
 type TUseQueryOptions = {
     poll: boolean
     endpoint: TEndpointNames
+    offset?: number
 }
 
 export function useQuery<Data, Variables>(
@@ -20,7 +21,7 @@ export function useQuery<Data, Variables>(
     }
 
     const { data, error, isLoading } = useSWR<Data>(
-        [query, variables, mergedOptions.endpoint],
+        [query, variables, mergedOptions.endpoint, mergedOptions.offset ?? 0],
         fetcher,
         {
             revalidateOnFocus: true,

diff --git a/tavla/src/Shared/hooks/useToggle.ts b/tavla/src/Shared/hooks/useToggle.ts
diff --git a/tavla/src/Shared/hooks/useUpdateLastActive.ts b/tavla/src/Shared/hooks/useUpdateLastActive.ts