Skip to content

Commit 2f6df6d

Browse files
authored
fix(app): fix odd module pages update issue (#13646)
* fix(app): fix odd module screen update issue
1 parent 3b5d00c commit 2f6df6d

File tree

3 files changed

+18
-7
lines changed

3 files changed

+18
-7
lines changed
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
import { useModulesQuery } from '@opentrons/react-api-client'
2-
import type { AttachedModule } from '@opentrons/api-client'
2+
import type { UseQueryOptions } from 'react-query'
3+
import type { AttachedModule, Modules } from '@opentrons/api-client'
34

4-
export function useAttachedModules(): AttachedModule[] {
5-
const attachedModulesResponse = useModulesQuery()
5+
export function useAttachedModules(
6+
options: UseQueryOptions<Modules> = {}
7+
): AttachedModule[] {
8+
const attachedModulesResponse = useModulesQuery({ ...options })
69

710
return attachedModulesResponse.data?.data || []
811
}

app/src/organisms/ProtocolSetupModules/index.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ import type { ProtocolCalibrationStatus } from '../../organisms/Devices/hooks'
6565
import type { AttachedProtocolModuleMatch } from './utils'
6666
import type { CommandData } from '@opentrons/api-client'
6767

68+
const ATTACHED_MODULE_POLL_MS = 5000
69+
6870
const OT3_STANDARD_DECK_VIEW_LAYER_BLOCK_LIST: string[] = [
6971
'DECK_BASE',
7072
'BARCODE_COVERS',
@@ -314,7 +316,10 @@ export function ProtocolSetupModules({
314316

315317
const deckDef = getDeckDefFromRobotType(ROBOT_MODEL_OT3)
316318

317-
const attachedModules = useAttachedModules()
319+
const attachedModules =
320+
useAttachedModules({
321+
refetchInterval: ATTACHED_MODULE_POLL_MS,
322+
}) ?? []
318323

319324
const localRobot = useSelector(getLocalRobot)
320325
const robotName = localRobot?.name != null ? localRobot.name : ''

app/src/pages/OnDeviceDisplay/ProtocolSetup/index.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ import { getLatestCurrentOffsets } from '../../../organisms/Devices/ProtocolRun/
7777

7878
import type { OnDeviceRouteParams } from '../../../App/types'
7979

80-
const FETCH_DOOR_STATUS_MS = 5000
80+
const FETCH_DURATION_MS = 5000
8181
interface ProtocolSetupStepProps {
8282
onClickSetupStep: () => void
8383
status: 'ready' | 'not ready' | 'general'
@@ -369,7 +369,10 @@ function PrepareToRun({
369369
const protocolHasModules =
370370
mostRecentAnalysis?.modules != null &&
371371
mostRecentAnalysis?.modules.length > 0
372-
const attachedModules = useAttachedModules()
372+
const attachedModules =
373+
useAttachedModules({
374+
refetchInterval: FETCH_DURATION_MS,
375+
}) ?? []
373376

374377
const runStatus = useRunStatus(runId)
375378
const isHeaterShakerInProtocol = useIsHeaterShakerInProtocol()
@@ -505,7 +508,7 @@ function PrepareToRun({
505508
const liquidsInProtocol = mostRecentAnalysis?.liquids ?? []
506509

507510
const { data: doorStatus } = useDoorQuery({
508-
refetchInterval: FETCH_DOOR_STATUS_MS,
511+
refetchInterval: FETCH_DURATION_MS,
509512
})
510513
const isDoorOpen =
511514
doorStatus?.data.status === 'open' &&

0 commit comments

Comments
 (0)