Merge branch 'edge' into feat_AUTH-1224

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

@@ -370,7 +370,7 @@ jobs:
 
       - name: 'upload github artifact'
         if: matrix.target == 'desktop'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: 'opentrons-${{matrix.variant}}-${{ matrix.os }}'
           path: app-shell/dist/publish
@@ -392,7 +392,7 @@ jobs:
     if: contains(fromJSON(needs.determine-build-type.outputs.variants), 'release') || contains(fromJSON(needs.determine-build-type.outputs.variants), 'internal-release')
     steps:
       - name: 'download run app builds'
-        uses: 'actions/download-artifact@v3'
+        uses: 'actions/download-artifact@v4'
         with:
           path: ./artifacts
       - name: 'separate release and internal-release artifacts'

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

@@ -105,7 +105,7 @@ jobs:
       - name: 'build components'
         run: make -C components
       - name: 'upload github artifact'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: 'components-artifact'
           path: storybook-static
@@ -158,7 +158,7 @@ jobs:
             const { buildComplexEnvVars } = require(`${process.env.GITHUB_WORKSPACE}/.github/workflows/utils.js`)
             buildComplexEnvVars(core, context)
       - name: 'download components build'
-        uses: 'actions/download-artifact@v3'
+        uses: 'actions/download-artifact@v4'
         with:
           name: components-artifact
           path: ./dist

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

@@ -164,7 +164,7 @@ jobs:
         run: |
           make -C labware-library
       - name: 'upload github artifact'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: 'll-artifact'
           path: labware-library/dist
@@ -197,7 +197,7 @@ jobs:
             const { buildComplexEnvVars } = require(`${process.env.GITHUB_WORKSPACE}/.github/workflows/utils.js`)
             buildComplexEnvVars(core, context)
       - name: 'download LL build'
-        uses: 'actions/download-artifact@v3'
+        uses: 'actions/download-artifact@v4'
         with:
           name: ll-artifact
           path: ./dist

app/src/assets/localization/en/index.ts

@@ -3,7 +3,6 @@ import anonymous from './anonymous.json'
 import app_settings from './app_settings.json'
 import branded from './branded.json'
 import change_pipette from './change_pipette.json'
-import protocol_command_text from './protocol_command_text.json'
 import device_details from './device_details.json'
 import device_settings from './device_settings.json'
 import devices_landing from './devices_landing.json'
@@ -28,27 +27,29 @@ import run_details from './run_details.json'
 import top_navigation from './top_navigation.json'
 import error_recovery from './error_recovery.json'
 import incompatible_modules from './incompatible_modules.json'
