yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-07 16:29:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

RepeatableComponent: Simplify error handling and fix all nesting levels

Browse Source
This commit is contained in:
Gustav Hansen 2022-03-29 16:02:56 +02:00
parent 1f811ed9a7
commit c3383c63b1
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/core/admin/admin/src/content-manager/components/RepeatableComponent/utils/getComponentErrorKeys.js
View File

@ -1,14 +1,10 @@
import take from 'lodash/take'; export default function getComponentErrorKeys(name, formErrors) {
export default function getComponentErrorKeys(name, formErrors, isNested = false) {
return Object.keys(formErrors) return Object.keys(formErrors)
.filter((errorKey) => { .filter(errorKey => errorKey.startsWith(name))
return take(errorKey.split('.'), isNested ? 2 : 1).join('.') === name; .map(errorKey =>
}) errorKey
.map((errorKey) => {
return errorKey
.split('.') .split('.')
.slice(0, name.split('.').length + 1) .slice(0, name.split('.').length + 1)
.join('.'); .join('.')
}); );
} }

2
packages/core/admin/admin/src/content-manager/components/RepeatableComponent/utils/tests/getComponentErrorKeys.test.js
View File

@ -19,7 +19,7 @@ describe('getComponentErrorKeys', () => {
'parent.child.1.field': 'validation-error', 'parent.child.1.field': 'validation-error',
}; };
expect(getComponentErrorKeys('parent.child', FIXTURE, true)).toStrictEqual([ expect(getComponentErrorKeys('parent.child', FIXTURE)).toStrictEqual([
'parent.child.0', 'parent.child.0',
'parent.child.1', 'parent.child.1',
]); ]);