refactor(app): Add more host overrides

Opentrons · Jul 30, 2024 · 17871df · 17871df
1 parent 45a722f
commit 17871df
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 11 deletions.
diff --git a/app/src/resources/runs/useCurrentRunId.ts b/app/src/resources/runs/useCurrentRunId.ts
@@ -3,11 +3,17 @@ import { useNotifyAllRunsQuery } from './useNotifyAllRunsQuery'
 import type { AxiosError } from 'axios'
 import type { UseAllRunsQueryOptions } from '@opentrons/react-api-client/src/runs/useAllRunsQuery'
 import type { QueryOptionsWithPolling } from '../useNotifyDataReady'
+import type { HostConfig } from '@opentrons/api-client'
 
 export function useCurrentRunId(
-  options: QueryOptionsWithPolling<UseAllRunsQueryOptions, AxiosError> = {}
+  options: QueryOptionsWithPolling<UseAllRunsQueryOptions, AxiosError> = {},
+  hostOverride?: HostConfig | null
 ): string | null {
-  const { data: allRuns } = useNotifyAllRunsQuery({ pageLength: 0 }, options)
+  const { data: allRuns } = useNotifyAllRunsQuery(
+    { pageLength: 0 },
+    options,
+    hostOverride
+  )
   const currentRunLink = allRuns?.links?.current ?? null
   return currentRunLink != null &&
     typeof currentRunLink !== 'string' &&

diff --git a/app/src/resources/runs/useNotifyRunQuery.ts b/app/src/resources/runs/useNotifyRunQuery.ts
@@ -3,26 +3,32 @@ import { useRunQuery } from '@opentrons/react-api-client'
 import { useNotifyDataReady } from '../useNotifyDataReady'
 
 import type { UseQueryResult } from 'react-query'
-import type { Run } from '@opentrons/api-client'
+import type { Run, HostConfig } from '@opentrons/api-client'
 import type { QueryOptionsWithPolling } from '../useNotifyDataReady'
 import type { NotifyTopic } from '../../redux/shell/types'
 
 export function useNotifyRunQuery<TError = Error>(
   runId: string | null,
-  options: QueryOptionsWithPolling<Run, TError> = {}
+  options: QueryOptionsWithPolling<Run, TError> = {},
+  hostOverride?: HostConfig | null
 ): UseQueryResult<Run, TError> {
   const isEnabled = options.enabled !== false && runId != null
 
   const { notifyOnSettled, shouldRefetch } = useNotifyDataReady({
     topic: `robot-server/runs/${runId}` as NotifyTopic,
     options: { ...options, enabled: options.enabled != null && runId != null },
+    hostOverride,
   })
 
-  const httpResponse = useRunQuery(runId, {
-    ...options,
-    enabled: isEnabled && shouldRefetch,
-    onSettled: notifyOnSettled,
-  })
+  const httpResponse = useRunQuery(
+    runId,
+    {
+      ...options,
+      enabled: isEnabled && shouldRefetch,
+      onSettled: notifyOnSettled,
+    },
+    hostOverride
+  )
 
   return httpResponse
 }
diff --git a/react-api-client/src/runs/useRunQuery.ts b/react-api-client/src/runs/useRunQuery.ts
@@ -7,9 +7,12 @@ import type { HostConfig, Run } from '@opentrons/api-client'
 
 export function useRunQuery<TError = Error>(
   runId: string | null,
-  options: UseQueryOptions<Run, TError> = {}
+  options: UseQueryOptions<Run, TError> = {},
+  hostOverride?: HostConfig | null
 ): UseQueryResult<Run, TError> {
-  const host = useHost()
+  const contextHost = useHost()
+  const host =
+    hostOverride != null ? { ...contextHost, ...hostOverride } : contextHost
   const query = useQuery<Run, TError>(
     [host, 'runs', runId, 'details'],
     () =>