refactor(app): untangle the rest of the device hooks

app/src/local-resources/deck_configuration/index.ts

@@ -0,0 +1 @@
+export * from './getStandardDeckViewLayerBlockList'

app/src/resources/instruments/__tests__/hooks.test.ts → app/src/local-resources/instruments/__tests__/hooks.test.ts

@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-import { useIsOEMMode } from '../../robot-settings/hooks'
+import { useIsOEMMode } from '/app/resources/robot-settings/hooks'
 
 import {
   useGripperDisplayName,
@@ -11,7 +11,7 @@ import {
 
 import type { PipetteV2Specs } from '@opentrons/shared-data'
 
-vi.mock('../../robot-settings/hooks')
+vi.mock('/app/resources/robot-settings/hooks')
 
 const BRANDED_P1000_FLEX_DISPLAY_NAME = 'Flex 1-Channel 1000 μL'
 const ANONYMOUS_P1000_FLEX_DISPLAY_NAME = '1-Channel 1000 μL'

app/src/resources/instruments/hooks.ts → app/src/local-resources/instruments/hooks.ts

@@ -5,7 +5,7 @@ import {
   getPipetteSpecsV2,
   GRIPPER_MODELS,
 } from '@opentrons/shared-data'
-import { useIsOEMMode } from '../robot-settings/hooks'
+import { useIsOEMMode } from '/app/resources/robot-settings/hooks'
 
 import type {
   GripperModel,

app/src/local-resources/instruments/index.ts

@@ -0,0 +1 @@
+export * from './hooks'

app/src/local-resources/modules/index.ts

@@ -0,0 +1 @@
+export * from './getModulePrepCommands'

app/src/molecules/PythonLabwareOffsetSnippet/createSnippet.ts

@@ -1,7 +1,7 @@
 import isEqual from 'lodash/isEqual'
 import { getLoadedLabwareDefinitionsByUri } from '@opentrons/shared-data'
-import { getLabwareDefinitionUri } from '/app/organisms/Devices/ProtocolRun/utils/getLabwareDefinitionUri'
-import { getLabwareOffsetLocation } from '/app/organisms/Devices/ProtocolRun/utils/getLabwareOffsetLocation'
+import { getLabwareDefinitionUri } from '/app/transformations/protocols'
+import { getLabwareOffsetLocation } from '/app/transformations/analysis'
 import type { LabwareOffset } from '@opentrons/api-client'
 import type {
   LoadedLabware,

app/src/organisms/CalibrationTaskList/__tests__/CalibrationTaskList.test.tsx

@@ -18,15 +18,13 @@ import {
   expectedIncompleteRightMountTaskList,
   expectedIncompleteLeftMountTaskList,
 } from '../../Devices/hooks/__fixtures__/taskListFixtures'
-import {
-  useCalibrationTaskList,
-  useRunHasStarted,
-  useAttachedPipettes,
-} from '../../Devices/hooks'
+import { useCalibrationTaskList, useRunHasStarted } from '../../Devices/hooks'
+import { useAttachedPipettes } from '/app/resources/instruments'
 import { mockLeftProtoPipette } from '/app/redux/pipettes/__fixtures__'
 
 vi.mock('../../Devices/hooks')
 vi.mock('/app/resources/runs')
+vi.mock('/app/resources/instruments')
 
 const render = (robotName: string = 'otie') => {
   return renderWithProviders(

app/src/organisms/CalibrationTaskList/index.tsx

@@ -21,10 +21,10 @@ import { StatusLabel } from '/app/atoms/StatusLabel'
 import { TaskList } from '../TaskList'
 
 import {
-  useAttachedPipettes,
   useCalibrationTaskList,
   useRunHasStarted,
 } from '/app/organisms/Devices/hooks'
+import { useAttachedPipettes } from '/app/resources/instruments'
 import { useCurrentRunId } from '/app/resources/runs'
 
 import type {

app/src/organisms/ChangePipette/__tests__/ChangePipette.test.tsx

@@ -15,7 +15,7 @@ import {
   SUCCESS,
   useDispatchApiRequests,
 } from '/app/redux/robot-api'
-import { useAttachedPipettes } from '../../Devices/hooks'
+import { useAttachedPipettes } from '/app/resources/instruments'
 import { PipetteSelection } from '../PipetteSelection'
 import { ExitModal } from '../ExitModal'
 import { ConfirmPipette } from '../ConfirmPipette'
@@ -51,7 +51,7 @@ vi.mock('../PipetteSelection')
 vi.mock('../ExitModal')
 vi.mock('/app/molecules/InProgressModal/InProgressModal')
 vi.mock('../ConfirmPipette')
-vi.mock('../../Devices/hooks')
+vi.mock('/app/resources/instruments')
 vi.mock('/app/assets/images')
 
 const render = (props: React.ComponentProps<typeof ChangePipette>) => {

app/src/organisms/ChangePipette/index.tsx

@@ -31,7 +31,7 @@ import {
 
 import { WizardHeader } from '/app/molecules/WizardHeader'
 import { InProgressModal } from '/app/molecules/InProgressModal/InProgressModal'
-import { useAttachedPipettes } from '../Devices/hooks'
+import { useAttachedPipettes } from '/app/resources/instruments'
 import { ExitModal } from './ExitModal'
 import { Instructions } from './Instructions'
 import { ConfirmPipette } from './ConfirmPipette'

app/src/organisms/Devices/HistoricalProtocolRunDrawer.tsx

@@ -28,7 +28,7 @@ import {
 } from '@opentrons/shared-data'
 import { useCsvFileQuery } from '@opentrons/react-api-client'
 import { DownloadCsvFileLink } from './DownloadCsvFileLink'
-import { useMostRecentCompletedAnalysis } from '../LabwarePositionCheck/useMostRecentCompletedAnalysis'
+import { useMostRecentCompletedAnalysis } from '/app/resources/runs'
 import { useDeckCalibrationData } from './hooks'
 import { OffsetVector } from '/app/molecules/OffsetVector'
 import type { RunData } from '@opentrons/api-client'

app/src/organisms/Devices/InstrumentsAndModules.tsx

@@ -26,7 +26,7 @@ import { useCurrentRunId } from '/app/resources/runs'
 import { useIsFlex } from '/app/redux-resources/robots'
 import { ModuleCard } from '../ModuleCard'
 import { useIsRobotViewable, useRunStatuses } from './hooks'
-import { getShowPipetteCalibrationWarning } from './utils'
+import { getShowPipetteCalibrationWarning } from '/app/transformations/instruments'
 import { PipetteCard } from './PipetteCard'
 import { FlexPipetteCard } from './PipetteCard/FlexPipetteCard'
 import { GripperCard } from '../GripperCard'

app/src/organisms/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderContent/ActionButton/hooks/useIsFixtureMismatch.ts

@@ -1,4 +1,4 @@
-import { useMostRecentCompletedAnalysis } from '../../../../../../LabwarePositionCheck/useMostRecentCompletedAnalysis'
+import { useMostRecentCompletedAnalysis } from '/app/resources/runs'
 import { useRobotType } from '/app/redux-resources/robots'
 import {
   getIsFixtureMismatch,

app/src/organisms/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderContent/ActionButton/index.tsx

@@ -16,12 +16,15 @@ import {
 
 import {
   useModuleCalibrationStatus,
-  useRunCalibrationStatus,
   useUnmatchedModulesForProtocol,
 } from '../../../../hooks'
 import { useRobot } from '/app/redux-resources/robots'
 import { useRobotAnalyticsData } from '/app/redux-resources/analytics'
-import { useCurrentRunId, useProtocolDetailsForRun } from '/app/resources/runs'
+import {
+  useCurrentRunId,
+  useProtocolDetailsForRun,
+  useRunCalibrationStatus,
+} from '/app/resources/runs'
 import { useActionBtnDisabledUtils, useActionButtonProperties } from './hooks'
 import { getFallbackRobotSerialNumber, isRunAgainStatus } from '../../utils'
 import { useIsRobotOnWrongVersionOfSoftware } from '/app/redux/robot-update'

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

@@ -2,7 +2,7 @@ import * as React from 'react'
 
 import { ErrorRecoveryFlows } from '../../../../ErrorRecoveryFlows'
 import { DropTipWizardFlows } from '../../../../DropTipWizardFlows'
-import { useMostRecentCompletedAnalysis } from '../../../../LabwarePositionCheck/useMostRecentCompletedAnalysis'
+import { useMostRecentCompletedAnalysis } from '/app/resources/runs'
 import {
   ConfirmCancelModal,
   HeaterShakerIsRunningModal,

app/src/organisms/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderModalContainer/modals/HeaterShakerIsRunningModal/HeaterShakerIsRunningModal.tsx

@@ -18,7 +18,7 @@ import {
 } from '@opentrons/components'
 import { HEATERSHAKER_MODULE_TYPE } from '@opentrons/shared-data'
 
-import { useAttachedModules } from '../../../../../hooks'
+import { useAttachedModules } from '/app/resources/modules'
 import { HeaterShakerModuleCard } from './HeaterShakerModuleCard'
 import { getActiveHeaterShaker } from './utils'
 import { useIsHeaterShakerInProtocol } from '../../../../../../ModuleCard/hooks'

app/src/organisms/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderModalContainer/modals/HeaterShakerIsRunningModal/__tests__/HeaterShakerIsRunningModal.test.tsx

@@ -9,8 +9,8 @@ import { renderWithProviders } from '/app/__testing-utils__'
 import { mockHeaterShaker } from '/app/redux/modules/__fixtures__'
 import { HeaterShakerIsRunningModal } from '../HeaterShakerIsRunningModal'
 import { HeaterShakerModuleCard } from '../HeaterShakerModuleCard'
-import { useAttachedModules } from '../../../../../../hooks'
-import { useMostRecentCompletedAnalysis } from '../../../../../../../LabwarePositionCheck/useMostRecentCompletedAnalysis'
+import { useAttachedModules } from '/app/resources/modules'
+import { useMostRecentCompletedAnalysis } from '/app/resources/runs'
 
 import type * as ReactApiClient from '@opentrons/react-api-client'
 
@@ -21,10 +21,8 @@ vi.mock('@opentrons/react-api-client', async importOriginal => {
     useCreateLiveCommandMutation: vi.fn(),
   }
 })
-vi.mock('../../../../../../hooks')
-vi.mock(
-  '../../../../../../../LabwarePositionCheck/useMostRecentCompletedAnalysis'
-)
+vi.mock('/app/resources/modules')
+vi.mock('/app/resources/runs')
 vi.mock('../HeaterShakerModuleCard')
 
 const mockMovingHeaterShakerOne = {

app/src/organisms/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderModalContainer/modals/HeaterShakerIsRunningModal/__tests__/hooks.test.tsx

@@ -7,15 +7,13 @@ import { renderHook } from '@testing-library/react'
 import { HEATERSHAKER_MODULE_V1 } from '@opentrons/shared-data'
 
 import { RUN_ID_1 } from '/app/resources/runs/__fixtures__'
-import { useMostRecentCompletedAnalysis } from '../../../../../../../LabwarePositionCheck/useMostRecentCompletedAnalysis'
+import { useMostRecentCompletedAnalysis } from '/app/resources/runs'
 import { useHeaterShakerModuleIdsFromRun } from '../hooks'
 
 import type { Store } from 'redux'
 import type { State } from '/app/redux/types'
 
-vi.mock(
-  '../../../../../../../LabwarePositionCheck/useMostRecentCompletedAnalysis'
-)
+vi.mock('/app/resources/runs')
 
 describe('useHeaterShakerModuleIdsFromRun', () => {
   const store: Store<State> = createStore(vi.fn(), {})

app/src/organisms/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderModalContainer/modals/HeaterShakerIsRunningModal/hooks.tsx

@@ -1,4 +1,4 @@
-import { useMostRecentCompletedAnalysis } from '../../../../../../LabwarePositionCheck/useMostRecentCompletedAnalysis'
+import { useMostRecentCompletedAnalysis } from '/app/resources/runs'
 
 export interface ModuleIdsFromRun {
   moduleIdsFromRun: string[]

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

@@ -33,8 +33,11 @@ import {
 } from '@opentrons/components'
 
 import { Divider } from '/app/atoms/structure'
-import { useMostRecentCompletedAnalysis } from '../../LabwarePositionCheck/useMostRecentCompletedAnalysis'
-import { useNotifyRunQuery, useRunStatus } from '/app/resources/runs'
+import {
+  useMostRecentCompletedAnalysis,
+  useNotifyRunQuery,
+  useRunStatus,
+} from '/app/resources/runs'
 
 import type { RunTimeParameter } from '@opentrons/shared-data'
 import type { RunStatus } from '@opentrons/api-client'

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

@@ -34,12 +34,14 @@ import { useStoredProtocolAnalysis } from '/app/resources/analysis'
 import {
   useModuleCalibrationStatus,
   useProtocolAnalysisErrors,
-  useRunCalibrationStatus,
   useRunHasStarted,
-  useRunPipetteInfoByMount,
   useUnmatchedModulesForProtocol,
 } from '../hooks'
-import { useMostRecentCompletedAnalysis } from '../../LabwarePositionCheck/useMostRecentCompletedAnalysis'
+import {
+  useMostRecentCompletedAnalysis,
+  useRunPipetteInfoByMount,
+  useRunCalibrationStatus,
+} from '/app/resources/runs'
 import { SetupLabware } from './SetupLabware'
 import { SetupLabwarePositionCheck } from './SetupLabwarePositionCheck'
 import { SetupRobotCalibration } from './SetupRobotCalibration'

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

@@ -15,7 +15,7 @@ import {
 } from '@opentrons/shared-data'
 import { useInstrumentsQuery } from '@opentrons/react-api-client'
 import { TertiaryButton } from '/app/atoms/buttons'
-import { useMostRecentCompletedAnalysis } from '../../LabwarePositionCheck/useMostRecentCompletedAnalysis'
+import { useMostRecentCompletedAnalysis } from '/app/resources/runs'
 import { useStoredProtocolAnalysis } from '/app/resources/analysis'
 import { PipetteWizardFlows } from '../../PipetteWizardFlows'
 import { FLOWS } from '../../PipetteWizardFlows/constants'

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

@@ -10,15 +10,17 @@ import {
   TYPOGRAPHY,
 } from '@opentrons/components'
 import * as PipetteConstants from '/app/redux/pipettes/constants'
-import { getShowPipetteCalibrationWarning } from '../utils'
+import { getShowPipetteCalibrationWarning } from '/app/transformations/instruments'
 import { PipetteRecalibrationWarning } from '../PipetteCard/PipetteRecalibrationWarning'
-import { useRunPipetteInfoByMount } from '../hooks'
 import { useStoredProtocolAnalysis } from '/app/resources/analysis'
 import { useIsFlex } from '/app/redux-resources/robots'
 import { SetupPipetteCalibrationItem } from './SetupPipetteCalibrationItem'
 import { SetupFlexPipetteCalibrationItem } from './SetupFlexPipetteCalibrationItem'
 import { SetupGripperCalibrationItem } from './SetupGripperCalibrationItem'
-import { useMostRecentCompletedAnalysis } from '../../LabwarePositionCheck/useMostRecentCompletedAnalysis'
+import {
+  useRunPipetteInfoByMount,
+  useMostRecentCompletedAnalysis,
+} from '/app/resources/runs'
 import { useInstrumentsQuery } from '@opentrons/react-api-client'
 import { isGripperInCommands } from '/app/resources/protocols/utils'
 

app/src/organisms/Devices/ProtocolRun/SetupLabware/CurrentOffsetsModal.tsx

@@ -24,7 +24,7 @@ import { getIsLabwareOffsetCodeSnippetsOn } from '/app/redux/config'
 import { LabwareOffsetTabs } from '../../../LabwareOffsetTabs'
 import { OffsetVector } from '/app/molecules/OffsetVector'
 import { PythonLabwareOffsetSnippet } from '/app/molecules/PythonLabwareOffsetSnippet'
-import { getLatestCurrentOffsets } from '../SetupLabwarePositionCheck/utils'
+import { getLatestCurrentOffsets } from '/app/transformations/runs'
 
 import type { LabwareOffset } from '@opentrons/api-client'
 import type {

app/src/organisms/Devices/ProtocolRun/SetupLabware/LabwareListItem.tsx

@@ -51,9 +51,11 @@ import type {
   LoadLabwareRunTimeCommand,
 } from '@opentrons/shared-data'
 import type { ModuleRenderInfoForProtocol } from '../../hooks'
-import type { LabwareSetupItem } from '/app/transformations/commands'
+import type {
+  LabwareSetupItem,
+  NestedLabwareInfo,
+} from '/app/transformations/commands'
 import type { ModuleTypesThatRequireExtraAttention } from '../utils/getModuleTypesThatRequireExtraAttention'
-import type { NestedLabwareInfo } from './getNestedLabwareInfo'
 
 const LabwareRow = styled.div`
   display: ${DISPLAY_GRID};

app/src/organisms/Devices/ProtocolRun/SetupLabware/LabwareStackModal.tsx

@@ -18,7 +18,7 @@ import {
 } from '@opentrons/components'
 import { OddModal } from '/app/molecules/OddModal'
 import { getIsOnDevice } from '/app/redux/config'
-import { getLocationInfoNames } from '../utils/getLocationInfoNames'
+import { getLocationInfoNames } from '/app/transformations/commands'
 import { getSlotLabwareDefinition } from '../utils/getSlotLabwareDefinition'
 import { Divider } from '/app/atoms/structure'
 import { getModuleImage } from '../SetupModuleAndDeck/utils'

app/src/organisms/Devices/ProtocolRun/SetupLabware/SetupLabwareList.tsx

@@ -7,9 +7,11 @@ import {
   StyledText,
   COLORS,
 } from '@opentrons/components'
-import { getLabwareSetupItemGroups } from '/app/transformations/commands'
+import {
+  getLabwareSetupItemGroups,
+  getNestedLabwareInfo,
+} from '/app/transformations/commands'
 import { LabwareListItem } from './LabwareListItem'
-import { getNestedLabwareInfo } from './getNestedLabwareInfo'
 
 import type { RunTimeCommand } from '@opentrons/shared-data'
 import type { ModuleRenderInfoForProtocol } from '../../hooks'

app/src/organisms/Devices/ProtocolRun/SetupLabware/SetupLabwareMap.tsx

@@ -18,9 +18,11 @@ import {
 
 import { getLabwareSetupItemGroups } from '/app/transformations/commands'
 import { LabwareInfoOverlay } from '../LabwareInfoOverlay'
-import { getLabwareRenderInfo } from '../utils/getLabwareRenderInfo'
-import { getProtocolModulesInfo } from '../utils/getProtocolModulesInfo'
-import { getStandardDeckViewLayerBlockList } from '../utils/getStandardDeckViewLayerBlockList'
+import {
+  getProtocolModulesInfo,
+  getLabwareRenderInfo,
+} from '/app/transformations/analysis'
+import { getStandardDeckViewLayerBlockList } from '/app/local-resources/deck_configuration'
 import { OffDeckLabwareList } from './OffDeckLabwareList'
 
 import type {

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

@@ -12,14 +12,13 @@ import { getModuleTypesThatRequireExtraAttention } from '../../utils/getModuleTy
 import { getIsLabwareOffsetCodeSnippetsOn } from '/app/redux/config'
 import {
   useLPCDisabledReason,
-  useRunCalibrationStatus,
   useRunHasStarted,
   useUnmatchedModulesForProtocol,
 } from '../../../hooks'
 import { SetupLabwareList } from '../SetupLabwareList'
 import { SetupLabwareMap } from '../SetupLabwareMap'
 import { SetupLabware } from '..'
-import { useNotifyRunQuery } from '/app/resources/runs'
+import { useNotifyRunQuery, useRunCalibrationStatus } from '/app/resources/runs'
 
 vi.mock('../SetupLabwareList')
 vi.mock('../SetupLabwareMap')

app/src/organisms/Devices/ProtocolRun/SetupLabware/__tests__/SetupLabwareMap.test.tsx

@@ -15,7 +15,7 @@ import { renderWithProviders } from '/app/__testing-utils__'
 import { i18n } from '/app/i18n'
 import { getAttachedProtocolModuleMatches } from '../../../../ODD/ProtocolSetup/ProtocolSetupModulesAndDeck/utils'
 import { LabwareInfoOverlay } from '../../LabwareInfoOverlay'
-import { getLabwareRenderInfo } from '../../utils/getLabwareRenderInfo'
+import { getLabwareRenderInfo } from '/app/transformations/analysis'
 import { SetupLabwareMap } from '../SetupLabwareMap'
 
 import type {
@@ -42,7 +42,7 @@ vi.mock('@opentrons/shared-data', async importOriginal => {
 
 vi.mock('../../../../ODD/ProtocolSetup/ProtocolSetupModulesAndDeck/utils')
 vi.mock('../../LabwareInfoOverlay')
-vi.mock('../../utils/getLabwareRenderInfo')
+vi.mock('/app/transformations/analysis/getLabwareRenderInfo')
 vi.mock('../../utils/getModuleTypesThatRequireExtraAttention')
 vi.mock('../../../../RunTimeControl/hooks')
 vi.mock('../../../hooks')

app/src/organisms/Devices/ProtocolRun/SetupLabware/index.tsx

@@ -10,7 +10,7 @@ import {
 } from '@opentrons/components'
 import { useToggleGroup } from '/app/molecules/ToggleGroup/useToggleGroup'
 import { getModuleTypesThatRequireExtraAttention } from '../utils/getModuleTypesThatRequireExtraAttention'
-import { useMostRecentCompletedAnalysis } from '../../../LabwarePositionCheck/useMostRecentCompletedAnalysis'
+import { useMostRecentCompletedAnalysis } from '/app/resources/runs'
 import { useIsFlex } from '/app/redux-resources/robots'
 import { useStoredProtocolAnalysis } from '/app/resources/analysis'
 import { useModuleRenderInfoForProtocolById } from '../../hooks'

app/src/organisms/Devices/ProtocolRun/SetupLabwarePositionCheck/__tests__/CurrentOffsetsTable.test.tsx

@@ -12,7 +12,7 @@ import { i18n } from '/app/i18n'
 import { getIsLabwareOffsetCodeSnippetsOn } from '/app/redux/config'
 import { LabwarePositionCheck } from '../../../../LabwarePositionCheck'
 import { useLPCDisabledReason } from '../../../hooks'
-import { getLatestCurrentOffsets } from '../utils'
+import { getLatestCurrentOffsets } from '/app/transformations/runs'
 import { CurrentOffsetsTable } from '../CurrentOffsetsTable'
 
 import type { CompletedProtocolAnalysis } from '@opentrons/shared-data'
@@ -21,7 +21,7 @@ import type { LabwareOffset } from '@opentrons/api-client'
 vi.mock('../../../hooks')
 vi.mock('../../../../LabwarePositionCheck')
 vi.mock('/app/redux/config')
-vi.mock('../utils')
+vi.mock('/app/transformations/runs')
 
 vi.mock('@opentrons/shared-data', async importOriginal => {
   const actual = await importOriginal<typeof getLoadedLabwareDefinitionsByUri>()