Merge branch 'chore_mono-pd-8100-into-edge' into edge

Author: mjhuff

.github/workflows/app-test-build-deploy.yaml

@@ -354,7 +354,7 @@ jobs:
     if: contains(fromJSON(needs.determine-build-type.outputs.variants), 'release') || contains(fromJSON(needs.determine-build-type.outputs.variants), 'internal-release')
     permissions:
       id-token: write
-      contents: read
+      contents: write
     steps:
       - name: 'download run app builds'
         uses: 'actions/download-artifact@v4'
@@ -373,7 +373,7 @@ jobs:
       - name: 'configure s3 deploy creds (GitHub OIDC)'
         uses: aws-actions/configure-aws-credentials@v4
         with:
-          role-to-assume: ${{ secrets.OT_APP_OT3_DEPLOY_ROLE }}
+          role-to-assume: ${{ vars.OT_APP_OT3_DEPLOY_ROLE }}
           aws-region: us-east-2
       - name: 'deploy release builds to s3'
         run: |

components/src/hardware-sim/Labware/labwareInternals/StaticLabware.tsx

@@ -82,6 +82,7 @@ export function StaticLabwareComponent(props: StaticLabwareProps): JSX.Element {
     selectedTipsByIndex,
     borderStroke,
   } = props
+
   const { isTiprack } = definition.parameters
   return (
     <g onClick={onLabwareClick}>
@@ -143,6 +144,7 @@ export function StaticLabwareComponent(props: StaticLabwareProps): JSX.Element {
                       {isTiprack ? (
                         <TipStatus
                           wellMap={definition.wells}
+                          wellName={wellName}
                           type={statusByWellName[wellName] as TipType}
                           text={
                             selectedTipsByIndex != null &&
@@ -157,6 +159,7 @@ export function StaticLabwareComponent(props: StaticLabwareProps): JSX.Element {
                           wellMap={definition.wells}
                           type={statusByWellName[wellName] as WellType}
                           parentType={LABWARE}
+                          wellName={wellName}
                         />
                       )}
                     </svg>

components/src/hardware-sim/Labware/labwareInternals/Tips/TipStatus.tsx

@@ -19,21 +19,36 @@ import type { TipType } from '../types'
 interface TipStatusProps {
   type: TipType
   wellMap: LabwareWellMap
+  wellName: string
   size?: string
   text?: string
 }
 
 export function TipStatus(props: TipStatusProps): JSX.Element {
-  const { type, size, text, wellMap } = props
+  const { type, size, text, wellMap, wellName } = props
   switch (type) {
     case NEW:
       return <NewTip size={size} />
     case USED:
       return <UsedTip size={size} />
     case SELECTED:
-      return <SelectedWell size={size} textInsideTip={text} wellMap={wellMap} />
+      return (
+        <SelectedWell
+          size={size}
+          textInsideTip={text}
+          wellMap={wellMap}
+          wellName={wellName}
+        />
+      )
     case NO:
-      return <EmptyWell size={size} wellMap={wellMap} parentType={LABWARE} />
+      return (
+        <EmptyWell
+          size={size}
+          wellMap={wellMap}
+          parentType={LABWARE}
+          wellName={wellName}
+        />
+      )
     case INACCESSIBLE:
       return <InaccessibleTip size={size} />
     case SELECTED_USED:
@@ -43,6 +58,7 @@ export function TipStatus(props: TipStatusProps): JSX.Element {
           textInsideTip={text}
           isUsed
           wellMap={wellMap}
+          wellName={wellName}
         />
       )
     case SELECTED_ERROR:
@@ -52,6 +68,7 @@ export function TipStatus(props: TipStatusProps): JSX.Element {
           textInsideTip={text}
           isError
           wellMap={wellMap}
+          wellName={wellName}
         />
       )
   }

components/src/hardware-sim/Labware/labwareInternals/Tips/__tests__/TipStatus.test.tsx

@@ -33,6 +33,7 @@ describe('TipStatus', () => {
       <TipStatus
         type="new"
         wellMap={fixtureTiprack1000ul.wells as LabwareWellMap}
+        wellName="A1"
       />
     )
     screen.getByText('New tip')
@@ -43,6 +44,7 @@ describe('TipStatus', () => {
       <TipStatus
         type="used"
         wellMap={fixtureTiprack1000ul.wells as LabwareWellMap}
+        wellName="A1"
       />
     )
     screen.getByText('Used tip')
@@ -53,6 +55,7 @@ describe('TipStatus', () => {
       <TipStatus
         type="selected"
         wellMap={fixtureTiprack1000ul.wells as LabwareWellMap}
+        wellName="A1"
       />
     )
     screen.getByText('Selected well')
@@ -63,6 +66,7 @@ describe('TipStatus', () => {
       <TipStatus
         type="no"
         wellMap={fixtureTiprack1000ul.wells as LabwareWellMap}
+        wellName="A1"
       />
     )
     screen.getByText('Empty well')
@@ -73,6 +77,7 @@ describe('TipStatus', () => {
       <TipStatus
         type="inaccessible"
         wellMap={fixtureTiprack1000ul.wells as LabwareWellMap}
+        wellName="A1"
       />
     )
     screen.getByText('Inaccessible tip')

components/src/hardware-sim/Labware/labwareInternals/Wells/EmptyWell.tsx

@@ -1,3 +1,5 @@
+import { INTERACTIVE_WELL_DATA_ATTRIBUTE } from '@opentrons/shared-data'
+
 import { COLORS } from '../../../../helix-design-system'
 import { LABWARE } from '../types'
 import { getWidthAndHeightOfWellSVG } from './utils'
@@ -8,11 +10,15 @@ import type { ParentType } from '../types'
 interface EmptyWellProps {
   wellMap: LabwareWellMap
   parentType: ParentType
+  wellName: string
   size?: string
 }
 
 export function EmptyWell(props: EmptyWellProps): JSX.Element {
-  const { size, wellMap, parentType } = props
+  const { size, wellMap, wellName, parentType } = props
+  const commonProps = {
+    [INTERACTIVE_WELL_DATA_ATTRIBUTE]: wellName,
+  }
   const firstWell = wellMap.A1
   const isCircular = firstWell.shape === 'circular'
   const [width, height] = getWidthAndHeightOfWellSVG(wellMap)
@@ -53,9 +59,16 @@ export function EmptyWell(props: EmptyWellProps): JSX.Element {
         height={isCircular ? circularDimension : height}
       >
         {isCircular ? (
-          <circle cx="10" cy="10" r="9.5" fill="white" />
+          <circle cx="10" cy="10" r="9.5" fill="white" {...commonProps} />
         ) : (
-          <rect x="0" y="0" width={width} height={height} fill="white" />
+          <rect
+            x="0"
+            y="0"
+            width={width}
+            height={height}
+            fill="white"
+            {...commonProps}
+          />
         )}
       </mask>
 
@@ -67,6 +80,7 @@ export function EmptyWell(props: EmptyWellProps): JSX.Element {
             r="9"
             fill="#CBCCCC"
             stroke={outlineColor}
+            {...commonProps}
             strokeWidth="3"
           />
         ) : (
@@ -77,6 +91,7 @@ export function EmptyWell(props: EmptyWellProps): JSX.Element {
             height={height}
             fill="#CBCCCC"
             stroke={outlineColor}
+            {...commonProps}
             strokeWidth="2"
           />
         )}

components/src/hardware-sim/Labware/labwareInternals/Wells/SelectedWell.tsx

@@ -1,3 +1,5 @@
+import { INTERACTIVE_WELL_DATA_ATTRIBUTE } from '@opentrons/shared-data'
+
 import { COLORS } from '../../../../helix-design-system'
 import { getWidthAndHeightOfWellSVG } from './utils'
 import styles from './wells.module.css'
@@ -6,6 +8,7 @@ import type { LabwareWellMap } from '@opentrons/shared-data'
 
 interface SelectedWellProps {
   wellMap: LabwareWellMap
+  wellName: string
   size?: string
   textInsideTip?: string
   isUsed?: boolean
@@ -16,6 +19,7 @@ interface SelectedWellProps {
 export function SelectedWell(props: SelectedWellProps): JSX.Element {
   const {
     wellMap,
+    wellName,
     size,
     textInsideTip,
     isUsed = false,
@@ -48,6 +52,10 @@ export function SelectedWell(props: SelectedWellProps): JSX.Element {
   // TODO (nd: 10/16/25): create a "Nozzle" component wrapping SelectedTip to avoid this flakey logic
   const viewBox =
     size || isWellCircular ? '0 0 20 20' : `0 0 ${width} ${height}`
+  const commonProps = {
+    [INTERACTIVE_WELL_DATA_ATTRIBUTE]: wellName,
+  }
+
   return (
     <svg
       width={size ?? width}
@@ -60,6 +68,7 @@ export function SelectedWell(props: SelectedWellProps): JSX.Element {
         <circle
           cx="10"
           cy="10"
+          {...commonProps}
           r={shouldShowStroke ? 9 : 10}
           fill={getFillColor(isSelected, isError, isUsed)}
           stroke={shouldShowStroke ? COLORS.black90 : undefined}
@@ -71,6 +80,7 @@ export function SelectedWell(props: SelectedWellProps): JSX.Element {
           y={shouldShowStroke ? 1 : 0}
           width={width}
           height={height}
+          {...commonProps}
           fill={getFillColor(isSelected, isError, isUsed)}
           stroke={shouldShowStroke ? COLORS.black90 : undefined}
           strokeWidth={shouldShowStroke ? 2 : undefined}

components/src/hardware-sim/Labware/labwareInternals/Wells/WellStatus.tsx

@@ -8,14 +8,22 @@ import type { ParentType, WellType } from '../types'
 
 interface WellStatusProps {
   wellMap: LabwareWellMap
+  wellName: string
   type: WellType
   parentType: ParentType
   showStroke?: boolean
   size?: string
 }
 
 export function WellStatus(props: WellStatusProps): JSX.Element {
-  const { type, size, wellMap, parentType, showStroke = false } = props
+  const {
+    type,
+    size,
+    wellMap,
+    parentType,
+    wellName,
+    showStroke = false,
+  } = props
   switch (type) {
     case SELECTED:
       return (
@@ -24,17 +32,26 @@ export function WellStatus(props: WellStatusProps): JSX.Element {
           wellMap={wellMap}
           isSelected={true}
           showStroke={showStroke}
+          wellName={wellName}
         />
       )
     case INACCESSIBLE:
-      return <EmptyWell wellMap={wellMap} size={size} parentType={parentType} />
+      return (
+        <EmptyWell
+          wellMap={wellMap}
+          size={size}
+          parentType={parentType}
+          wellName={wellName}
+        />
+      )
     case UNSELECTED:
       return (
         <SelectedWell
           size={size}
           wellMap={wellMap}
           isSelected={false}
           showStroke={showStroke}
+          wellName={wellName}
         />
       )
     case SELECTED_ERROR:
@@ -45,6 +62,7 @@ export function WellStatus(props: WellStatusProps): JSX.Element {
           isSelected={false}
           showStroke={showStroke}
           isError={true}
+          wellName={wellName}
         />
       )
   }

components/src/hardware-sim/Pipette/StrokedNozzles.tsx

@@ -40,14 +40,14 @@ export function StrokedNozzlesComponent(
 
   return (
     <>
-      {Object.entries(nozzleStatus).map(([key, wellType]) => {
+      {Object.entries(nozzleStatus).map(([wellName, wellType]) => {
         return (
           <svg
-            key={key}
-            x={wells[key].x - NOZZLE_POSITION_IN_RENDER}
-            y={wells[key].y - NOZZLE_POSITION_IN_RENDER}
+            key={wellName}
+            x={wells[wellName].x - NOZZLE_POSITION_IN_RENDER}
+            y={wells[wellName].y - NOZZLE_POSITION_IN_RENDER}
             onClick={() => {
-              handleClickNozzle(key)
+              handleClickNozzle(wellName)
             }}
           >
             <WellStatus
@@ -56,6 +56,7 @@ export function StrokedNozzlesComponent(
               wellMap={wells}
               showStroke
               parentType={PIPETTE}
+              wellName={wellName}
             />
           </svg>
         )

e2e-testing/tests/pd/test_pd_mix_step.py

@@ -49,7 +49,7 @@ def test_mix_step_configuration_workflow(page: Page, pd_base_url: str) -> None:
 
     for label in [
         "Pipette nozzles and wells",
-        "Volume per well",
+        "Mix volume",
         "Mix repetitions",
     ]:
         mix_form.expect_text(label)

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

@@ -264,6 +264,10 @@
         "body": "This step uses labware that has previously been discarded into a trash.",
         "title": "Labware not available"
       },
+      "MOVE_LOCATION_NOT_SPECIFIED": {
+        "body": "This step is missing a move location.",
+        "title": "Move location not defined."
+      },
       "LABWARE_OFF_DECK": {
         "body": "The robot can only perform steps on labware that is on the deck. Add or change a Move Labware step to put it on the deck before this step.",
         "title": "Labware not on deck"