Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[EDR Workflows][chore] Change previously added antivirus_registration.mode from optional to required #181986

Merged
merged 2 commits into from
May 3, 2024
Merged

[EDR Workflows][chore] Change previously added antivirus_registration.mode from optional to required #181986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c84758
change previously added `antivirus_registration.mode` from optional t…
gergoabraham Apr 29, 2024
0765ce0
Merge branch 'main' into change-antivirus-registration-mode-entry-to-…
kibanamachine May 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion x-pack/plugins/security_solution/common/endpoint/types/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1000,7 +1000,7 @@ export interface PolicyConfig {
};
};
antivirus_registration: {
mode?: AntivirusRegistrationModes;
mode: AntivirusRegistrationModes;
enabled: boolean;
};
attack_surface_reduction: {
Expand Down
24 changes: 0 additions & 24 deletions ...es/policy/view/policy_settings_form/components/cards/antivirus_registration_card.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
});
});
10 changes: 1 addition & 9 deletions ...t/pages/policy/view/policy_settings_form/components/cards/antivirus_registration_card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
() => ({
Expand Down