Merge branch 'edge' into flex-stacker-add-tof-sensors-to-diag-script

Author: vegano1

.eslintignore

@@ -13,6 +13,7 @@
 !api/release-notes.md
 !app-shell/build/release-notes.md
 **/.yarn-cache/**
+protocol-designer/cypress/downloads/**
 
 # components library
 storybook-static

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

@@ -78,6 +78,8 @@ jobs:
     if: github.event_name != 'pull_request'
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - uses: ./.github/actions/js/setup
       - name: 'build PD'
         env:

.storybook/main.js .storybook/main.ts

@@ -41,6 +41,15 @@ export const customViewports = {
       height: '700px',
     },
   },
+  protocolDesignerBase: {
+    // The base size for Protocol Designer. This might be the base size for web
+    name: 'Protocol Designer Base',
+    type: 'desktop',
+    styles: {
+      width: '14402px',
+      height: '1024px',
+    },
+  },
 }
 
 export const parameters = {
@@ -51,6 +60,7 @@ export const parameters = {
       method: 'alphabetical',
       order: [
         'Design Tokens',
+        'Helix',
         'Library',
         'App',
         'ODD',

.storybook/preview.jsx .storybook/preview.tsx

@@ -17,7 +17,7 @@
     "source": "Protocol Library",
 }
 
-requirements = {"robotType": "Flex", "apiLevel": "2.21"}
+requirements = {"robotType": "Flex", "apiLevel": "2.22"}
 
 
 def add_parameters(parameters: ParameterContext) -> None:
@@ -83,7 +83,7 @@ def run(protocol: ProtocolContext) -> None:
     mount_pos = protocol.params.pipette_mount  # type: ignore[attr-defined]
     all_data = protocol.params.parameters_csv.parse_as_csv()  # type: ignore[attr-defined]
     data = all_data[1:]
-    helpers.comment_protocol_version(protocol, "01")
+    helpers.comment_protocol_version(protocol, "02")
     # DECK SETUP AND LABWARE
     protocol.comment("THIS IS A NO MODULE RUN")
     tiprack_x_1 = protocol.load_labware("opentrons_flex_96_tiprack_200ul", "D1")

abr-testing/abr_testing/protocols/active_protocols/1_Simple Normalize Long Right.py

@@ -14,7 +14,7 @@
     "protocolName": "PCR Protocol with TC Auto Sealing Lid",
     "author": "Rami Farawi <[email protected]",
 }
-requirements = {"robotType": "Flex", "apiLevel": "2.21"}
+requirements = {"robotType": "Flex", "apiLevel": "2.22"}
 
 
 def add_parameters(parameters: ParameterContext) -> None:
@@ -33,7 +33,7 @@ def run(protocol: ProtocolContext) -> None:
     parsed_csv = protocol.params.parameters_csv.parse_as_csv()  # type: ignore[attr-defined]
     deck_riser = protocol.params.deck_riser  # type: ignore[attr-defined]
     deactivate_modules_bool = protocol.params.deactivate_modules  # type: ignore[attr-defined]
-    helpers.comment_protocol_version(protocol, "01")
+    helpers.comment_protocol_version(protocol, "02")
 
     rxn_vol = 50
     real_mode = True

abr-testing/abr_testing/protocols/active_protocols/2_BMS_PCR_Protocol.py

@@ -26,7 +26,7 @@
 
 requirements = {
     "robotType": "Flex",
-    "apiLevel": "2.21",
+    "apiLevel": "2.22",
 }
 
 # SCRIPT SETTINGS
@@ -75,7 +75,7 @@ def run(protocol: ProtocolContext) -> None:
     deck_riser = protocol.params.deck_riser  # type: ignore[attr-defined]
     trash_lid = protocol.params.trash_lid  # type: ignore[attr-defined]
     deactivate_modules_bool = protocol.params.deactivate_modules  # type: ignore[attr-defined]
-    helpers.comment_protocol_version(protocol, "01")
+    helpers.comment_protocol_version(protocol, "02")
 
     unused_lids: List[Labware] = []
     used_lids: List[Labware] = []