Merge branch 'edge' into 7.3.1-shapshot-testing-2.19-protocols

.eslintrc.js

@@ -101,9 +101,7 @@ module.exports = {
         '@typescript-eslint/no-floating-promises': 'warn',
         '@typescript-eslint/no-unnecessary-type-assertion': 'warn',
         '@typescript-eslint/no-unnecessary-boolean-literal-compare': 'warn',
-        '@typescript-eslint/no-unsafe-argument': 'warn',
         '@typescript-eslint/consistent-indexed-object-style': 'warn',
-        '@typescript-eslint/no-confusing-void-expression': 'warn',
         '@typescript-eslint/ban-types': 'warn',
         '@typescript-eslint/non-nullable-type-assertion-style': 'warn',
         '@typescript-eslint/await-thenable': 'warn',
@@ -127,11 +125,13 @@ module.exports = {
         '**/__fixtures__/**.@(js|ts|tsx)',
         '**/fixtures/**.@(js|ts|tsx)',
         'scripts/*.@(js|ts|tsx)',
+        '**/**test.@(js|ts|tsx)',
       ],
       rules: {
         '@typescript-eslint/consistent-type-assertions': 'off',
         '@typescript-eslint/no-var-requires': 'off',
         '@typescript-eslint/explicit-function-return-type': 'off',
+        '@typescript-eslint/no-unsafe-argument': 'off',
         '@typescript-eslint/no-confusing-void-expression': 'warn',
         'node/handle-callback-err': 'off',
       },

.github/workflows/analyses-snapshot-test.yaml

@@ -13,14 +13,23 @@ on:
         default: 'edge'
   schedule:
     - cron:  '26 7 * * *' # 7:26 AM UTC
+  pull_request:
+    paths:
+      - 'api/**'
+      - 'shared-data/**/*'
+      - '!shared-data/js/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build-and-test:
     timeout-minutes: 15
     runs-on: ubuntu-latest
     env:
-      TARGET: ${{ github.event.inputs.TARGET || 'edge' }}
-      TEST_SOURCE: ${{ github.event.inputs.TEST_SOURCE || 'edge' }}
+      TARGET: ${{ github.event.inputs.TARGET || github.head_ref || 'edge' }}
+      TEST_SOURCE: ${{ github.event.inputs.TEST_SOURCE || github.head_ref || 'edge' }}
 
     steps:
     - name: Checkout Repository
@@ -61,6 +70,7 @@ jobs:
       run: make snapshot-test-update
 
     - name: Create Snapshot update Request
+      id: create-pull-request
       if: failure()
       uses: peter-evans/create-pull-request@v5
       with:
@@ -70,3 +80,15 @@ jobs:
           branch: 'app-testing/${{ env.TARGET }}-from-${{ env.TEST_SOURCE}}'
           base: ${{ env.TEST_SOURCE}}
 
+    - name: Comment on PR
+      if: failure() && github.event_name == 'pull_request'
+      uses: actions/github-script@v7
+      with:
+        script: |
+          const message = 'A PR has been opened to address analyses snapshot changes. Please review the changes here: https://github.com/${{ github.repository }}/pull/${{ steps.create-pull-request.outputs.pull-request-number }}';
+          github.rest.issues.createComment({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            issue_number: context.issue.number,
+            body: message
+          });

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

@@ -7,13 +7,17 @@ on:
     paths:
       - 'Makefile'
       - 'components/**'
-      - 'app/**/*.stories.@(js|jsx|ts|tsx)'
+      - 'app/**/*.stories.*'
+      - 'app/src/atoms/**/*'
+      - 'app/src/molecules/**/*'
       - 'package.json'
       - '.github/workflows/components-test-build-deploy.yaml'
   push:
     paths:
       - 'components/**'
-      - 'app/**/*.stories.@(js|jsx|ts|tsx)'
+      - 'app/**/*.stories.*'
+      - 'app/src/atoms/**/*'
+      - 'app/src/molecules/**/*'
       - 'package.json'
       - '.github/workflows/components-test-build-deploy.yaml'
     branches:
@@ -114,15 +118,18 @@ jobs:
     steps:
       - id: determine-build-type
         run: |
-          echo "Determining build type for event ${{github.event_type}} and ref ${{github.ref}}"
-          if [ "${{ format('{0}', github.ref == 'refs/heads/edge') }}" = "true" ] ; then
-            echo "storybook s3 builds for edge"
+          echo "Determining build type for event ${{github.event_name}} and ref ${{github.ref}}"
+          if [ "${{ format('{0}', github.event_name == 'pull_request') }}" = "true" ] ; then
+            echo "No builds for pull requests"
+            echo 'type=none' >> $GITHUB_OUTPUT
+          elif [ "${{ format('{0}', startsWith(github.ref, 'refs/heads/')) }}" = "true" ] ; then
+            echo "storybook s3 builds for branch ${{ github.ref_name }}"
             echo 'type=storybook' >> $GITHUB_OUTPUT
           elif [ "${{ format('{0}', startsWith(github.ref, 'refs/tags/components')) }}" = "true" ] ; then
             echo "publish builds for components tags"
             echo 'type=publish' >> $GITHUB_OUTPUT
           else
-            echo "No build for ref ${{github.ref}} and event ${{github.event_type}}"
+            echo "No build for ref ${{github.ref}} and event ${{github.event_name}}"
             echo 'type=none' >> $GITHUB_OUTPUT
           fi
 
@@ -162,6 +169,10 @@ jobs:
           AWS_DEFAULT_REGION: us-east-2
         run: |
           aws s3 sync ./dist s3://opentrons-components/${{ env.OT_BRANCH}} --acl public-read
+      - name: 'Set generated URL'
+        run: |
+          echo 'Created component storybook for [${{ env.OT_BRANCH }}](https://s3-us-west-2.amazonaws.com/opentrons-components/${{ env.OT_BRANCH }}/index.html?path=/)' >> $GITHUB_STEP_SUMMARY
+          echo 'Created component storybook for https://s3-us-west-2.amazonaws.com/opentrons-components/${{ env.OT_BRANCH }}/index.html?path=/'
 
   publish-components:
     name: 'publish components package to npm'

.github/workflows/js-check.yaml

@@ -75,12 +75,12 @@ jobs:
           make setup-js
         # Use the if to run all the lint checks even of some fail
         shell: bash
-      - name: 'lint js'
-        if: always() && steps.setup-js.outcome == 'success'
-        run: make lint-js
       - name: 'typechecks'
         if: always() && steps.setup-js.outcome == 'success'
         run: make check-js
+      - name: 'lint js'
+        if: always() && steps.setup-js.outcome == 'success'
+        run: make lint-js
       - name: 'circular deps'
         if: always() && steps.setup-js.outcome == 'success'
         run: make circular-dependencies-js

.gitignore

@@ -137,6 +137,7 @@ update-server/LICENSE
 shared-data/python/LICENSE
 shared-data/LICENSE
 robot-server/LICENSE
+performance-metrics/LICENSE
 
 # typescript incremental files
 *.tsbuildinfo
@@ -160,4 +161,5 @@ opentrons-robot-app.tar.gz
 # asdf versions file
 .tool-versions
 mock_dir
+.npm-cache/
 .eslintcache

.storybook/preview.jsx

@@ -3,6 +3,15 @@ import { I18nextProvider } from 'react-i18next'
 import { GlobalStyle } from '../app/src/atoms/GlobalStyle'
 import { i18n } from '../app/src/i18n'
 
+global.APP_SHELL_REMOTE = {
+  ipcRenderer: {
+    on: (topic, cb) => {},
+    invoke: (callname, args) => {},
+    send:  (message, payload) => {}
+  },
+}
+global._PKG_VERSION_ = '0.0.0-storybook'
+
 export const customViewports = {
   onDeviceDisplay: {
     name: 'Touchscreen',
@@ -12,6 +21,27 @@ export const customViewports = {
       height: '600px',
     },
   },
+  desktopMinWidth: {
+    // retains a 4:3 aspect ratio... minHeight is not set so the user
+    // could drag the app up to a thin strip, but that's not terribly
+    // useful for viewing designs
+    name: 'Desktop Minimum Width',
+    type: 'desktop',
+    styles: {
+      width: '600px',
+      height: '450px'
+    }
+  },
+  desktopSmall: {
+    // A size typically used in figma app backgrounds, useful for viewing
+    // larger components in context
+    name: 'Desktop Typical Small',
+    type: 'desktop',
+    styles: {
+      width: '1024px',
+      height: '700px'
+    }
+  }
 }
 
 export const parameters = {
@@ -29,7 +59,7 @@ export const parameters = {
 export const decorators = [
   Story => (
     <I18nextProvider i18n={i18n}>
-      <GlobalStyle isOnDevice={true} />
+      <GlobalStyle />
       <Story />
     </I18nextProvider>
   ),

Makefile

@@ -219,7 +219,7 @@ lint-js: lint-js-eslint lint-js-prettier
 
 .PHONY: lint-js-eslint
 lint-js-eslint:
-	yarn eslint --quiet=$(quiet) --ignore-pattern "node_modules/" --cache ".*.@(js|ts|tsx)" "**/*.@(js|ts|tsx)"
+	yarn eslint --quiet=$(quiet) --ignore-pattern "node_modules/" ".*.@(js|ts|tsx)" "**/*.@(js|ts|tsx)"
 
 .PHONY: lint-js-prettier
 lint-js-prettier:

abr-testing/Pipfile

@@ -5,7 +5,7 @@ name = "pypi"
 
 [packages]
 abr-testing = { editable = true, path = "." }
-google-api-python-client = "==2.41.0"
+google-api-python-client = "*"
 httplib2 = "==0.22.0"
 types-httplib2 = "*"
 oauth2client = "==4.1.3"
@@ -14,6 +14,10 @@ hardware-testing = {editable = true, path = "../hardware-testing"}
 opentrons-shared-data = {editable = true, path = "./../shared-data/python"}
 opentrons-hardware = {editable = true, path = "./../hardware", extras=['FLEX']}
 opentrons = {editable = true, path = "./../api", extras=['flex-hardware']}
+slackclient = "*"
+slack-sdk = "*"
+scikit-learn = "*"
+pandas = "*"
 
 [dev-packages]
 atomicwrites = "==1.4.1"