remove staging changes from odd protocol setup add fixture

Opentrons · May 16, 2024 · 80b2cb4 · 80b2cb4
1 parent 7c3a8c6
commit 80b2cb4
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 43 deletions.
diff --git a/app/src/organisms/DeviceDetailsDeckConfiguration/AddFixtureModal.stories.tsx b/app/src/organisms/DeviceDetailsDeckConfiguration/AddFixtureModal.stories.tsx
@@ -26,6 +26,6 @@ const Template: Story<React.ComponentProps<typeof AddFixtureModal>> = args => (
 export const Default = Template.bind({})
 Default.args = {
   fixtureLocation: 'cutoutD3',
-  setShowAddFixtureModal: () => {},
+  closeModal: () => {},
   isOnDevice: true,
 }
diff --git a/app/src/organisms/DeviceDetailsDeckConfiguration/AddFixtureModal.tsx b/app/src/organisms/DeviceDetailsDeckConfiguration/AddFixtureModal.tsx
@@ -304,7 +304,9 @@ export function AddFixtureModal({
         )?.usbPort.port
       )}
       buttonText={t('add')}
-      onClickHandler={() => { handleAddFixture(cutoutConfigs) }}
+      onClickHandler={() => {
+        handleAddFixture(cutoutConfigs)
+      }}
       isOnDevice={isOnDevice}
     />
   ))
