clean up

Opentrons · Jan 17, 2025 · 5625bf7 · 5625bf7
1 parent 48cc042
commit 5625bf7
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 195 deletions.
diff --git a/components/src/organisms/ProtocolTimelineScrubber/index.tsx b/components/src/organisms/ProtocolTimelineScrubber/index.tsx
@@ -51,6 +51,7 @@ export const COMMAND_WIDTH_PX = 240
 
 interface ProtocolTimelineScrubberProps {
   analysis: CompletedProtocolAnalysis | ProtocolAnalysisOutput
+  height?: string
 }
 
 export const DECK_LAYER_BLOCKLIST = [
@@ -66,7 +67,7 @@ export const DECK_LAYER_BLOCKLIST = [
 export function ProtocolTimelineScrubber(
   props: ProtocolTimelineScrubberProps
 ): JSX.Element {
-  const { analysis } = props
+  const { analysis, height } = props
   const { commands, robotType, liquids } = analysis
   const wrapperRef = useRef<HTMLDivElement>(null)
   const commandListRef = useRef<ViewportListRef>(null)
@@ -140,7 +141,7 @@ export function ProtocolTimelineScrubber(
       gridGap={SPACING.spacing8}
     >
       <Flex gridGap={SPACING.spacing8} flex="1 1 0">
-        <Flex height="40vh">
+        <Flex height={height ?? '60vh'}>
           <BaseDeck
             robotType={robotType ?? FLEX_ROBOT_TYPE}
             deckConfig={getSimplestDeckConfigForProtocol(analysis)}

diff --git a/protocol-designer/src/pages/ProtocolOverview/ScrubberContainer.tsx b/protocol-designer/src/pages/ProtocolOverview/ScrubberContainer.tsx
@@ -13,6 +13,7 @@ import {
 } from '../../step-forms/selectors'
 import { getLabwareNicknamesById } from '../../ui/labware/selectors'
 import { selectors as ingredSelectors } from '../../labware-ingred/selectors'
+import { getLoadCommands } from '../../file-data/selectors/utils'
 import type {
   AddressableAreaName,
   CompletedProtocolAnalysis,
@@ -24,7 +25,6 @@ import type {
   LoadedPipette,
   RunTimeCommand,
 } from '@opentrons/shared-data'
-import { getLoadCommands } from '../../file-data/selectors/utils'
 
 export function ScrubberContainer(): JSX.Element {
   const robotType = useSelector(getRobotType)
@@ -163,5 +163,5 @@ export function ScrubberContainer(): JSX.Element {
     robotType,
   }
 
-  return <ProtocolTimelineScrubber analysis={analysis} />
+  return <ProtocolTimelineScrubber analysis={analysis} height="40vh" />
 }
diff --git a/shared-data/js/index.ts b/shared-data/js/index.ts
@@ -14,6 +14,5 @@ export * from './liquidClasses'
 export * from './modules'
 export * from './pipettes'
 export * from './protocols'
-export * from './sharedLocalizations'
 export * from './titleCase'
 export * from './types'
diff --git a/shared-data/js/sharedLocalizations/en/index.ts b/shared-data/js/sharedLocalizations/en/index.ts
diff --git a/shared-data/js/sharedLocalizations/en/protocol_command_text.json b/shared-data/js/sharedLocalizations/en/protocol_command_text.json
diff --git a/shared-data/js/sharedLocalizations/index.ts b/shared-data/js/sharedLocalizations/index.ts
diff --git a/shared-data/js/sharedLocalizations/zh/index.ts b/shared-data/js/sharedLocalizations/zh/index.ts
diff --git a/shared-data/js/sharedLocalizations/zh/protocol_command_text.json b/shared-data/js/sharedLocalizations/zh/protocol_command_text.json
diff --git a/step-generation/src/utils/createTimelineFromRunCommands.ts b/step-generation/src/utils/createTimelineFromRunCommands.ts
@@ -25,10 +25,10 @@ export function getResultingTimelineFrameFromRunCommands(
 ): ResultingTimelineFrame {
   const pipetteLocations = commands.reduce<RobotState['pipettes']>(
     (acc, command) => {
-      if (command.commandType === 'loadPipette') {
+      if (command.commandType === 'loadPipette' && command.result != null) {
         return {
           ...acc,
-          [command.params.pipetteId]: {
+          [command.result.pipetteId]: {
             mount: command.params.mount,
           },
         }