chore(release): 7.1.0

.eslintignore

@@ -27,6 +27,7 @@ update-server/**
 robot-server/**
 notify-server/**
 shared-data/python/**
+hardware-testing/**
 
 # app-testing don't format the json protocols
 app-testing/files

.github/CODEOWNERS

@@ -9,18 +9,17 @@
 /webpack-config @Opentrons/js
 
 # subprojects - those with clear team ownership should have appropriate notifications
-/protocol-designer @Opentrons/spddrs
-/labware-designer @Opentrons/spddrs
-/labware-library @Opentrons/spddrs
-/protocol-library-kludge @Opentrons/spddrs
-/update-server @Opentrons/cpx
-/api/src/opentrons @Opentrons/hmg
-/discovery-client @Opentrons/cpx
-/shared-data/pipette @Opentrons/hmg
-/shared-data/protocol @Opentrons/spddrs
-/shared-data/module @Opentrons/hmg
-/shared-data/deck @Opentrons/hmg
-/shared-data/labware @Opentrons/hmg
+/protocol-designer @Opentrons/app-and-uis
+/labware-designer @Opentrons/app-and-uis
+/labware-library @Opentrons/app-and-uis
+/protocol-library-kludge @Opentrons/app-and-uis
+/update-server @Opentrons/robot-svcs
+/discovery-client @Opentrons/robot-svcs @Opentrons/app-and-uis
+/shared-data/pipette @Opentrons/embedded-sw
+/shared-data/protocol @Opentrons/robot-svcs @Opentrons/app-and-uis
+/shared-data/module @Opentrons/embedded-sw
+/shared-data/deck @Opentrons/embedded-sw
+/shared-data/labware @Opentrons/embedded-sw
 
 # subprojects by language - some subprojects are shared by teams but united by a
 # language community (including makefiles and config) so mark them appropriately

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

@@ -85,7 +85,7 @@ jobs:
           make setup-js
       - name: 'test frontend packages'
         run: |
-          yarn jest --coverage=true --ci=true --collectCoverageFrom="app/src/**/*.(js|ts|tsx)" app/src components/src shared-data/js
+          make -C app test-cov
       - name: 'Upload coverage report'
         uses: codecov/codecov-action@v3
         with:
@@ -141,8 +141,7 @@ jobs:
           yarn config set cache-folder ${{ github.workspace }}/.yarn-cache
           make setup-js
       - name: 'test native(er) packages'
-        run: |
-          yarn jest --coverage=true --ci=true --collectCoverageFrom="(app-shell|app-shell-odd| discovery-client)/src/**/*.(js|ts|tsx)" app-shell/src app-shell-odd/src discovery-client/src
+        run: make test-js-internal tests="app-shell/src app-shell-odd/src discovery-client/src" cov_opts="--coverage=true --ci=true --collectCoverageFrom='(app-shell|app-shell-odd| discovery-client)/src/**/*.(js|ts|tsx)'"
       - name: 'Upload coverage report'
         uses: 'codecov/codecov-action@v3'
         with:
@@ -231,7 +230,7 @@ jobs:
              echo "Configuring project, bucket, and folder for ot3"
              echo "project=ot3" >> $GITHUB_OUTPUT
              echo "bucket=${{env._APP_DEPLOY_BUCKET_OT3}}" >> $GITHUB_OUTPUT
-             echo "folder=${{env._APP_DEPLOY_BUCKET_OT3}}" >> $GITHUB_OUTPUT
+             echo "folder=${{env._APP_DEPLOY_FOLDER_OT3}}" >> $GITHUB_OUTPUT
           fi
       - uses: 'actions/checkout@v3'
         with:
@@ -315,7 +314,8 @@ jobs:
   deploy-release-app:
     name: 'Deploy built app artifacts to S3'
     runs-on: 'ubuntu-22.04'
-    needs: ['js-unit-test', 'backend-unit-test', 'build-app', 'determine-build-type']
+    needs:
+      ['js-unit-test', 'backend-unit-test', 'build-app', 'determine-build-type']
     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'
@@ -401,15 +401,15 @@ jobs:
         uses: slackapi/[email protected]
         if: contains(fromJSON(needs.determine-build-type.outputs.variants), 'internal-release')
         with:
