refactor(protocol-designer, components): scrubber is out the door, bye bye bye (#20130)

Author: jerader

components/src/organisms/CommandText/__tests__/CommandText.test.tsx

@@ -9,9 +9,8 @@ import {
 
 import { i18n } from '../../../i18n'
 import { renderWithProviders } from '../../../testing/utils'
-import { getCommandTextData } from '../../ProtocolTimelineScrubber/utils'
 import { mockRobotSideAnalysis } from '../fixtures'
-import { CommandText } from '../index'
+import { CommandText, getCommandTextData } from '../index'
 
 import type {
   AspirateInPlaceRunTimeCommand,
@@ -33,7 +32,7 @@ import type {
   PrepareToAspirateRunTimeCommand,
   RunTimeCommand,
 } from '@opentrons/shared-data'
-import type { CommandTextData } from '../../ProtocolTimelineScrubber'
+import type { CommandTextData } from '../index'
 
 const mockCommandTextData: CommandTextData = {
   commands: mockRobotSideAnalysis.commands,

components/src/organisms/CommandText/getCommandData.ts

@@ -0,0 +1,18 @@
+import type {
+  CompletedProtocolAnalysis,
+  ProtocolAnalysisOutput,
+  RunTimeCommand,
+} from '@opentrons/shared-data'
+import type { CommandTextData } from './useCommandTextString'
+
+export function getCommandTextData(
+  protocolData: CompletedProtocolAnalysis | ProtocolAnalysisOutput,
+  protocolCommands?: RunTimeCommand[]
+): CommandTextData {
+  const { pipettes, labware, modules, liquids } = protocolData
+  const commands =
+    'commands' in protocolData
+      ? protocolData.commands
+      : (protocolCommands ?? [])
+  return { commands, pipettes, labware, modules, liquids }
+}

components/src/organisms/CommandText/index.tsx

@@ -14,14 +14,16 @@ import type {
   RunTimeCommand,
 } from '@opentrons/shared-data'
 import type { StyleProps } from '../../primitives'
-import type { CommandTextData } from '../ProtocolTimelineScrubber/types'
 import type {
+  CommandTextData,
   GetTCRunExtendedProfileCommandTextResult,
   GetTCRunProfileCommandTextResult,
   GetTCStartRunExtendedProfileCommandTextResult,
 } from './useCommandTextString'
 
 export * from './useCommandTextString'
+export * from './getCommandData'
+
 interface LegacySTProps {
   as?: ComponentProps<typeof LegacyStyledText>['as']
   modernStyledTextDefaults?: false

components/src/organisms/CommandText/useCommandTextString/index.ts

@@ -8,7 +8,6 @@ import type {
   RobotType,
   RunTimeCommand,
 } from '@opentrons/shared-data'
-import type { CommandTextData } from '../../ProtocolTimelineScrubber/types'
 import type {
   GetDirectTranslationCommandText,
   TCProfileCycleText,
@@ -20,7 +19,7 @@ export * from './utils'
 export interface UseCommandTextStringParams {
   command: RunTimeCommand | null
   allRunDefs: LabwareDefinition[]
-  commandTextData: CommandTextData | null
+  commandTextData: utils.CommandTextData | null
   robotType: RobotType
 }
 

components/src/organisms/CommandText/useCommandTextString/utils/types.ts

@@ -1,4 +1,5 @@
 import type {
+  CompletedProtocolAnalysis,
   LoadedLabware,
   LoadedModule,
   LoadedPipette,
@@ -17,3 +18,8 @@ export type LoadedPipettes = LoadedPipette[] | Record<string, LoadedPipette>
 export type LoadedLabwares = LoadedLabware[] | Record<string, LoadedLabware>
 
 export type LoadedModules = LoadedModule[] | Record<string, LoadedModule>
+
+export type CommandTextData = Pick<
+  CompletedProtocolAnalysis,
+  'pipettes' | 'labware' | 'modules' | 'liquids' | 'commands'
+>