update FE unsubscribe flag shape to match BE

Opentrons · Mar 11, 2024 · d97e9b7 · d97e9b7
1 parent a1ad5d7
commit d97e9b7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/app/src/redux/shell/types.ts b/app/src/redux/shell/types.ts
@@ -24,7 +24,7 @@ interface NotifyRefetchData {
   statusCode: never
 }
 
-interface NotifyUnsubscribeData extends NotifyRefetchData {
+interface NotifyUnsubscribeData {
   unsubscribe: boolean
 }
 

diff --git a/app/src/resources/__tests__/useNotifyService.test.ts b/app/src/resources/__tests__/useNotifyService.test.ts
@@ -151,4 +151,21 @@ describe('useNotifyService', () => {
     rerender()
     expect(mockHTTPRefetch).toHaveBeenCalledWith('once')
   })
+
+  it('should trigger a single HTTP refetch if the unsubscribe flag was returned', () => {
+    vi.mocked(appShellListener).mockImplementation(
+      (_: any, __: any, mockCb: any) => {
+        mockCb({ unsubscribe: true })
+      }
+    )
+    const { rerender } = renderHook(() =>
+      useNotifyService({
+        topic: MOCK_TOPIC,
+        setRefetchUsingHTTP: mockHTTPRefetch,
+        options: MOCK_OPTIONS,
+      } as any)
+    )
+    rerender()
+    expect(mockHTTPRefetch).toHaveBeenCalledWith('once')
+  })
 })
diff --git a/app/src/resources/useNotifyService.ts b/app/src/resources/useNotifyService.ts
@@ -73,7 +73,7 @@ export function useNotifyService<TData, TError = Error>({
           properties: {},
         })
       }
-    } else if ('refetchUsingHTTP' in data) {
+    } else if ('refetchUsingHTTP' in data || 'unsubscribe' in data) {
       setRefetchUsingHTTP('once')
     }
   }