-          payload: "{\"branch_or_tag\":\"${{ github.ref_name }}\",\"build_type\":\"${{ needs.determine-build-type.outputs.type }}\", \"gh_linkback\":\"https://github.com/Opentrons/opentrons/tree/${{ github.ref_name }}\", \"windows_build\":\"${{ env._ACCESS_URL }}/${{steps.names.outputs.windows-internal-release}}\", \"mac_build\":\"${{ env._ACCESS_URL }}/${{steps.names.outputs.mac-internal-release}}\", \"linux_build\":\"${{ env._ACCESS_URL }}/${{steps.names.outputs.linux-internal-release}}\"}"
+          payload: '{"branch_or_tag":"${{ github.ref_name }}","build_type":"${{ needs.determine-build-type.outputs.type }}", "gh_linkback":"https://github.com/Opentrons/opentrons/tree/${{ github.ref_name }}", "windows_build":"${{ env._ACCESS_URL }}/${{steps.names.outputs.windows-internal-release}}", "mac_build":"${{ env._ACCESS_URL }}/${{steps.names.outputs.mac-internal-release}}", "linux_build":"${{ env._ACCESS_URL }}/${{steps.names.outputs.linux-internal-release}}"}'
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.OT_APP_OT3_SLACK_NOTIFICATION_WEBHOOK_URL }}
           _ACCESS_URL: https://${{env._APP_DEPLOY_BUCKET_OT3}}/${{env._APP_DEPLOY_FOLDER_OT3}}
       - name: 'slack notify release'
         uses: slackapi/[email protected]
         if: contains(fromJSON(needs.determine-build-type.outputs.variants), 'release')
         with:
-          payload: "{\"branch_or_tag\":\"${{ github.ref_name }}\",\"build_type\":\"${{ needs.determine-build-type.outputs.type }}\", \"gh_linkback\":\"https://github.com/Opentrons/opentrons/tree/${{ github.ref_name }}\", \"windows_build\":\"${{ env._ACCESS_URL }}/${{steps.names.outputs.windows-release}}\", \"mac_build\":\"${{ env._ACCESS_URL }}/${{steps.names.outputs.mac-release}}\", \"linux_build\":\"${{ env._ACCESS_URL }}/${{steps.names.outputs.linux-release}}\"}"
+          payload: '{"branch_or_tag":"${{ github.ref_name }}","build_type":"${{ needs.determine-build-type.outputs.type }}", "gh_linkback":"https://github.com/Opentrons/opentrons/tree/${{ github.ref_name }}", "windows_build":"${{ env._ACCESS_URL }}/${{steps.names.outputs.windows-release}}", "mac_build":"${{ env._ACCESS_URL }}/${{steps.names.outputs.mac-release}}", "linux_build":"${{ env._ACCESS_URL }}/${{steps.names.outputs.linux-release}}"}'
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.OT_APP_ROBOTSTACK_SLACK_NOTIFICATION_WEBHOOK_URL }}
           _ACCESS_URL: https://${{env._APP_DEPLOY_BUCKET_ROBOTSTACK}}/${{env._APP_DEPLOY_FOLDER_ROBOTSTACK}}

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

@@ -62,8 +62,7 @@ jobs:
           yarn config set cache-folder ./.yarn-cache
           make setup-js
       - name: 'run components unit tests'
-        run: |
-          yarn jest --coverage=true --ci=true --collectCoverageFrom="components/src/**/*.(js|ts|tsx)" components/src
+        run: make -C components test-cov
       - name: 'Upload coverage report'
         uses: codecov/codecov-action@v3
         with:

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

@@ -69,8 +69,7 @@ jobs:
           yarn config set cache-folder ./.yarn-cache
           make setup-js
       - name: 'run labware library unit tests'
-        run: |
-          yarn jest --coverage=true --ci=true --collectCoverageFrom="labware-library/src/**/*.(js|ts|tsx)" labware-library/src
+        run: make -C labware-library test-cov
       - name: 'Upload coverage report'
         uses: codecov/codecov-action@v3
         with:
@@ -117,6 +116,7 @@ jobs:
   build-ll:
     name: 'build labware library artifact'
     needs: ['js-unit-test']
+    timeout-minutes: 30
     runs-on: 'ubuntu-20.04'
     if: github.event_name != 'pull_request'
     steps:

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

@@ -71,8 +71,7 @@ jobs:
           yarn config set cache-folder ./.yarn-cache
           make setup-js
       - name: 'run PD unit tests'
-        run: |
-          yarn jest --coverage=true --ci=true --collectCoverageFrom="protocol-designer/src/**/*.(js|ts|tsx)" protocol-designer/src
+        run: make -C protocol-designer test-cov
       - name: 'Upload coverage report'
         uses: codecov/codecov-action@v3
         with:

