(draft): try updating labware location for move labware intervention

Author: ahiuchingau

app/src/assets/localization/en/protocol_command_text.json

@@ -89,8 +89,7 @@
   "single": "single",
   "single_nozzle_layout": "single nozzle layout",
   "slot": "Slot {{slot_name}}",
-  "stacker_display_name": "Stacker {{stacker_slot}}",
-  "stacker_column_display_name": "Stacker in Column {{stacker_slot}}",
+  "stacker_hopper_display": "Stacker {{row}}",
   "target_temperature": "target temperature",
   "tc_awaiting_for_duration": "Waiting for Thermocycler profile to complete",
   "tc_run_profile_steps": "Temperature: {{celsius}}°C, hold time: {{duration}}",

app/src/organisms/InterventionModal/MoveLabwareInterventionContent.tsx

@@ -10,6 +10,7 @@ import {
   DIRECTION_COLUMN,
   DISPLAY_NONE,
   Flex,
+  getLabwareDisplayLocation,
   getLoadedLabware,
   getLoadedModule,
   Icon,
@@ -173,19 +174,27 @@ export function MoveLabwareInterventionContent({
             </Flex>
             <Divider css={DIVIDER_STYLE} />
             <Flex css={LABWARE_DIRECTION_STYLE}>
-              <LabwareDisplayLocation
-                protocolData={run}
-                location={oldLabwareLocation}
-                robotType={robotType}
-                labwareDefsByUri={labwareDefsByUri}
+              <DeckInfoLabel
+                deckLabel={getLabwareDisplayLocation({
+                  location: oldLabwareLocation,
+                  loadedModules: run.modules,
+                  loadedLabwares: run.labware,
+                  robotType: 'OT-3 Standard',
+                  detailLevel: 'slot-only',
+                  t,
+                })}
               />
 
               <Icon name="arrow-right" css={ICON_STYLE} />
-              <LabwareDisplayLocation
-                protocolData={run}
-                location={command.params.newLocation}
-                robotType={robotType}
-                labwareDefsByUri={labwareDefsByUri}
+              <DeckInfoLabel
+                deckLabel={getLabwareDisplayLocation({
+                  location: command.params.newLocation,
+                  loadedModules: run.modules,
+                  loadedLabwares: run.labware,
+                  robotType: 'OT-3 Standard',
+                  detailLevel: 'slot-only',
+                  t,
+                })}
               />
             </Flex>
           </Flex>
@@ -226,7 +235,7 @@ export function MoveLabwareInterventionContent({
                         childrenPositioningMode="offsetToSlot"
                       >
                         {nestedLabwareDef != null &&
-                        nestedLabwareId !== command.params.labwareId ? (
+                          nestedLabwareId !== command.params.labwareId ? (
                           <LabwareRender
                             definition={nestedLabwareDef}
                             positioningMode="offsetInSlot"

components/src/organisms/CommandText/useCommandTextString/utils/getLabwareLocation.tsx

@@ -1,6 +1,8 @@
 import {
   FLEX_STACKER_MODULE_V1,
   getCutoutDisplayName,
+  getModuleType,
+  FLEX_STACKER_MODULE_TYPE,
   getLabwareDefURI,
   getLabwareDisplayName,
   getModuleModelFromAddressableArea,
@@ -204,7 +206,9 @@ export function getLabwareLocation(
 
     return {
       slotName,
-      moduleModel,
+      moduleModel: getModuleType(moduleModel) === FLEX_STACKER_MODULE_TYPE
+        ? undefined
+        : moduleModel,
     }
   } else if ('labwareId' in location) {
     if (!Array.isArray(loadedLabwares)) {

components/src/organisms/CommandText/useCommandTextString/utils/getModuleDisplayLocation.ts

@@ -1,3 +1,4 @@
+import { FLEX_STACKER_MODULE_TYPE, getModuleType } from '@opentrons/shared-data'
 import { getLoadedModule } from './getLoadedModule'
 
 import type { LoadedModules } from './types'
@@ -7,5 +8,12 @@ export function getModuleDisplayLocation(
   moduleId: string
 ): string {
   const loadedModule = getLoadedModule(loadedModules, moduleId)
-  return loadedModule != null ? loadedModule.location.slotName : ''
+  if (loadedModule == null) {
+    console.warn(`Module with ID ${moduleId} not found in loaded modules`)
+    return ''
+  }
+  const slotName = loadedModule.location.slotName
+  return getModuleType(loadedModule.model) === FLEX_STACKER_MODULE_TYPE
+    ? `${slotName[0]}4`
+    : slotName
 }