Merge branch 'edge' into wire_up_error_recovery_setting

Resolve conflicts in robot-server/tests/runs/test_run_data_manager.py.

api-client/src/runs/getRunCurrentState.ts

@@ -0,0 +1,17 @@
+import { GET, request } from '../request'
+
+import type { ResponsePromise } from '../request'
+import type { HostConfig } from '../types'
+import type { RunCurrentState } from './types'
+
+export function getRunCurrentState(
+  config: HostConfig,
+  runId: string
+): ResponsePromise<RunCurrentState> {
+  return request<RunCurrentState>(
+    GET,
+    `/runs/${runId}/currentState`,
+    null,
+    config
+  )
+}

api-client/src/runs/index.ts

@@ -10,6 +10,7 @@ export { getCommands } from './commands/getCommands'
 export { getCommandsAsPreSerializedList } from './commands/getCommandsAsPreSerializedList'
 export { createRunAction } from './createRunAction'
 export { getRunCommandErrors } from './commands/getRunCommandErrors'
+export { getRunCurrentState } from './getRunCurrentState'
 export * from './createLabwareOffset'
 export * from './createLabwareDefinition'
 export * from './constants'

api-client/src/runs/types.ts

@@ -87,10 +87,24 @@ export interface Run {
   data: RunData
 }
 
+export interface RunCurrentState {
+  data: RunCurrentStateData
+  links: RunCommandLink
+}
+
 export interface RunsLinks {
   current?: ResourceLink
 }
 
+export interface RunCommandLink {
+  current: CommandLinkNoMeta
+}
+
+export interface CommandLinkNoMeta {
+  id: string
+  href: string
+}
+
 export interface GetRunsParams {
   pageLength?: number // the number of items to include
 }
@@ -100,6 +114,10 @@ export interface Runs {
   links: RunsLinks
 }
 
+export interface RunCurrentStateData {
+  activeNozzleLayouts: Record<string, NozzleLayoutValues> // keyed by pipetteId
+}
+
 export const RUN_ACTION_TYPE_PLAY: 'play' = 'play'
 export const RUN_ACTION_TYPE_PAUSE: 'pause' = 'pause'
 export const RUN_ACTION_TYPE_STOP: 'stop' = 'stop'
@@ -173,3 +191,13 @@ export interface UpdateErrorRecoveryPolicyRequest {
 }
 
 export type UpdateErrorRecoveryPolicyResponse = Record<string, never>
+
+/**
+ * Current Run State Data
+ */
+export interface NozzleLayoutValues {
+  startingNozzle: string
+  activeNozzles: string[]
+  config: NozzleLayoutConfig
+}
+export type NozzleLayoutConfig = 'column' | 'row' | 'full' | 'subrect'

api/src/opentrons/protocol_engine/state/tips.py

@@ -486,6 +486,10 @@ def get_pipette_nozzle_map(self, pipette_id: str) -> NozzleMap:
         """Get the current nozzle map the given pipette's configuration."""
         return self._state.nozzle_map_by_pipette_id[pipette_id]
 
