refactor(app, components, protocol-designer): update moveToWell command text

Author: mjhuff

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

@@ -60,7 +60,7 @@
   "move_to_addressable_area_drop_tip": "Moving to {{addressable_area}}",
   "move_to_coordinates": "Moving to (X: {{x}}, Y: {{y}}, Z: {{z}})",
   "move_to_slot": "Moving to Slot {{slot_name}}",
-  "move_to_well": "Moving to well {{well_name}} of {{labware}} in {{labware_location}}",
+  "move_to_well": "Moving to well {{wellName}} of {{labware}} with x,y,z offset {{xOffset}}, {{yOffset}}, {{zOffset}} relative to {{positionRelative}} in {{displayLocation}}",
   "multiple": "multiple",
   "notes": "notes",
   "off_deck": "off deck",

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

@@ -54,7 +54,7 @@
   "move_to_addressable_area_drop_tip": "Moving to {{addressable_area}}",
   "move_to_coordinates": "Moving to (X: {{x}}, Y: {{y}}, Z: {{z}})",
   "move_to_slot": "Moving to Slot {{slot_name}}",
-  "move_to_well": "Moving to well {{well_name}} of {{labware}} in {{labware_location}}",
+  "move_to_well": "Moving to well {{wellName}} of {{labware}} with x,y,z offset {{xOffset}}, {{yOffset}}, {{zOffset}} relative to {{positionRelative}} in {{displayLocation}}",
   "multiple": "multiple",
   "notes": "notes",
   "off_deck": "off deck",

components/src/organisms/CommandText/__tests__/CommandText.test.tsx

@@ -216,7 +216,7 @@ describe('CommandText', () => {
         { i18nInstance: i18n }
       )
       screen.getByText(
-        'Moving to well A1 of NEST 1 Well Reservoir 195 mL in Slot 5'
+        'Moving to well A1 of NEST 1 Well Reservoir 195 mL with x,y,z offset 0.00, 0.00, -24.00 relative to top in Slot 5'
       )
     }
   })

components/src/organisms/CommandText/useCommandTextString/utils/commandText/getMoveToWellCommandText.ts

@@ -12,7 +12,12 @@ export function getMoveToWellCommandText({
   commandTextData,
   robotType,
 }: HandlesCommands<MoveToWellRunTimeCommand>): string {
-  const { wellName, labwareId } = command.params
+  const { wellName, labwareId, wellLocation } = command.params
+  const {
+    x: xOffsetUnformatted,
+    y: yOffsetUnformatted,
+    z: zOffsetUnformatted,
+  } = wellLocation.offset
   const allPreviousCommands = commandTextData?.commands.slice(
     0,
     commandTextData.commands.findIndex(c => c.id === command.id)
@@ -32,7 +37,7 @@ export function getMoveToWellCommandText({
   })
 
   return t('move_to_well', {
-    well_name: wellName,
+    wellName,
     labware:
       commandTextData != null
         ? getLabwareName({
@@ -41,6 +46,10 @@ export function getMoveToWellCommandText({
             allRunDefs,
           })
         : null,
-    labware_location: displayLocation,
+    xOffset: xOffsetUnformatted.toFixed(2),
+    yOffset: yOffsetUnformatted.toFixed(2),
+    zOffset: zOffsetUnformatted.toFixed(2),
+    positionRelative: wellLocation.origin,
+    displayLocation,
   })
 }

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

@@ -54,7 +54,7 @@
   "move_to_addressable_area_drop_tip": "Moving to {{addressable_area}}",
   "move_to_coordinates": "Moving to (X: {{x}}, Y: {{y}}, Z: {{z}})",
   "move_to_slot": "Moving to Slot {{slot_name}}",
-  "move_to_well": "Moving to well {{well_name}} of {{labware}} in {{labware_location}}",
+  "move_to_well": "Moving to well {{wellName}} of {{labware}} with x,y,z offset {{xOffset}}, {{yOffset}}, {{zOffset}} relative to {{positionRelative}} in {{displayLocation}}",
   "multiple": "multiple",
   "notes": "notes",
   "off_deck": "off deck",