Skip to content

[Fleet] Fix required validation for multi text input field #205768

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

Merged
juliaElastic merged 2 commits into from
Jan 9, 2025
Merged

[Fleet] Fix required validation for multi text input field #205768

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
fc3d720
[Fleet] Fix required validation for multi text input field
viajes7 Jan 7, 2025
c0db11c
[Fleet] add unit test
viajes7 Jan 7, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions x-pack/platform/plugins/shared/fleet/common/services/validate_package_policy.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,6 +872,46 @@ describe('Fleet - validationHasErrors()', () => {
});

describe('Fleet - validatePackagePolicyConfig', () => {
describe('Multi Text', () => {
it('should return required error message for empty string', () => {
const res = validatePackagePolicyConfig(
{
type: 'text',
value: [''],
},
{
name: 'myvariable',
type: 'text',
multi: true,
required: true,
},
'myvariable',
load
);

expect(res).toEqual(['myvariable is required']);
});

it('should return required error message for blank spaces', () => {
const res = validatePackagePolicyConfig(
{
type: 'text',
value: ['value1', ' '],
},
{
name: 'myvariable',
type: 'text',
multi: true,
required: true,
},
'myvariable',
load
);

expect(res).toEqual(['myvariable is required']);
});
});

describe('Integer', () => {
it('should return an error message for invalid integer', () => {
const res = validatePackagePolicyConfig(
Expand Down
23 changes: 14 additions & 9 deletions x-pack/platform/plugins/shared/fleet/common/services/validate_package_policy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,15 +291,20 @@ export const validatePackagePolicyConfig = (
);
return errors;
}
if (varDef.required && Array.isArray(parsedValue) && parsedValue.length === 0) {
errors.push(
i18n.translate('xpack.fleet.packagePolicyValidation.requiredErrorMessage', {
defaultMessage: '{fieldName} is required',
values: {
fieldName: varDef.title || varDef.name,
},
})
);
if (varDef.required && Array.isArray(parsedValue)) {
const hasEmptyString =
varDef.type === 'text' && parsedValue.some((item) => item.trim() === '');

if (hasEmptyString || parsedValue.length === 0) {
errors.push(
i18n.translate('xpack.fleet.packagePolicyValidation.requiredErrorMessage', {
defaultMessage: '{fieldName} is required',
values: {
fieldName: varDef.title || varDef.name,
},
})
);
}
}
if (varDef.type === 'text' && parsedValue) {
const invalidStrings = parsedValue.filter((cand: any) => /^[*&]/.test(cand));
Expand Down
Loading