+    def get_pipette_nozzle_maps(self) -> Dict[str, NozzleMap]:
+        """Get current nozzle maps keyed by pipette id."""
+        return self._state.nozzle_map_by_pipette_id
+
     def has_clean_tip(self, labware_id: str, well_name: str) -> bool:
         """Get whether a well in a labware has a clean tip.
 

api/src/opentrons/protocol_runner/run_orchestrator.py

@@ -14,6 +14,7 @@
 from . import protocol_runner, RunResult, JsonRunner, PythonAndLegacyRunner
 from ..hardware_control import HardwareControlAPI
 from ..hardware_control.modules import AbstractModule as HardwareModuleAPI
+from ..hardware_control.nozzle_manager import NozzleMap
 from ..protocol_engine import (
     ProtocolEngine,
     CommandCreate,
@@ -397,6 +398,10 @@ def get_deck_type(self) -> DeckType:
         """Get engine deck type."""
         return self._protocol_engine.state_view.config.deck_type
 
+    def get_nozzle_maps(self) -> Dict[str, NozzleMap]:
+        """Get current nozzle maps keyed by pipette id."""
+        return self._protocol_engine.state_view.tips.get_pipette_nozzle_maps()
+
     def set_error_recovery_policy(self, policy: ErrorRecoveryPolicy) -> None:
         """Create error recovery policy for the run."""
         self._protocol_engine.set_error_recovery_policy(policy)

app/src/molecules/OddModal/OddModalHeader.tsx

@@ -34,7 +34,7 @@ export function OddModalHeader(props: OddModalHeaderBaseProps): JSX.Element {
       borderRadius={`${BORDERS.borderRadius12} ${BORDERS.borderRadius12} 0px 0px`}
       {...styleProps}
     >
-      <Flex flexDirection={DIRECTION_ROW}>
+      <Flex flexDirection={DIRECTION_ROW} gridGap={SPACING.spacing16}>
         {iconName != null && iconColor != null ? (
           <Icon
             aria-label={`icon_${iconName}`}

app/src/organisms/ErrorRecoveryFlows/RecoverySplash.tsx

@@ -198,21 +198,19 @@ export function RecoverySplash(props: RecoverySplashProps): JSX.Element | null {
           gridGap={SPACING.spacing16}
         >
           <LargeButton
+            css={SHARED_BUTTON_STYLE_ODD}
             onClick={onCancelClick}
             buttonText={t('cancel_run')}
-            css={
-              isDisabled() ? BTN_STYLE_DISABLED_ODD : SHARED_BUTTON_STYLE_ODD
-            }
-            iconName={'remove'}
+            iconName="remove"
+            ariaDisabled={isDisabled()}
             buttonType="alertAlt"
           />
           <LargeButton
+            css={SHARED_BUTTON_STYLE_ODD}
             onClick={onLaunchERClick}
             buttonText={t('launch_recovery_mode')}
-            css={
-              isDisabled() ? BTN_STYLE_DISABLED_ODD : SHARED_BUTTON_STYLE_ODD
-            }
-            iconName={'recovery'}
+            iconName="recovery"
+            ariaDisabled={isDisabled()}
             buttonType="alertStroke"
           />
         </Flex>
@@ -297,30 +295,6 @@ const SHARED_BUTTON_STYLE_ODD = css`
   width: 29rem;
   height: 13.5rem;
 `
-const BTN_STYLE_DISABLED_ODD = css`
-  ${SHARED_BUTTON_STYLE_ODD}
-
-  background-color: ${COLORS.grey35};
-  color: ${COLORS.grey50};
-  border: none;
-  box-shadow: none;
-
-  #btn-icon: {
-    color: ${COLORS.grey50};
-  }
-
-  &:active,
-  &:focus,
-  &:hover {
-    background-color: ${COLORS.grey35};
-    color: ${COLORS.grey50};
-  }
-  &:active,
-  &:focus,
-  &:hover #btn-icon {
-    color: ${COLORS.grey50};
-  }
-`
 
 const PRIMARY_BTN_STYLES_DESKTOP = css`
   background-color: ${COLORS.red50};

app/src/organisms/LabwarePositionCheck/utils/getTipBasedLPCSteps.ts

@@ -18,8 +18,8 @@ import type {
 import type {
   RunTimeCommand,
   ProtocolAnalysisOutput,
+  PickUpTipRunTimeCommand,
 } from '@opentrons/shared-data'
-import type { PickUpTipRunTimeCommand } from '@opentrons/shared-data/protocol/types/schemaV6/command/pipetting'
 import type { LabwareLocationCombo } from '../../ApplyHistoricOffsets/hooks/getLabwareLocationCombos'
 
 interface LPCArgs {

components/src/atoms/InputField/index.tsx

@@ -8,7 +8,7 @@ import { Icon } from '../../icons'
 import { RESPONSIVENESS, SPACING, TYPOGRAPHY } from '../../ui-style-constants'
 import { Tooltip } from '../Tooltip'
 import { useHoverTooltip } from '../../tooltips'
-import { LegacyStyledText } from '../StyledText'
+import { StyledText } from '../StyledText'
 import type { IconName } from '../../icons'
 export const INPUT_TYPE_NUMBER = 'number' as const
 export const LEGACY_INPUT_TYPE_TEXT = 'text' as const
@@ -198,8 +198,8 @@ export const InputField = React.forwardRef<HTMLInputElement, InputFieldProps>(
     `
 
     const TITLE_STYLE = css`
-      color: ${hasError ? COLORS.red50 : COLORS.black90};
-      padding-bottom: ${SPACING.spacing8};
+      color: ${COLORS.grey60};
+      padding-bottom: ${SPACING.spacing4};
       text-align: ${textAlign};
       @media ${RESPONSIVENESS.touchscreenMediaQuerySpecs} {
         font-size: ${TYPOGRAPHY.fontSize22};
@@ -221,9 +221,7 @@ export const InputField = React.forwardRef<HTMLInputElement, InputFieldProps>(
 
     const UNITS_STYLE = css`
       color: ${props.disabled ? COLORS.grey40 : COLORS.grey50};
-      font-size: ${TYPOGRAPHY.fontSizeLabel};
-      font-weight: ${TYPOGRAPHY.fontWeightSemiBold};
-      line-height: ${TYPOGRAPHY.lineHeight12};
+      font: ${TYPOGRAPHY.bodyTextRegular};
       text-align: ${TYPOGRAPHY.textAlignRight};
       @media ${RESPONSIVENESS.touchscreenMediaQuerySpecs} {
         color: ${props.disabled ? COLORS.grey40 : COLORS.grey50};
@@ -246,14 +244,13 @@ export const InputField = React.forwardRef<HTMLInputElement, InputFieldProps>(
         <Flex flexDirection={DIRECTION_COLUMN} width="100%">
           {title != null ? (
             <Flex gridGap={SPACING.spacing8}>
-              <LegacyStyledText
-                as="label"
-                fontWeight={TYPOGRAPHY.fontWeightSemiBold}
+              <StyledText
+                desktopStyle="bodyDefaultRegular"
                 htmlFor={props.id}
                 css={TITLE_STYLE}
               >
                 {title}
-              </LegacyStyledText>
+              </StyledText>
               {tooltipText != null ? (
                 <>
                   <Flex {...targetProps}>
@@ -314,18 +311,21 @@ export const InputField = React.forwardRef<HTMLInputElement, InputFieldProps>(
             </Flex>
           </Flex>
           {props.caption != null ? (
-            <LegacyStyledText
-              as="label"
+            <StyledText
+              desktopStyle="bodyDefaultRegular"
               css={FORM_BOTTOM_SPACE_STYLE}
               color={COLORS.grey60}
             >
               {props.caption}
-            </LegacyStyledText>
+            </StyledText>
           ) : null}
           {hasError ? (
-            <LegacyStyledText as="label" css={ERROR_TEXT_STYLE}>
+            <StyledText
+              desktopStyle="bodyDefaultRegular"
+              css={ERROR_TEXT_STYLE}
+            >
               {props.error}
-            </LegacyStyledText>
+            </StyledText>
           ) : null}
         </Flex>
       </Flex>

components/src/atoms/ListButton/index.tsx

@@ -50,8 +50,9 @@ export function ListButton(props: ListButtonProps): JSX.Element {
       ? COLORS.grey35
       : listButtonProps.backgroundColor};
     max-width: 26.875rem;
-    padding: ${SPACING.spacing20} ${SPACING.spacing24};
-    border-radius: ${BORDERS.borderRadius16};
+    padding: ${styleProps.padding ??
+    `${SPACING.spacing20} ${SPACING.spacing24}`};
+    border-radius: ${BORDERS.borderRadius8};
 
     &:hover {
       background-color: ${listButtonProps.hoverBackgroundColor};

components/src/atoms/ListItem/index.tsx

@@ -16,6 +16,8 @@ interface ListItemProps extends StyleProps {
   /** ListItem contents */
   children: React.ReactNode
   onClick?: () => void
+  onMouseEnter?: () => void
+  onMouseLeave?: () => void
 }
 
 const LISTITEM_PROPS_BY_TYPE: Record<
@@ -40,7 +42,14 @@ const LISTITEM_PROPS_BY_TYPE: Record<
   ListItem is used in ODD and helix
 **/
 export function ListItem(props: ListItemProps): JSX.Element {
-  const { type, children, onClick, ...styleProps } = props
+  const {
+    type,
+    children,
+    onClick,
+    onMouseEnter,
+    onMouseLeave,
+    ...styleProps
+  } = props
   const listItemProps = LISTITEM_PROPS_BY_TYPE[type]
 
   const LIST_ITEM_STYLE = css`
@@ -60,6 +69,8 @@ export function ListItem(props: ListItemProps): JSX.Element {
     <Flex
       data-testid={`ListItem_${type}`}
       onClick={onClick}
+      onMouseEnter={onMouseEnter}
+      onMouseLeave={onMouseLeave}
       css={LIST_ITEM_STYLE}
       {...styleProps}
     >