[8.x] [SecuritySolution][Onboarding] Catch completion check failure (#…

…196389) (#197034) # Backport This will backport the following commits from `main` to `8.x`: - [[SecuritySolution][Onboarding] Catch completion check failure (#196389)](#196389)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Angela Chuang <[email protected]>
elastic · Oct 21, 2024 · 67e2f94 · 67e2f94
1 parent 933cbc0
commit 67e2f94
Show file tree

Hide file tree

Showing 6 changed files with 181 additions and 16 deletions.
diff --git a/...s/security_solution/public/onboarding/components/onboarding_body/cards/assistant/index.ts b/...s/security_solution/public/onboarding/components/onboarding_body/cards/assistant/index.ts
@@ -25,6 +25,8 @@ export const assistantCardConfig: OnboardingCardConfig<AssistantCardMetadata> =
       )
   ),
   checkComplete: checkAssistantCardComplete,
-  capabilities: 'securitySolutionAssistant.ai-assistant',
+  // Both capabilities are needed for this card, so we should use a double array to create an AND conditional
+  // (a single array would create an OR conditional between them)
+  capabilities: [['securitySolutionAssistant.ai-assistant', 'actions.show']],
   licenseType: 'enterprise',
 };
diff --git a/...ublic/onboarding/components/onboarding_body/cards/integrations/integrations_card.test.tsx b/...ublic/onboarding/components/onboarding_body/cards/integrations/integrations_card.test.tsx
@@ -28,4 +28,15 @@ describe('IntegrationsCard', () => {
     );
     expect(getByTestId('loadingInstalledIntegrations')).toBeInTheDocument();
   });
+
+  it('renders the content', () => {
+    const { queryByTestId } = render(
+      <IntegrationsCard
+        {...props}
+        checkCompleteMetadata={{ installedIntegrationsCount: 1, isAgentRequired: false }}
+      />
+    );
+    expect(queryByTestId('loadingInstalledIntegrations')).not.toBeInTheDocument();
+    expect(queryByTestId('integrationsCardGridTabs')).toBeInTheDocument();
+  });
 });
