call the actions instead of the sagas

looker-open-source · Apr 20, 2023 · 5486cef · 5486cef
1 parent 8bdd542
commit 5486cef
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 20 deletions.
diff --git a/packages/embed-components/src/Theme/SelectTheme.tsx b/packages/embed-components/src/Theme/SelectTheme.tsx
@@ -64,7 +64,7 @@ export const SelectTheme = () => {
   return (
     <SpaceVertical gap="xxxsmall">
       <Select
-        disabled={themes.length === 1}
+        disabled={themes.length <= 1}
         isLoading={!initialized || working}
         validationType={error ? 'error' : undefined}
         value={selectedTheme.name}

diff --git a/packages/embed-components/src/Theme/state/sagas.spec.ts b/packages/embed-components/src/Theme/state/sagas.spec.ts
@@ -239,18 +239,15 @@ describe('SelectTheme sagas', () => {
   })
 
   describe('selectThemeSaga', () => {
-    const {
-      selectThemeAction,
-      getThemesSuccessAction,
-      getDefaultThemeSuccessAction,
-      selectThemeSuccessAction,
-      setFailureAction,
-    } = themeActions
+    const { selectThemeAction, selectThemeSuccessAction, setFailureAction } =
+      themeActions
 
     it('sends selectThemeSuccessAction on success', async () => {
       registerThemeService()
       const service = getThemeService()
       const selectedTheme = { name: 'Looker', id: '1' } as ITheme
+
+      jest.spyOn(service, 'expired').mockReturnValue(false)
       const getSpy = jest
         .spyOn(service, 'get')
         .mockResolvedValueOnce(selectedTheme)
@@ -263,18 +260,12 @@ describe('SelectTheme sagas', () => {
 
       await sagaTester.waitFor('themes/selectThemeSuccessAction')
       const calledActions = sagaTester.getCalledActions()
-      expect(calledActions).toHaveLength(4)
+      expect(calledActions).toHaveLength(2)
       expect(calledActions[0]).toEqual(
         selectThemeAction({ id: selectedTheme.id! })
       )
-      expect(calledActions[1]).toEqual(
-        getThemesSuccessAction({ themes: service.items })
-      )
-      expect(calledActions[2]).toEqual(
-        getDefaultThemeSuccessAction({ defaultTheme: selectedTheme })
-      )
       expect(getSpy).toHaveBeenCalledWith(selectedTheme.id)
-      expect(calledActions[3]).toEqual(
+      expect(calledActions[1]).toEqual(
         selectThemeSuccessAction({ selectedTheme })
       )
     })

diff --git a/packages/embed-components/src/Theme/state/sagas.ts b/packages/embed-components/src/Theme/state/sagas.ts
@@ -106,12 +106,17 @@ function* getDefaultThemeSaga() {
  * @param action containing id of theme to select
  */
 function* selectThemeSaga(action: PayloadAction<SelectThemeAction>) {
-  const { selectThemeSuccessAction, setFailureAction } = themeActions
+  const {
+    selectThemeSuccessAction,
+    getThemesAction,
+    getDefaultThemeAction,
+    setFailureAction,
+  } = themeActions
   try {
     const service = getThemeService()
     if (service.expired()) {
-      yield* call(getThemesSaga)
-      yield* call(getDefaultThemeSaga)
+      yield* call(getThemesAction)
+      yield* call(getDefaultThemeAction)
     }
     const selectedTheme = yield* call([service, 'get'], action.payload.id)
     yield* put(selectThemeSuccessAction({ selectedTheme }))

diff --git a/packages/embed-components/src/index.ts b/packages/embed-components/src/index.ts
@@ -24,5 +24,4 @@
 
  */
 export * from './GlobalStore'
-export * from './QuickEmbed'
 export * from './Theme'