rancher
/
dashboard
mirror of https://github.com/rancher/dashboard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

was incorrectly checking for apiGroups on the missingOneResource error. (#9916)

This commit is contained in:
Sean-McQ 2023-10-13 13:46:18 -06:00 committed by GitHub
parent 13d6b2b60f
commit 39adb0880a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shell/utils/validators/formRules/index.ts
View File

@ -382,7 +382,7 @@ export default function(t: Translation, { key = 'Value' }: ValidationOptions): {
if (val.some((rule: any) => isEmpty(rule.apiGroups))) { if (val.some((rule: any) => isEmpty(rule.apiGroups))) {
return t('validation.roleTemplate.roleTemplateRules.missingApiGroup'); return t('validation.roleTemplate.roleTemplateRules.missingApiGroup');
} }
} else if (val.some((rule: any) => isEmpty(rule.resources) && isEmpty(rule.nonResourceURLs) && isEmpty(rule.apiGroups))) { } else if (val.some((rule: any) => isEmpty(rule.resources) && isEmpty(rule.nonResourceURLs))) {
return t('validation.roleTemplate.roleTemplateRules.missingOneResource'); return t('validation.roleTemplate.roleTemplateRules.missingOneResource');
} }

2
shell/utils/validators/role-template.js
View File

@ -21,7 +21,7 @@ export function roleTemplateRules(rules = [], getters, errors, validatorArgs = [
errors.push(getters['i18n/t']('validation.roleTemplate.roleTemplateRules.noResourceAndNonResource')); errors.push(getters['i18n/t']('validation.roleTemplate.roleTemplateRules.noResourceAndNonResource'));
} }
if (rules.some((rule) => isEmpty(rule.resources) && isEmpty(rule.nonResourceURLs) && isEmpty(rule.apiGroups))) { if (rules.some((rule) => isEmpty(rule.resources) && isEmpty(rule.nonResourceURLs))) {
errors.push(getters['i18n/t']('validation.roleTemplate.roleTemplateRules.missingOneResource')); errors.push(getters['i18n/t']('validation.roleTemplate.roleTemplateRules.missingOneResource'));
} }
} }