.github/workflows/react-api-client-test.yaml

@@ -57,8 +57,7 @@ jobs:
           yarn config set cache-folder ./.yarn-cache
           make setup-js
       - name: 'run react-api-client unit tests'
-        run: |
-          yarn jest --coverage=true --ci=true --collectCoverageFrom="react-api-client/src/**/*.(js|ts|tsx)" react-api-client/src
+        run: make -C react-api-client test-cov
       - name: 'Upload coverage report'
         uses: codecov/codecov-action@v3
         with:

.github/workflows/robot-server-lint-test.yaml

@@ -52,7 +52,7 @@ defaults:
 jobs:
   lint-test:
     name: 'robot server package linting and tests'
-    timeout-minutes: 20
+    timeout-minutes: 40
     runs-on: 'ubuntu-22.04'
     strategy:
       matrix:

.github/workflows/shared-data-test-lint-deploy.yaml

@@ -133,8 +133,7 @@ jobs:
           yarn config set cache-folder ./.yarn-cache
           make setup-js
       - name: 'run shared-data JS unit tests'
-        run: |
-          yarn jest --coverage=true --ci=true --collectCoverageFrom="shared-data/js/**/*.(js|ts|tsx)" shared-data/js
+        run: make -C shared-data test-cov
       - name: 'Upload coverage report'
         uses: codecov/codecov-action@v3
         with:

.github/workflows/step-generation-test.yaml

@@ -58,8 +58,7 @@ jobs:
           yarn config set cache-folder ./.yarn-cache
           make setup-js
       - name: 'run step generation unit tests'
-        run: |
-          yarn jest --coverage=true --ci=true --collectCoverageFrom="step-generation/src/**/*.(js|ts|tsx)" step-generation/src
+        run: make -C step-generation test-cov
       - name: 'Upload coverage report'
         uses: codecov/codecov-action@v3
         with:

.gitignore

@@ -156,5 +156,8 @@ opentrons-robot-app.tar.gz
 # local VERSION.json file when pushing to Flex
 *new_version_file.json
 
-# swap files
+# ignore linux swap files
 *.swp
+
+# asdf versions file
+.tool-versions

.storybook/preview.js

