fix load-file ingredients type

Opentrons · Feb 5, 2025 · 6b63aae · 6b63aae
1 parent 1f240e0
commit 6b63aae
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 17 deletions.
diff --git a/protocol-designer/fixtures/protocol/8/doItAllV3MigratedToV8.json b/protocol-designer/fixtures/protocol/8/doItAllV3MigratedToV8.json
@@ -34,10 +34,10 @@
       "ingredients": {
         "0": {
           "displayName": "Water",
+          "displayColor": "#b925ff",
           "description": null,
-          "liquidGroupId": "0",
           "pythonName": "liquid_1",
-          "displayColor": "#b925ff"
+          "liquidGroupId": "0"
         }
       },
       "ingredLocations": {

diff --git a/protocol-designer/fixtures/protocol/8/doItAllV4MigratedToV8.json b/protocol-designer/fixtures/protocol/8/doItAllV4MigratedToV8.json
@@ -34,10 +34,10 @@
       "ingredients": {
         "0": {
           "displayName": "Water",
+          "displayColor": "#b925ff",
           "description": null,
-          "liquidGroupId": "0",
           "pythonName": "liquid_1",
-          "displayColor": "#b925ff"
+          "liquidGroupId": "0"
         }
       },
       "ingredLocations": {

diff --git a/protocol-designer/fixtures/protocol/8/doItAllV7MigratedToV8.json b/protocol-designer/fixtures/protocol/8/doItAllV7MigratedToV8.json
@@ -37,17 +37,17 @@
       "ingredients": {
         "0": {
           "displayName": "Water",
+          "displayColor": "#b925ff",
           "description": null,
-          "liquidGroupId": "0",
           "pythonName": "liquid_1",
-          "displayColor": "#b925ff"
+          "liquidGroupId": "0"
         },
         "1": {
           "displayName": "Samples",
+          "displayColor": "#ffd600",
           "description": null,
-          "liquidGroupId": "1",
           "pythonName": "liquid_2",
-          "displayColor": "#ffd600"
+          "liquidGroupId": "1"
         }
       },
       "ingredLocations": {

diff --git a/protocol-designer/fixtures/protocol/8/doItAllV8.json b/protocol-designer/fixtures/protocol/8/doItAllV8.json
@@ -33,14 +33,14 @@
       },
       "ingredients": {
         "0": {
-          "displayName": "",
+          "displayName": "h20",
           "description": null,
           "liquidGroupId": "0",
           "pythonName": "liquid_1",
           "displayColor": "#b925ff"
         },
         "1": {
-          "displayName": "",
+          "displayName": "sample",
           "description": null,
           "liquidGroupId": "1",
           "pythonName": "liquid_2",

diff --git a/protocol-designer/fixtures/protocol/8/example_1_1_0MigratedToV8.json b/protocol-designer/fixtures/protocol/8/example_1_1_0MigratedToV8.json
@@ -38,16 +38,16 @@
         "0": {
           "displayName": "samples",
           "description": null,
-          "liquidGroupId": "0",
+          "displayColor": "#b925ff",
           "pythonName": "liquid_1",
-          "displayColor": "#b925ff"
+          "liquidGroupId": "0"
         },
         "1": {
           "displayName": "dna",
           "description": null,
-          "liquidGroupId": "1",
           "pythonName": "liquid_2",
-          "displayColor": "#ffd600"
+          "displayColor": "#ffd600",
+          "liquidGroupId": "1"
         }
       },
       "ingredLocations": {

diff --git a/protocol-designer/fixtures/protocol/8/thermocyclerOnOt2V7MigratedToV8.json b/protocol-designer/fixtures/protocol/8/thermocyclerOnOt2V7MigratedToV8.json
@@ -34,10 +34,10 @@
       "ingredients": {
         "0": {
           "displayName": "123",
+          "displayColor": "#b925ff",
           "description": null,
-          "liquidGroupId": "0",
           "pythonName": "liquid_1",
-          "displayColor": "#b925ff"
+          "liquidGroupId": "0"
         }
       },
       "ingredLocations": {

diff --git a/protocol-designer/src/file-types.ts b/protocol-designer/src/file-types.ts
@@ -5,12 +5,13 @@ import type { ProtocolFile as ProtocolFileV3 } from '@opentrons/shared-data/prot
 import type { ProtocolFile as ProtocolFileV4 } from '@opentrons/shared-data/protocol/types/schemaV4'
 import type { ProtocolFile as ProtocolFileV5 } from '@opentrons/shared-data/protocol/types/schemaV5'
 import type { ProtocolFile as ProtocolFileV6 } from '@opentrons/shared-data/protocol/types/schemaV6'
+import { LiquidEntities } from '@opentrons/step-generation'
 
 export interface PDMetadata {
   // pipetteId to tiprackModel
   pipetteTiprackAssignments: Record<string, string[]>
   dismissedWarnings: DismissRoot['dismissedWarnings']
-  ingredients: IngredRoot['ingredients']
+  ingredients: LiquidEntities
   ingredLocations: IngredRoot['ingredLocations']
   savedStepForms: StepformRoot['savedStepForms']
   orderedStepIds: StepformRoot['orderedStepIds']