diff --git a/protocol-designer/fixtures/protocol/8/doItAllV3MigratedToV8.json b/protocol-designer/fixtures/protocol/8/doItAllV3MigratedToV8.json index bfe4767cdff..48c933990a4 100644 --- a/protocol-designer/fixtures/protocol/8/doItAllV3MigratedToV8.json +++ b/protocol-designer/fixtures/protocol/8/doItAllV3MigratedToV8.json @@ -15,13 +15,7 @@ "name": "opentrons/protocol-designer", "version": "8.5.0", "data": { - "_internalAppBuildDate": "Tue, 04 Feb 2025 15:16:30 GMT", - "defaultValues": { - "aspirate_mmFromBottom": 1, - "dispense_mmFromBottom": 1, - "touchTip_mmFromTop": -1, - "blowout_mmFromTop": 0 - }, + "_internalAppBuildDate": "Wed, 29 Jan 2025 13:23:47 GMT", "pipetteTiprackAssignments": { "0b3f2210-75c7-11ea-b42f-4b64e50f43e5": [ "opentrons/opentrons_96_tiprack_300ul/1" @@ -266,7 +260,27 @@ "3961e4c0-75c7-11ea-b42f-4b64e50f43e5", "54dc3200-75c7-11ea-b42f-4b64e50f43e5", "a4cee9a0-75dc-11ea-b42f-4b64e50f43e5" - ] + ], + "pipettes": { + "0b3f2210-75c7-11ea-b42f-4b64e50f43e5": { + "pipetteName": "p300_single_gen2" + } + }, + "modules": {}, + "labware": { + "0b44c760-75c7-11ea-b42f-4b64e50f43e5:opentrons/opentrons_96_tiprack_300ul/1": { + "displayName": "Opentrons 96 Tip Rack 300 µL", + "labwareDefURI": "opentrons/opentrons_96_tiprack_300ul/1" + }, + "1e610d40-75c7-11ea-b42f-4b64e50f43e5:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/1": { + "displayName": "NEST 96 Well Plate 100 µL PCR Full Skirt", + "labwareDefURI": "opentrons/nest_96_wellplate_100ul_pcr_full_skirt/1" + }, + "21ed8f60-75c7-11ea-b42f-4b64e50f43e5:opentrons/opentrons_24_aluminumblock_generic_2ml_screwcap/1": { + "displayName": "Opentrons 24 Well Aluminum Block with Generic 2 mL Screwcap", + "labwareDefURI": "opentrons/opentrons_24_aluminumblock_generic_2ml_screwcap/1" + } + } } }, "robot": { diff --git a/protocol-designer/fixtures/protocol/8/doItAllV4MigratedToV8.json b/protocol-designer/fixtures/protocol/8/doItAllV4MigratedToV8.json index 5ef201e8e50..ea1d1cb31f3 100644 --- a/protocol-designer/fixtures/protocol/8/doItAllV4MigratedToV8.json +++ b/protocol-designer/fixtures/protocol/8/doItAllV4MigratedToV8.json @@ -15,13 +15,7 @@ "name": "opentrons/protocol-designer", "version": "8.5.0", "data": { - "_internalAppBuildDate": "Tue, 04 Feb 2025 15:16:30 GMT", - "defaultValues": { - "aspirate_mmFromBottom": 1, - "dispense_mmFromBottom": 1, - "touchTip_mmFromTop": -1, - "blowout_mmFromTop": 0 - }, + "_internalAppBuildDate": "Wed, 29 Jan 2025 13:23:47 GMT", "pipetteTiprackAssignments": { "0b3f2210-75c7-11ea-b42f-4b64e50f43e5": [ "opentrons/opentrons_96_tiprack_300ul/1" @@ -288,7 +282,34 @@ "4f4057e0-75c7-11ea-b42f-4b64e50f43e5", "54dc3200-75c7-11ea-b42f-4b64e50f43e5", "80c00130-75c7-11ea-b42f-4b64e50f43e5" - ] + ], + "pipettes": { + "0b3f2210-75c7-11ea-b42f-4b64e50f43e5": { + "pipetteName": "p300_single_gen2" + } + }, + "modules": { + "0b419310-75c7-11ea-b42f-4b64e50f43e5:magneticModuleType": { + "model": "magneticModuleV2" + }, + "0b4319b0-75c7-11ea-b42f-4b64e50f43e5:temperatureModuleType": { + "model": "temperatureModuleV2" + } + }, + "labware": { + "0b44c760-75c7-11ea-b42f-4b64e50f43e5:opentrons/opentrons_96_tiprack_300ul/1": { + "displayName": "Opentrons 96 Tip Rack 300 µL", + "labwareDefURI": "opentrons/opentrons_96_tiprack_300ul/1" + }, + "1e610d40-75c7-11ea-b42f-4b64e50f43e5:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/1": { + "displayName": "NEST 96 Well Plate 100 µL PCR Full Skirt", + "labwareDefURI": "opentrons/nest_96_wellplate_100ul_pcr_full_skirt/1" + }, + "21ed8f60-75c7-11ea-b42f-4b64e50f43e5:opentrons/opentrons_24_aluminumblock_generic_2ml_screwcap/1": { + "displayName": "Opentrons 24 Well Aluminum Block with Generic 2 mL Screwcap", + "labwareDefURI": "opentrons/opentrons_24_aluminumblock_generic_2ml_screwcap/1" + } + } } }, "robot": { diff --git a/protocol-designer/fixtures/protocol/8/doItAllV7MigratedToV8.json b/protocol-designer/fixtures/protocol/8/doItAllV7MigratedToV8.json index 17257c9b64d..5ceb1bedabb 100644 --- a/protocol-designer/fixtures/protocol/8/doItAllV7MigratedToV8.json +++ b/protocol-designer/fixtures/protocol/8/doItAllV7MigratedToV8.json @@ -15,13 +15,7 @@ "name": "opentrons/protocol-designer", "version": "8.5.0", "data": { - "_internalAppBuildDate": "Tue, 04 Feb 2025 15:16:30 GMT", - "defaultValues": { - "aspirate_mmFromBottom": 1, - "dispense_mmFromBottom": 1, - "touchTip_mmFromTop": -1, - "blowout_mmFromTop": 0 - }, + "_internalAppBuildDate": "Wed, 29 Jan 2025 13:23:47 GMT", "pipetteTiprackAssignments": { "2e7c6344-58ab-465c-b542-489883cb63fe": [ "opentrons/opentrons_flex_96_filtertiprack_50ul/1" @@ -409,7 +403,51 @@ "7747287c-abea-4855-843e-d61b272124b2", "dcc6a6c7-2db8-417b-a1aa-3927abccfadd", "2f862881-7ce3-4d20-b0ef-53c8244f6ef3" - ] + ], + "pipettes": { + "2e7c6344-58ab-465c-b542-489883cb63fe": { + "pipetteName": "p1000_single_flex" + }, + "6d1e53c3-2db3-451b-ad60-3fe13781a193": { + "pipetteName": "p50_multi_flex" + } + }, + "modules": { + "1be16305-74e7-4bdb-9737-61ec726d2b44:magneticBlockType": { + "model": "magneticBlockV1" + }, + "c19dffa3-cb34-4702-bcf6-dcea786257d1:heaterShakerModuleType": { + "model": "heaterShakerModuleV1" + }, + "ef44ad7f-0fd9-46d6-8bc0-c70785644cc8:temperatureModuleType": { + "model": "temperatureModuleV2" + }, + "627b7a27-5bb7-46de-a530-67af45652e3b:thermocyclerModuleType": { + "model": "thermocyclerModuleV2" + } + }, + "labware": { + "d95bb3be-b453-457c-a947-bd03dc8e56b9:opentrons/opentrons_96_flat_bottom_adapter/1": { + "displayName": "Opentrons 96 Flat Bottom Heater-Shaker Adapter", + "labwareDefURI": "opentrons/opentrons_96_flat_bottom_adapter/1" + }, + "23ed35de-5bfd-4bb0-8f54-da99a2804ed9:opentrons/opentrons_flex_96_filtertiprack_50ul/1": { + "displayName": "Opentrons Flex 96 Filter Tip Rack 50 µL", + "labwareDefURI": "opentrons/opentrons_flex_96_filtertiprack_50ul/1" + }, + "fcba73e7-b88e-438e-963e-f8b9a5de0983:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2": { + "displayName": "NEST 96 Well Plate 100 µL PCR Full Skirt", + "labwareDefURI": "opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2" + }, + "a793a135-06aa-4ed6-a1d3-c176c7810afa:opentrons/opentrons_24_aluminumblock_nest_1.5ml_snapcap/1": { + "displayName": "Opentrons 24 Well Aluminum Block with NEST 1.5 mL Snapcap", + "labwareDefURI": "opentrons/opentrons_24_aluminumblock_nest_1.5ml_snapcap/1" + }, + "239ceac8-23ec-4900-810a-70aeef880273:opentrons/nest_96_wellplate_200ul_flat/2": { + "displayName": "NEST 96 Well Plate 200 µL Flat", + "labwareDefURI": "opentrons/nest_96_wellplate_200ul_flat/2" + } + } } }, "robot": { diff --git a/protocol-designer/fixtures/protocol/8/doItAllV8.json b/protocol-designer/fixtures/protocol/8/doItAllV8.json index aaece68eb3a..7015a8a0c94 100644 --- a/protocol-designer/fixtures/protocol/8/doItAllV8.json +++ b/protocol-designer/fixtures/protocol/8/doItAllV8.json @@ -15,13 +15,7 @@ "name": "opentrons/protocol-designer", "version": "8.5.0", "data": { - "_internalAppBuildDate": "Wed, 05 Feb 2025 18:32:26 GMT", - "defaultValues": { - "aspirate_mmFromBottom": 1, - "dispense_mmFromBottom": 1, - "touchTip_mmFromTop": -1, - "blowout_mmFromTop": 0 - }, + "_internalAppBuildDate": "Wed, 29 Jan 2025 13:23:47 GMT", "pipetteTiprackAssignments": { "9fcd50d9-92b2-45ac-acf1-e2cf773feffc": [ "opentrons/opentrons_flex_96_tiprack_1000ul/1" @@ -358,7 +352,38 @@ "2b8f84e2-b079-41e8-a66e-ff8d9c5dfe1d", "07dd4472-3ea4-475c-8fd3-18819519b401", "ed84f11e-db82-4039-9e04-e619b03af42f" - ] + ], + "pipettes": { + "9fcd50d9-92b2-45ac-acf1-e2cf773feffc": { + "pipetteName": "p1000_single_flex" + } + }, + "modules": { + "23347241-80bb-4a7e-9c91-5d9727a9e483:heaterShakerModuleType": { + "model": "heaterShakerModuleV1" + }, + "fd6da9f1-d63b-414b-929e-c646b64790e9:thermocyclerModuleType": { + "model": "thermocyclerModuleV2" + } + }, + "labware": { + "7c4d59fa-0e50-442f-adce-9e4b0c7f0b88:opentrons/opentrons_96_pcr_adapter/1": { + "displayName": "Opentrons 96 PCR Heater-Shaker Adapter", + "labwareDefURI": "opentrons/opentrons_96_pcr_adapter/1" + }, + "f2d371ea-5146-4c89-8200-9c056a7f321a:opentrons/opentrons_flex_96_tiprack_1000ul/1": { + "displayName": "Opentrons Flex 96 Tip Rack 1000 µL", + "labwareDefURI": "opentrons/opentrons_flex_96_tiprack_1000ul/1" + }, + "54370838-4fca-4a14-b88a-7840e4903649:opentrons/opentrons_96_wellplate_200ul_pcr_full_skirt/2": { + "displayName": "Opentrons Tough 96 Well Plate 200 µL PCR Full Skirt", + "labwareDefURI": "opentrons/opentrons_96_wellplate_200ul_pcr_full_skirt/2" + }, + "8bacda22-9e05-45e8-bef4-cc04414a204f:opentrons/axygen_1_reservoir_90ml/1": { + "displayName": "Axygen 1 Well Reservoir 90 mL", + "labwareDefURI": "opentrons/axygen_1_reservoir_90ml/1" + } + } } }, "robot": { diff --git a/protocol-designer/fixtures/protocol/8/example_1_1_0MigratedToV8.json b/protocol-designer/fixtures/protocol/8/example_1_1_0MigratedToV8.json index 7e0b8eeabff..dde560281b0 100644 --- a/protocol-designer/fixtures/protocol/8/example_1_1_0MigratedToV8.json +++ b/protocol-designer/fixtures/protocol/8/example_1_1_0MigratedToV8.json @@ -15,13 +15,7 @@ "name": "opentrons/protocol-designer", "version": "8.5.0", "data": { - "_internalAppBuildDate": "Tue, 04 Feb 2025 15:16:30 GMT", - "defaultValues": { - "aspirate_mmFromBottom": 1, - "dispense_mmFromBottom": 1, - "touchTip_mmFromTop": -1, - "blowout_mmFromTop": 0 - }, + "_internalAppBuildDate": "Thu, 30 Jan 2025 17:05:24 GMT", "pipetteTiprackAssignments": { "c6f45030-92a5-11e9-ac62-1b173f839d9e": [ "opentrons/opentrons_96_tiprack_10ul/1" @@ -235,7 +229,30 @@ "e7d36200-92a5-11e9-ac62-1b173f839d9e", "18113c80-92a6-11e9-ac62-1b173f839d9e", "2e622080-92a6-11e9-ac62-1b173f839d9e" - ] + ], + "pipettes": { + "c6f45030-92a5-11e9-ac62-1b173f839d9e": { + "pipetteName": "p10_single" + }, + "c6f47740-92a5-11e9-ac62-1b173f839d9e": { + "pipetteName": "p50_single" + } + }, + "modules": {}, + "labware": { + "c6f4ec70-92a5-11e9-ac62-1b173f839d9e:tiprack-10ul:opentrons/opentrons_96_tiprack_10ul/1": { + "displayName": "tiprack 10ul (1)", + "labwareDefURI": "opentrons/opentrons_96_tiprack_10ul/1" + }, + "c6f51380-92a5-11e9-ac62-1b173f839d9e:tiprack-200ul:opentrons/tipone_96_tiprack_200ul/1": { + "displayName": "tiprack 200ul (1)", + "labwareDefURI": "opentrons/tipone_96_tiprack_200ul/1" + }, + "dafd4000-92a5-11e9-ac62-1b173f839d9e:96-deep-well:opentrons/usascientific_96_wellplate_2.4ml_deep/1": { + "displayName": "96 deep well (1)", + "labwareDefURI": "opentrons/usascientific_96_wellplate_2.4ml_deep/1" + } + } } }, "robot": { diff --git a/protocol-designer/fixtures/protocol/8/mix_8_0_0.json b/protocol-designer/fixtures/protocol/8/mix_8_0_0.json index b3f37e7e9b5..b55b9b94478 100644 --- a/protocol-designer/fixtures/protocol/8/mix_8_0_0.json +++ b/protocol-designer/fixtures/protocol/8/mix_8_0_0.json @@ -13,15 +13,9 @@ }, "designerApplication": { "name": "opentrons/protocol-designer", - "version": "8.2.0", + "version": "8.5.0", "data": { "_internalAppBuildDate": "Wed, 01 May 2024 13:32:34 GMT", - "defaultValues": { - "aspirate_mmFromBottom": 1, - "dispense_mmFromBottom": 1, - "touchTip_mmFromTop": -1, - "blowout_mmFromTop": 0 - }, "pipetteTiprackAssignments": { "pipetteId": ["opentrons/opentrons_96_tiprack_10ul/1"] }, @@ -91,7 +85,23 @@ "orderedStepIds": [ "f59ea8e0-fc3a-11ea-8809-e959e7d61d96", "fc4dc7c0-fc3a-11ea-8809-e959e7d61d96" - ] + ], + "pipettes": { + "pipetteId": { + "pipetteName": "p20_single_gen2" + } + }, + "modules": {}, + "labware": { + "f1c677c0-fc3a-11ea-8809-e959e7d61d96:opentrons/opentrons_96_tiprack_10ul/1": { + "displayName": "Opentrons OT-2 96 Tip Rack 10 µL", + "labwareDefURI": "opentrons/opentrons_96_tiprack_10ul/1" + }, + "fe572c50-fc3a-11ea-8809-e959e7d61d96:opentrons/biorad_96_wellplate_200ul_pcr/1": { + "displayName": "Bio-Rad 96 Well Plate 200 µL PCR", + "labwareDefURI": "opentrons/biorad_96_wellplate_200ul_pcr/1" + } + } } }, "robot": { "model": "OT-2 Standard", "deckId": "ot2_standard" }, diff --git a/protocol-designer/fixtures/protocol/8/newAdvancedSettingsAndMultiTemp.json b/protocol-designer/fixtures/protocol/8/newAdvancedSettingsAndMultiTemp.json index eeb2cd9765c..e41bc40b181 100644 --- a/protocol-designer/fixtures/protocol/8/newAdvancedSettingsAndMultiTemp.json +++ b/protocol-designer/fixtures/protocol/8/newAdvancedSettingsAndMultiTemp.json @@ -15,13 +15,7 @@ "name": "opentrons/protocol-designer", "version": "8.5.0", "data": { - "_internalAppBuildDate": "Tue, 04 Feb 2025 15:16:30 GMT", - "defaultValues": { - "aspirate_mmFromBottom": 1, - "dispense_mmFromBottom": 1, - "touchTip_mmFromTop": -1, - "blowout_mmFromTop": 0 - }, + "_internalAppBuildDate": "Wed, 29 Jan 2025 13:23:47 GMT", "pipetteTiprackAssignments": { "21087f15-4c03-4587-8a2b-1ba0b5a501a0": [ "opentrons/opentrons_flex_96_tiprack_50ul/1" @@ -186,7 +180,38 @@ "c72b4af9-7488-4109-8221-15a5433f4fd8", "ffb0d1ff-8146-409c-9248-2065a3b27c4d", "eab2ec89-6d11-4246-ae91-d451cb3a5b1d" - ] + ], + "pipettes": { + "21087f15-4c03-4587-8a2b-1ba0b5a501a0": { + "pipetteName": "p50_single_flex" + } + }, + "modules": { + "d6966555-6c0e-45e0-8056-428d7c486401:temperatureModuleType": { + "model": "temperatureModuleV2" + }, + "b9c56153-9026-42d1-8113-949e15254571:temperatureModuleType": { + "model": "temperatureModuleV2" + } + }, + "labware": { + "32b596f6-79bb-4ad8-a34a-c44620fdb68f:opentrons/opentrons_96_well_aluminum_block/1": { + "displayName": "Opentrons 96 Well Aluminum Block", + "labwareDefURI": "opentrons/opentrons_96_well_aluminum_block/1" + }, + "0d39213c-49c2-4170-bf19-4c09e1b72aca:opentrons/opentrons_flex_96_tiprack_50ul/1": { + "displayName": "Opentrons Flex 96 Tip Rack 50 µL", + "labwareDefURI": "opentrons/opentrons_flex_96_tiprack_50ul/1" + }, + "c3c4e3fd-069f-4f3d-9b70-016a20f36de7:opentrons/opentrons_24_aluminumblock_nest_1.5ml_screwcap/1": { + "displayName": "Opentrons 24 Well Aluminum Block with NEST 1.5 mL Screwcap", + "labwareDefURI": "opentrons/opentrons_24_aluminumblock_nest_1.5ml_screwcap/1" + }, + "c0093e5f-3f7d-4cbf-aa17-d88394108501:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2": { + "displayName": "NEST 96 Well Plate 100 µL PCR Full Skirt", + "labwareDefURI": "opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2" + } + } } }, "robot": { diff --git a/protocol-designer/fixtures/protocol/8/ninetySixChannelFullAndColumn.json b/protocol-designer/fixtures/protocol/8/ninetySixChannelFullAndColumn.json index f38b1eb287b..763f62e6c27 100644 --- a/protocol-designer/fixtures/protocol/8/ninetySixChannelFullAndColumn.json +++ b/protocol-designer/fixtures/protocol/8/ninetySixChannelFullAndColumn.json @@ -15,13 +15,7 @@ "name": "opentrons/protocol-designer", "version": "8.5.0", "data": { - "_internalAppBuildDate": "Tue, 04 Feb 2025 15:16:30 GMT", - "defaultValues": { - "aspirate_mmFromBottom": 1, - "dispense_mmFromBottom": 1, - "touchTip_mmFromTop": -1, - "blowout_mmFromTop": 0 - }, + "_internalAppBuildDate": "Wed, 29 Jan 2025 13:23:47 GMT", "pipetteTiprackAssignments": { "de7da440-95ec-43e8-8723-851321fbd6f9": [ "opentrons/opentrons_flex_96_tiprack_50ul/1" @@ -184,7 +178,31 @@ "orderedStepIds": [ "83a095fa-b649-4105-99d4-177f1a3f363a", "f5ea3139-1585-4848-9d5f-832eb88c99ca" - ] + ], + "pipettes": { + "de7da440-95ec-43e8-8723-851321fbd6f9": { + "pipetteName": "p1000_96" + } + }, + "modules": {}, + "labware": { + "ec850fd3-cf7c-44c5-b358-fba3a30315c9:opentrons/opentrons_flex_96_tiprack_adapter/1": { + "displayName": "Opentrons Flex 96 Tip Rack Adapter", + "labwareDefURI": "opentrons/opentrons_flex_96_tiprack_adapter/1" + }, + "75aa666f-98d8-4af9-908e-963ced428580:opentrons/opentrons_flex_96_tiprack_50ul/1": { + "displayName": "Opentrons Flex 96 Tip Rack 50 µL", + "labwareDefURI": "opentrons/opentrons_flex_96_tiprack_50ul/1" + }, + "fe1942b1-1b75-4d3a-9c12-d23004958a12:opentrons/biorad_96_wellplate_200ul_pcr/2": { + "displayName": "Bio-Rad 96 Well Plate 200 µL PCR", + "labwareDefURI": "opentrons/biorad_96_wellplate_200ul_pcr/2" + }, + "9bd16b50-4ae9-4cfd-8583-3378087e6a6c:opentrons/opentrons_flex_96_tiprack_50ul/1": { + "displayName": "Opentrons Flex 96 Tip Rack 50 µL", + "labwareDefURI": "opentrons/opentrons_flex_96_tiprack_50ul/1" + } + } } }, "robot": { diff --git a/protocol-designer/fixtures/protocol/8/thermocyclerOnOt2V7MigratedToV8.json b/protocol-designer/fixtures/protocol/8/thermocyclerOnOt2V7MigratedToV8.json index d08d93857e8..0fdb37a057e 100644 --- a/protocol-designer/fixtures/protocol/8/thermocyclerOnOt2V7MigratedToV8.json +++ b/protocol-designer/fixtures/protocol/8/thermocyclerOnOt2V7MigratedToV8.json @@ -15,13 +15,7 @@ "name": "opentrons/protocol-designer", "version": "8.5.0", "data": { - "_internalAppBuildDate": "Tue, 04 Feb 2025 15:40:12 GMT", - "defaultValues": { - "aspirate_mmFromBottom": 1, - "dispense_mmFromBottom": 1, - "touchTip_mmFromTop": -1, - "blowout_mmFromTop": 0 - }, + "_internalAppBuildDate": "Wed, 29 Jan 2025 13:23:47 GMT", "pipetteTiprackAssignments": { "733ba018-3550-476c-9fa3-0b5259d1a1d6": [ "opentrons/opentrons_96_tiprack_20ul/1" @@ -187,7 +181,23 @@ "orderedStepIds": [ "f07a86fc-8373-427b-b159-89ec8d20b9a6", "72b79c80-00e4-48ce-b42a-35b0ba17664c" - ] + ], + "pipettes": { + "733ba018-3550-476c-9fa3-0b5259d1a1d6": { + "pipetteName": "p20_single_gen2" + } + }, + "modules": { + "82858229-5c25-46cc-87d4-35ab318c18ce:thermocyclerModuleType": { + "model": "thermocyclerModuleV1" + } + }, + "labware": { + "ac928a51-a248-4304-be43-e9cb19c34fa9:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2": { + "displayName": "NEST 96 Well Plate 100 µL PCR Full Skirt", + "labwareDefURI": "opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2" + } + } } }, "robot": { diff --git a/protocol-designer/src/file-types.ts b/protocol-designer/src/file-types.ts index 90903c13daa..41d7a9fe076 100644 --- a/protocol-designer/src/file-types.ts +++ b/protocol-designer/src/file-types.ts @@ -34,7 +34,7 @@ export interface PDMetadata { labware: Labware } -export type PDProtocolFile = ProtocolFile & PDMetadata +export type PDProtocolFile = ProtocolFile export function getPDMetadata(file: PDProtocolFile): PDMetadata { const metadata = file.designerApplication?.data diff --git a/protocol-designer/src/load-file/migration/8_5_0.ts b/protocol-designer/src/load-file/migration/8_5_0.ts index 0ae063f61de..bbf2fda4c62 100644 --- a/protocol-designer/src/load-file/migration/8_5_0.ts +++ b/protocol-designer/src/load-file/migration/8_5_0.ts @@ -162,7 +162,6 @@ export const migrateFile = ( commands, labwareDefinitions ) - return { ...appData, designerApplication: { diff --git a/protocol-designer/src/step-forms/reducers/index.ts b/protocol-designer/src/step-forms/reducers/index.ts index 011741bb57f..ef2b30ed303 100644 --- a/protocol-designer/src/step-forms/reducers/index.ts +++ b/protocol-designer/src/step-forms/reducers/index.ts @@ -991,8 +991,8 @@ export const labwareInvariantProperties: Reducer< action: LoadFileAction ): NormalizedLabwareById => { const { file } = action.payload - const labware = file.labware - return { ...labware, ...state } + const metadata = getPDMetadata(file) + return { ...metadata.labware, ...state } }, REPLACE_CUSTOM_LABWARE_DEF: ( state: NormalizedLabwareById, @@ -1048,8 +1048,8 @@ export const moduleInvariantProperties: Reducer< action: LoadFileAction ): ModuleEntities => { const { file } = action.payload - const modulesFromFile = file.modules - const modules: ModuleEntities = Object.entries(modulesFromFile).reduce( + const metadata = getPDMetadata(file) + const modules: ModuleEntities = Object.entries(metadata.modules).reduce( ( acc: ModuleEntities, [id, moduleLoadInfo]: [string, ModuleLoadInfo] @@ -1081,9 +1081,8 @@ export const pipetteInvariantProperties: Reducer< action: LoadFileAction ): NormalizedPipetteById => { const { file } = action.payload - const pipettesFromFile = file.pipettes const metadata = getPDMetadata(file) - const pipettes = Object.entries(pipettesFromFile).reduce( + const pipettes = Object.entries(metadata.pipettes).reduce( ( acc: NormalizedPipetteById, [id, pipetteLoadInfo]: [string, PipetteLoadInfo]