further js cleanup for systemLocation

Opentrons · Jan 17, 2025 · 81cec84 · 81cec84
1 parent 02c7464
commit 81cec84
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/labware-library/src/localization/en.ts b/labware-library/src/localization/en.ts
@@ -11,6 +11,7 @@ export const CATEGORY_LABELS_BY_CATEGORY = {
   other: 'Other',
   adapter: 'Adapter',
   lid: 'Lid',
+  system: 'System',
 }
 
 export const PLURAL_CATEGORY_LABELS_BY_CATEGORY = {
@@ -24,6 +25,7 @@ export const PLURAL_CATEGORY_LABELS_BY_CATEGORY = {
   lid: 'Lid',
   trash: 'Trashes',
   other: 'Other',
+  system: 'System',
 }
 
 export const WELL_TYPE_BY_CATEGORY = {

diff --git a/protocol-designer/src/pages/ProtocolOverview/utils.ts b/protocol-designer/src/pages/ProtocolOverview/utils.ts
@@ -80,10 +80,12 @@ export const getUnusedStagingAreas = (
         command =>
           (command.commandType === 'loadLabware' &&
             command.params.location !== 'offDeck' &&
+            command.params.location !== 'systemLocation' &&
             'addressableAreaName' in command.params.location &&
             command.params.location.addressableAreaName === location) ||
           (command.commandType === 'moveLabware' &&
             command.params.newLocation !== 'offDeck' &&
+            command.params.newLocation !== 'systemLocation' &&
             'addressableAreaName' in command.params.newLocation &&
             command.params.newLocation.addressableAreaName === location)
       )
@@ -131,6 +133,7 @@ export const getUnusedTrash = (
               )) ||
             (command.commandType === 'moveLabware' &&
               command.params.newLocation !== 'offDeck' &&
+              command.params.newLocation !== 'systemLocation' &&
               'addressableAreaName' in command.params.newLocation &&
               command.params.newLocation.addressableAreaName ===
                 'gripperWasteChute')

diff --git a/protocol-designer/src/step-forms/utils/index.ts b/protocol-designer/src/step-forms/utils/index.ts
@@ -338,6 +338,7 @@ export const getUnoccupiedSlotForTrash = (
       const location = command.params.location
       if (
         location !== 'offDeck' &&
+        location !== 'systemLocation' &&
         location !== null &&
         'slotName' in location
       ) {

diff --git a/protocol-designer/src/steplist/formLevel/moveLabwareFormErrors.ts b/protocol-designer/src/steplist/formLevel/moveLabwareFormErrors.ts
@@ -22,6 +22,7 @@ const getMoveLabwareError = (
     labware == null ||
     newLocation == null ||
     newLocation === 'offDeck' ||
+    newLocation === 'systemLocation' ||
     !getLabwareDefIsStandard(labware?.def)
   )
     return null