Chore: Incremental mergeback of PD chore release 8.4.4 into edge

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

@@ -0,0 +1,79 @@
+import { swatchColors } from '../../components/organisms/DefineLiquidsModal/swatchColors'
+import { getAdditionalEquipmentLocationUpdate } from './utils/getAdditionalEquipmentLocationUpdate'
+import { getEquipmentLoadInfoFromCommands } from './utils/getEquipmentLoadInfoFromCommands'
+
+import type { ProtocolFile } from '@opentrons/shared-data'
+import type { Ingredients } from '@opentrons/step-generation'
+import type { PDMetadata } from '../../file-types'
+import type { DesignerApplicationData } from './utils/getLoadLiquidCommands'
+
+export const migrateFile = (
+  appData: ProtocolFile<DesignerApplicationData>
+): ProtocolFile<PDMetadata> => {
+  const {
+    designerApplication,
+    commands,
+    labwareDefinitions,
+    liquids,
+    robot,
+  } = appData
+
+  if (designerApplication == null || designerApplication?.data == null) {
+    throw Error('The designerApplication key in your file is corrupt.')
+  }
+  const ingredients = designerApplication.data.ingredients
+  const savedStepForms = designerApplication.data.savedStepForms
+
+  const migratedIngredients: Ingredients = Object.entries(
+    ingredients
+  ).reduce<Ingredients>((acc, [id, ingredient]) => {
+    acc[id] = {
+      displayName: ingredient.name ?? '',
+      liquidClass: ingredient.liquidClass,
+      description: ingredient.description ?? null,
+      liquidGroupId: id,
+      displayColor: liquids[id].displayColor ?? swatchColors(id),
+    }
+    return acc
+  }, {})
+
+  const updatedInitialStep = Object.values(savedStepForms).reduce(
+    (acc, form) => {
+      const { id } = form
+      if (id === '__INITIAL_DECK_SETUP_STEP__') {
+        return {
+          ...acc,
+          [id]: {
+            ...form,
+            ...getAdditionalEquipmentLocationUpdate(
+              commands,
+              robot.model,
+              savedStepForms
+            ),
+          },
+        }
+      }
+      return acc
+    },
+    {}
+  )
+  const equipmentLoadInfoFromCommands = getEquipmentLoadInfoFromCommands(
+    commands,
+    labwareDefinitions
+  )
+  return {
+    ...appData,
+    designerApplication: {
+      ...designerApplication,
+      data: {
+        ...designerApplication.data,
+        ingredients: migratedIngredients,
+        ...equipmentLoadInfoFromCommands,
+        savedStepForms: {
+          ...designerApplication.data.savedStepForms,
+          ...updatedInitialStep,
+        },
+      },
+    },
+  }
+}

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

@@ -4,50 +4,28 @@
   POSITION_REFERENCE_BOTTOM,
 } from '@opentrons/shared-data'
 
-import { swatchColors } from '../../components/organisms/DefineLiquidsModal/swatchColors'
 import {
   DEFAULT_MM_TOUCH_TIP_OFFSET_FROM_EDGE,
   PROTOCOL_DESIGNER_SOURCE,
 } from '../../constants'
 import { getDefaultPushOutVolume } from '../../utils'
-import { getAdditionalEquipmentLocationUpdate } from './utils/getAdditionalEquipmentLocationUpdate'
 import { getEquipmentLoadInfoFromCommands } from './utils/getEquipmentLoadInfoFromCommands'
 import { getMigratedPositionFromTop } from './utils/getMigrationPositionFromTop'
 
 import type {
   LoadLabwareCreateCommand,
   ProtocolFile,
 } from '@opentrons/shared-data'
-import type { Ingredients } from '@opentrons/step-generation'
 import type { PDMetadata } from '../../file-types'
-import type { DesignerApplicationData } from './utils/getLoadLiquidCommands'
 
 export const migrateFile = (
-  appData: ProtocolFile<DesignerApplicationData>
+  appData: ProtocolFile<PDMetadata>
 ): ProtocolFile<PDMetadata> => {
-  const {
-    designerApplication,
-    commands,
-    labwareDefinitions,
-    liquids,
-    robot,
-  } = appData
+  const { designerApplication, commands, labwareDefinitions } = appData
   if (designerApplication == null || designerApplication?.data == null) {
     throw Error('The designerApplication key in your file is corrupt.')
   }
-  const { savedStepForms, ingredients } = designerApplication.data
-  const migratedIngredients: Ingredients = Object.entries(
-    ingredients
-  ).reduce<Ingredients>((acc, [id, ingredient]) => {
-    acc[id] = {
-      displayName: ingredient.name ?? '',
-      liquidClass: ingredient.liquidClass,
-      description: ingredient.description ?? null,
-      liquidGroupId: id,
-      displayColor: liquids[id].displayColor ?? swatchColors(id),
-    }
-    return acc
-  }, {})
+  const { savedStepForms } = designerApplication.data
 
   const loadLabwareCommands = commands.filter(
     (command): command is LoadLabwareCreateCommand =>
@@ -217,26 +195,6 @@
     {}
   )
 
-  const updatedInitialStep = Object.values(savedStepForms).reduce(
-    (acc, form) => {
-      const { id } = form
-      if (id === '__INITIAL_DECK_SETUP_STEP__') {
-        return {
-          ...acc,
-          [id]: {
-            ...form,
-            ...getAdditionalEquipmentLocationUpdate(
-              commands,
-              robot.model,
-              savedStepForms
-            ),
-          },
-        }
-      }
-      return acc
-    },
-    {}
-  )
   return {
     ...appData,
     metadata: {
@@ -247,11 +205,8 @@
       ...designerApplication,
       data: {
         ...designerApplication.data,
-        ingredients: migratedIngredients,
-        ...equipmentLoadInfoFromCommands,
         savedStepForms: {
           ...designerApplication.data.savedStepForms,
-          ...updatedInitialStep,
           ...savedStepsWithUpdatedMoveLiquidFields,
           ...savedStepsWithUpdatedMixFields,
         },

protocol-designer/src/load-file/migration/index.ts

@@ -14,6 +14,7 @@
 import { migrateFile as migrateFileEightOne } from './8_1_0'
 import { migrateFile as migrateFileEightTwo } from './8_2_0'
 import { migrateFile as migrateFileEightTwoPointTwo } from './8_2_2'
+import { migrateFile as migrateFileEightFourFour } from './8_4_4'
 import { migrateFile as migrateFileEightFive } from './8_5_0'
 
 import type {
@@ -64,6 +65,8 @@
   // @ts-expect-error
   '8.2.2': migrateFileEightTwoPointTwo,
   // @ts-expect-error
+  '8.4.4': migrateFileEightFourFour,
+  // @ts-expect-error
   '8.5.0': migrateFileEightFive,
 }
 export const migration = (