@@ -315,9 +317,7 @@ export function AddFixtureModal({
         <Modal
           header={modalHeader}
           onOutsideClick={() =>
-            providedFixtureOptions != null
-              ? null
-              : closeModal()
+            providedFixtureOptions != null ? null : closeModal()
           }
         >
           <Flex flexDirection={DIRECTION_COLUMN} gridGap={SPACING.spacing32}>

diff --git a/app/src/organisms/DeviceDetailsDeckConfiguration/__tests__/AddFixtureModal.test.tsx b/app/src/organisms/DeviceDetailsDeckConfiguration/__tests__/AddFixtureModal.test.tsx
@@ -23,7 +23,7 @@ import type { Modules } from '@opentrons/api-client'
 vi.mock('@opentrons/react-api-client')
 vi.mock('../../../resources/deck_configuration')
 
-const mockSetShowAddFixtureModal = vi.fn()
+const mockCloseModal = vi.fn()
 const mockUpdateDeckConfiguration = vi.fn()
 const mockSetCurrentDeckConfig = vi.fn()
 
@@ -39,8 +39,7 @@ describe('Touchscreen AddFixtureModal', () => {
   beforeEach(() => {
     props = {
       cutoutId: 'cutoutD3',
-      setShowAddFixtureModal: mockSetShowAddFixtureModal,
-      setCurrentDeckConfig: mockSetCurrentDeckConfig,
+      closeModal: mockCloseModal,
       isOnDevice: true,
     }
     vi.mocked(useUpdateDeckConfigurationMutation).mockReturnValue({
@@ -96,7 +95,7 @@ describe('Desktop AddFixtureModal', () => {
   beforeEach(() => {
     props = {
       cutoutId: 'cutoutD3',
-      setShowAddFixtureModal: mockSetShowAddFixtureModal,
+      closeModal: mockCloseModal,
     }
     vi.mocked(useUpdateDeckConfigurationMutation).mockReturnValue({
       updateDeckConfiguration: mockUpdateDeckConfiguration,

diff --git a/app/src/organisms/DeviceDetailsDeckConfiguration/index.tsx b/app/src/organisms/DeviceDetailsDeckConfiguration/index.tsx
@@ -36,7 +36,10 @@ import { Banner } from '../../atoms/Banner'
 import { DeckFixtureSetupInstructionsModal } from './DeckFixtureSetupInstructionsModal'
 import { useIsRobotViewable, useRunStatuses } from '../Devices/hooks'
 import { useIsEstopNotDisengaged } from '../../resources/devices/hooks/useIsEstopNotDisengaged'
-import { useDeckConfigurationEditingTools, useNotifyDeckConfigurationQuery } from '../../resources/deck_configuration'
+import {
+  useDeckConfigurationEditingTools,
+  useNotifyDeckConfigurationQuery,
+} from '../../resources/deck_configuration'
 
 import type { CutoutId } from '@opentrons/shared-data'
 

diff --git a/app/src/organisms/ProtocolSetupDeckConfiguration/index.tsx b/app/src/organisms/ProtocolSetupDeckConfiguration/index.tsx
@@ -76,11 +76,7 @@ export function ProtocolSetupDeckConfiguration({
       : config
   )
 
-  const [
-    currentDeckConfig,
-    setCurrentDeckConfig,
-  ] = React.useState<DeckConfiguration>(mergedDeckConfig)
-  const modulesOnDeck = currentDeckConfig.reduce<ModuleOnDeck[]>(
+  const modulesOnDeck = mergedDeckConfig.reduce<ModuleOnDeck[]>(
     (acc, cutoutConfig) => {
       const matchingFixtureIdsAndModel = Object.entries(
         MODULE_FIXTURES_BY_MODEL
@@ -117,9 +113,7 @@ export function ProtocolSetupDeckConfiguration({
     []
   )
 
-  const { updateDeckConfiguration } = useUpdateDeckConfigurationMutation()
   const handleClickConfirm = (): void => {
-    updateDeckConfiguration(currentDeckConfig)
     setSetupScreen('modules')
   }
 
@@ -135,9 +129,8 @@ export function ProtocolSetupDeckConfiguration({
           {showConfigurationModal && cutoutId != null ? (
             <AddFixtureModal
               cutoutId={cutoutId}
-              setShowAddFixtureModal={setShowConfigurationModal}
+              closeModal={() => setShowConfigurationModal(false)}
               providedFixtureOptions={providedFixtureOptions}
-              setCurrentDeckConfig={setCurrentDeckConfig}
               isOnDevice
             />
           ) : null}
@@ -158,7 +151,7 @@ export function ProtocolSetupDeckConfiguration({
           height="28.4375rem"
         >
           <BaseDeck
-            deckConfig={currentDeckConfig}
+            deckConfig={mergedDeckConfig}
             robotType={FLEX_ROBOT_TYPE}
             modulesOnDeck={modulesOnDeck}
           />

diff --git a/app/src/pages/DeckConfiguration/index.tsx b/app/src/pages/DeckConfiguration/index.tsx
@@ -16,7 +16,10 @@ import { ChildNavigation } from '../../organisms/ChildNavigation'
 import { DeckFixtureSetupInstructionsModal } from '../../organisms/DeviceDetailsDeckConfiguration/DeckFixtureSetupInstructionsModal'
 import { DeckConfigurationDiscardChangesModal } from '../../organisms/DeviceDetailsDeckConfiguration/DeckConfigurationDiscardChangesModal'
 import { getTopPortalEl } from '../../App/portal'
-import { useDeckConfigurationEditingTools, useNotifyDeckConfigurationQuery } from '../../resources/deck_configuration'
+import {
+  useDeckConfigurationEditingTools,
+  useNotifyDeckConfigurationQuery,
+} from '../../resources/deck_configuration'
 
 export function DeckConfigurationEditor(): JSX.Element {
   const { t, i18n } = useTranslation([

diff --git a/app/src/resources/deck_configuration/hooks.tsx b/app/src/resources/deck_configuration/hooks.tsx
@@ -76,23 +76,23 @@ export function useDeckConfigurationCompatibility(
       // get the on-deck labware name for a missing single-slot addressable area
       const missingSingleSlotLabware =
         cutoutFixtureId != null &&
-          // fixture mismatch
-          !compatibleCutoutFixtureIds.includes(cutoutFixtureId) &&
-          compatibleCutoutFixtureIds[0] != null &&
-          // compatible fixture is single-slot
-          SINGLE_SLOT_FIXTURES.includes(compatibleCutoutFixtureIds[0])
+        // fixture mismatch
+        !compatibleCutoutFixtureIds.includes(cutoutFixtureId) &&
+        compatibleCutoutFixtureIds[0] != null &&
+        // compatible fixture is single-slot
+        SINGLE_SLOT_FIXTURES.includes(compatibleCutoutFixtureIds[0])
           ? labwareInSlots.find(
-            ({ location }) =>
-              // match the addressable area to an on-deck labware
-              requiredAddressableAreasForCutoutId[0] === location.slotName
-          )
+              ({ location }) =>
+                // match the addressable area to an on-deck labware
+                requiredAddressableAreasForCutoutId[0] === location.slotName
+            )
           : null
 
       const missingLabwareDisplayName =
         missingSingleSlotLabware != null
           ? missingSingleSlotLabware.labwareNickName ??
-          getLabwareDisplayName(missingSingleSlotLabware.labwareDef) ??
-          null
+            getLabwareDisplayName(missingSingleSlotLabware.labwareDef) ??
+            null
           : null
 
       return [
@@ -110,12 +110,17 @@ export function useDeckConfigurationCompatibility(
   )
 }
 
-interface DeckConfigurationEditingTools { 
-  addFixtureToCutout: (cutoutId: CutoutId) => void, 
-  removeFixtureFromCutout: (cutoutId: CutoutId, cutoutFixtureId: CutoutFixtureId) => void
+interface DeckConfigurationEditingTools {
+  addFixtureToCutout: (cutoutId: CutoutId) => void
+  removeFixtureFromCutout: (
+    cutoutId: CutoutId,
+    cutoutFixtureId: CutoutFixtureId
+  ) => void
   addFixtureModal: React.ReactNode
 }
-export function useDeckConfigurationEditingTools(isOnDevice: boolean): DeckConfigurationEditingTools {
+export function useDeckConfigurationEditingTools(
+  isOnDevice: boolean
+): DeckConfigurationEditingTools {
   const deckDef = getDeckDefFromRobotType(FLEX_ROBOT_TYPE)
   const deckConfig =
     useNotifyDeckConfigurationQuery({
@@ -182,12 +187,13 @@ export function useDeckConfigurationEditingTools(isOnDevice: boolean): DeckConfi
   return {
     addFixtureToCutout,
     removeFixtureFromCutout,
-    addFixtureModal: targetCutoutId != null ? (
-      <AddFixtureModal
-        cutoutId={targetCutoutId}
-        closeModal={() => setTargetCutoutId(null)}
-        isOnDevice={isOnDevice}
-      />
-    ) : null
+    addFixtureModal:
+      targetCutoutId != null ? (
+        <AddFixtureModal
+          cutoutId={targetCutoutId}
+          closeModal={() => setTargetCutoutId(null)}
+          isOnDevice={isOnDevice}
+        />
+      ) : null,
   }
 }