[8.x] [EDR Workflows] Fix agent count on policy deploy modal (#209593)

x-pack/solutions/security/plugins/security_solution/public/management/hooks/policy/use_fetch_endpoint_policy_agent_summary.test.ts

@@ -12,6 +12,7 @@ import type { PolicyData } from '../../../../common/endpoint/types';
 import { allFleetHttpMocks } from '../../mocks';
 import { FleetPackagePolicyGenerator } from '../../../../common/endpoint/data_generators/fleet_package_policy_generator';
 import { useFetchAgentByAgentPolicySummary } from './use_fetch_endpoint_policy_agent_summary';
+import type { GetAgentStatusResponse } from '@kbn/fleet-plugin/common';
 import { agentRouteService, API_VERSIONS } from '@kbn/fleet-plugin/common';
 
 const useQueryMock = _useQuery as jest.Mock;
@@ -59,16 +60,20 @@ describe('When using the `useFetchEndpointPolicyAgentSummary()` hook', () => {
       query: { policyId: policy.policy_ids[0] },
       version: API_VERSIONS.public.v1,
     });
-    expect(data).toEqual({
+    const expectedData: GetAgentStatusResponse['results'] = {
+      active: 50,
       total: 50,
+      all: 0,
       inactive: 5,
       online: 40,
       error: 0,
       offline: 5,
       updating: 0,
       other: 0,
       events: 0,
-    });
+      unenrolled: 0,
+    };
+    expect(data).toEqual(expectedData);
   });
 
   it('should apply default values to api returned data', async () => {

x-pack/solutions/security/plugins/security_solution/public/management/mocks/fleet_mocks.ts

@@ -415,9 +415,10 @@ export const fleetGetAgentStatusHttpMock =
       id: 'agentStatus',
       path: AGENT_API_ROUTES.STATUS_PATTERN,
       method: 'get',
-      handler: () => {
+      handler: (): GetAgentStatusResponse => {
         return {
           results: {
+            active: 50,
             total: 50,
             inactive: 5,
             online: 40,
@@ -426,6 +427,8 @@ export const fleetGetAgentStatusHttpMock =
             updating: 0,
             other: 0,
             events: 0,
+            unenrolled: 0,
+            all: 0,
           },
         };
       },

x-pack/solutions/security/plugins/security_solution/public/management/pages/policy/view/policy_settings_layout/policy_settings_layout.test.tsx

@@ -25,6 +25,7 @@ import { cloneDeep } from 'lodash';
 import { set } from '@kbn/safer-lodash-set';
 import { ProtectionModes } from '../../../../../../common/endpoint/types';
 import { waitFor, cleanup } from '@testing-library/react';
+import type { GetAgentStatusResponse } from '@kbn/fleet-plugin/common';
 import { packagePolicyRouteService, API_VERSIONS } from '@kbn/fleet-plugin/common';
 import { getPolicyDataForUpdate } from '../../../../../../common/endpoint/service/policy';
 import { getDeferred } from '../../../../mocks/utils';
@@ -34,8 +35,7 @@ jest.mock('../../../../../common/components/user_privileges');
 
 const useUserPrivilegesMock = _useUserPrivileges as jest.Mock;
 
-// Failing: See https://github.com/elastic/kibana/issues/179984
-describe.skip('When rendering PolicySettingsLayout', () => {
+describe('When rendering PolicySettingsLayout', () => {
   jest.setTimeout(15000);
 
   const testSubj = getPolicySettingsFormTestSubjects();
@@ -84,6 +84,14 @@ describe.skip('When rendering PolicySettingsLayout', () => {
       }
     };
 
+    /**
+     * Performs a minimal number of updates to make 'Save' button enabled.
+     */
+    const makeMinimalUpdates = async () => {
+      const { getByTestId } = renderResult;
+      await userEvent.click(getByTestId(testSubj.malware.enableDisableSwitch));
+    };
+
     /**
      * Makes updates to the policy form on the UI and return back a new (cloned) `PolicyData`
      * with the updates reflected in it
@@ -114,9 +122,11 @@ describe.skip('When rendering PolicySettingsLayout', () => {
       await userEvent.type(getByTestId(testSubj.ransomware.notifyCustomMessage), 'foo message');
       set(policySettings, 'windows.popup.ransomware.message', 'foo message');
 
-      await userEvent.click(getByTestId(testSubj.advancedSection.showHideButton));
-      await userEvent.type(getByTestId('linux.advanced.agent.connection_delay'), '1000');
-      set(policySettings, 'linux.advanced.agent.connection_delay', '1000');
+      // skipping Advanced Options as changing them takes too long.
+      // todo: re-enable them with this issue: https://github.com/elastic/security-team/issues/11765
+      // await userEvent.click(getByTestId(testSubj.advancedSection.showHideButton));
+      // await userEvent.type(getByTestId('linux.advanced.agent.connection_delay'), '1000');
+      // set(policySettings, 'linux.advanced.agent.connection_delay', '1000');
 
       return expectedUpdates;
     };
@@ -131,7 +141,7 @@ describe.skip('When rendering PolicySettingsLayout', () => {
 
     it('should render layout with expected content when changes have been made', async () => {
       const { getByTestId } = render();
-      await makeUpdates();
+      await makeMinimalUpdates();
       expect(getByTestId('endpointPolicyForm'));
       expect(getByTestId('policyDetailsCancelButton')).not.toBeDisabled();
       expect(getByTestId('policyDetailsSaveButton')).not.toBeDisabled();
@@ -153,7 +163,7 @@ describe.skip('When rendering PolicySettingsLayout', () => {
       const deferred = getDeferred();
       apiMocks.responseProvider.updateEndpointPolicy.mockDelay.mockReturnValue(deferred.promise);
       const { getByTestId } = render();
-      await makeUpdates();
+      await makeMinimalUpdates();
       await clickSave(true, false);
 
       await waitFor(() => {
@@ -164,13 +174,11 @@ describe.skip('When rendering PolicySettingsLayout', () => {
       expect(
         getByTestId('policyDetailsSaveButton').querySelector('.euiLoadingSpinner')
       ).not.toBeNull();
-
-      deferred.resolve();
     });
 
     it('should show success toast on update success', async () => {
       render();
-      await makeUpdates();
+      await makeMinimalUpdates();
       await clickSave();
 
       await waitFor(() => {
@@ -189,7 +197,7 @@ describe.skip('When rendering PolicySettingsLayout', () => {
         throw new Error('oh oh!');
       });
       render();
-      await makeUpdates();
+      await makeMinimalUpdates();
       await clickSave();
 
       await waitFor(() => {
@@ -202,6 +210,39 @@ describe.skip('When rendering PolicySettingsLayout', () => {
         title: 'Failed!',
       });
     });
+
+    it('should not show warning about endpoints if there are no active endpoints', async () => {
+      apiMocks.responseProvider.agentStatus.mockReturnValue({
+        results: { active: 0 },
+      } as GetAgentStatusResponse);
+
+      const { getByTestId, queryByTestId } = render();
+      await makeMinimalUpdates();
+
+      await userEvent.click(getByTestId('policyDetailsSaveButton'));
+      await waitFor(() => {
+        expect(getByTestId('confirmModalConfirmButton')).toBeInTheDocument();
+      });
+      expect(queryByTestId('policyDetailsWarningCallout')).not.toBeInTheDocument();
+    });
+
+    it('should show warning about endpoints with the number of active endpoints', async () => {
+      apiMocks.responseProvider.agentStatus.mockReturnValue({
+        results: { active: 6 },
+      } as GetAgentStatusResponse);
+
+      const { getByTestId } = render();
+      await makeMinimalUpdates();
+
+      await userEvent.click(getByTestId('policyDetailsSaveButton'));
+      await waitFor(() => {
+        expect(getByTestId('confirmModalConfirmButton')).toBeInTheDocument();
+      });
+
+      const callout = getByTestId('policyDetailsWarningCallout');
+      expect(callout).toBeInTheDocument();
+      expect(callout.textContent).toContain('This action will update 6 endpoints');
+    });
   });
 
   describe('and user has View Only permissions', () => {

x-pack/solutions/security/plugins/security_solution/public/management/pages/policy/view/policy_settings_layout/policy_settings_layout.tsx

@@ -170,7 +170,7 @@ export const PolicySettingsLayout = memo<PolicySettingsLayoutProps>(
       <>
         {showConfirm && (
           <ConfirmUpdate
-            endpointCount={agentSummaryData ? agentSummaryData.all : 0}
+            endpointCount={agentSummaryData ? agentSummaryData.active : 0}
             onCancel={handleSaveCancel}
             onConfirm={handleSaveConfirmation}
           />