From abf9af04051ac5fda7eee1cfb0068dd7f5992485 Mon Sep 17 00:00:00 2001 From: Jamey Huffnagle Date: Fri, 22 Nov 2024 14:39:44 -0500 Subject: [PATCH] local-resources -> resources --- app/src/local-resources/instruments/hooks/index.ts | 1 - .../RunHeaderModalContainer/hooks/useRunHeaderDropTip.ts | 4 ++-- .../RunHeaderModalContainer/modals/ProtocolDropTipModal.tsx | 6 ++---- app/src/organisms/DropTipWizardFlows/TipsAttachedModal.tsx | 6 ++---- .../DropTipWizardFlows/__tests__/TipsAttachedModal.test.tsx | 2 +- .../ErrorRecoveryFlows/RecoveryOptions/ManageTips.tsx | 2 +- .../RecoveryOptions/SelectRecoveryOption.tsx | 2 +- .../ErrorRecoveryFlows/hooks/useRecoveryTipStatus.ts | 4 ++-- app/src/pages/ODD/RunSummary/index.tsx | 4 ++-- .../instruments/__tests__/useTipAttachmentStatus.test.ts | 2 +- app/src/resources/instruments/index.ts | 1 + .../instruments}/useTipAttachmentStatus.ts | 0 12 files changed, 15 insertions(+), 19 deletions(-) rename app/src/{local-resources => resources}/instruments/__tests__/useTipAttachmentStatus.test.ts (99%) rename app/src/{local-resources/instruments/hooks => resources/instruments}/useTipAttachmentStatus.ts (100%) diff --git a/app/src/local-resources/instruments/hooks/index.ts b/app/src/local-resources/instruments/hooks/index.ts index 59288cbf377..6cfd0af2293 100644 --- a/app/src/local-resources/instruments/hooks/index.ts +++ b/app/src/local-resources/instruments/hooks/index.ts @@ -3,4 +3,3 @@ export * from './useHomePipettes' export * from './usePipetteModelSpecs' export * from './usePipetteNameSpecs' export * from './usePipetteSpecsv2' -export * from './useTipAttachmentStatus' diff --git a/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderModalContainer/hooks/useRunHeaderDropTip.ts b/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderModalContainer/hooks/useRunHeaderDropTip.ts index fb74f7580b9..687b0d404c5 100644 --- a/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderModalContainer/hooks/useRunHeaderDropTip.ts +++ b/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderModalContainer/hooks/useRunHeaderDropTip.ts @@ -12,11 +12,11 @@ import { } from '/app/resources/runs' import { isTerminalRunStatus } from '../../utils' import { lastRunCommandPromptedErrorRecovery } from '/app/local-resources/commands' -import { useTipAttachmentStatus } from '/app/local-resources/instruments' +import { useTipAttachmentStatus } from '/app/resources/instruments' import type { RobotType } from '@opentrons/shared-data' import type { Run, RunStatus } from '@opentrons/api-client' -import type { PipetteWithTip } from '/app/local-resources/instruments' +import type { PipetteWithTip } from '/app/resources/instruments' import type { DropTipWizardFlowsProps } from '/app/organisms/DropTipWizardFlows' import type { UseProtocolDropTipModalResult } from '../modals' import type { PipetteDetails } from '/app/resources/maintenance_runs' diff --git a/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderModalContainer/modals/ProtocolDropTipModal.tsx b/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderModalContainer/modals/ProtocolDropTipModal.tsx index abdc23717fb..b9f30de446f 100644 --- a/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderModalContainer/modals/ProtocolDropTipModal.tsx +++ b/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderModalContainer/modals/ProtocolDropTipModal.tsx @@ -20,10 +20,8 @@ import { useHomePipettes } from '/app/local-resources/instruments' import type { PipetteData } from '@opentrons/api-client' import type { IconProps } from '@opentrons/components' -import type { - UseHomePipettesProps, - TipAttachmentStatusResult, -} from '/app/local-resources/instruments' +import type { UseHomePipettesProps } from '/app/local-resources/instruments' +import type { TipAttachmentStatusResult } from '/app/resources/instruments' type UseProtocolDropTipModalProps = Pick< UseHomePipettesProps, diff --git a/app/src/organisms/DropTipWizardFlows/TipsAttachedModal.tsx b/app/src/organisms/DropTipWizardFlows/TipsAttachedModal.tsx index 161d086b7c6..86778afe97b 100644 --- a/app/src/organisms/DropTipWizardFlows/TipsAttachedModal.tsx +++ b/app/src/organisms/DropTipWizardFlows/TipsAttachedModal.tsx @@ -18,11 +18,9 @@ import { useHomePipettes } from '/app/local-resources/instruments' import type { HostConfig } from '@opentrons/api-client' import type { OddModalHeaderBaseProps } from '/app/molecules/OddModal/types' -import type { - UseHomePipettesProps, - PipetteWithTip, -} from '/app/local-resources/instruments' +import type { UseHomePipettesProps } from '/app/local-resources/instruments' import type { PipetteDetails } from '/app/resources/maintenance_runs' +import type { PipetteWithTip } from '/app/resources/instruments' type TipsAttachedModalProps = Pick & { aPipetteWithTip: PipetteWithTip diff --git a/app/src/organisms/DropTipWizardFlows/__tests__/TipsAttachedModal.test.tsx b/app/src/organisms/DropTipWizardFlows/__tests__/TipsAttachedModal.test.tsx index 75c3484e203..2a71920c4fc 100644 --- a/app/src/organisms/DropTipWizardFlows/__tests__/TipsAttachedModal.test.tsx +++ b/app/src/organisms/DropTipWizardFlows/__tests__/TipsAttachedModal.test.tsx @@ -14,7 +14,7 @@ import { useDropTipWizardFlows } from '..' import type { Mock } from 'vitest' import type { PipetteModelSpecs } from '@opentrons/shared-data' import type { HostConfig } from '@opentrons/api-client' -import type { PipetteWithTip } from '/app/local-resources/instruments' +import type { PipetteWithTip } from '/app/resources/instruments' vi.mock('/app/resources/runs/useCloseCurrentRun') vi.mock('..') diff --git a/app/src/organisms/ErrorRecoveryFlows/RecoveryOptions/ManageTips.tsx b/app/src/organisms/ErrorRecoveryFlows/RecoveryOptions/ManageTips.tsx index 6e37617b3c3..1609acfa0ca 100644 --- a/app/src/organisms/ErrorRecoveryFlows/RecoveryOptions/ManageTips.tsx +++ b/app/src/organisms/ErrorRecoveryFlows/RecoveryOptions/ManageTips.tsx @@ -25,7 +25,7 @@ import { SelectRecoveryOption } from './SelectRecoveryOption' import type { RecoveryContentProps, RecoveryRoute, RouteStep } from '../types' import type { FixitCommandTypeUtils } from '/app/organisms/DropTipWizardFlows' -import type { PipetteWithTip } from '/app/local-resources/instruments' +import type { PipetteWithTip } from '/app/resources/instruments' // The Drop Tip flow entry point. Includes entry from SelectRecoveryOption and CancelRun. export function ManageTips(props: RecoveryContentProps): JSX.Element { diff --git a/app/src/organisms/ErrorRecoveryFlows/RecoveryOptions/SelectRecoveryOption.tsx b/app/src/organisms/ErrorRecoveryFlows/RecoveryOptions/SelectRecoveryOption.tsx index a4c3afc63b1..59888c39c42 100644 --- a/app/src/organisms/ErrorRecoveryFlows/RecoveryOptions/SelectRecoveryOption.tsx +++ b/app/src/organisms/ErrorRecoveryFlows/RecoveryOptions/SelectRecoveryOption.tsx @@ -20,7 +20,7 @@ import { import { RecoverySingleColumnContentWrapper } from '../shared' import type { ErrorKind, RecoveryContentProps, RecoveryRoute } from '../types' -import type { PipetteWithTip } from '/app/local-resources/instruments' +import type { PipetteWithTip } from '/app/resources/instruments' // The "home" route within Error Recovery. When a user completes a non-terminal flow or presses "Go back" enough // to escape the boundaries of any route, they will be redirected here. diff --git a/app/src/organisms/ErrorRecoveryFlows/hooks/useRecoveryTipStatus.ts b/app/src/organisms/ErrorRecoveryFlows/hooks/useRecoveryTipStatus.ts index 4a8338087eb..8db4af030ea 100644 --- a/app/src/organisms/ErrorRecoveryFlows/hooks/useRecoveryTipStatus.ts +++ b/app/src/organisms/ErrorRecoveryFlows/hooks/useRecoveryTipStatus.ts @@ -3,7 +3,7 @@ import head from 'lodash/head' import { useRunCurrentState } from '@opentrons/react-api-client' import { getPipetteModelSpecs } from '@opentrons/shared-data' -import { useTipAttachmentStatus } from '/app/local-resources/instruments/hooks' +import { useTipAttachmentStatus } from '/app/resources/instruments' import { ERROR_KINDS } from '/app/organisms/ErrorRecoveryFlows/constants' import { getErrorKind } from '/app/organisms/ErrorRecoveryFlows/utils' @@ -11,7 +11,7 @@ import type { Run, Instruments, PipetteData } from '@opentrons/api-client' import type { PipetteWithTip, TipAttachmentStatusResult, -} from '/app/local-resources/instruments/hooks' +} from '/app/resources/instruments' import type { ERUtilsProps } from '/app/organisms/ErrorRecoveryFlows/hooks/useERUtils' interface UseRecoveryTipStatusProps { diff --git a/app/src/pages/ODD/RunSummary/index.tsx b/app/src/pages/ODD/RunSummary/index.tsx index 95e4a416511..98a53f591d4 100644 --- a/app/src/pages/ODD/RunSummary/index.tsx +++ b/app/src/pages/ODD/RunSummary/index.tsx @@ -69,11 +69,11 @@ import { } from '/app/resources/runs' import { handleTipsAttachedModal } from '/app/organisms/DropTipWizardFlows' import { lastRunCommandPromptedErrorRecovery } from '/app/local-resources/commands' -import { useTipAttachmentStatus } from '/app/local-resources/instruments' +import { useTipAttachmentStatus } from '/app/resources/instruments' import type { IconName } from '@opentrons/components' import type { OnDeviceRouteParams } from '/app/App/types' -import type { PipetteWithTip } from '/app/local-resources/instruments' +import type { PipetteWithTip } from '/app/resources/instruments' export function RunSummary(): JSX.Element { const { runId } = useParams< diff --git a/app/src/local-resources/instruments/__tests__/useTipAttachmentStatus.test.ts b/app/src/resources/instruments/__tests__/useTipAttachmentStatus.test.ts similarity index 99% rename from app/src/local-resources/instruments/__tests__/useTipAttachmentStatus.test.ts rename to app/src/resources/instruments/__tests__/useTipAttachmentStatus.test.ts index a8e66aba7de..6d0de5c6d05 100644 --- a/app/src/local-resources/instruments/__tests__/useTipAttachmentStatus.test.ts +++ b/app/src/resources/instruments/__tests__/useTipAttachmentStatus.test.ts @@ -10,7 +10,7 @@ import { getPipetteModelSpecs } from '@opentrons/shared-data' import { useHost } from '@opentrons/react-api-client' import { mockPipetteInfo } from '/app/redux/pipettes/__fixtures__' -import { useTipAttachmentStatus } from '../hooks' +import { useTipAttachmentStatus } from '../useTipAttachmentStatus' import type { PipetteModelSpecs } from '@opentrons/shared-data' import type { PipetteData } from '@opentrons/api-client' diff --git a/app/src/resources/instruments/index.ts b/app/src/resources/instruments/index.ts index 16fae1ecad8..d88a2c7215f 100644 --- a/app/src/resources/instruments/index.ts +++ b/app/src/resources/instruments/index.ts @@ -1,3 +1,4 @@ export * from './useAttachedPipettes' export * from './useAttachedPipetteCalibrations' export * from './useAttachedPipettesFromInstrumentsQuery' +export * from './useTipAttachmentStatus' diff --git a/app/src/local-resources/instruments/hooks/useTipAttachmentStatus.ts b/app/src/resources/instruments/useTipAttachmentStatus.ts similarity index 100% rename from app/src/local-resources/instruments/hooks/useTipAttachmentStatus.ts rename to app/src/resources/instruments/useTipAttachmentStatus.ts