Little fixes and typechecks and handling of trash files

Opentrons · Nov 6, 2023 · 07994f9 · 07994f9
1 parent 574a1d9
commit 07994f9
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 9 deletions.
diff --git a/app-shell-odd/src/system-update/index.ts b/app-shell-odd/src/system-update/index.ts
@@ -353,9 +353,12 @@ export function getCachedSystemUpdateFiles(
 
 function getInfoFromUpdateSet(
   filepaths: ReleaseSetFilepaths
-): Promise<{ version: string; releaseNotes: string }> {
+): Promise<{ version: string; releaseNotes: string | null }> {
   const version = getLatestVersion()
-  return readFile(filepaths.releaseNotes, 'utf8')
+  const releaseNotesContentPromise = filepaths.releaseNotes
+    ? readFile(filepaths.releaseNotes, 'utf8')
+    : new Promise<string | null>(resolve => resolve(null))
+  return releaseNotesContentPromise
     .then(releaseNotes => ({
       version: version,
       releaseNotes,
@@ -365,7 +368,7 @@ function getInfoFromUpdateSet(
 
 function cacheUpdateSet(
   filepaths: ReleaseSetFilepaths
-): Promise<{ version: string; releaseNotes: string }> {
+): Promise<{ version: string; releaseNotes: string | null }> {
   systemUpdateSet = filepaths
   return getInfoFromUpdateSet(systemUpdateSet)
 }
diff --git a/app-shell-odd/src/types.ts b/app-shell-odd/src/types.ts
@@ -3,7 +3,6 @@ import type {
   Action,
   Error as PlainError,
 } from '@opentrons/app/src/redux/types'
-
 import type { Logger } from '@opentrons/app/src/logger'
 export type { Action, PlainError }
 

diff --git a/app-shell-odd/src/usb.ts b/app-shell-odd/src/usb.ts
@@ -12,6 +12,14 @@ const FLEX_USB_MOUNT_DIR = '/media/'
 const FLEX_USB_MOUNT_FILTER = /sd[a-z][0-9]$/
 const MOUNT_ENUMERATION_DELAY_MS = 1000
 
+// These directories are generated by OSX and contain entries for all
+// the files that were deleted from a mass storage device, or search index
+// data
+const isWeirdDirectoryAndShouldSkip = (dirName: string): boolean =>
+  ['.Trashes', '.Spotlight']
+    .map(keyword => dirName.includes(keyword))
+    .reduce((prev, current) => prev || current, false)
+
 const enumerateMassStorage = (path: string): Promise<string[]> =>
   fsPromises
     .readdir(path)
@@ -26,7 +34,7 @@ const enumerateMassStorage = (path: string): Promise<string[]> =>
     .then(entries =>
       Promise.all(
         entries.map(entry =>
-          entry.isDirectory()
+          entry.isDirectory() && !isWeirdDirectoryAndShouldSkip(entry.name)
             ? enumerateMassStorage(join(path, entry.name))
             : new Promise<string[]>(resolve =>
                 resolve([join(path, entry.name)])

diff --git a/app/src/organisms/RobotSettingsDashboard/__tests__/RobotSystemVersion.test.tsx b/app/src/organisms/RobotSettingsDashboard/__tests__/RobotSystemVersion.test.tsx
@@ -34,6 +34,7 @@ describe('RobotSystemVersion', () => {
       currentVersion: 'mock7.0.0',
       isUpdateAvailable: false,
       setCurrentOption: mockBack,
+      robotUpdateInfo: null,
     }
     mockRobotSystemVersionModal.mockReturnValue(
       <div>mock RobotSystemVersionModal</div>
@@ -58,6 +59,11 @@ describe('RobotSystemVersion', () => {
     props = {
       ...props,
       isUpdateAvailable: true,
+      robotUpdateInfo: {
+        target: 'flex',
+        version: 'mock1.2.3',
+        releaseNotes: null,
+      },
     }
     const [{ getByText }] = render(props)
     getByText('Update available')

diff --git a/app/src/pages/OnDeviceDisplay/__tests__/UpdateRobot.test.tsx b/app/src/pages/OnDeviceDisplay/__tests__/UpdateRobot.test.tsx
@@ -6,6 +6,7 @@ import { renderWithProviders } from '@opentrons/components'
 import { i18n } from '../../../i18n'
 
 import * as RobotUpdate from '../../../redux/robot-update'
+import type { RobotUpdateSession } from '../../../redux/robot-update/types'
 import { getLocalRobot } from '../../../redux/discovery'
 
 import { UpdateRobot } from '../UpdateRobot'
@@ -60,7 +61,7 @@ const mockRobot = {
   serverHealthStatus: null,
 } as any
 
-const mockSession = {
+const mockSession: RobotUpdateSession = {
   robotName: mockRobot.name,
   fileInfo: null,
   token: null,

diff --git a/app/src/pages/OnDeviceDisplay/__tests__/UpdateRobotDuringOnboarding.test.tsx b/app/src/pages/OnDeviceDisplay/__tests__/UpdateRobotDuringOnboarding.test.tsx
@@ -5,6 +5,7 @@ import { renderWithProviders } from '@opentrons/components'
 import { i18n } from '../../../i18n'
 
 import * as RobotUpdate from '../../../redux/robot-update'
+import type { RobotUpdateSession } from '../../../redux/robot-update/types'
 import { getLocalRobot } from '../../../redux/discovery'
 
 import { UpdateRobotDuringOnboarding } from '../UpdateRobotDuringOnboarding'
@@ -59,7 +60,7 @@ const mockRobot = {
   serverHealthStatus: null,
 } as any
 
-const mockSession = {
+const mockSession: RobotUpdateSession = {
   robotName: mockRobot.name,
   fileInfo: null,
   token: null,

diff --git a/app/src/redux/robot-update/reducer.ts b/app/src/redux/robot-update/reducer.ts
@@ -10,12 +10,14 @@ export const INITIAL_STATE: RobotUpdateState = {
     releaseNotes: null,
     downloadProgress: null,
     downloadError: null,
+    force: false,
   },
   ot2: {
     version: null,
     releaseNotes: null,
     downloadProgress: null,
     downloadError: null,
+    force: false,
   },
   session: null,
 }
@@ -46,7 +48,7 @@ export const robotUpdateReducer: Reducer<RobotUpdateState, Action> = (
           [action.payload.target]: {
             ...state[action.payload.target],
             version: action.payload.version,
-            force: action.payload.force ?? false,
+            force: action.payload?.force ?? false,
           },
         },
       }
@@ -60,7 +62,6 @@ export const robotUpdateReducer: Reducer<RobotUpdateState, Action> = (
             ...state[action.payload.target],
             version: action.payload.version,
             releaseNotes: action.payload.releaseNotes,
-            force: action.payload.force ?? false,
           },
         },
       }