+import protocol_command_text from './protocol_command_text.json'
 
 export const en = {
-  shared,
   anonymous,
   app_settings,
   branded,
   change_pipette,
-  protocol_command_text,
   device_details,
   device_settings,
   devices_landing,
   drop_tip_wizard,
+  error_recovery,
   firmware_update,
   gripper_wizard_flows,
   heater_shaker,
+  incompatible_modules,
   instruments_dashboard,
   labware_details,
   labware_landing,
   labware_position_check,
   module_wizard_flows,
   pipette_wizard_flows,
+  protocol_command_text,
   protocol_details,
   protocol_info,
   protocol_list,
@@ -57,7 +58,6 @@ export const en = {
   robot_calibration,
   robot_controls,
   run_details,
+  shared,
   top_navigation,
-  error_recovery,
-  incompatible_modules,
 }

app/src/assets/localization/zh/index.ts

@@ -3,7 +3,6 @@ import anonymous from './anonymous.json'
 import app_settings from './app_settings.json'
 import branded from './branded.json'
 import change_pipette from './change_pipette.json'
-import protocol_command_text from './protocol_command_text.json'
 import device_details from './device_details.json'
 import device_settings from './device_settings.json'
 import devices_landing from './devices_landing.json'
@@ -28,27 +27,29 @@ import run_details from './run_details.json'
 import top_navigation from './top_navigation.json'
 import error_recovery from './error_recovery.json'
 import incompatible_modules from './incompatible_modules.json'
+import protocol_command_text from './protocol_command_text.json'
 
 export const zh = {
-  shared,
   anonymous,
   app_settings,
   branded,
   change_pipette,
-  protocol_command_text,
   device_details,
   device_settings,
   devices_landing,
   drop_tip_wizard,
+  error_recovery,
   firmware_update,
   gripper_wizard_flows,
   heater_shaker,
+  incompatible_modules,
   instruments_dashboard,
   labware_details,
   labware_landing,
   labware_position_check,
   module_wizard_flows,
   pipette_wizard_flows,
+  protocol_command_text,
   protocol_details,
   protocol_info,
   protocol_list,
@@ -57,7 +58,6 @@ export const zh = {
   robot_calibration,
   robot_controls,
   run_details,
+  shared,
   top_navigation,
-  error_recovery,
-  incompatible_modules,
 }

app/src/local-resources/commands/hooks/index.ts

@@ -1,9 +1,9 @@
-export { useCommandTextString } from './useCommandTextString'
+export { useCommandTextString } from '@opentrons/components'
 
 export type {
   UseCommandTextStringParams,
   GetCommandText,
   GetCommandTextResult,
   GetTCRunExtendedProfileCommandTextResult,
   GetTCRunProfileCommandTextResult,
-} from './useCommandTextString'
+} from '@opentrons/components'

app/src/local-resources/commands/index.ts

@@ -1,4 +1,2 @@
 export * from './hooks'
 export * from './utils'
-
-export * from './types'

app/src/local-resources/commands/utils/index.ts

@@ -1,2 +1 @@
-export * from './getCommandTextData'
 export * from './lastRunCommandPromptedErrorRecovery'

app/src/local-resources/instruments/utils.ts

@@ -1,6 +1,3 @@
-import type { LoadedPipette } from '@opentrons/shared-data'
-import type { LoadedPipettes } from '/app/local-resources/instruments/types'
-
 export interface IsPartialTipConfigParams {
   channel: 1 | 8 | 96
   activeNozzleCount: number
@@ -19,13 +16,3 @@ export function isPartialTipConfig({
       return activeNozzleCount !== 96
   }
 }
-
-export function getLoadedPipette(
-  loadedPipettes: LoadedPipettes,
-  mount: string
-): LoadedPipette | undefined {
-  // NOTE: old analysis contains a object dictionary of pipette entities by id, this case is supported for backwards compatibility purposes
-  return Array.isArray(loadedPipettes)
-    ? loadedPipettes.find(l => l.mount === mount)
-    : loadedPipettes[mount]
-}

app/src/local-resources/labware/utils/index.ts

@@ -1,8 +1,3 @@
 export * from './getAllDefinitions'
 export * from './labwareImages'
 export * from './getAllDefs'
-export * from './getLabwareDefinitionsFromCommands'
-export * from './getLabwareName'
-export * from './getLoadedLabware'
-export * from './getLabwareDisplayLocation'
-export * from './getLabwareLocation'

app/src/local-resources/modules/index.ts

@@ -1,3 +1 @@
 export * from './utils'
-
-export * from './types'

app/src/local-resources/modules/utils/index.ts

@@ -1,5 +1,2 @@
-export * from './getLoadedModule'
-export * from './getModuleDisplayLocation'
 export * from './getModuleImage'
-export * from './getModuleModel'
 export * from './getModulePrepCommands'

app/src/molecules/Command/Command.stories.tsx

@@ -1,10 +1,10 @@
+import uniq from 'lodash/uniq'
 import { Command as CommandComponent } from '.'
-import type { CommandState } from './Command'
 import * as Fixtures from './__fixtures__'
+import type { CommandState } from './Command'
 import { customViewports } from '../../../../.storybook/preview'
 import type { Meta, StoryObj } from '@storybook/react'
 import type { RunTimeCommand } from '@opentrons/shared-data'
-import { uniq } from 'lodash'
 
 type CommandType = RunTimeCommand['commandType']
 

app/src/molecules/Command/Command.tsx

@@ -9,9 +9,9 @@ import {
   BORDERS,
   SPACING,
   RESPONSIVENESS,
+  CommandText,
 } from '@opentrons/components'
 
-import { CommandText } from './CommandText'
 import { CommandIcon } from './CommandIcon'
 import { Skeleton } from '/app/atoms/Skeleton'
 
@@ -20,8 +20,7 @@ import type {
   RobotType,
   RunTimeCommand,
 } from '@opentrons/shared-data'
-import type { CommandTextData } from '/app/local-resources/commands'
-import type { StyleProps } from '@opentrons/components'
+import type { CommandTextData, StyleProps } from '@opentrons/components'
 
 export type CommandState = NonSkeletonCommandState | 'loading'
 export type NonSkeletonCommandState = 'current' | 'failed' | 'future'

app/src/molecules/Command/__fixtures__/index.ts

@@ -2,7 +2,7 @@ import robotSideAnalysis from './mockRobotSideAnalysis.json'
 import doItAllAnalysis from './doItAllV10.json'
 import qiaseqAnalysis from './analysis_QIAseqFX24xv4_8.json'
 import type { CompletedProtocolAnalysis } from '@opentrons/shared-data'
-import type { CommandTextData } from '/app/local-resources/commands'
+import type { CommandTextData } from '@opentrons/components'
 
 export const mockRobotSideAnalysis: CompletedProtocolAnalysis = robotSideAnalysis as CompletedProtocolAnalysis
 export const mockDoItAllAnalysis: CompletedProtocolAnalysis = doItAllAnalysis as CompletedProtocolAnalysis

app/src/molecules/Command/index.ts

@@ -1,4 +1,3 @@
-export * from './CommandText'
 export * from './Command'
 export * from './CommandIcon'
 export * from './CommandIndex'

app/src/molecules/InterventionModal/CategorizedStepContent.tsx

@@ -11,13 +11,13 @@ import {
 
 import { Command, CommandIndex } from '../Command'
 
-import type { CommandTextData } from '/app/local-resources/commands'
-import type { NonSkeletonCommandState } from '../Command'
 import type {
   LabwareDefinition2,
   RobotType,
   RunTimeCommand,
 } from '@opentrons/shared-data'
+import type { CommandTextData } from '@opentrons/components'
+import type { NonSkeletonCommandState } from '../Command'
 
 export interface CommandWithIndex {
   index: number | undefined

app/src/organisms/Desktop/Devices/ProtocolRun/SetupLabwarePositionCheck/CurrentOffsetsTable.tsx

@@ -16,14 +16,14 @@ import {
   SPACING,
   LegacyStyledText,
   TYPOGRAPHY,
+  getLabwareDefinitionsFromCommands,
 } from '@opentrons/components'
 
 import { getIsLabwareOffsetCodeSnippetsOn } from '/app/redux/config'
 import { LabwareOffsetTabs } from '/app/organisms/LabwareOffsetTabs'
 import { OffsetVector } from '/app/molecules/OffsetVector'
 import { PythonLabwareOffsetSnippet } from '/app/molecules/PythonLabwareOffsetSnippet'
 import { getDisplayLocation } from '/app/organisms/LegacyLabwarePositionCheck/utils/getDisplayLocation'
-import { getLabwareDefinitionsFromCommands } from '/app/local-resources/labware'
 import type { LabwareOffset } from '@opentrons/api-client'
 import type {
   RunTimeCommand,

app/src/organisms/Desktop/Devices/RunPreview/index.tsx

@@ -8,6 +8,7 @@ import {
   ALIGN_CENTER,
   BORDERS,
   COLORS,
+  CommandText,
   DIRECTION_COLUMN,
   DISPLAY_FLEX,
   DISPLAY_NONE,
@@ -18,6 +19,7 @@ import {
   POSITION_FIXED,
   PrimaryButton,
   SPACING,
+  getLabwareDefinitionsFromCommands,
   TYPOGRAPHY,
 } from '@opentrons/components'
 
@@ -28,10 +30,9 @@ import {
   useMostRecentCompletedAnalysis,
   useLastRunCommand,
 } from '/app/resources/runs'
-import { CommandText, CommandIcon } from '/app/molecules/Command'
+import { CommandIcon } from '/app/molecules/Command'
 import { Divider } from '/app/atoms/structure'
 import { NAV_BAR_WIDTH } from '/app/App/constants'
-import { getLabwareDefinitionsFromCommands } from '/app/local-resources/labware'
 
 import type { ForwardedRef } from 'react'
 import type { ViewportListRef } from 'react-viewport-list'