Merge branch 'edge' into sg_trash-addressable-area-util

Author: jerader

api/src/opentrons/drivers/asyncio/communication/errors.py

@@ -52,7 +52,7 @@ class BaseErrorCode(Enum):
     def code_string(self) -> str:
         """Return the error code string."""
         code: str = self.value[0]
-        return code
+        return code.lower()
 
     @property
     def exception(self) -> Type[ErrorResponse]:

api/tests/opentrons/drivers/asyncio/communication/test_serial_connection.py

@@ -180,6 +180,14 @@ def test_raise_on_error(
         subject.raise_on_error(response, "fake request")
 
 
+def test_get_error_codes_lowercase(
+    subject: SerialKind,
+) -> None:
+    """It should return an error code dictionary keyed by lowercase value."""
+    lowercase_result = subject._error_codes.get_error_codes()
+    assert lowercase_result == {"err003": DefaultErrorCodes.UNHANDLED_GCODE}
+
+
 async def test_on_retry(mock_serial_port: AsyncMock, subject: SerialKind) -> None:
     """It should try to re-open connection."""
     await subject.on_retry()

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

@@ -3,6 +3,11 @@
   "adapter_in_slot": "{{adapter}} in {{slot}}",
   "adapter_in_tc": "{{adapter}} in {{module}}",
   "add": "Add",
+  "add_a_default_offset": "Add a default offset to automatically apply it to all placements of this labware on the deck",
+  "add_default_labware_offset": "Add default labware offset",
+  "adjust": "Adjust",
+  "adjust_applied_location_offset": "Adjust applied location offset",
+  "adjust_default_labware_offset": "Adjust default labware offset",
   "all_modules_and_labware_from_protocol": "All modules and all labware used in the protocol {{protocol_name}}",
   "applied_location_offsets": "Applied Location Offsets",
   "applied_offset_data": "Applied Labware Offset data",
@@ -12,16 +17,19 @@
   "backmost": "backmost",
   "calibration_probe": "Calibration Probe",
   "calibration_probe_not_detected": "Calibration probe not detected",
+  "cancel": "Cancel",
   "check_item_in_location": "Check {{item}} in {{location}}",
   "check_labware_in_slot_title": "Check Labware {{labware_display_name}} in slot {{slot}}",
   "check_remaining_labware_with_primary_pipette_section": "Check remaining labware with {{primary_mount}} Pipette and tip",
   "check_tip_location": "the top of the tip in the A1 position",
   "check_well_location": "well A1 on the labware",
-  "clear_all_slots": "Clear all deck slots of labware, leaving modules in place",
-  "clear_all_slots_odd": "Clear all deck slots of labware",
+  "clear_deck_all_lw_all_modules_from": "Clear all deck slots of labware and remove any modules from <strong>{{slot}}</strong>",
+  "clear_deck_all_lw_leave_modules": "Clear all deck slots of labware, leaving modules in place",
   "cli_ssh": "Command Line Interface (SSH)",
   "close_and_apply_offset_data": "Close and apply labware offset data",
+  "confirm": "Confirm",
   "confirm_detached": "Confirm removal",
+  "confirm_go_back_without_saving": "Are you sure you want to go back to the the labware list without saving?",
   "confirm_pick_up_tip_modal_title": "Did the pipette pick up a tip successfully?",
   "confirm_pick_up_tip_modal_try_again_text": "No, try again",
   "confirm_placement": "Confirm placement",
@@ -30,6 +38,7 @@
   "confirm_position_and_return_tip": "Confirm position, return tip to Slot {{next_slot}} and home",
   "confirm_removal": "Confirm removal",
   "continue": "Continue",
+  "default": "Default",
   "default_labware_offset": "Default Labware Offset",
   "detach_probe": "Remove calibration probe",
   "ensure_nozzle_position_desktop": "<block>Ensure that the {{tip_type}} is centered above and level with {{item_location}}. If it isn't, use the controls below or your keyboard to jog the pipette until it is properly aligned.</block>",
@@ -40,14 +49,15 @@
   "exit_screen_go_back": "Go back to labware position check",
   "exit_screen_subtitle": "If you exit now, all labware offsets will be discarded. This cannot be undone.",
   "exit_screen_title": "Exit before completing Labware Position Check?",
+  "failed_to_save_final_position": "Failed to save final position",
   "get_labware_offset_data": "Get Labware Offset Data",
   "install_probe": "<block>Take the calibration probe from its storage location. Ensure the collar is fully unlocked. Push the pipette ejector up and press the probe firmly onto the pipette nozzle as far as it can go. Twist the collar to lock the probe.</block><block>Test that the probe is secure by gently pulling it back and forth. It should be firmly in place.</block>",
   "jog_controls_adjustment": "Need to make an adjustment?",
   "jupyter_notebook": "Jupyter Notebook",
   "labware": "labware",
   "labware_display_location_text": "Deck Slot {{slot}}",
   "labware_offset": "Labware Offset",
-  "labware_offset_data": "labware offset data",
+  "labware_offset_data": "Labware Offset Data",
   "labware_offsets_deleted_warning": "Once you begin Labware Position Check, previously created Labware Offsets will be discarded.",
   "labware_offsets_summary_labware": "Labware",
   "labware_offsets_summary_location": "Location",
@@ -73,11 +83,16 @@
   "labware_step_detail_tiprack_plural": "The pipette nozzles should be centered above column 1 in <italic>{{tiprack_name}}</italic> and <bold>level</bold> with the top of the tips.",
   "learn_more": "Learn more",
   "legacy_calibration_probe": "calibration probe",
+  "legacy_clear_all_slots": "Clear all deck slots of labware, leaving modules in place",
+  "legacy_clear_all_slots_odd": "Clear all deck slots of labware",
   "legacy_install_probe": "Take the calibration probe from its storage location. Ensure its collar is fully unlocked. Push the pipette ejector up and press the probe firmly onto the <bold>{{location}}</bold> pipette nozzle as far as it can go. Twist the collar to lock the probe. Test that the probe is secure by gently pulling it back and forth.",
+  "legacy_labware_offset_data": "labware offset data",
   "legacy_labware_position_check_description": "<block>Labware Position Check is a guided workflow that checks every labware on the deck for an added degree of precision in your protocol.</block><block>Labware Position Check first checks tip racks, and then checks all other labware used in your protocol.</block>",
   "legacy_no_offset_data": "No offset data available",
   "location": "location",
+  "location_header": "Location",
   "lpc_complete": "Labware Position Check complete",
+  "lpc_complete_summary_screen_heading": "Labware Position Check Complete",
   "module_display_location_text": "{{moduleName}} in Deck Slot {{slot}}",
   "module_in_slot": "{{module}} in {{slot}}",
   "move_gantry_to_front": "Move gantry to front",
@@ -90,7 +105,12 @@
   "no_offset_data": "No offset data",
   "no_offset_data_available": "No labware offset data available",
   "no_offset_data_on_robot": "This robot has no useable labware offset data for this run.",
+  "num_missing_offsets": "{{num}} missing offsets",
+  "num_offsets": "{{num}} offsets",
+  "offset_values": "X {{x}}, Y {{y}}, Z {{z}}",
   "offsets": "Offsets",
+  "one_missing_offset": "1 missing offset",
+  "one_offset": "1 offset",
   "pick_up_tip_from_rack_in_location": "Pick up tip from tip rack in {{location}}",
   "picking_up_tip_title": "Picking up tip in slot {{slot}}",
   "pipette_nozzle": "pipette nozzle furthest from you",
@@ -105,6 +125,7 @@
   "remove_calibration_probe": "Remove calibration probe",
   "remove_probe": "Unlock the calibraiton probe, remove it from the nozzle, and return it to its storage location.",
   "remove_probe_before_exit": "Remove the calibration probe before exiting",
+  "reset_to_default": "Reset to default",
   "return_tip_rack_to_location": "Return tip rack to {{location}}",
   "return_tip_section": "Return tip",
   "returning_tip_title": "Returning tip in slot {{slot}}",
@@ -117,17 +138,19 @@
   "save": "Save",
   "secondary_pipette_tipracks_section": "Check tip racks with {{secondary_mount}} Pipette",
   "see_how_offsets_work": "See how labware offsets work",
-  "select_labware_from_list": "Select a labware from the list to check its stored offset data",
+  "select_labware_to_view_data": "Select a labware to view its stored offset data.",
   "slot": "Slot {{slotName}}",
   "slot_location": "Slot Location",
   "slot_name": "slot {{slotName}}",
+  "specific_slots_can_be_adjusted": "Specific slot locations can be adjusted as needed",
   "start_position_check": "begin labware position check, move to Slot {{initial_labware_slot}}",
   "store_probe": "Before exiting, unlock the calibration probe, remove it from the nozzle, and return it to its storage location.",
   "stored_offset_data": "Apply Stored Labware Offset Data?",
   "stored_offsets_for_this_protocol": "Stored Labware Offset data that applies to this protocol",
   "table_view": "Table View",
   "tip_rack": "tip rack",
   "try_again": "Try again",
+  "unsaved_changes_will_be_lost": "Unsaved changes will be lost",
   "view_current_offsets": "view current offsets",
   "view_data": "View data",
   "what_is_labware_offset_data": "What is labware offset data?"

app/src/molecules/MultiDeckLabelTagBtns/index.tsx

@@ -18,12 +18,15 @@ import {
 
 import { QuaternaryButton, SmallButton } from '/app/atoms/buttons'
 
+import type { SmallButtonTypes } from '/app/atoms/buttons/SmallButton'
+
 const MAX_SUPPORTED_LABELS = 3
 
 export interface MultiDeckLabelTagBtn {
   buttonText: string
   onClick: () => void
   disabled?: boolean
+  buttonType?: SmallButtonTypes
 }
 
 export interface MultiDeckLabelTagBtnsProps {
@@ -92,6 +95,10 @@ const CONTAINER_STYLE = css`
   gap: ${SPACING.spacing24};
   align-items: ${ALIGN_CENTER};
 
+  @media ${RESPONSIVENESS.touchscreenMediaQuerySpecs} {
+    border-radius: ${BORDERS.borderRadius8};
+  }
+
   /* Collapse the Tag vertically beneath the DeckInfo labels */
   @media (max-width: 423px) {
     grid-template-columns: 1fr auto;

app/src/organisms/Desktop/Devices/ProtocolRun/SetupLabwarePositionCheck/CurrentOffsetsTable.tsx

@@ -78,7 +78,9 @@ export function CurrentOffsetsTable(
         <tr>
           <OffsetTableHeader>{t('location')}</OffsetTableHeader>
           <OffsetTableHeader>{t('labware')}</OffsetTableHeader>
-          <OffsetTableHeader>{t('labware_offset_data')}</OffsetTableHeader>
+          <OffsetTableHeader>
+            {t('legacy_labware_offset_data')}
+          </OffsetTableHeader>
         </tr>
       </thead>
       <tbody>

app/src/organisms/LabwarePositionCheck/LPCContentContainer.tsx

@@ -5,6 +5,7 @@ import {
   Flex,
   RESPONSIVENESS,
   SPACING,
+  POSITION_FIXED,
 } from '@opentrons/components'
 
 import { StepMeter } from '/app/atoms/StepMeter'
@@ -39,11 +40,13 @@ export function LPCContentContainer({
 
   return (
     <Flex css={CONTAINER_STYLE}>
-      <StepMeter
-        totalSteps={totalStepCount}
-        currentStep={currentStepIndex + 1}
-      />
-      <ChildNavigation {...rest} css={CHILD_NAV_STYLE} />
+      <Flex css={FIXED_HEADER_STYLE}>
+        <StepMeter
+          totalSteps={totalStepCount}
+          currentStep={currentStepIndex + 1}
+        />
+        <ChildNavigation {...rest} css={CHILD_NAV_STYLE} />
+      </Flex>
       <Flex css={contentStyle ?? CHILDREN_CONTAINER_STYLE}>{children}</Flex>
     </Flex>
   )
@@ -54,14 +57,24 @@ const CONTAINER_STYLE = css`
   height: 100vh;
 `
 
+// TODO(jh, 03-12-25): This should be a fixed value in components.
+const FIXED_HEADER_STYLE = css`
+  position: ${POSITION_FIXED};
+  top: 0;
+  left: 0;
+  right: 0;
+  flex-direction: ${DIRECTION_COLUMN};
+`
+
 // TODO(jh, 02-05-25): Investigate whether we can remove the position: fixed styling from ChildNav.
 const CHILD_NAV_STYLE = css`
-  top: ${SPACING.spacing8};
+  margin-top: ${SPACING.spacing8};
 `
 const CHILDREN_CONTAINER_STYLE = css`
   margin-top: 7.75rem;
   flex-direction: ${DIRECTION_COLUMN};
   height: 100%;
+  overflow-y: auto;
 
   @media ${RESPONSIVENESS.touchscreenMediaQuerySpecs} {
     padding: ${SPACING.spacing32} ${SPACING.spacing60} ${SPACING.spacing40}

app/src/organisms/LabwarePositionCheck/LPCErrorModal.tsx

@@ -34,7 +34,7 @@ export function LPCErrorModal(props: LPCWizardContentProps): JSX.Element {
     <LPCContentContainer
       {...props}
       header={t('labware_position_check_title')}
-      onClickButton={headerCommands.handleClose}
+      onClickButton={headerCommands.handleCloseWithoutHome}
       buttonText={t('exit')}
     >
       <ModalContainer
@@ -71,7 +71,7 @@ export function LPCErrorModal(props: LPCWizardContentProps): JSX.Element {
         <PrimaryButton
           textTransform={TEXT_TRANSFORM_CAPITALIZE}
           alignSelf={ALIGN_FLEX_END}
-          onClick={headerCommands.handleClose}
+          onClick={headerCommands.handleCloseWithoutHome}
         >
           {t('shared:exit')}
         </PrimaryButton>

app/src/organisms/LabwarePositionCheck/LPCFlows/hooks/useLPCLabwareInfo/getLPCLabwareInfoFrom.ts

@@ -2,8 +2,14 @@ import isEqual from 'lodash/isEqual'
 
 import { getLabwareDisplayName, getLabwareDefURI } from '@opentrons/shared-data'
 
+import { OFFSET_KIND_LOCATION_SPECIFIC } from '/app/redux/protocol-runs'
+
 import type { LabwareDefinition2 } from '@opentrons/shared-data'
-import type { LPCLabwareInfo, OffsetDetails } from '/app/redux/protocol-runs'
+import type {
+  DefaultOffsetDetails,
+  LocationSpecificOffsetDetails,
+  LPCLabwareInfo,
+} from '/app/redux/protocol-runs'
 import type { LabwareLocationCombo } from '/app/organisms/LegacyApplyHistoricOffsets/hooks/getLabwareLocationCombos'
 import type { UseLPCLabwareInfoProps } from '.'
 
@@ -36,7 +42,16 @@ function getLabwareInfoRecords(
       labwareDetails[uri] = {
         id: getALabwareIdFromUri({ ...params, uri }),
         displayName: getDisplayNameFromUri({ ...params, uri }),
-        offsetDetails: getOffsetDetailsForLabware({ ...params, uri }),
+        defaultOffsetDetails: getDefaultOffsetDetailsForLabware({
+          ...params,
+          uri,
+        }),
+        locationSpecificOffsetDetails: getLocationSpecificOffsetDetailsForLabware(
+          {
+            ...params,
+            uri,
+          }
+        ),
       }
     }
   })
@@ -84,30 +99,54 @@ function getDisplayNameFromUri({
 
 // NOTE: A lot of the logic here acts as temporary adapter that resolves the app's current way of getting offset data (scraping the run record)
 // and the end goal of treating labware as first class citizens.
-function getOffsetDetailsForLabware({
+function getLocationSpecificOffsetDetailsForLabware({
   currentOffsets,
   lwLocationCombos,
   uri,
-}: GetLPCLabwareInfoForURI): OffsetDetails[] {
-  return lwLocationCombos.flatMap(comboInfo => {
-    const { definitionUri, location, ...restInfo } = comboInfo
-
-    const existingOffset =
-      currentOffsets.find(
-        offset =>
-          uri === offset.definitionUri &&
-          isEqual(offset.location, comboInfo.location)
-      ) ?? null
-
-    return {
-      existingOffset: existingOffset ?? null,
-      workingOffset: null,
-      locationDetails: {
-        ...location,
-        ...restInfo,
-        definitionUri,
-        kind: 'location-specific',
-      },
-    }
-  })
+}: GetLPCLabwareInfoForURI): LocationSpecificOffsetDetails[] {
+  // @ts-expect-error - Temporary util. No need to solve this completely here.
+  return lwLocationCombos
+    .flatMap(comboInfo => {
+      const { definitionUri, location, ...restInfo } = comboInfo
+
+      const existingOffset =
+        currentOffsets.find(
+          offset =>
+            uri === offset.definitionUri &&
+            isEqual(offset.location, comboInfo.location)
+        ) ?? null
+
+      return {
+        existingOffset: existingOffset ?? null,
+        workingOffset: null,
+        locationDetails: {
+          ...location,
+          ...restInfo,
+          definitionUri,
+          kind: OFFSET_KIND_LOCATION_SPECIFIC,
+        },
+      }
+    })
+    .filter(detail => detail.locationDetails.definitionUri === uri)
+}
+
+// A temporary utility for getting a dummy default offset.
+function getDefaultOffsetDetailsForLabware({
+  lwLocationCombos,
+  uri,
+}: GetLPCLabwareInfoForURI): DefaultOffsetDetails {
+  const aLabwareId =
+    lwLocationCombos?.find(combo => combo.definitionUri === uri)?.labwareId ??
+    ''
+
+  return {
+    workingOffset: null,
+    existingOffset: null,
+    locationDetails: {
+      labwareId: aLabwareId,
+      definitionUri: uri,
+      kind: 'default',
+      slotName: 'C2',
+    },
+  }
 }

app/src/organisms/LabwarePositionCheck/__fixtures__/index.ts

@@ -2,3 +2,8 @@ export * from './mockWorkingOffsets'
 export * from './mockExistingOffsets'
 export * from './mockTipRackDef'
 export * from './mockCompletedAnalysis'
+export * from './mockOffsets'
+export * from './mockLPCContentProps'
+export * from './mockLabwareInfo'
+export * from './mockActivePipette'
+export * from './mockSelectedLwOverview'

app/src/organisms/LabwarePositionCheck/__fixtures__/mockActivePipette.ts

@@ -0,0 +1,8 @@
+export const mockActivePipette = {
+  id: 'test-pipette-id',
+  mount: 'left',
+  modelSpecs: {
+    channels: 8,
+    displayName: 'Test Pipette',
+  },
+} as any