@@ -17,6 +17,12 @@ export const customViewports = {
 export const parameters = {
   actions: { argTypesRegex: '^on[A-Z].*' },
   viewport: { viewports: customViewports },
+  options: {
+    storySort: {
+      method: 'alphabetical',
+      order: ['Design Tokens', 'Library', 'App', 'ODD'],
+    },
+  },
 }
 
 // Global decorator to apply the styles to all stories

Config.in

@@ -5,4 +5,5 @@ source "$BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH/robot-server/Config.in"
 source "$BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH/shared-data/python/Config.in"
 source "$BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH/notify-server/Config.in"
 source "$BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH/system-server/Config.in"
-source "$BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH/server-utils/Config.in"
+source "$BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH/server-utils/Config.in"
+source "$BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH/hardware/Config.in"

Makefile

@@ -5,6 +5,8 @@
 include ./scripts/python.mk
 
 API_DIR := api
+API_CLIENT_DIR := api-client
+APP_DIR := app
 APP_SHELL_DIR := app-shell
 APP_SHELL_ODD_DIR := app-shell-odd
 COMPONENTS_DIR := components
@@ -15,8 +17,10 @@ NOTIFY_SERVER_DIR := notify-server
 PROTOCOL_DESIGNER_DIR := protocol-designer
 SHARED_DATA_DIR := shared-data
 UPDATE_SERVER_DIR := update-server
+REACT_API_CLIENT_DIR := react-api-client
 ROBOT_SERVER_DIR := robot-server
 SERVER_UTILS_DIR := server-utils
+STEP_GENERATION_DIR := step-generation
 SYSTEM_SERVER_DIR := system-server
 HARDWARE_DIR := hardware
 USB_BRIDGE_DIR := usb-bridge
@@ -195,12 +199,7 @@ test-py: test-py-windows
 	$(MAKE) -C $(USB_BRIDGE_DIR) test
 
 .PHONY: test-js
-test-js:
-	yarn jest \
-		--coverage=$(cover) \
-		--watch=$(watch) \
-		--updateSnapshot=$(updateSnapshot) \
-		--ci=$(if $(CI),true,false)
+test-js: test-js-internal
 
 # lints and typechecks
 .PHONY: lint
@@ -261,3 +260,11 @@ circular-dependencies-js:
 	yarn madge $(and $(CI),--no-spinner --no-color) --circular labware-library/src/index.tsx
 	yarn madge $(and $(CI),--no-spinner --no-color) --circular app/src/index.tsx
 	yarn madge $(and $(CI),--no-spinner --no-color) --circular components/src/index.ts
+
+.PHONY: test-js-internal
+test-js-internal:
+	yarn jest $(tests) $(test_opts) $(cov_opts)
+
+.PHONY: test-js-%
+test-js-%: 
+	$(MAKE) test-js-internal tests="$(if $(tests),$(foreach test,$(tests),$*/$(test)),$*)" test_opts="$(test_opts)" cov_opts="$(cov_opts)"

api-client/Makefile

@@ -17,3 +17,7 @@ clean:
 .PHONY: build
 build:
 	rollup --config rollup.config.js
+
+.PHONY: test
+test:
+	$(MAKE) -C .. test-js-api-client

api-client/src/deck_configuration/getDeckConfiguration.ts

@@ -0,0 +1,16 @@
+import { GET, request } from '../request'
+
+import type { ResponsePromise } from '../request'
+import type { HostConfig } from '../types'
+import type { DeckConfigurationResponse } from './types'
+
+export function getDeckConfiguration(
+  config: HostConfig
+): ResponsePromise<DeckConfigurationResponse> {
+  return request<DeckConfigurationResponse>(
+    GET,
+    `/deck_configuration`,
+    null,
+    config
+  )
+}

api-client/src/deck_configuration/index.ts

@@ -0,0 +1,7 @@
+export { getDeckConfiguration } from './getDeckConfiguration'
+export { updateDeckConfiguration } from './updateDeckConfiguration'
+
+export type {
+  DeckConfigurationResponse,
+  UpdateDeckConfigurationRequest,
+} from './types'

api-client/src/deck_configuration/types.ts

@@ -0,0 +1,14 @@
+import type { DeckConfiguration } from '@opentrons/shared-data'
+
+export interface UpdateDeckConfigurationRequest {
+  data: {
+    cutoutFixtures: DeckConfiguration
+  }
+}
+
+export interface DeckConfigurationResponse {
+  data: {
+    cutoutFixtures: DeckConfiguration
+    lastModifiedAt: string
+  }
+}

api-client/src/deck_configuration/updateDeckConfiguration.ts

@@ -0,0 +1,21 @@
+import { PUT, request } from '../request'
+
+import type { DeckConfiguration } from '@opentrons/shared-data'
+import type { ResponsePromise } from '../request'
+import type { HostConfig } from '../types'
+import type {
+  DeckConfigurationResponse,
+  UpdateDeckConfigurationRequest,
+} from './types'
+
+export function updateDeckConfiguration(
+  config: HostConfig,
+  deckConfig: DeckConfiguration
+): ResponsePromise<DeckConfigurationResponse> {
+  return request<DeckConfigurationResponse, UpdateDeckConfigurationRequest>(
+    PUT,
+    '/deck_configuration',
+    { data: { cutoutFixtures: deckConfig } },
+    config
+  )
+}

api-client/src/index.ts

@@ -1,5 +1,6 @@
 // api client entry point
 export * from './calibration'
+export * from './deck_configuration'
 export * from './health'
 export * from './instruments'
 export * from './maintenance_runs'

api-client/src/instruments/types.ts

@@ -1,3 +1,5 @@
+import type { PipetteModel } from '@opentrons/shared-data'
+
 export type InstrumentData = PipetteData | GripperData | BadPipette | BadGripper
 
 // pipettes module already exports type `Mount`
@@ -48,10 +50,13 @@ export interface PipetteData {
   }
   firmwareVersion?: string
   instrumentName: string
-  instrumentModel: string
+  instrumentModel: PipetteModel
   instrumentType: 'pipette'
   mount: 'left' | 'right'
   serialNumber: string
+  state?: {
+    tipDetected: boolean
+  }
   subsystem: 'pipette_left' | 'pipette_right'
   ok: true
 }

api-client/src/maintenance_runs/createMaintenanceCommand.ts

@@ -1,6 +1,6 @@
 import { POST, request } from '../request'
 
-import type { CreateCommand } from '@opentrons/shared-data/protocol/types/schemaV7'
+import type { CreateCommand } from '@opentrons/shared-data'
 import type { ResponsePromise } from '../request'
 import type { HostConfig } from '../types'
 import type { CommandData, CreateCommandParams } from '../runs/types'