From 46cb0e44dd64ed49803b4f482dbeae03b6114d30 Mon Sep 17 00:00:00 2001 From: Jamey Huffnagle Date: Mon, 17 Jun 2024 21:50:22 -0400 Subject: [PATCH] refactor(app): rename error recovery "hooks" dir to "utils" --- app/src/organisms/DropTipWizardFlows/types.ts | 2 +- app/src/organisms/ErrorRecoveryFlows/ErrorRecoveryWizard.tsx | 4 ++-- .../ErrorRecoveryFlows/RecoveryOptions/CancelRun.tsx | 2 +- app/src/organisms/ErrorRecoveryFlows/RunPausedSplash.tsx | 4 ++-- .../ErrorRecoveryFlows/__tests__/ErrorRecoveryFlows.test.tsx | 4 ++-- app/src/organisms/ErrorRecoveryFlows/index.tsx | 2 +- .../{hooks => utils}/__tests__/getErrorKind.test.ts | 0 .../__tests__/getFailedCommandPipetteInfo.test.ts | 0 .../__tests__/useCurrentlyRecoveringFrom.test.ts | 0 .../{hooks => utils}/__tests__/useFailedLabwareUtils.test.ts | 0 .../{hooks => utils}/__tests__/useRecoveryCommands.test.ts | 0 .../{hooks => utils}/__tests__/useRecoveryMapUtils.test.tsx | 0 .../{hooks => utils}/__tests__/useRecoveryOptionCopy.test.tsx | 0 .../{hooks => utils}/__tests__/useRecoveryRouting.test.ts | 0 .../{hooks => utils}/__tests__/useRouteUpdateActions.test.ts | 0 .../ErrorRecoveryFlows/{hooks => utils}/getErrorKind.ts | 0 .../{hooks => utils}/getFailedCommandPipetteInfo.ts | 0 .../organisms/ErrorRecoveryFlows/{hooks => utils}/index.ts | 0 .../{hooks => utils}/useCurrentlyRecoveringFrom.ts | 0 .../ErrorRecoveryFlows/{hooks => utils}/useERUtils.ts | 0 .../ErrorRecoveryFlows/{hooks => utils}/useErrorMessage.ts | 0 .../ErrorRecoveryFlows/{hooks => utils}/useErrorName.ts | 0 .../{hooks => utils}/useFailedLabwareUtils.ts | 0 .../{hooks => utils}/useRecoveryCommands.ts | 0 .../{hooks => utils}/useRecoveryMapUtils.tsx | 0 .../{hooks => utils}/useRecoveryOptionCopy.tsx | 0 .../ErrorRecoveryFlows/{hooks => utils}/useRecoveryRouting.ts | 0 .../{hooks => utils}/useRecoveryTipStatus.ts | 0 .../{hooks => utils}/useRouteUpdateActions.ts | 0 29 files changed, 9 insertions(+), 9 deletions(-) rename app/src/organisms/ErrorRecoveryFlows/{hooks => utils}/__tests__/getErrorKind.test.ts (100%) rename app/src/organisms/ErrorRecoveryFlows/{hooks => utils}/__tests__/getFailedCommandPipetteInfo.test.ts (100%) rename app/src/organisms/ErrorRecoveryFlows/{hooks => utils}/__tests__/useCurrentlyRecoveringFrom.test.ts (100%) rename app/src/organisms/ErrorRecoveryFlows/{hooks => utils}/__tests__/useFailedLabwareUtils.test.ts (100%) rename app/src/organisms/ErrorRecoveryFlows/{hooks => utils}/__tests__/useRecoveryCommands.test.ts (100%) rename app/src/organisms/ErrorRecoveryFlows/{hooks => utils}/__tests__/useRecoveryMapUtils.test.tsx (100%) rename app/src/organisms/ErrorRecoveryFlows/{hooks => utils}/__tests__/useRecoveryOptionCopy.test.tsx (100%) rename app/src/organisms/ErrorRecoveryFlows/{hooks => utils}/__tests__/useRecoveryRouting.test.ts (100%) rename app/src/organisms/ErrorRecoveryFlows/{hooks => utils}/__tests__/useRouteUpdateActions.test.ts (100%) rename app/src/organisms/ErrorRecoveryFlows/{hooks => utils}/getErrorKind.ts (100%) rename app/src/organisms/ErrorRecoveryFlows/{hooks => utils}/getFailedCommandPipetteInfo.ts (100%) rename app/src/organisms/ErrorRecoveryFlows/{hooks => utils}/index.ts (100%) rename app/src/organisms/ErrorRecoveryFlows/{hooks => utils}/useCurrentlyRecoveringFrom.ts (100%) rename app/src/organisms/ErrorRecoveryFlows/{hooks => utils}/useERUtils.ts (100%) rename app/src/organisms/ErrorRecoveryFlows/{hooks => utils}/useErrorMessage.ts (100%) rename app/src/organisms/ErrorRecoveryFlows/{hooks => utils}/useErrorName.ts (100%) rename app/src/organisms/ErrorRecoveryFlows/{hooks => utils}/useFailedLabwareUtils.ts (100%) rename app/src/organisms/ErrorRecoveryFlows/{hooks => utils}/useRecoveryCommands.ts (100%) rename app/src/organisms/ErrorRecoveryFlows/{hooks => utils}/useRecoveryMapUtils.tsx (100%) rename app/src/organisms/ErrorRecoveryFlows/{hooks => utils}/useRecoveryOptionCopy.tsx (100%) rename app/src/organisms/ErrorRecoveryFlows/{hooks => utils}/useRecoveryRouting.ts (100%) rename app/src/organisms/ErrorRecoveryFlows/{hooks => utils}/useRecoveryTipStatus.ts (100%) rename app/src/organisms/ErrorRecoveryFlows/{hooks => utils}/useRouteUpdateActions.ts (100%) diff --git a/app/src/organisms/DropTipWizardFlows/types.ts b/app/src/organisms/DropTipWizardFlows/types.ts index d40d2030488..1b8286ab9f3 100644 --- a/app/src/organisms/DropTipWizardFlows/types.ts +++ b/app/src/organisms/DropTipWizardFlows/types.ts @@ -1,7 +1,7 @@ import type { DT_ROUTES } from './constants' import type { DropTipErrorComponents } from './hooks' import type { DropTipWizardProps } from './DropTipWizard' -import type { ERUtilsResults } from '../ErrorRecoveryFlows/hooks' +import type { ERUtilsResults } from '../ErrorRecoveryFlows/utils' export type DropTipFlowsRoute = typeof DT_ROUTES[keyof typeof DT_ROUTES] export type DropTipFlowsStep = DropTipFlowsRoute[number] diff --git a/app/src/organisms/ErrorRecoveryFlows/ErrorRecoveryWizard.tsx b/app/src/organisms/ErrorRecoveryFlows/ErrorRecoveryWizard.tsx index c0182d53690..047dbf7a7a4 100644 --- a/app/src/organisms/ErrorRecoveryFlows/ErrorRecoveryWizard.tsx +++ b/app/src/organisms/ErrorRecoveryFlows/ErrorRecoveryWizard.tsx @@ -18,7 +18,7 @@ import { ManageTips, } from './RecoveryOptions' import { RecoveryInProgress } from './RecoveryInProgress' -import { getErrorKind } from './hooks' +import { getErrorKind } from './utils' import { RECOVERY_MAP } from './constants' import type { RobotType } from '@opentrons/shared-data' @@ -27,7 +27,7 @@ import type { useRouteUpdateActions, useRecoveryCommands, ERUtilsResults, -} from './hooks' +} from './utils' import type { ErrorRecoveryFlowsProps } from '.' interface UseERWizardResult { diff --git a/app/src/organisms/ErrorRecoveryFlows/RecoveryOptions/CancelRun.tsx b/app/src/organisms/ErrorRecoveryFlows/RecoveryOptions/CancelRun.tsx index 907a6bca0f4..731023da05a 100644 --- a/app/src/organisms/ErrorRecoveryFlows/RecoveryOptions/CancelRun.tsx +++ b/app/src/organisms/ErrorRecoveryFlows/RecoveryOptions/CancelRun.tsx @@ -19,7 +19,7 @@ import type { RecoveryTipStatusUtils, UseRecoveryCommandsResult, UseRouteUpdateActionsResult, -} from '../hooks' +} from '../utils' export function CancelRun({ isOnDevice, diff --git a/app/src/organisms/ErrorRecoveryFlows/RunPausedSplash.tsx b/app/src/organisms/ErrorRecoveryFlows/RunPausedSplash.tsx index caa5b13d9f7..8562149e142 100644 --- a/app/src/organisms/ErrorRecoveryFlows/RunPausedSplash.tsx +++ b/app/src/organisms/ErrorRecoveryFlows/RunPausedSplash.tsx @@ -19,12 +19,12 @@ import { } from '@opentrons/components' import { getIsOnDevice } from '../../redux/config' -import { getErrorKind, useErrorMessage, useErrorName } from './hooks' +import { getErrorKind, useErrorMessage, useErrorName } from './utils' import { LargeButton } from '../../atoms/buttons' import { RECOVERY_MAP } from './constants' import type { FailedCommand } from './types' -import type { UseRouteUpdateActionsResult } from './hooks' +import type { UseRouteUpdateActionsResult } from './utils' export function useRunPausedSplash(): boolean { return useSelector(getIsOnDevice) diff --git a/app/src/organisms/ErrorRecoveryFlows/__tests__/ErrorRecoveryFlows.test.tsx b/app/src/organisms/ErrorRecoveryFlows/__tests__/ErrorRecoveryFlows.test.tsx index ba592e78191..e0fe5ade3c8 100644 --- a/app/src/organisms/ErrorRecoveryFlows/__tests__/ErrorRecoveryFlows.test.tsx +++ b/app/src/organisms/ErrorRecoveryFlows/__tests__/ErrorRecoveryFlows.test.tsx @@ -12,7 +12,7 @@ import { renderWithProviders } from '../../../__testing-utils__' import { i18n } from '../../../i18n' import { mockFailedCommand } from '../__fixtures__' import { ErrorRecoveryFlows, useErrorRecoveryFlows } from '..' -import { useCurrentlyRecoveringFrom, useERUtils } from '../hooks' +import { useCurrentlyRecoveringFrom, useERUtils } from '../utils' import { useFeatureFlag } from '../../../redux/config' import { useERWizard, ErrorRecoveryWizard } from '../ErrorRecoveryWizard' import { useRunPausedSplash, RunPausedSplash } from '../RunPausedSplash' @@ -20,7 +20,7 @@ import { useRunPausedSplash, RunPausedSplash } from '../RunPausedSplash' import type { RunStatus } from '@opentrons/api-client' vi.mock('../ErrorRecoveryWizard') -vi.mock('../hooks') +vi.mock('../utils') vi.mock('../useRecoveryCommands') vi.mock('../../../redux/config') vi.mock('../RunPausedSplash') diff --git a/app/src/organisms/ErrorRecoveryFlows/index.tsx b/app/src/organisms/ErrorRecoveryFlows/index.tsx index f7f6923a135..6513cf93246 100644 --- a/app/src/organisms/ErrorRecoveryFlows/index.tsx +++ b/app/src/organisms/ErrorRecoveryFlows/index.tsx @@ -15,7 +15,7 @@ import { OT2_ROBOT_TYPE } from '@opentrons/shared-data' import { useFeatureFlag } from '../../redux/config' import { ErrorRecoveryWizard, useERWizard } from './ErrorRecoveryWizard' import { RunPausedSplash, useRunPausedSplash } from './RunPausedSplash' -import { useCurrentlyRecoveringFrom, useERUtils } from './hooks' +import { useCurrentlyRecoveringFrom, useERUtils } from './utils' import type { RunStatus } from '@opentrons/api-client' import type { CompletedProtocolAnalysis } from '@opentrons/shared-data' diff --git a/app/src/organisms/ErrorRecoveryFlows/hooks/__tests__/getErrorKind.test.ts b/app/src/organisms/ErrorRecoveryFlows/utils/__tests__/getErrorKind.test.ts similarity index 100% rename from app/src/organisms/ErrorRecoveryFlows/hooks/__tests__/getErrorKind.test.ts rename to app/src/organisms/ErrorRecoveryFlows/utils/__tests__/getErrorKind.test.ts diff --git a/app/src/organisms/ErrorRecoveryFlows/hooks/__tests__/getFailedCommandPipetteInfo.test.ts b/app/src/organisms/ErrorRecoveryFlows/utils/__tests__/getFailedCommandPipetteInfo.test.ts similarity index 100% rename from app/src/organisms/ErrorRecoveryFlows/hooks/__tests__/getFailedCommandPipetteInfo.test.ts rename to app/src/organisms/ErrorRecoveryFlows/utils/__tests__/getFailedCommandPipetteInfo.test.ts diff --git a/app/src/organisms/ErrorRecoveryFlows/hooks/__tests__/useCurrentlyRecoveringFrom.test.ts b/app/src/organisms/ErrorRecoveryFlows/utils/__tests__/useCurrentlyRecoveringFrom.test.ts similarity index 100% rename from app/src/organisms/ErrorRecoveryFlows/hooks/__tests__/useCurrentlyRecoveringFrom.test.ts rename to app/src/organisms/ErrorRecoveryFlows/utils/__tests__/useCurrentlyRecoveringFrom.test.ts diff --git a/app/src/organisms/ErrorRecoveryFlows/hooks/__tests__/useFailedLabwareUtils.test.ts b/app/src/organisms/ErrorRecoveryFlows/utils/__tests__/useFailedLabwareUtils.test.ts similarity index 100% rename from app/src/organisms/ErrorRecoveryFlows/hooks/__tests__/useFailedLabwareUtils.test.ts rename to app/src/organisms/ErrorRecoveryFlows/utils/__tests__/useFailedLabwareUtils.test.ts diff --git a/app/src/organisms/ErrorRecoveryFlows/hooks/__tests__/useRecoveryCommands.test.ts b/app/src/organisms/ErrorRecoveryFlows/utils/__tests__/useRecoveryCommands.test.ts similarity index 100% rename from app/src/organisms/ErrorRecoveryFlows/hooks/__tests__/useRecoveryCommands.test.ts rename to app/src/organisms/ErrorRecoveryFlows/utils/__tests__/useRecoveryCommands.test.ts diff --git a/app/src/organisms/ErrorRecoveryFlows/hooks/__tests__/useRecoveryMapUtils.test.tsx b/app/src/organisms/ErrorRecoveryFlows/utils/__tests__/useRecoveryMapUtils.test.tsx similarity index 100% rename from app/src/organisms/ErrorRecoveryFlows/hooks/__tests__/useRecoveryMapUtils.test.tsx rename to app/src/organisms/ErrorRecoveryFlows/utils/__tests__/useRecoveryMapUtils.test.tsx diff --git a/app/src/organisms/ErrorRecoveryFlows/hooks/__tests__/useRecoveryOptionCopy.test.tsx b/app/src/organisms/ErrorRecoveryFlows/utils/__tests__/useRecoveryOptionCopy.test.tsx similarity index 100% rename from app/src/organisms/ErrorRecoveryFlows/hooks/__tests__/useRecoveryOptionCopy.test.tsx rename to app/src/organisms/ErrorRecoveryFlows/utils/__tests__/useRecoveryOptionCopy.test.tsx diff --git a/app/src/organisms/ErrorRecoveryFlows/hooks/__tests__/useRecoveryRouting.test.ts b/app/src/organisms/ErrorRecoveryFlows/utils/__tests__/useRecoveryRouting.test.ts similarity index 100% rename from app/src/organisms/ErrorRecoveryFlows/hooks/__tests__/useRecoveryRouting.test.ts rename to app/src/organisms/ErrorRecoveryFlows/utils/__tests__/useRecoveryRouting.test.ts diff --git a/app/src/organisms/ErrorRecoveryFlows/hooks/__tests__/useRouteUpdateActions.test.ts b/app/src/organisms/ErrorRecoveryFlows/utils/__tests__/useRouteUpdateActions.test.ts similarity index 100% rename from app/src/organisms/ErrorRecoveryFlows/hooks/__tests__/useRouteUpdateActions.test.ts rename to app/src/organisms/ErrorRecoveryFlows/utils/__tests__/useRouteUpdateActions.test.ts diff --git a/app/src/organisms/ErrorRecoveryFlows/hooks/getErrorKind.ts b/app/src/organisms/ErrorRecoveryFlows/utils/getErrorKind.ts similarity index 100% rename from app/src/organisms/ErrorRecoveryFlows/hooks/getErrorKind.ts rename to app/src/organisms/ErrorRecoveryFlows/utils/getErrorKind.ts diff --git a/app/src/organisms/ErrorRecoveryFlows/hooks/getFailedCommandPipetteInfo.ts b/app/src/organisms/ErrorRecoveryFlows/utils/getFailedCommandPipetteInfo.ts similarity index 100% rename from app/src/organisms/ErrorRecoveryFlows/hooks/getFailedCommandPipetteInfo.ts rename to app/src/organisms/ErrorRecoveryFlows/utils/getFailedCommandPipetteInfo.ts diff --git a/app/src/organisms/ErrorRecoveryFlows/hooks/index.ts b/app/src/organisms/ErrorRecoveryFlows/utils/index.ts similarity index 100% rename from app/src/organisms/ErrorRecoveryFlows/hooks/index.ts rename to app/src/organisms/ErrorRecoveryFlows/utils/index.ts diff --git a/app/src/organisms/ErrorRecoveryFlows/hooks/useCurrentlyRecoveringFrom.ts b/app/src/organisms/ErrorRecoveryFlows/utils/useCurrentlyRecoveringFrom.ts similarity index 100% rename from app/src/organisms/ErrorRecoveryFlows/hooks/useCurrentlyRecoveringFrom.ts rename to app/src/organisms/ErrorRecoveryFlows/utils/useCurrentlyRecoveringFrom.ts diff --git a/app/src/organisms/ErrorRecoveryFlows/hooks/useERUtils.ts b/app/src/organisms/ErrorRecoveryFlows/utils/useERUtils.ts similarity index 100% rename from app/src/organisms/ErrorRecoveryFlows/hooks/useERUtils.ts rename to app/src/organisms/ErrorRecoveryFlows/utils/useERUtils.ts diff --git a/app/src/organisms/ErrorRecoveryFlows/hooks/useErrorMessage.ts b/app/src/organisms/ErrorRecoveryFlows/utils/useErrorMessage.ts similarity index 100% rename from app/src/organisms/ErrorRecoveryFlows/hooks/useErrorMessage.ts rename to app/src/organisms/ErrorRecoveryFlows/utils/useErrorMessage.ts diff --git a/app/src/organisms/ErrorRecoveryFlows/hooks/useErrorName.ts b/app/src/organisms/ErrorRecoveryFlows/utils/useErrorName.ts similarity index 100% rename from app/src/organisms/ErrorRecoveryFlows/hooks/useErrorName.ts rename to app/src/organisms/ErrorRecoveryFlows/utils/useErrorName.ts diff --git a/app/src/organisms/ErrorRecoveryFlows/hooks/useFailedLabwareUtils.ts b/app/src/organisms/ErrorRecoveryFlows/utils/useFailedLabwareUtils.ts similarity index 100% rename from app/src/organisms/ErrorRecoveryFlows/hooks/useFailedLabwareUtils.ts rename to app/src/organisms/ErrorRecoveryFlows/utils/useFailedLabwareUtils.ts diff --git a/app/src/organisms/ErrorRecoveryFlows/hooks/useRecoveryCommands.ts b/app/src/organisms/ErrorRecoveryFlows/utils/useRecoveryCommands.ts similarity index 100% rename from app/src/organisms/ErrorRecoveryFlows/hooks/useRecoveryCommands.ts rename to app/src/organisms/ErrorRecoveryFlows/utils/useRecoveryCommands.ts diff --git a/app/src/organisms/ErrorRecoveryFlows/hooks/useRecoveryMapUtils.tsx b/app/src/organisms/ErrorRecoveryFlows/utils/useRecoveryMapUtils.tsx similarity index 100% rename from app/src/organisms/ErrorRecoveryFlows/hooks/useRecoveryMapUtils.tsx rename to app/src/organisms/ErrorRecoveryFlows/utils/useRecoveryMapUtils.tsx diff --git a/app/src/organisms/ErrorRecoveryFlows/hooks/useRecoveryOptionCopy.tsx b/app/src/organisms/ErrorRecoveryFlows/utils/useRecoveryOptionCopy.tsx similarity index 100% rename from app/src/organisms/ErrorRecoveryFlows/hooks/useRecoveryOptionCopy.tsx rename to app/src/organisms/ErrorRecoveryFlows/utils/useRecoveryOptionCopy.tsx diff --git a/app/src/organisms/ErrorRecoveryFlows/hooks/useRecoveryRouting.ts b/app/src/organisms/ErrorRecoveryFlows/utils/useRecoveryRouting.ts similarity index 100% rename from app/src/organisms/ErrorRecoveryFlows/hooks/useRecoveryRouting.ts rename to app/src/organisms/ErrorRecoveryFlows/utils/useRecoveryRouting.ts diff --git a/app/src/organisms/ErrorRecoveryFlows/hooks/useRecoveryTipStatus.ts b/app/src/organisms/ErrorRecoveryFlows/utils/useRecoveryTipStatus.ts similarity index 100% rename from app/src/organisms/ErrorRecoveryFlows/hooks/useRecoveryTipStatus.ts rename to app/src/organisms/ErrorRecoveryFlows/utils/useRecoveryTipStatus.ts diff --git a/app/src/organisms/ErrorRecoveryFlows/hooks/useRouteUpdateActions.ts b/app/src/organisms/ErrorRecoveryFlows/utils/useRouteUpdateActions.ts similarity index 100% rename from app/src/organisms/ErrorRecoveryFlows/hooks/useRouteUpdateActions.ts rename to app/src/organisms/ErrorRecoveryFlows/utils/useRouteUpdateActions.ts