fix(protocol-designer): timeline errors/warnings show up in mixpanel (#…

…17164) closes RQA-3778
Opentrons · Dec 20, 2024 · 99da252 · 99da252
1 parent 3162131
commit 99da252
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/protocol-designer/src/analytics/__tests__/reduxActionToAnalyticsEvent.test.ts b/protocol-designer/src/analytics/__tests__/reduxActionToAnalyticsEvent.test.ts
@@ -154,9 +154,10 @@ describe('reduxActionToAnalyticsEvent', () => {
         id: 'stepId',
         pipette: 'pipetteId',
         otherField: 123,
-        aspirateFlowRate: undefined,
-        dispenseFlowRate: undefined,
-        aspirateAirGap: undefined,
+        aspirateFlowRate: 'default',
+        dispenseFlowRate: 'default',
+        aspirateAirGap: 'default',
+        dispenseAirGap: 'default',
         nested: { inner: true },
         // de-nested fields
         __nested__inner: true,

diff --git a/protocol-designer/src/analytics/middleware.ts b/protocol-designer/src/analytics/middleware.ts
@@ -158,9 +158,14 @@ export const reduxActionToAnalyticsEvent = (
             name: `${modifiedStepName}Step`,
             properties: {
               ...stepArgModified,
-              aspirateAirGap: stepArgModified.aspirateAirGapVolume,
-              aspirateFlowRate: stepArgModified.aspirateFlowRateUlSec,
-              dispenseFlowRate: stepArgModified.dispenseFlowRateUlSec,
+              aspirateAirGap:
+                stepArgModified.aspirateAirGapVolume ?? DEFAULT_VALUE,
+              aspirateFlowRate:
+                stepArgModified.aspirateFlowRateUlSec ?? DEFAULT_VALUE,
+              dispenseFlowRate:
+                stepArgModified.dispenseFlowRateUlSec ?? DEFAULT_VALUE,
+              dispenseAirGap:
+                stepArgModified.dispenseAirGapVolume ?? DEFAULT_VALUE,
               blowoutFlowRate: stepArgModified.blowoutFlowRateUlSec,
               aspirateOffsetFromBottomMm:
                 stepArgModified.aspirateOffsetFromBottomMm ===
@@ -202,8 +207,10 @@ export const reduxActionToAnalyticsEvent = (
             name: `mixStep`,
             properties: {
               ...stepArgModified,
-              aspirateFlowRate: stepArgModified.aspirateFlowRateUlSec,
-              dispenseFlowRate: stepArgModified.dispenseFlowRateUlSec,
+              aspirateFlowRate:
+                stepArgModified.aspirateFlowRateUlSec ?? DEFAULT_VALUE,
+              dispenseFlowRate:
+                stepArgModified.dispenseFlowRateUlSec ?? DEFAULT_VALUE,
               blowoutFlowRate: stepArgModified.blowoutFlowRateUlSec,
               aspirateOffsetFromBottomMm:
                 stepArgModified.aspirateOffsetFromBottomMm ===

diff --git a/protocol-designer/src/configureStore.ts b/protocol-designer/src/configureStore.ts
@@ -89,9 +89,9 @@ export function configureStore(): StoreType {
     /* preloadedState, */
     composeEnhancers(
       applyMiddleware(
-        trackEventMiddleware as Middleware<BaseState, Record<string, any>, any>,
+        thunk,
         timelineMiddleware as Middleware<BaseState, Record<string, any>, any>,
-        thunk
+        trackEventMiddleware as Middleware<BaseState, Record<string, any>, any>
       )
     ) as StoreEnhancer<unknown, unknown>
   )