yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-01 18:33:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor validators and add better messages

Browse Source 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
This commit is contained in:
Convly 2020-08-13 14:15:25 +02:00 committed by Pierre Noël
parent df5dc17c75
commit 28beaaa932
2 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
packages/strapi-admin/validation/common-validators.js
View File

@ -46,19 +46,6 @@ const arrayOfConditionNames = yup
: this.createError({ path: this.path, message: `contains conditions that don't exist` });
});
const checkContentTypesFieldsRestriction = permissions => {
const { actionProvider } = strapi.admin.services.permission;
if (!_.isArray(permissions)) {
return true;
}
return permissions.every(({ action: actionId, fields }) => {
const action = actionProvider.getByActionId(actionId);
return actionDomain.hasFieldsRestriction(action) || _.isNil(fields);
});
};
const permissionsAreEquals = (a, b) =>
a.action === b.action && (a.subject === b.subject || (_.isNil(a.subject) && _.isNil(b.subject)));
@ -93,20 +80,25 @@ const updatePermissions = yup
'field-nested',
'Fields format are incorrect (duplicates).',
checkFieldsDontHaveDuplicates
)
.test(
'fields-restriction',
'The permission at ${path} must have fields set to null or undefined',
function(fields) {
const { actionProvider } = strapi.admin.services.permission;
const action = actionProvider.getByActionId(this.parent.action);
return actionDomain.hasFieldsRestriction(action) || _.isNil(fields);
}
),
conditions: yup.array().of(yup.string()),
})
.test(
'delete-fields-are-null',
'Some permissions are duplicated (same action and subject)',
checkNoDuplicatedPermissions
)
.test(
'fields-restriction',
'The actions must have fields set to null or undefined',
checkContentTypesFieldsRestriction
)
.noUnknown()
)
.test(
'delete-fields-are-null',
'Some permissions are duplicated (same action and subject)',
checkNoDuplicatedPermissions
),
})
.required()

4
packages/strapi-utils/lib/validators.js
View File

@ -16,8 +16,8 @@ function isNotNull(msg = '${path} cannot be null.') {
return this.test('defined', msg, isNotNullTest);
}
function arrayRequiredAllowEmpty(message) {
return this.test('field is required', message || '', value => _.isArray(value));
function arrayRequiredAllowEmpty(message = '${path} is required') {
return this.test('field is required', message, value => _.isArray(value));
}
yup.addMethod(yup.mixed, 'notNil', isNotNill);