refactor(protocol-designer): deprecate unused equipment modal (#18537)

closes AUTH-1957

Author: jerader

protocol-designer/cypress/e2e/migrations.cy.ts

@@ -13,53 +13,46 @@ describe('Protocol fixtures migrate and match snapshots', () => {
       title: 'example_1_1_0 (schema 1, PD version 1.1.1) -> PD 8.5.x, schema 8',
       importTestFile: TestFilePath.Example_1_1_0,
       expectedTestFile: TestFilePath.Example_1_1_0V8,
-      unusedHardware: true,
       migrationModal: 'newLabwareDefs',
     },
     {
       title: 'doItAllV3 (schema 3, PD version 4.0.0) -> PD 8.5.x, schema 8',
       importTestFile: TestFilePath.DoItAllV3V4,
       expectedTestFile: TestFilePath.DoItAllV3MigratedToV8,
-      unusedHardware: false,
       migrationModal: 'v8.1',
     },
     {
       title: 'doItAllV4 (schema 4, PD version 4.0.0) -> PD 8.5.x, schema 8',
       importTestFile: TestFilePath.DoItAllV4V4,
       expectedTestFile: TestFilePath.DoItAllV4MigratedToV8,
-      unusedHardware: false,
       migrationModal: 'v8.1',
     },
     {
       title:
         'doItAllv7MigratedToV8 (schema 7, PD version 8.0.0) -> should migrate to 8.5.x, schema 8',
       importTestFile: TestFilePath.DoItAllV7,
       expectedTestFile: TestFilePath.DoItAllV7MigratedToV8,
-      unusedHardware: false,
       migrationModal: 'v8.1',
     },
     {
       title:
         '96-channel full and column schema 8 -> should migrate to 8.5.x, schema 8',
       importTestFile: TestFilePath.NinetySixChannelFullAndColumn,
       expectedTestFile: TestFilePath.NinetySixChannelFullAndColumn,
-      unusedHardware: false,
       migrationModal: null,
     },
     {
       title:
         'doItAllV8 flex robot -> reimported, should migrate to 8.5.x, schema 8',
       importTestFile: TestFilePath.DoItAllV8,
       expectedTestFile: TestFilePath.DoItAllV8,
-      unusedHardware: false,
       migrationModal: null,
     },
     {
       title:
         'new advanced settings with multi temp => reimported, should not migrate and stay at 8.5.x, schema 8',
       importTestFile: TestFilePath.NewAdvancedSettingsAndMultiTemp,
       expectedTestFile: TestFilePath.NewAdvancedSettingsAndMultiTemp,
-      unusedHardware: false,
       migrationModal: null,
     },
     {
@@ -68,24 +61,16 @@ describe('Protocol fixtures migrate and match snapshots', () => {
       importTestFile: TestFilePath.ThermocyclerOnOt2V7,
       expectedTestFile: TestFilePath.ThermocyclerOnOt2V7MigratedToV8,
       migrationModal: 'v8.1',
-      unusedHardware: true,
     },
   ]
 
   testCases.forEach(
-    ({
-      title,
-      importTestFile,
-      expectedTestFile,
-      unusedHardware,
-      migrationModal,
-    }) => {
+    ({ title, importTestFile, expectedTestFile, migrationModal }) => {
       it(title, () => {
         migrateAndMatchSnapshot({
           title,
           importTestFile,
           expectedTestFile,
-          unusedHardware,
           migrationModal,
         })
       })

protocol-designer/cypress/support/Import.ts

@@ -11,7 +11,6 @@ export interface MigrateTestCase {
   title: string
   importTestFile: TestFilePath
   expectedTestFile: TestFilePath
-  unusedHardware: boolean
   migrationModal: 'newLabwareDefs' | 'v8.1' | 'noBehaviorChange' | null
 }
 
@@ -20,7 +19,6 @@ export const ContentStrings = {
   v8_1: 'The default dispense height is now 1 mm from the bottom of the well',
   noBehaviorChange:
     'We have added new features since the last time this protocol was updated, but have not made any changes to existing protocol behavior',
-  unusedHardwareWarning: 'Protocol has unused hardware',
   exportButton: 'Export',
   continueButton: 'continue',
   continueWithExport: 'Continue with export',
@@ -66,7 +64,6 @@ export const verifyImportProtocolPage = (protocol: TestFile): void => {
 export const migrateAndMatchSnapshot = ({
   importTestFile,
   expectedTestFile,
-  unusedHardware,
   migrationModal,
 }: MigrateTestCase): void => {
   const uploadProtocol: TestFile = getTestFile(importTestFile)
@@ -87,10 +84,6 @@ export const migrateAndMatchSnapshot = ({
 
   cy.get(LocatorStrings.exportProtocol).click({ force: true })
 
-  if (unusedHardware) {
-    cy.get('div').contains(ContentStrings.unusedHardwareWarning).should('exist')
-    cy.contains(ContentStrings.continueWithExport).click({ force: true })
-  }
   const expectedProtocol: TestFile = getTestFile(expectedTestFile)
 
   cy.readFile(expectedProtocol.path).then(expectedProtocolRead => {

protocol-designer/fixtures/protocol/8/thermocyclerOnOt2V7MigratedToV8.json

@@ -14,7 +14,7 @@
   },
   "designerApplication": {
     "name": "opentrons/protocol-designer",
-    "version": "8.4.3-alpha.0",
+    "version": "8.5.0",
     "data": {
       "_internalAppBuildDate": "Mon, 10 Mar 2025 14:05:38 GMT",
       "pipetteTiprackAssignments": {

protocol-designer/src/assets/localization/en/alert.json

@@ -29,9 +29,6 @@
   },
   "hint": {
     "dont_show_again": "Don't show me again",
-    "unused_hardware": {
-      "title": "Protocol has unused hardware"
-    },
     "no_commands": {
       "title": "Protocol has no steps"
     },

protocol-designer/src/components/organisms/BlockingHintModal/index.tsx

@@ -51,9 +51,7 @@ export function BlockingHintModal(props: HintProps): JSX.Element {
   }
 
   const confirmButtonText =
-    hintKey === 'no_commands' || hintKey === 'unused_hardware'
-      ? 'continue_with_export'
-      : 'confirm'
+    hintKey === 'no_commands' ? 'continue_with_export' : 'confirm'
 
   return createPortal(
     <Modal

protocol-designer/src/pages/Designer/ProtocolSteps/index.tsx

@@ -35,15 +35,13 @@ import { useKitchen } from '../../../components/organisms/Kitchen/hooks'
 import { DECK_SETUP_TOOLS_WIDTH_REM } from '../../../constants'
 import { getEnableHotKeysDisplay } from '../../../feature-flags/selectors'
 import {
-  createFile,
   getRobotStateTimeline,
   getRobotType,
 } from '../../../file-data/selectors'
 import { selectZoomedIntoSlot } from '../../../labware-ingred/actions'
 import { saveProtocolFile } from '../../../load-file/actions'
 import { useProtocolExportHandler } from '../../../resources/hooks'
 import {
-  getAdditionalEquipmentEntities,
   getSavedStepForms,
   getUnsavedForm,
 } from '../../../step-forms/selectors'
@@ -58,12 +56,6 @@ import {
   getSelectedTerminalItemId,
 } from '../../../ui/steps/selectors'
 import { getHasTrash } from '../../../utils'
-import { LOAD_COMMANDS } from '../../ProtocolOverview'
-import {
-  getUnusedEntities,
-  getUnusedStagingAreas,
-  getUnusedTrash,
-} from '../../ProtocolOverview/utils'
 import { DeckSetupContainer } from '../DeckSetup'
 import { zoomInOnCoordinate } from '../DeckSetup/utils'
 import { OffDeck } from '../OffDeck'
@@ -75,7 +67,6 @@ import { TimelineEditHardware } from './TimelineEditHardware'
 
 import type { Dispatch, SetStateAction } from 'react'
 import type { DeckSlot, ThunkDispatch } from '../../../types'
-import type { Fixture } from '../../ProtocolOverview'
 
 const CONTENT_MAX_WIDTH = '46.9375rem'
 const STEP_SUMMARY_HEIGHT = '18.2rem'
@@ -107,7 +98,7 @@ export function ProtocolSteps({
   const robotType = useSelector(getRobotType)
   const activeItem = useSelector(getActiveItem)
   const deckSetup = useSelector(getDeckSetupForActiveItem)
-  const { pipettes, modules, labware, additionalEquipmentOnDeck } = deckSetup
+  const { labware, additionalEquipmentOnDeck } = deckSetup
   const [hoverSlot, setHoverSlot] = useState<DeckSlot | null>(null)
   const savedStepForms = useSelector(getSavedStepForms)
   const deckDef = useMemo(() => getDeckDefFromRobotType(robotType), [robotType])
@@ -130,7 +121,11 @@ export function ProtocolSteps({
   const initialViewBox = `${viewBoxX} ${viewBoxY} ${viewBoxWidth} ${viewBoxHeight}`
   const [viewBox, setViewBox] = useState<string>(initialViewBox)
 
-  const { errors: timelineErrors } = useSelector(getRobotStateTimeline)
+  const { errors: timelineErrors, timeline } = useSelector(
+    getRobotStateTimeline
+  )
+  const hasCommands = timeline.length > 0
+
   const leftString = t('onDeck')
   const rightString = t('offDeck')
   const [deckView, setDeckView] = useState<
@@ -139,61 +134,11 @@ export function ProtocolSteps({
   const isOffDeck = deckView === rightString
   const isZoomedIn = zoomedInSlot != null
 
-  const fileData = useSelector(createFile)
-  const additionalEquipment = useSelector(getAdditionalEquipmentEntities)
-
-  const nonLoadCommands =
-    fileData?.commands.filter(
-      command => !LOAD_COMMANDS.includes(command.commandType)
-    ) ?? []
-  const gripperInUse =
-    fileData?.commands.find(
-      command =>
-        (command.commandType === 'moveLabware' &&
-          command.params.strategy === 'usingGripper') ||
-        command.commandType === 'absorbanceReader/closeLid' ||
-        command.commandType === 'absorbanceReader/openLid'
-    ) != null
-  const noCommands = fileData != null ? nonLoadCommands.length === 0 : true
-  const modulesWithoutStep = getUnusedEntities(
-    modules,
-    savedStepForms,
-    'moduleId',
-    robotType
-  )
-  const pipettesWithoutStep = getUnusedEntities(
-    pipettes,
-    savedStepForms,
-    'pipette',
-    robotType
-  )
-  const isGripperAttached = Object.values(additionalEquipment).some(
-    equipment => equipment?.name === 'gripper'
-  )
-  const gripperWithoutStep = isGripperAttached && !gripperInUse
-
-  const { trashBinUnused, wasteChuteUnused } = getUnusedTrash(
-    additionalEquipmentOnDeck,
-    fileData?.commands
-  )
-  const fixtureWithoutStep: Fixture = {
-    trashBin: trashBinUnused,
-    wasteChute: wasteChuteUnused,
-    stagingAreaSlots: getUnusedStagingAreas(
-      additionalEquipmentOnDeck,
-      fileData?.commands
-    ),
-  }
-
   const {
     handleExportClick,
     exportWarningModalElement,
   } = useProtocolExportHandler({
-    noCommands,
-    modulesWithoutStep,
-    pipettesWithoutStep,
-    gripperWithoutStep,
-    fixtureWithoutStep,
+    hasCommands,
     onConfirmExport: () => {
       dispatch(saveProtocolFile())
     },

protocol-designer/src/pages/ProtocolOverview/UnusedModalContent.tsx

@@ -6,7 +6,11 @@ import { FLEX_ROBOT_TYPE } from '@opentrons/shared-data'
 import { renderWithProviders } from '../../../__testing-utils__'
 import { i18n } from '../../../assets/localization'
 import { MaterialsListModal } from '../../../components/organisms/MaterialsListModal'
-import { getFileMetadata, getRobotType } from '../../../file-data/selectors'
+import {
+  getFileMetadata,
+  getRobotStateTimeline,
+  getRobotType,
+} from '../../../file-data/selectors'
 import { selectors as labwareIngredSelectors } from '../../../labware-ingred/selectors'
 import {
   getAdditionalEquipmentEntities,
@@ -55,6 +59,7 @@ const render = () => {
 
 describe('ProtocolOverview', () => {
   beforeEach(() => {
+    vi.mocked(getRobotStateTimeline).mockReturnValue({ timeline: [] })
     vi.mocked(getAdditionalEquipmentEntities).mockReturnValue({})
     vi.mocked(getSavedStepForms).mockReturnValue({
       __INITIAL_DECK_SETUP_STEP__: {} as any,