diff --git a/...oarding/components/onboarding_body/cards/integrations/integrations_check_complete.test.ts b/...oarding/components/onboarding_body/cards/integrations/integrations_check_complete.test.ts
@@ -16,6 +16,7 @@ jest.mock('rxjs', () => ({
 }));
 
 describe('checkIntegrationsCardComplete', () => {
+  const mockLastValueFrom = lastValueFrom as jest.Mock;
   const mockHttpGet: jest.Mock = jest.fn();
   const mockSearch: jest.Mock = jest.fn();
   const mockService = {
@@ -27,6 +28,11 @@ describe('checkIntegrationsCardComplete', () => {
         search: mockSearch,
       },
     },
+    notifications: {
+      toasts: {
+        addError: jest.fn(),
+      },
+    },
   } as unknown as StartServices;
 
   beforeEach(() => {
@@ -38,7 +44,7 @@ describe('checkIntegrationsCardComplete', () => {
       items: [],
     });
 
-    (lastValueFrom as jest.Mock).mockResolvedValue({
+    mockLastValueFrom.mockResolvedValue({
       rawResponse: {
         hits: { total: 0 },
       },
@@ -60,7 +66,7 @@ describe('checkIntegrationsCardComplete', () => {
       items: [{ status: installationStatuses.Installed }],
     });
 
-    (lastValueFrom as jest.Mock).mockResolvedValue({
+    mockLastValueFrom.mockResolvedValue({
       rawResponse: {
         hits: { total: 0 },
       },
@@ -86,7 +92,7 @@ describe('checkIntegrationsCardComplete', () => {
       ],
     });
 
-    (lastValueFrom as jest.Mock).mockResolvedValue({
+    mockLastValueFrom.mockResolvedValue({
       rawResponse: {
         hits: { total: 1 },
       },
@@ -103,4 +109,43 @@ describe('checkIntegrationsCardComplete', () => {
       },
     });
   });
+
+  it('renders an error toast when fetching integrations data fails', async () => {
+    const err = new Error('Failed to fetch integrations data');
+    mockHttpGet.mockRejectedValue(err);
+
+    const res = await checkIntegrationsCardComplete(mockService);
+
+    expect(mockService.notifications.toasts.addError).toHaveBeenCalledWith(err, {
+      title: 'Error fetching integrations data',
+    });
+    expect(res).toEqual({
+      isComplete: false,
+      metadata: {
+        installedIntegrationsCount: 0,
+        isAgentRequired: false,
+      },
+    });
+  });
+
+  it('renders an error toast when fetching agents data fails', async () => {
+    const err = new Error('Failed to fetch agents data');
+    mockLastValueFrom.mockRejectedValue(err);
+
+    const res = await checkIntegrationsCardComplete(mockService);
+
+    expect(mockService.notifications.toasts.addError).toHaveBeenCalledWith(
+      new Error('Failed to fetch agents data'),
+      {
+        title: 'Error fetching agents data',
+      }
+    );
+    expect(res).toEqual({
+      isComplete: false,
+      metadata: {
+        installedIntegrationsCount: 0,
+        isAgentRequired: false,
+      },
+    });
+  });
 });
diff --git a/...c/onboarding/components/onboarding_body/cards/integrations/integrations_check_complete.ts b/...c/onboarding/components/onboarding_body/cards/integrations/integrations_check_complete.ts
@@ -17,18 +17,37 @@ import type { IntegrationCardMetadata } from './types';
 export const checkIntegrationsCardComplete: OnboardingCardCheckComplete<
   IntegrationCardMetadata
 > = async (services: StartServices) => {
-  const packageData = await services.http.get<GetPackagesResponse>(
-    EPM_API_ROUTES.INSTALL_BY_UPLOAD_PATTERN,
-    {
+  const packageData = await services.http
+    .get<GetPackagesResponse>(EPM_API_ROUTES.INSTALL_BY_UPLOAD_PATTERN, {
       version: '2023-10-31',
-    }
-  );
+    })
+    .catch((err: Error) => {
+      services.notifications.toasts.addError(err, {
+        title: i18n.translate(
+          'xpack.securitySolution.onboarding.integrationsCard.checkComplete.fetchIntegrations.errorTitle',
+          {
+            defaultMessage: 'Error fetching integrations data',
+          }
+        ),
+      });
+      return { items: [] };
+    });
 
   const agentsData = await lastValueFrom(
     services.data.search.search({
       params: { index: AGENT_INDEX, body: { size: 1 } },
     })
-  );
+  ).catch((err: Error) => {
+    services.notifications.toasts.addError(err, {
+      title: i18n.translate(
+        'xpack.securitySolution.onboarding.integrationsCard.checkComplete.fetchAgents.errorTitle',
+        {
+          defaultMessage: 'Error fetching agents data',
+        }
+      ),
+    });
+    return { rawResponse: { hits: { total: 0 } } };
+  });
 
   const installed = packageData?.items?.filter(
     (pkg) =>

diff --git a/...y_solution/public/onboarding/components/onboarding_body/hooks/use_completed_cards.test.ts b/...y_solution/public/onboarding/components/onboarding_body/hooks/use_completed_cards.test.ts
@@ -11,9 +11,11 @@ import { useCompletedCards } from './use_completed_cards';
 import type { OnboardingGroupConfig } from '../../../types';
 import type { OnboardingCardId } from '../../../constants';
 import { mockReportCardComplete } from '../../__mocks__/onboarding_context_mocks';
+import { useKibana } from '../../../../common/lib/kibana';
 
 const defaultStoredCompletedCardIds: OnboardingCardId[] = [];
 const mockSetStoredCompletedCardIds = jest.fn();
+const mockUseKibana = useKibana as jest.Mock;
 const mockUseStoredCompletedCardIds = jest.fn(() => [
   defaultStoredCompletedCardIds,
   mockSetStoredCompletedCardIds,
@@ -24,6 +26,15 @@ jest.mock('../../../hooks/use_stored_state', () => ({
 }));
 
 jest.mock('../../onboarding_context');
+jest.mock('../../../../common/lib/kibana', () => {
+  const original = jest.requireActual('../../../../common/lib/kibana');
+  return {
+    ...original,
+    useKibana: jest.fn().mockReturnValue({
+      services: { notifications: { toasts: { addError: jest.fn() } } },
+    }),
+  };
+});
 
 const cardComplete = {
   id: 'card-completed' as OnboardingCardId,
@@ -62,6 +73,13 @@ const cardMetadata = {
     .fn()
     .mockResolvedValue({ isComplete: true, metadata: { custom: 'metadata' } }),
 };
+const mockAddError = jest.fn();
+const mockError = new Error('Failed to check complete');
+const cardCheckCompleteFailed = {
+  id: 'card-failed' as OnboardingCardId,
+  title: 'card failed',
+  checkComplete: jest.fn().mockRejectedValue(mockError),
+};
 
 const mockCardsGroupConfig = [
   {
@@ -74,11 +92,65 @@ const mockCardsGroupConfig = [
   },
 ] as unknown as OnboardingGroupConfig[];
 
+const mockFailureCardsGroupConfig = [
+  {
+    title: 'Group 1',
+    cards: [cardCheckCompleteFailed],
+  },
+] as unknown as OnboardingGroupConfig[];
+
 describe('useCompletedCards Hook', () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });
 
+  describe('when checkComplete functions are rejected', () => {
+    let renderResult: RenderHookResult<
+      OnboardingGroupConfig[],
+      ReturnType<typeof useCompletedCards>
+    >;
+    beforeEach(async () => {
+      mockUseKibana.mockReturnValue({
+        services: { notifications: { toasts: { addError: mockAddError } } },
+      });
+      renderResult = renderHook(useCompletedCards, { initialProps: mockFailureCardsGroupConfig });
+      await act(async () => {
+        await waitFor(() => {
+          expect(mockSetStoredCompletedCardIds).toHaveBeenCalledTimes(0); // number of completed cards
+        });
+      });
+    });
+
+    describe('when a the auto check is called', () => {
+      beforeEach(async () => {
+        jest.clearAllMocks();
+        await act(async () => {
+          renderResult.result.current.checkCardComplete(cardCheckCompleteFailed.id);
+        });
+      });
+
+      it('should not set the completed card ids', async () => {
+        expect(mockSetStoredCompletedCardIds).not.toHaveBeenCalled();
+      });
+
+      it('should return the correct completed state', () => {
+        expect(renderResult.result.current.isCardComplete(cardCheckCompleteFailed.id)).toEqual(
+          false
+        );
+      });
+
+      it('should show an error toast', () => {
+        expect(mockAddError).toHaveBeenCalledWith(mockError, {
+          title: cardCheckCompleteFailed.title,
+        });
+      });
+
+      it('should not report the completed card', async () => {
+        expect(mockReportCardComplete).not.toHaveBeenCalled();
+      });
+    });
+  });
+
   describe('when checkComplete functions are resolved', () => {
     let renderResult: RenderHookResult<
       OnboardingGroupConfig[],

diff --git a/...curity_solution/public/onboarding/components/onboarding_body/hooks/use_completed_cards.ts b/...curity_solution/public/onboarding/components/onboarding_body/hooks/use_completed_cards.ts
@@ -114,9 +114,17 @@ export const useCompletedCards = (cardsGroupConfig: OnboardingGroupConfig[]) =>
       const cardConfig = cardsWithAutoCheck.find(({ id }) => id === cardId);
 
       if (cardConfig) {
-        cardConfig.checkComplete?.(services).then((checkCompleteResult) => {
-          processCardCheckCompleteResult(cardId, checkCompleteResult);
-        });
+        cardConfig
+          .checkComplete?.(services)
+          .catch((err: Error) => {
+            services.notifications.toasts.addError(err, { title: cardConfig.title });
+            return {
+              isComplete: false,
+            };
+          })
+          .then((checkCompleteResult) => {
+            processCardCheckCompleteResult(cardId, checkCompleteResult);
+          });
       }
     },
     [cardsWithAutoCheck, processCardCheckCompleteResult, services]
@@ -129,9 +137,17 @@ export const useCompletedCards = (cardsGroupConfig: OnboardingGroupConfig[]) =>
     }
     autoCheckCompletedRef.current = true;
     cardsWithAutoCheck.map((card) =>
-      card.checkComplete?.(services).then((checkCompleteResult) => {
-        processCardCheckCompleteResult(card.id, checkCompleteResult);
-      })
+      card
+        .checkComplete?.(services)
+        .catch((err: Error) => {
+          services.notifications.toasts.addError(err, { title: card.title });
+          return {
+            isComplete: false,
+          };
+        })
+        .then((checkCompleteResult) => {
+          processCardCheckCompleteResult(card.id, checkCompleteResult);
+        })
     );
   }, [cardsWithAutoCheck, processCardCheckCompleteResult, services]);