Skip to content

Commit 45a722f

Browse files
committed
refactor(app): move useCurrentRunId into resources
This is (very) widely used and is better off in a more shared location than having all these places poke into ProtocolUpload
1 parent 42a0541 commit 45a722f

31 files changed

+43
-59
lines changed

app/src/organisms/CalibrationTaskList/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {
2525
useCalibrationTaskList,
2626
useRunHasStarted,
2727
} from '../Devices/hooks'
28-
import { useCurrentRunId } from '../ProtocolUpload/hooks'
28+
import { useCurrentRunId } from '../../resources/runs'
2929

3030
import type { DashboardCalOffsetInvoker } from '../../pages/Devices/CalibrationDashboard/hooks/useDashboardCalibratePipOffset'
3131
import type { DashboardCalTipLengthInvoker } from '../../pages/Devices/CalibrationDashboard/hooks/useDashboardCalibrateTipLength'

app/src/organisms/Devices/InstrumentsAndModules.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {
2222

2323
import { Banner } from '../../atoms/Banner'
2424
import { PipetteRecalibrationWarning } from './PipetteCard/PipetteRecalibrationWarning'
25-
import { useCurrentRunId } from '../ProtocolUpload/hooks'
25+
import { useCurrentRunId } from '../../resources/runs'
2626
import { ModuleCard } from '../ModuleCard'
2727
import { useIsFlex, useIsRobotViewable, useRunStatuses } from './hooks'
2828
import { getShowPipetteCalibrationWarning } from './utils'

app/src/organisms/Devices/ProtocolRun/ProtocolRunHeader.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,7 @@ import {
6767
} from '../../../redux/analytics'
6868
import { getIsHeaterShakerAttached } from '../../../redux/config'
6969
import { Tooltip } from '../../../atoms/Tooltip'
70-
import {
71-
useCloseCurrentRun,
72-
useCurrentRunId,
73-
} from '../../../organisms/ProtocolUpload/hooks'
70+
import { useCloseCurrentRun } from '../../../organisms/ProtocolUpload/hooks'
7471
import { ConfirmCancelModal } from '../../../organisms/RunDetails/ConfirmCancelModal'
7572
import { HeaterShakerIsRunningModal } from '../HeaterShakerIsRunningModal'
7673
import {
@@ -103,7 +100,7 @@ import { getIsFixtureMismatch } from '../../../resources/deck_configuration/util
103100
import { useDeckConfigurationCompatibility } from '../../../resources/deck_configuration/hooks'
104101
import { useMostRecentCompletedAnalysis } from '../../LabwarePositionCheck/useMostRecentCompletedAnalysis'
105102
import { useMostRecentRunId } from '../../ProtocolUpload/hooks/useMostRecentRunId'
106-
import { useNotifyRunQuery } from '../../../resources/runs'
103+
import { useNotifyRunQuery, useCurrentRunId } from '../../../resources/runs'
107104
import {
108105
useErrorRecoveryFlows,
109106
ErrorRecoveryFlows,

app/src/organisms/Devices/ProtocolRun/__tests__/ProtocolRunHeader.test.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,7 @@ import {
3434

3535
import { renderWithProviders } from '../../../../__testing-utils__'
3636
import { i18n } from '../../../../i18n'
37-
import {
38-
useCloseCurrentRun,
39-
useCurrentRunId,
40-
} from '../../../../organisms/ProtocolUpload/hooks'
37+
import { useCloseCurrentRun } from '../../../../organisms/ProtocolUpload/hooks'
4138
import { ConfirmCancelModal } from '../../../../organisms/RunDetails/ConfirmCancelModal'
4239
import {
4340
useRunTimestamps,
@@ -87,7 +84,7 @@ import { getIsFixtureMismatch } from '../../../../resources/deck_configuration/u
8784
import { useDeckConfigurationCompatibility } from '../../../../resources/deck_configuration/hooks'
8885
import { useMostRecentCompletedAnalysis } from '../../../LabwarePositionCheck/useMostRecentCompletedAnalysis'
8986
import { useMostRecentRunId } from '../../../ProtocolUpload/hooks/useMostRecentRunId'
90-
import { useNotifyRunQuery } from '../../../../resources/runs'
87+
import { useNotifyRunQuery, useCurrentRunId } from '../../../../resources/runs'
9188
import {
9289
useDropTipWizardFlows,
9390
useTipAttachmentStatus,

app/src/organisms/Devices/RecentProtocolRuns.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@ import {
1616
TYPOGRAPHY,
1717
} from '@opentrons/components'
1818

19-
import { useCurrentRunId } from '../ProtocolUpload/hooks'
2019
import { HistoricalProtocolRun } from './HistoricalProtocolRun'
2120
import { useIsRobotViewable, useRunStatuses } from './hooks'
22-
import { useNotifyAllRunsQuery } from '../../resources/runs'
21+
import { useNotifyAllRunsQuery, useCurrentRunId } from '../../resources/runs'
2322
import { useFeatureFlag } from '../../redux/config'
2423

2524
interface RecentProtocolRunsProps {

app/src/organisms/Devices/RobotOverflowMenu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { Divider } from '../../atoms/structure'
2424
import { MenuItem } from '../../atoms/MenuList/MenuItem'
2525
import { getTopPortalEl } from '../../App/portal'
2626
import { ChooseProtocolSlideout } from '../ChooseProtocolSlideout'
27-
import { useCurrentRunId } from '../ProtocolUpload/hooks'
27+
import { useCurrentRunId } from '../../resources/runs'
2828
import { ConnectionTroubleshootingModal } from './ConnectionTroubleshootingModal'
2929
import { useMenuHandleClickOutside } from '../../atoms/MenuList/hooks'
3030
import { useIsRobotBusy } from './hooks'

app/src/organisms/Devices/RobotOverviewOverflowMenu.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import { Tooltip } from '../../atoms/Tooltip'
2525
import { ChooseProtocolSlideout } from '../../organisms/ChooseProtocolSlideout'
2626
import { DisconnectModal } from '../../organisms/Devices/RobotSettings/ConnectNetwork/DisconnectModal'
2727
import { handleUpdateBuildroot } from '../../organisms/Devices/RobotSettings/UpdateBuildroot'
28-
import { useCurrentRunId } from '../../organisms/ProtocolUpload/hooks'
2928
import { getRobotUpdateDisplayInfo } from '../../redux/robot-update'
3029
import { UNREACHABLE, CONNECTABLE, REACHABLE } from '../../redux/discovery'
3130
import { checkShellUpdate } from '../../redux/shell'
@@ -34,7 +33,7 @@ import { home, ROBOT } from '../../redux/robot-controls'
3433
import { useIsRobotBusy } from './hooks'
3534
import { useCanDisconnect } from '../../resources/networking/hooks'
3635
import { useIsEstopNotDisengaged } from '../../resources/devices/hooks/useIsEstopNotDisengaged'
37-
36+
import { useCurrentRunId } from '../../resources/runs'
3837
import type { DiscoveredRobot } from '../../redux/discovery/types'
3938
import type { Dispatch, State } from '../../redux/types'
4039

app/src/organisms/Devices/RobotStatusHeader.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,14 @@ import {
2626
import { QuaternaryButton } from '../../atoms/buttons'
2727
import { Tooltip } from '../../atoms/Tooltip'
2828
import { useIsFlex } from '../../organisms/Devices/hooks'
29-
import { useCurrentRunId } from '../../organisms/ProtocolUpload/hooks'
3029
import { useCurrentRunStatus } from '../../organisms/RunTimeControl/hooks'
3130
import {
3231
getRobotAddressesByName,
3332
HEALTH_STATUS_OK,
3433
OPENTRONS_USB,
3534
} from '../../redux/discovery'
3635
import { getNetworkInterfaces, fetchStatus } from '../../redux/networking'
37-
import { useNotifyRunQuery } from '../../resources/runs'
36+
import { useNotifyRunQuery, useCurrentRunId } from '../../resources/runs'
3837

3938
import type { IconName, StyleProps } from '@opentrons/components'
4039
import type { DiscoveredRobot } from '../../redux/discovery/types'

app/src/organisms/Devices/__tests__/InstrumentsAndModules.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import {
1313
import { i18n } from '../../../i18n'
1414
import { Banner } from '../../../atoms/Banner'
1515
import { mockMagneticModule } from '../../../redux/modules/__fixtures__'
16-
import { useCurrentRunId } from '../../ProtocolUpload/hooks'
1716
import { useIsFlex, useIsRobotViewable, useRunStatuses } from '../hooks'
1817
import { ModuleCard } from '../../ModuleCard'
1918
import { InstrumentsAndModules } from '../InstrumentsAndModules'
@@ -23,6 +22,7 @@ import { FlexPipetteCard } from '../PipetteCard/FlexPipetteCard'
2322
import { PipetteRecalibrationWarning } from '../PipetteCard/PipetteRecalibrationWarning'
2423
import { getShowPipetteCalibrationWarning } from '../utils'
2524
import { useIsEstopNotDisengaged } from '../../../resources/devices/hooks/useIsEstopNotDisengaged'
25+
import { useCurrentRunId } from '../../../resources/runs'
2626
import type * as Components from '@opentrons/components'
2727

2828
vi.mock('@opentrons/components', async importOriginal => {
@@ -39,7 +39,7 @@ vi.mock('../../ModuleCard')
3939
vi.mock('../PipetteCard')
4040
vi.mock('../PipetteCard/FlexPipetteCard')
4141
vi.mock('../PipetteCard/PipetteRecalibrationWarning')
42-
vi.mock('../../ProtocolUpload/hooks')
42+
vi.mock('../../../resources/runs')
4343
vi.mock('../../../atoms/Banner')
4444
vi.mock('../utils')
4545
vi.mock('../../RunTimeControl/hooks')

app/src/organisms/Devices/__tests__/RobotOverflowMenu.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { describe, it, vi, beforeEach, expect } from 'vitest'
55
import '@testing-library/jest-dom/vitest'
66
import { renderWithProviders } from '../../../__testing-utils__'
77
import { i18n } from '../../../i18n'
8-
import { useCurrentRunId } from '../../ProtocolUpload/hooks'
8+
import { useCurrentRunId } from '../../../resources/runs'
99
import { ChooseProtocolSlideout } from '../../ChooseProtocolSlideout'
1010
import { RobotOverflowMenu } from '../RobotOverflowMenu'
1111
import { getRobotUpdateDisplayInfo } from '../../../redux/robot-update'
@@ -17,7 +17,7 @@ import {
1717
} from '../../../redux/discovery/__fixtures__'
1818

1919
vi.mock('../../../redux/robot-update/selectors')
20-
vi.mock('../../ProtocolUpload/hooks')
20+
vi.mock('../../../resources/runs')
2121
vi.mock('../../ChooseProtocolSlideout')
2222
vi.mock('../hooks')
2323
vi.mock('../../../resources/devices/hooks/useIsEstopNotDisengaged')

app/src/organisms/Devices/__tests__/RobotOverview.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import * as DiscoveryClientFixtures from '../../../../../discovery-client/src/fi
99
import { useAuthorization } from '@opentrons/react-api-client'
1010

1111
import { i18n } from '../../../i18n'
12-
import { useCurrentRunId } from '../../ProtocolUpload/hooks'
12+
import { useCurrentRunId } from '../../../resources/runs'
1313
import { mockConnectableRobot } from '../../../redux/discovery/__fixtures__'
1414
import { getRobotUpdateDisplayInfo } from '../../../redux/robot-update'
1515
import { getConfig, useFeatureFlag } from '../../../redux/config'
@@ -61,7 +61,7 @@ vi.mock('../../../redux/robot-controls')
6161
vi.mock('../../../redux/robot-update/selectors')
6262
vi.mock('../../../redux/config')
6363
vi.mock('../../../redux/discovery/selectors')
64-
vi.mock('../../ProtocolUpload/hooks')
64+
vi.mock('../../../resources/runs')
6565
vi.mock('../hooks')
6666
vi.mock('../RobotStatusHeader')
6767
vi.mock('../../UpdateRobotBanner')

app/src/organisms/Devices/__tests__/RobotOverviewOverflowMenu.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
import { useCanDisconnect } from '../../../resources/networking/hooks'
1919
import { DisconnectModal } from '../../../organisms/Devices/RobotSettings/ConnectNetwork/DisconnectModal'
2020
import { ChooseProtocolSlideout } from '../../ChooseProtocolSlideout'
21-
import { useCurrentRunId } from '../../ProtocolUpload/hooks'
21+
import { useCurrentRunId } from '../../../resources/runs'
2222
import { useIsRobotBusy } from '../hooks'
2323
import { handleUpdateBuildroot } from '../RobotSettings/UpdateBuildroot'
2424
import { useIsEstopNotDisengaged } from '../../../resources/devices/hooks/useIsEstopNotDisengaged'
@@ -35,7 +35,7 @@ vi.mock(
3535
'../../../organisms/Devices/RobotSettings/ConnectNetwork/DisconnectModal'
3636
)
3737
vi.mock('../../ChooseProtocolSlideout')
38-
vi.mock('../../ProtocolUpload/hooks')
38+
vi.mock('../../../resources/runs')
3939
vi.mock('../RobotSettings/UpdateBuildroot')
4040
vi.mock('../../../resources/devices/hooks/useIsEstopNotDisengaged')
4141

app/src/organisms/Devices/__tests__/RobotStatusHeader.test.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { renderWithProviders } from '../../../__testing-utils__'
99
import { useProtocolQuery } from '@opentrons/react-api-client'
1010

1111
import { i18n } from '../../../i18n'
12-
import { useCurrentRunId } from '../../../organisms/ProtocolUpload/hooks'
1312
import { useCurrentRunStatus } from '../../../organisms/RunTimeControl/hooks'
1413
import {
1514
getRobotAddressesByName,
@@ -19,14 +18,13 @@ import {
1918
import { getNetworkInterfaces } from '../../../redux/networking'
2019
import { useIsFlex } from '../hooks'
2120
import { RobotStatusHeader } from '../RobotStatusHeader'
22-
import { useNotifyRunQuery } from '../../../resources/runs'
21+
import { useNotifyRunQuery, useCurrentRunId } from '../../../resources/runs'
2322

2423
import type { DiscoveryClientRobotAddress } from '../../../redux/discovery/types'
2524
import type { SimpleInterfaceStatus } from '../../../redux/networking/types'
2625
import type { State } from '../../../redux/types'
2726

2827
vi.mock('@opentrons/react-api-client')
29-
vi.mock('../../../organisms/ProtocolUpload/hooks')
3028
vi.mock('../../../organisms/RunTimeControl/hooks')
3129
vi.mock('../../../redux/discovery')
3230
vi.mock('../../../redux/networking')

app/src/organisms/Devices/hooks/__tests__/useRunStartedOrLegacySessionInProgress.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ import { useAllSessionsQuery } from '@opentrons/react-api-client'
22
import { RUN_STATUS_IDLE, RUN_STATUS_RUNNING } from '@opentrons/api-client'
33
import { vi, it, expect, describe, beforeEach, afterEach } from 'vitest'
44

5-
import { useCurrentRunId } from '../../../ProtocolUpload/hooks'
5+
import { useCurrentRunId } from '../../../../resources/runs'
66
import { useRunStatus } from '../../../RunTimeControl/hooks'
77
import { useRunStartedOrLegacySessionInProgress } from '..'
88

99
import type { UseQueryResult } from 'react-query'
1010
import type { Sessions } from '@opentrons/api-client'
1111

1212
vi.mock('@opentrons/react-api-client')
13-
vi.mock('../../../ProtocolUpload/hooks')
13+
vi.mock('../../../../resources/runs')
1414
vi.mock('../../../RunTimeControl/hooks')
1515

1616
describe('useRunStartedOrLegacySessionInProgress', () => {

app/src/organisms/Devices/hooks/__tests__/useRunStatuses.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import {
88
} from '@opentrons/api-client'
99
import { vi, it, expect, describe, beforeEach, afterEach } from 'vitest'
1010

11-
import { useCurrentRunId } from '../../../ProtocolUpload/hooks'
11+
import { useCurrentRunId } from '../../../../resources/runs'
1212
import { useRunStatus } from '../../../RunTimeControl/hooks'
1313
import { useRunStatuses } from '..'
1414

15-
vi.mock('../../../ProtocolUpload/hooks')
15+
vi.mock('../../../../resources/runs')
1616
vi.mock('../../../RunTimeControl/hooks')
1717

1818
describe(' useRunStatuses ', () => {

app/src/organisms/Devices/hooks/useRunStartedOrLegacySessionInProgress.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useAllSessionsQuery } from '@opentrons/react-api-client'
22
import { RUN_STATUS_IDLE } from '@opentrons/api-client'
3-
import { useCurrentRunId } from '../../ProtocolUpload/hooks'
3+
import { useCurrentRunId } from '../../../resources/runs'
44
import { useRunStatus } from '../../RunTimeControl/hooks'
55

66
export function useRunStartedOrLegacySessionInProgress(): boolean {

app/src/organisms/Devices/hooks/useRunStatuses.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
RUN_STATUS_PAUSED,
77
RUN_STATUS_RUNNING,
88
} from '@opentrons/api-client'
9-
import { useCurrentRunId } from '../../ProtocolUpload/hooks'
9+
import { useCurrentRunId } from '../../../resources/runs'
1010
import { useRunStatus } from '../../RunTimeControl/hooks'
1111

1212
import type { RunStatus } from '@opentrons/api-client'

app/src/organisms/ModuleCard/ModuleOverflowMenu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
import { MenuList } from '../../atoms/MenuList'
1313
import { Tooltip } from '../../atoms/Tooltip'
1414
import { MenuItem } from '../../atoms/MenuList/MenuItem'
15-
import { useCurrentRunId } from '../ProtocolUpload/hooks'
15+
import { useCurrentRunId } from '../../resources/runs'
1616
import {
1717
useIsFlex,
1818
useRunStatuses,

app/src/organisms/ModuleCard/__tests__/ModuleOverflowMenu.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ import {
1616
useIsLegacySessionInProgress,
1717
useIsFlex,
1818
} from '../../Devices/hooks'
19-
import { useCurrentRunId } from '../../ProtocolUpload/hooks'
19+
import { useCurrentRunId } from '../../../resources/runs'
2020
import { ModuleOverflowMenu } from '../ModuleOverflowMenu'
2121

2222
import type { TemperatureStatus } from '@opentrons/api-client'
2323

2424
vi.mock('../../Devices/hooks')
2525
vi.mock('../../RunTimeControl/hooks')
26-
vi.mock('../../ProtocolUpload/hooks')
26+
vi.mock('../../../resources/runs')
2727

2828
const render = (props: React.ComponentProps<typeof ModuleOverflowMenu>) => {
2929
return renderWithProviders(<ModuleOverflowMenu {...props} />, {

app/src/organisms/ModuleCard/__tests__/hooks.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
} from '../../../redux/modules/__fixtures__'
2020
import { useIsRobotBusy, useRunStatuses } from '../../Devices/hooks'
2121
import { useMostRecentCompletedAnalysis } from '../../LabwarePositionCheck/useMostRecentCompletedAnalysis'
22-
import { useCurrentRunId } from '../../ProtocolUpload/hooks'
22+
import { useCurrentRunId } from '../../../resources/runs'
2323
import {
2424
useLatchControls,
2525
useModuleOverflowMenu,

app/src/organisms/ModuleCard/hooks.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
import { useMostRecentCompletedAnalysis } from '../LabwarePositionCheck/useMostRecentCompletedAnalysis'
1212
import { MenuItem } from '../../atoms/MenuList/MenuItem'
1313
import { Tooltip } from '../../atoms/Tooltip'
14-
import { useCurrentRunId } from '../ProtocolUpload/hooks'
14+
import { useCurrentRunId } from '../../resources/runs'
1515

1616
import type {
1717
HeaterShakerCloseLatchCreateCommand,

app/src/organisms/ProtocolUpload/hooks/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ export * from './useCloseCurrentRun'
22
export * from './useCurrentProtocol'
33
export * from './useCurrentRun'
44
export * from './useCurrentRunCommands'
5-
export * from './useCurrentRunId'
65
export * from './useCloneRun'
76
export * from './useRestartRun'
87
export * from './useRunCommands'

app/src/organisms/ProtocolUpload/hooks/useCloseCurrentRun.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from 'react'
22

33
import { useDismissCurrentRunMutation } from '@opentrons/react-api-client'
4-
import { useCurrentRunId } from './useCurrentRunId'
4+
import { useCurrentRunId } from '../../../resources/runs'
55

66
import type { UseDismissCurrentRunMutationOptions } from '@opentrons/react-api-client/src/runs/useDismissCurrentRunMutation'
77

app/src/organisms/ProtocolUpload/hooks/useCurrentRun.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { useCurrentRunId } from './useCurrentRunId'
2-
import { useNotifyRunQuery } from '../../../resources/runs'
1+
import { useNotifyRunQuery, useCurrentRunId } from '../../../resources/runs'
32

43
import type { Run } from '@opentrons/api-client'
54

app/src/organisms/ProtocolUpload/hooks/useCurrentRunCommands.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { useCurrentRunId } from './useCurrentRunId'
1+
import { useCurrentRunId } from '../../../resources/runs'
22
import { useRunCommands } from './useRunCommands'
33
import type { UseQueryOptions } from 'react-query'
44
import type {

app/src/organisms/RunTimeControl/hooks.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,8 @@ import {
1616
} from '@opentrons/api-client'
1717
import { useRunActionMutations } from '@opentrons/react-api-client'
1818

19-
import {
20-
useCloneRun,
21-
useCurrentRunId,
22-
useRunCommands,
23-
} from '../ProtocolUpload/hooks'
24-
import { useNotifyRunQuery } from '../../resources/runs'
19+
import { useCloneRun, useRunCommands } from '../ProtocolUpload/hooks'
20+
import { useNotifyRunQuery, useCurrentRunId } from '../../resources/runs'
2521
import { useMostRecentCompletedAnalysis } from '../LabwarePositionCheck/useMostRecentCompletedAnalysis'
2622

2723
import type { UseQueryOptions } from 'react-query'

app/src/pages/Devices/ProtocolRunDetails/__tests__/ProtocolRunDetails.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { ProtocolRunModuleControls } from '../../../../organisms/Devices/Protoco
1818
import { ProtocolRunSetup } from '../../../../organisms/Devices/ProtocolRun/ProtocolRunSetup'
1919
import { RunPreviewComponent } from '../../../../organisms/RunPreview'
2020
import { ProtocolRunRuntimeParameters } from '../../../../organisms/Devices/ProtocolRun/ProtocolRunRunTimeParameters'
21-
import { useCurrentRunId } from '../../../../organisms/ProtocolUpload/hooks'
21+
import { useCurrentRunId } from '../../../../resources/runs'
2222
import { mockRobotSideAnalysis } from '../../../../molecules/Command/__fixtures__'
2323
import { useFeatureFlag } from '../../../../redux/config'
2424
import { ProtocolRunDetails } from '..'
@@ -33,7 +33,7 @@ vi.mock('../../../../organisms/Devices/ProtocolRun/ProtocolRunHeader')
3333
vi.mock('../../../../organisms/Devices/ProtocolRun/ProtocolRunSetup')
3434
vi.mock('../../../../organisms/RunPreview')
3535
vi.mock('../../../../organisms/Devices/ProtocolRun/ProtocolRunModuleControls')
36-
vi.mock('../../../../organisms/ProtocolUpload/hooks')
36+
vi.mock('../../../../resources/runs')
3737
vi.mock(
3838
'../../../../organisms/Devices/ProtocolRun/ProtocolRunRunTimeParameters'
3939
)

app/src/pages/Devices/ProtocolRunDetails/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import { RunPreview } from '../../../organisms/RunPreview'
3333
import { ProtocolRunSetup } from '../../../organisms/Devices/ProtocolRun/ProtocolRunSetup'
3434
import { ProtocolRunModuleControls } from '../../../organisms/Devices/ProtocolRun/ProtocolRunModuleControls'
3535
import { ProtocolRunRuntimeParameters } from '../../../organisms/Devices/ProtocolRun/ProtocolRunRunTimeParameters'
36-
import { useCurrentRunId } from '../../../organisms/ProtocolUpload/hooks'
36+
import { useCurrentRunId } from '../../../resources/runs'
3737
import { OPENTRONS_USB } from '../../../redux/discovery'
3838
import { fetchProtocols } from '../../../redux/protocol-storage'
3939
import { appShellRequestor } from '../../../redux/shell/remote'

app/src/organisms/ProtocolUpload/hooks/__tests__/useCurrentRunId.test.tsx renamed to app/src/resources/runs/__tests__/useCurrentRunId.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import { renderHook } from '@testing-library/react'
33
import { describe, it, afterEach, expect, vi } from 'vitest'
44

55
import { useCurrentRunId } from '../useCurrentRunId'
6-
import { useNotifyAllRunsQuery } from '../../../../resources/runs'
6+
import { useNotifyAllRunsQuery } from '../useNotifyAllRunsQuery'
77

8-
vi.mock('../../../../resources/runs')
8+
vi.mock('../useNotifyAllRunsQuery')
99

1010
describe('useCurrentRunId hook', () => {
1111
afterEach(() => {

app/src/resources/runs/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ export * from './useNotifyAllRunsQuery'
44
export * from './useNotifyRunQuery'
55
export * from './useNotifyAllCommandsQuery'
66
export * from './useNotifyAllCommandsAsPreSerializedList'
7+
export * from './useCurrentRunId'

0 commit comments

Comments
 (0)