fix init loading on viewer when no exception lists exist

elastic · Jul 29, 2020 · 116ab1a · 116ab1a
1 parent c7cd80f
commit 116ab1a
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 20 deletions.
diff --git a/x-pack/plugins/lists/public/exceptions/hooks/use_exception_list.test.ts b/x-pack/plugins/lists/public/exceptions/hooks/use_exception_list.test.ts
@@ -221,30 +221,42 @@ describe('useExceptionList', () => {
 
     await act(async () => {
       const onSuccessMock = jest.fn();
-      const { waitForNextUpdate } = renderHook<UseExceptionListProps, ReturnExceptionListAndItems>(
-        () =>
-          useExceptionList({
-            filterOptions: [],
-            http: mockKibanaHttpService,
-            lists: [
-              { id: 'myListId', listId: 'list_id', namespaceType: 'single', type: 'detection' },
-            ],
-            matchFilters: false,
-            onError: onErrorMock,
-            onSuccess: onSuccessMock,
-            pagination: {
-              page: 1,
-              perPage: 20,
-              total: 0,
-            },
-            showDetectionsListsOnly: true,
-            showEndpointListsOnly: false,
-          })
+      const { result, waitForNextUpdate } = renderHook<
+        UseExceptionListProps,
+        ReturnExceptionListAndItems
+      >(() =>
+        useExceptionList({
+          filterOptions: [],
+          http: mockKibanaHttpService,
+          lists: [
+            { id: 'myListId', listId: 'list_id', namespaceType: 'single', type: 'detection' },
+          ],
+          matchFilters: false,
+          onError: onErrorMock,
+          onSuccess: onSuccessMock,
+          pagination: {
+            page: 1,
+            perPage: 20,
+            total: 0,
+          },
+          showDetectionsListsOnly: false,
+          showEndpointListsOnly: true,
+        })
       );
       await waitForNextUpdate();
       await waitForNextUpdate();
 
-      expect(spyOnfetchExceptionListsItemsByListIds).not.toHaveBeenCalledWith();
+      expect(spyOnfetchExceptionListsItemsByListIds).not.toHaveBeenCalled();
+      expect(result.current).toEqual([
+        false,
+        [],
+        {
+          page: 1,
+          perPage: 20,
+          total: 0,
+        },
+        result.current[3],
+      ]);
     });
   });
 

diff --git a/x-pack/plugins/lists/public/exceptions/hooks/use_exception_list.ts b/x-pack/plugins/lists/public/exceptions/hooks/use_exception_list.ts
@@ -142,6 +142,10 @@ export const useExceptionList = ({
               }
               setLoading(false);
             }
+          } else {
+            if (isSubscribed) {
+              setLoading(false);
+            }
           }
         } catch (error) {
           if (isSubscribed) {