Merge branch 'edge' into AUTH-866-add-transfer-flow-builder

Opentrons · Dec 12, 2024 · eb00776 · eb00776
2 parents 1851696 + 09febe7
commit eb00776
Show file tree

Hide file tree

Showing 991 changed files with 12,797 additions and 38,389 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -12,6 +12,7 @@
 **/CHANGELOG.md
 !api/release-notes.md
 !app-shell/build/release-notes.md
+**/.yarn-cache/**
 
 # components library
 storybook-static

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -39,6 +39,7 @@ module.exports = {
     'no-case-declarations': 'warn',
     'prefer-regex-literals': 'warn',
     'react/prop-types': 'warn',
+    'react/jsx-curly-brace-presence': 'warn',
 
     // Enforce notification hooks
     'no-restricted-imports': [

diff --git a/.github/actions/odd-resource-analysis/action/index.js b/.github/actions/odd-resource-analysis/action/index.js
@@ -5,9 +5,11 @@ async function run() {
   try {
     const mixpanelUser = core.getInput('mixpanel-user', { required: true })
     const mixpanelSecret = core.getInput('mixpanel-secret', { required: true })
-    const mixpanelProjectId = core.getInput('mixpanel-project-id', {
-      required: true,
-    })
+    const mixpanelProjectId = parseInt(
+      core.getInput('mixpanel-project-id', {
+        required: true,
+      })
+    )
     const previousVersionCount = parseInt(
       core.getInput('previous-version-count') || '2'
     )

diff --git a/.github/actions/odd-resource-analysis/action/lib/helpers/mixpanel.js b/.github/actions/odd-resource-analysis/action/lib/helpers/mixpanel.js
@@ -33,7 +33,7 @@ async function getMixpanelResourceMonitorDataFor({
   where,
 }) {
   const params = new URLSearchParams({
-    project_id: Number(projectId),
+    project_id: projectId,
     from_date: fromDate,
     to_date: toDate,
     event: '["resourceMonitorReport"]',