fix(app, shared-data): fix null check issue (#14619)

* fix(app, shared-data): fix null check issue
Opentrons · Mar 11, 2024 · 21dff79 · 21dff79
1 parent 1854842
commit 21dff79
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/__mocks__/electron-store.js b/__mocks__/electron-store.js
@@ -1,7 +1,6 @@
 // mock electron-store
 'use strict'
 import { vi } from 'vitest'
-// import { DEFAULTS_V12, migrate } from '../app-shell-odd/src/config/migrate'
 
 // will by default mock the config dir. if you need other behaavior you can
 // override this mock (see app-shell/src/__tests__/discovery.test.ts for an example)

diff --git a/app/src/resources/runs/useNotifyRunQuery.ts b/app/src/resources/runs/useNotifyRunQuery.ts
@@ -24,7 +24,7 @@ export function useNotifyRunQuery<TError = Error>(
   useNotifyService({
     topic: `robot-server/runs/${runId}` as NotifyTopic,
     setRefetchUsingHTTP,
-    options: { ...options, enabled: options.enabled && runId != null },
+    options: { ...options, enabled: options.enabled != null && runId != null },
   })
 
   const httpResponse = useRunQuery(runId, {

diff --git a/shared-data/js/helpers/getSimplestFlexDeckConfig.ts b/shared-data/js/helpers/getSimplestFlexDeckConfig.ts
@@ -80,11 +80,11 @@ export function getSimplestDeckConfigForProtocol(
         ({ cutoutId }) => cutoutId === cutoutIdForAddressableArea
       )
       const previousRequiredAAs = acc[accIndex]?.requiredAddressableAreas
-      const allNextRequiredAddressableAreas = previousRequiredAAs.includes(
-        addressableArea
-      )
-        ? previousRequiredAAs
-        : [...previousRequiredAAs, addressableArea]
+      const allNextRequiredAddressableAreas =
+        previousRequiredAAs != null &&
+        previousRequiredAAs.includes(addressableArea)
+          ? previousRequiredAAs
+          : [...previousRequiredAAs, addressableArea]
       const nextCompatibleCutoutFixture = getSimplestFixtureForAddressableAreas(
         cutoutIdForAddressableArea,
         allNextRequiredAddressableAreas,