mirrors/wagtail
mirrors/wagtail
0
0
Fork 0
mirror of https://github.com/wagtail/wagtail.git synced 2024-12-01 11:41:20 +01:00
Code Issues Releases Wiki Activity

Correctly handle nulls in ListBlock validation errors

Browse Source 
Fixes @cnk's test case from #7248. blockErrors within a ListBlockValidationError is an array (with nulls for the items with no errors), but setError was treating it as a dict keyed by block index, which meant it was erroneously passing nulls to the child setError method. FieldBlock handles this gracefully, but other blocks such as StructBlock don't.
This commit is contained in:
Matt Westcott 2021-06-28 18:55:07 +01:00 committed by Matt Westcott
parent ac00945d3b
commit fa648116b2
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/src/components/StreamField/blocks/ListBlock.js
View File

@ -130,12 +130,13 @@ export class ListBlock extends BaseSequenceBlock {
}
const error = errorList[0];
// eslint-disable-next-line no-restricted-syntax
for (const blockIndex in error.blockErrors) {
if (error.blockErrors.hasOwnProperty(blockIndex)) {
this.children[blockIndex].setError(error.blockErrors[blockIndex]);
// error.blockErrors = a list with the same length as the data,
// with nulls for items without errors
error.blockErrors.forEach((blockError, blockIndex) => {
if (blockError) {
this.children[blockIndex].setError(blockError);
}
}
});
}
}

24
client/src/components/StreamField/blocks/ListBlock.test.js
View File

@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/no-unused-vars */
import { FieldBlockDefinition } from './FieldBlock';
import { FieldBlock, FieldBlockDefinition } from './FieldBlock';
import { ListBlockDefinition, ListBlockValidationError } from './ListBlock';
import $ from 'jquery';
@ -43,6 +43,26 @@ class ValidationError {
}
}
/* ListBlock should not call setError on its children with a null value; FieldBlock handles this
gracefully, so define a custom one that doesn't
*/
class ParanoidFieldBlock extends FieldBlock {
setError(errorList) {
if (!errorList) {
throw new Error('ParanoidFieldBlock.setError was passed a null errorList');
}
return super.setError(errorList);
}
}
class ParanoidFieldBlockDefinition extends FieldBlockDefinition {
render(placeholder, prefix, initialState, initialError) {
return new ParanoidFieldBlock(this, placeholder, prefix, initialState, initialError);
}
}
describe('telepath: wagtail.blocks.ListBlock', () => {
let boundBlock;
@ -57,7 +77,7 @@ describe('telepath: wagtail.blocks.ListBlock', () => {
// Define a test block
const blockDef = new ListBlockDefinition(
'test_listblock',
new FieldBlockDefinition(
new ParanoidFieldBlockDefinition(
'',
new DummyWidgetDefinition('The widget'),
{