change previously added antivirus_registration.mode from optional t…

…o required
elastic · Apr 29, 2024 · 9c84758 · 9c84758
1 parent 694acf7
commit 9c84758
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 34 deletions.
diff --git a/x-pack/plugins/security_solution/common/endpoint/types/index.ts b/x-pack/plugins/security_solution/common/endpoint/types/index.ts
@@ -1000,7 +1000,7 @@ export interface PolicyConfig {
       };
     };
     antivirus_registration: {
-      mode?: AntivirusRegistrationModes;
+      mode: AntivirusRegistrationModes;
       enabled: boolean;
     };
     attack_surface_reduction: {

diff --git a/...es/policy/view/policy_settings_form/components/cards/antivirus_registration_card.test.tsx b/...es/policy/view/policy_settings_form/components/cards/antivirus_registration_card.test.tsx
@@ -169,28 +169,4 @@ describe('Policy Form Antivirus Registration Card', () => {
       expect(getRadioButton(antivirusTestSubj.syncRadioButton).checked).toBe(true);
     });
   });
-
-  describe('when antivirus_registration.mode is not available (serverless rollout)', () => {
-    beforeEach(() => {
-      delete formProps.policy.windows.antivirus_registration.mode;
-    });
-
-    it('should show disabled if `antivirus_registration.enabled` is false', () => {
-      formProps.policy.windows.antivirus_registration.enabled = false;
-      render();
-
-      expect(getRadioButton(antivirusTestSubj.disabledRadioButton).checked).toBe(true);
-      expect(getRadioButton(antivirusTestSubj.enabledRadioButton).checked).toBe(false);
-      expect(getRadioButton(antivirusTestSubj.syncRadioButton).checked).toBe(false);
-    });
-
-    it('should show enabled if `antivirus_registration.enabled` is true', () => {
-      formProps.policy.windows.antivirus_registration.enabled = true;
-      render();
-
-      expect(getRadioButton(antivirusTestSubj.disabledRadioButton).checked).toBe(false);
-      expect(getRadioButton(antivirusTestSubj.enabledRadioButton).checked).toBe(true);
-      expect(getRadioButton(antivirusTestSubj.syncRadioButton).checked).toBe(false);
-    });
-  });
 });
diff --git a/...t/pages/policy/view/policy_settings_form/components/cards/antivirus_registration_card.tsx b/...t/pages/policy/view/policy_settings_form/components/cards/antivirus_registration_card.tsx
@@ -51,15 +51,7 @@ export const AntivirusRegistrationCard = memo<AntivirusRegistrationCardProps>(
     const getTestId = useTestIdGenerator(dataTestSubj);
     const isProtectionsAllowed = !useGetProtectionsUnavailableComponent();
     const isEditMode = mode === 'edit';
-
-    let currentMode: AntivirusRegistrationModes;
-    if (policy.windows.antivirus_registration.mode) {
-      currentMode = policy.windows.antivirus_registration.mode;
-    } else {
-      currentMode = policy.windows.antivirus_registration.enabled
-        ? AntivirusRegistrationModes.enabled
-        : AntivirusRegistrationModes.disabled;
-    }
+    const currentMode = policy.windows.antivirus_registration.mode;
 
     const labels: Record<AntivirusRegistrationModes, React.ReactNode> = useMemo(
       () => ({