Merge back 'chore_release-pd-8.5.0' into 'edge' (#18924)

Author: ddcc4

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

@@ -60,8 +60,8 @@
   "num_liquid_plural": "{{count}} liquids",
   "num_liquid": "{{count}} liquid",
   "off_deck_labware": "Off-deck Labware",
-  "off_deck_title": "Off deck",
-  "offDeck": "Off deck",
+  "off_deck_title": "Off-deck",
+  "offDeck": "Off-deck",
   "onDeck": "On deck",
   "one_item": "No more than 1 {{hardware}} allowed on the deck at one time",
   "only_display_rec": "Only display recommended labware",

protocol-designer/src/components/organisms/LiquidsOverflowMenu/index.tsx

@@ -60,7 +60,7 @@ export function LiquidsOverflowMenu({
     right = undefined
     left =
       targetWidth !== undefined
-        ? `${targetWidth - OVERFLOW_MENU_POSITION_ADJUSTMENT}px`
+        ? `${targetWidth + OVERFLOW_MENU_POSITION_ADJUSTMENT}px`
         : undefined
   }
 

protocol-designer/src/constants.ts

@@ -95,7 +95,7 @@ export const OFFDECK: 'offDeck' = 'offDeck'
 export const PROTOCOL_DESIGNER_SOURCE: 'Protocol Designer' = 'Protocol Designer' // protocolSource for tracking analytics in the app
 
 export const DECK_SETUP_TOOLS_WIDTH_REM = 21.875
-export const OVERFLOW_MENU_POSITION_ADJUSTMENT = 4
+export const OVERFLOW_MENU_POSITION_ADJUSTMENT = 8
 
 // Below values copied from opentrons/api/src/opentrons/config/defaults_ot[2/3].py
 export const FLEX_X_Y_MAX_SPEED = 300

protocol-designer/src/load-file/migration/8_5_0.ts

@@ -4,6 +4,7 @@ import min from 'lodash/min'
 
 import {
   FLEX_ROBOT_TYPE,
+  getAllLabwareDefs,
   getPipetteSpecsV2,
   POSITION_REFERENCE_BOTTOM,
   POSITION_REFERENCE_TOP,
@@ -16,12 +17,10 @@ import {
   PROTOCOL_DESIGNER_SOURCE,
 } from '../../constants'
 import { getDefaultBlowoutFlowRate, getDefaultPushOutVolume } from '../../utils'
-import { getEquipmentLoadInfoFromCommands } from './utils/getEquipmentLoadInfoFromCommands'
 import { getMigratedPositionFromTop } from './utils/getMigrationPositionFromTop'
 
 import type {
   LabwareDefinition2,
-  LoadLabwareCreateCommand,
   PipetteV2Specs,
   ProtocolFile,
 } from '@opentrons/shared-data'
@@ -56,21 +55,25 @@ const getMigratedBlowoutLocation = (
 export const migrateFile = (
   appData: ProtocolFile<PDMetadata>
 ): ProtocolFile<PDMetadata> => {
-  const { designerApplication, commands, labwareDefinitions, robot } = appData
+  const { designerApplication, robot, labwareDefinitions } = appData
   if (designerApplication == null || designerApplication?.data == null) {
     throw Error('The designerApplication key in your file is corrupt.')
   }
-  const { savedStepForms, ingredients } = designerApplication.data
+  const {
+    savedStepForms,
+    ingredients,
+    labware,
+    pipettes,
+  } = designerApplication.data
   const { model: robotType } = robot
-  const loadLabwareCommands = commands.filter(
-    (command): command is LoadLabwareCreateCommand =>
-      command.commandType === 'loadLabware'
-  )
-  const equipmentLoadInfoFromCommands = getEquipmentLoadInfoFromCommands(
-    commands,
-    labwareDefinitions
-  )
 
+  const allLabwareDefsByURI =
+    //  read the labware definitions key first
+    //  otherwise map to all labware defs as a fallback
+    //  for OpentronsAI
+    Object.values(labwareDefinitions).length > 0
+      ? labwareDefinitions
+      : getAllLabwareDefs()
   const migratedIngredients: Ingredients = Object.entries(
     ingredients
   ).reduce<Ingredients>((acc, [id, ingredient]) => {
@@ -127,19 +130,17 @@ export const migrateFile = (
         blowout_z_offset,
         ...rest
       } = form
-      const aspirateLabwareUri =
-        equipmentLoadInfoFromCommands.labware[aspirate_labware].labwareDefURI
-      const isAspirateLabwareTouchtipDisabled = labwareDefinitions[
+      const aspirateLabwareUri = labware[aspirate_labware].labwareDefURI
+      const isAspirateLabwareTouchtipDisabled = allLabwareDefsByURI[
         aspirateLabwareUri
       ].parameters.quirks?.includes('touchTipDisabled')
-      const dispenseLabwareUri =
-        equipmentLoadInfoFromCommands.labware[dispense_labware]?.labwareDefURI
+      const dispenseLabwareUri = labware[dispense_labware]?.labwareDefURI
 
       const isDispenseLabwareTouchtipDisabled =
         //  dispense is in a waste chute/trash bin
-        labwareDefinitions[dispenseLabwareUri] == null
+        allLabwareDefsByURI[dispenseLabwareUri] == null
           ? true
-          : labwareDefinitions[dispenseLabwareUri].parameters.quirks?.includes(
+          : allLabwareDefsByURI[dispenseLabwareUri].parameters.quirks?.includes(
               'touchTipDisabled'
             )
 
@@ -148,21 +149,19 @@ export const migrateFile = (
         firstTrashBinOrWasteChuteId
       )
       const matchingAspirateLabwareWellDepth = getMigratedPositionFromTop(
-        labwareDefinitions,
-        loadLabwareCommands,
+        allLabwareDefsByURI,
         aspirate_labware as string,
+        labware,
         'aspirate'
       )
       const matchingDispenseLabwareWellDepth = getMigratedPositionFromTop(
-        labwareDefinitions,
-        loadLabwareCommands,
+        allLabwareDefsByURI,
         dispense_labware as string,
+        labware,
         'dispense'
       )
-      const tipRackDef = labwareDefinitions[form.tipRack]
-      const pipetteName =
-        equipmentLoadInfoFromCommands.pipettes?.[form.pipette]?.pipetteName ??
-        null
+      const tipRackDef = allLabwareDefsByURI[form.tipRack]
+      const pipetteName = pipettes?.[form.pipette]?.pipetteName ?? null
       const pipetteSpecs =
         pipetteName != null ? getPipetteSpecsV2(pipetteName) : null
       const defaultPushOutVolume =
@@ -272,20 +271,17 @@ export const migrateFile = (
         const {
           id,
           mix_touchTip_mmFromBottom,
-          labware,
+          labware: formLabware,
           liquidClassesSupported,
           mix_touchTip_checkbox,
           ...rest
         } = form
-        const tipRackDef = labwareDefinitions[form.tipRack]
-        const mixLabwareUri =
-          equipmentLoadInfoFromCommands.labware[labware].labwareDefURI
-        const isLabwareTouchtipDisabled = labwareDefinitions[
+        const tipRackDef = allLabwareDefsByURI[form.tipRack]
+        const mixLabwareUri = labware[formLabware].labwareDefURI
+        const isLabwareTouchtipDisabled = allLabwareDefsByURI[
           mixLabwareUri
         ].parameters.quirks?.includes('touchTipDisabled')
-        const pipetteName =
-          equipmentLoadInfoFromCommands.pipettes?.[form.pipette]?.pipetteName ??
-          null
+        const pipetteName = pipettes?.[form.pipette]?.pipetteName ?? null
         const pipetteSpecs =
           pipetteName != null ? getPipetteSpecsV2(pipetteName) : null
         const defaultPushOutVolume =
@@ -298,9 +294,9 @@ export const migrateFile = (
               )
 
         const matchingLabwareWellDepth = getMigratedPositionFromTop(
-          labwareDefinitions,
-          loadLabwareCommands,
-          labware as string,
+          allLabwareDefsByURI,
+          formLabware as string,
+          labware,
           'mix'
         )
 
@@ -321,7 +317,7 @@ export const migrateFile = (
           [id]: {
             ...rest,
             id,
-            labware,
+            labware: formLabware,
             mix_touchTip_checkbox: isLabwareTouchtipDisabled
               ? false
               : mix_touchTip_checkbox,

protocol-designer/src/load-file/migration/utils/getMigrationPositionFromTop.ts

@@ -1,44 +1,33 @@
-import type {
-  LabwareDefinition2,
-  LoadLabwareCreateCommand,
-} from '@opentrons/shared-data'
+import type { LabwareDefinition2 } from '@opentrons/shared-data'
+import type { Labware } from '../../../file-types'
 import type { MoveLiquidPrefixType } from '../../../resources/types'
 
 export const getMigratedPositionFromTop = (
-  labwareDefinitions: {
-    [definitionId: string]: LabwareDefinition2
-  },
-  loadLabwareCommands: LoadLabwareCreateCommand[],
-  labware: string,
+  labwareDefsByURI: Record<string, LabwareDefinition2>,
+  formLabwareId: string,
+  labware: Labware,
   type: MoveLiquidPrefixType
 ): number => {
-  const matchingLoadLabware = loadLabwareCommands.find(
-    command =>
-      command.commandType === 'loadLabware' &&
-      command.params.labwareId === labware
-  )
-  if (matchingLoadLabware == null) {
+  const labwareDefUri = labware[formLabwareId].labwareDefURI
+
+  if (labwareDefUri == null) {
     console.error(
-      `expected to find matching ${type} labware load command but could not with ${type}_labware from form data as ${labware}`
+      `unable to find matching labware def uri from form labware id ${formLabwareId}`
     )
   }
-  const labwareUri =
-    matchingLoadLabware != null
-      ? `${matchingLoadLabware.params.namespace}/${matchingLoadLabware.params.loadName}/${matchingLoadLabware.params.version}`
-      : ''
 
   //    early exit for dispense_labware equaling trashBin or wasteChute
-  if (labwareDefinitions[labwareUri] == null) {
+  if (labwareDefsByURI[labwareDefUri] == null) {
     return 0
   }
 
-  const matchingLabwareWellDepth = labwareUri
-    ? labwareDefinitions[labwareUri].wells.A1.depth
+  const matchingLabwareWellDepth = labwareDefUri
+    ? labwareDefsByURI[labwareDefUri].wells.A1.depth
     : 0
 
   if (matchingLabwareWellDepth === 0) {
     console.error(
-      `error in finding the ${type} labware well depth with labware uri ${labwareUri}`
+      `error in finding the ${type} labware well depth with labware uri ${labwareDefUri}`
     )
   }
   return matchingLabwareWellDepth

protocol-designer/src/pages/Designer/OffDeck/OffDeckDetails.tsx

@@ -64,17 +64,14 @@ export function OffDeckDetails(props: OffDeckDetailsProps): JSX.Element {
       <Flex
         backgroundColor={COLORS.white}
         borderRadius={BORDERS.borderRadius12}
-        width="100%"
-        height="100%"
-        padding={`${SPACING.spacing40} ${SPACING.spacing40} 0 ${SPACING.spacing40}`}
+        padding={SPACING.spacing40}
         gridGap={SPACING.spacing24}
         alignItems={ALIGN_CENTER}
         justifyContent={JUSTIFY_FLEX_END}
       >
         <Flex
           flex="0 0 auto"
           width={OFF_DECK_MAP_WIDTH}
-          height="100%"
           maxHeight={OFF_DECK_MAP_HEIGHT_FOR_STEP}
           minHeight={OFF_DECK_MAP_HEIGHT_FOR_STEP}
           alignItems={ALIGN_CENTER}
@@ -85,11 +82,7 @@ export function OffDeckDetails(props: OffDeckDetailsProps): JSX.Element {
           flexDirection={DIRECTION_COLUMN}
           gridGap={SPACING.spacing40}
         >
-          <Flex
-            justifyContent={JUSTIFY_CENTER}
-            width="100%"
-            color={COLORS.grey60}
-          >
+          <Flex justifyContent={JUSTIFY_CENTER} color={COLORS.grey60}>
             <StyledText desktopStyle="bodyDefaultSemiBold">
               {i18n.format(t('off_deck_labware'), 'upperCase')}
             </StyledText>
@@ -119,12 +112,7 @@ export function OffDeckDetails(props: OffDeckDetailsProps): JSX.Element {
                 zDimension: dimensions.zDimension ?? 0,
               }
               return (
-                <Flex
-                  id={lw.id}
-                  flexDirection={DIRECTION_COLUMN}
-                  key={lw.id}
-                  paddingBottom="0"
-                >
+                <Flex id={lw.id} flexDirection={DIRECTION_COLUMN} key={lw.id}>
                   <RobotWorkSpace
                     key={lw.id}
                     viewBox={`${definition.cornerOffsetFromSlot.x} ${definition.cornerOffsetFromSlot.y} ${dimensions.xDimension} ${dimensions.yDimension}`}
@@ -184,7 +172,7 @@ export function OffDeckDetails(props: OffDeckDetailsProps): JSX.Element {
         </Flex>
       </Flex>
       {hoverSlot != null && terminalItemId === START_TERMINAL_ITEM_ID ? (
-        <Flex width="100%" height="8rem">
+        <Flex>
           <SlotDetailsContainer
             robotType={robotType}
             slot="offDeck"

protocol-designer/src/pages/Designer/ProtocolSteps/Timeline/AddStepButton.tsx

@@ -2,7 +2,7 @@ import { useState } from 'react'
 import { createPortal } from 'react-dom'
 import { useTranslation } from 'react-i18next'
 import { useDispatch, useSelector } from 'react-redux'
-import { last } from 'lodash'
+import last from 'lodash/last'
 import { css } from 'styled-components'
 
 import {
@@ -66,9 +66,13 @@ import type { BaseState } from '../../../../types'
 
 interface AddStepButtonProps {
   hasText: boolean
+  sidebarWidth: number
 }
 
-export function AddStepButton({ hasText }: AddStepButtonProps): JSX.Element {
+export function AddStepButton({
+  hasText,
+  sidebarWidth,
+}: AddStepButtonProps): JSX.Element {
   const { t } = useTranslation(['tooltip', 'button', 'starting_deck_state'])
   const enableComment = useSelector(getEnableComment)
   const { makeSnackbar } = useKitchen()

protocol-designer/src/pages/Designer/ProtocolSteps/Timeline/AddStepOverflowButton.tsx

@@ -25,11 +25,6 @@ export function AddStepOverflowButton(
 ): JSX.Element {
   const { onClick, stepType, isFirstStep = false, isLastStep = false } = props
   const { t, i18n } = useTranslation(['tooltip', 'application'])
-  //   TODO(ja): add or delete tooltips when designs are finalized
-  //   const [targetProps, tooltipProps] = useHoverTooltip({
-  //     placement: TOOLTIP_RIGHT,
-  //   })
-  //   const tooltipMessage = t(`step_description.${stepType}`)
 
   const selectHoverStyle = (): string => {
     if (isFirstStep) {
@@ -52,7 +47,6 @@ export function AddStepOverflowButton(
           )}
         </StyledText>
       </MenuButton>
-      {/* <Tooltip tooltipProps={tooltipProps}>{tooltipMessage}</Tooltip> */}
     </>
   )
 }

protocol-designer/src/pages/Designer/ProtocolSteps/Timeline/StepOverflowMenu.tsx

@@ -14,6 +14,7 @@ import {
 
 import { analyticsEvent } from '../../../../analytics/actions'
 import { OPEN_STEP_DETAILS_EVENT } from '../../../../analytics/constants'
+import { OVERFLOW_MENU_POSITION_ADJUSTMENT } from '../../../../constants'
 import {
   getBatchEditFormHasUnsavedChanges,
   getCurrentFormHasUnsavedChanges,
@@ -44,8 +45,6 @@ interface StepOverflowMenuProps {
   sidebarWidth: number // adjust the position of the overflow menu
 }
 
-const POSITION_ADJUSTMENT = 4
-
 export function StepOverflowMenu(props: StepOverflowMenuProps): JSX.Element {
   const {
     stepId,
@@ -102,7 +101,7 @@ export function StepOverflowMenu(props: StepOverflowMenuProps): JSX.Element {
         ref={menuRootRef}
         zIndex={12}
         top={top}
-        left={sidebarWidth - POSITION_ADJUSTMENT} // the space between kebab menu button and overflow menu is 8px
+        left={sidebarWidth + OVERFLOW_MENU_POSITION_ADJUSTMENT} // the space between kebab menu button and overflow menu is 8px
         position={POSITION_ABSOLUTE}
         whiteSpace={NO_WRAP}
         borderRadius={BORDERS.borderRadius8}

protocol-designer/src/pages/Designer/ProtocolSteps/Timeline/TimelineToolbox.tsx

@@ -156,7 +156,10 @@ export function TimelineToolbox({
       childrenPadding="0px"
       confirmButton={
         formData != null ? undefined : (
-          <AddStepButton hasText={sidebarWidth > SIDEBAR_MIN_WIDTH_FOR_ICON} />
+          <AddStepButton
+            hasText={sidebarWidth > SIDEBAR_MIN_WIDTH_FOR_ICON}
+            sidebarWidth={sidebarWidth}
+          />
         )
       }
     >