feat(select-widget): add min/max validation (#3171)
This commit is contained in:
@ -52,6 +52,10 @@ const en = {
|
|||||||
range: '%{fieldLabel} must be between %{minValue} and %{maxValue}.',
|
range: '%{fieldLabel} must be between %{minValue} and %{maxValue}.',
|
||||||
min: '%{fieldLabel} must be at least %{minValue}.',
|
min: '%{fieldLabel} must be at least %{minValue}.',
|
||||||
max: '%{fieldLabel} must be %{maxValue} or less.',
|
max: '%{fieldLabel} must be %{maxValue} or less.',
|
||||||
|
rangeCount: '%{fieldLabel} must have between %{minCount} and %{maxCount} item(s).',
|
||||||
|
rangeCountExact: '%{fieldLabel} must have exactly %{count} item(s).',
|
||||||
|
minCount: '%{fieldLabel} must be at least %{minCount} item(s).',
|
||||||
|
maxCount: '%{fieldLabel} must be %{maxCount} or less item(s).',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
editor: {
|
editor: {
|
||||||
|
@ -2,7 +2,7 @@ import React from 'react';
|
|||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||||
import { Map, List, fromJS } from 'immutable';
|
import { Map, List, fromJS } from 'immutable';
|
||||||
import { find } from 'lodash';
|
import { find, isNumber } from 'lodash';
|
||||||
import Select from 'react-select';
|
import Select from 'react-select';
|
||||||
import { reactSelectStyles } from 'netlify-cms-ui-default';
|
import { reactSelectStyles } from 'netlify-cms-ui-default';
|
||||||
|
|
||||||
@ -55,6 +55,55 @@ export default class SelectControl extends React.Component {
|
|||||||
}),
|
}),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
isValid = () => {
|
||||||
|
const { field, value, t } = this.props;
|
||||||
|
const min = field.get('min');
|
||||||
|
const max = field.get('max');
|
||||||
|
if (!field.get('multiple')) {
|
||||||
|
return { error: false };
|
||||||
|
}
|
||||||
|
if ([min, max].every(isNumber)) {
|
||||||
|
const isValid = value && value.size >= min && value.size <= max;
|
||||||
|
const messageKey = min === max ? 'rangeCountExact' : 'rangeCount';
|
||||||
|
if (!isValid) {
|
||||||
|
return {
|
||||||
|
error: {
|
||||||
|
message: t(`editor.editorControlPane.widget.${messageKey}`, {
|
||||||
|
fieldLabel: field.get('label', field.get('name')),
|
||||||
|
minValue: min,
|
||||||
|
maxValue: max,
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
} else if (isNumber(min)) {
|
||||||
|
const isValid = value && value.size >= min;
|
||||||
|
if (!isValid) {
|
||||||
|
return {
|
||||||
|
error: {
|
||||||
|
message: t('editor.editorControlPane.widget.rangeMin', {
|
||||||
|
fieldLabel: field.get('label', field.get('name')),
|
||||||
|
minValue: min,
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
} else if (isNumber(max)) {
|
||||||
|
const isValid = !value || value.size <= max;
|
||||||
|
if (!isValid) {
|
||||||
|
return {
|
||||||
|
error: {
|
||||||
|
message: t('editor.editorControlPane.widget.rangeMax', {
|
||||||
|
fieldLabel: field.get('label', field.get('name')),
|
||||||
|
maxValue: max,
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return { error: false };
|
||||||
|
};
|
||||||
|
|
||||||
handleChange = selectedOption => {
|
handleChange = selectedOption => {
|
||||||
const { onChange, field } = this.props;
|
const { onChange, field } = this.props;
|
||||||
const isMultiple = field.get('multiple', false);
|
const isMultiple = field.get('multiple', false);
|
||||||
|
@ -34,7 +34,7 @@ class SelectController extends React.Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function setup({ field, defaultValue }) {
|
function setup({ field, defaultValue }) {
|
||||||
let renderArgs;
|
let renderArgs, ref;
|
||||||
const stateChangeSpy = jest.fn();
|
const stateChangeSpy = jest.fn();
|
||||||
const setActiveSpy = jest.fn();
|
const setActiveSpy = jest.fn();
|
||||||
const setInactiveSpy = jest.fn();
|
const setInactiveSpy = jest.fn();
|
||||||
@ -52,6 +52,8 @@ function setup({ field, defaultValue }) {
|
|||||||
classNameWrapper=""
|
classNameWrapper=""
|
||||||
setActiveStyle={setActiveSpy}
|
setActiveStyle={setActiveSpy}
|
||||||
setInactiveStyle={setInactiveSpy}
|
setInactiveStyle={setInactiveSpy}
|
||||||
|
ref={widgetRef => (ref = widgetRef)}
|
||||||
|
t={jest.fn(msg => msg)}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}}
|
}}
|
||||||
@ -66,6 +68,7 @@ function setup({ field, defaultValue }) {
|
|||||||
stateChangeSpy,
|
stateChangeSpy,
|
||||||
setActiveSpy,
|
setActiveSpy,
|
||||||
setInactiveSpy,
|
setInactiveSpy,
|
||||||
|
ref,
|
||||||
input,
|
input,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@ -207,4 +210,81 @@ describe('Select widget', () => {
|
|||||||
expect(getByText('baz')).toBeInTheDocument();
|
expect(getByText('baz')).toBeInTheDocument();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
describe.only('validation', () => {
|
||||||
|
function validate(setupOpts) {
|
||||||
|
const { ref } = setup(setupOpts);
|
||||||
|
const { error } = ref.isValid();
|
||||||
|
return error?.message;
|
||||||
|
}
|
||||||
|
it('should fail with less items than min allows', () => {
|
||||||
|
const opts = {
|
||||||
|
field: fromJS({ options: stringOptions, multiple: true, min: 1 }),
|
||||||
|
};
|
||||||
|
expect(validate(opts)).toMatchInlineSnapshot(`"editor.editorControlPane.widget.rangeMin"`);
|
||||||
|
});
|
||||||
|
it('should fail with more items than max allows', () => {
|
||||||
|
const opts = {
|
||||||
|
field: fromJS({ options: stringOptions, multiple: true, max: 1 }),
|
||||||
|
defaultValue: fromJS([stringOptions[0], stringOptions[1]]),
|
||||||
|
};
|
||||||
|
expect(validate(opts)).toMatchInlineSnapshot(`"editor.editorControlPane.widget.rangeMax"`);
|
||||||
|
});
|
||||||
|
it('should enforce min when both min and max are set', () => {
|
||||||
|
const opts = {
|
||||||
|
field: fromJS({ options: stringOptions, multiple: true, min: 1, max: 2 }),
|
||||||
|
};
|
||||||
|
expect(validate(opts)).toMatchInlineSnapshot(`"editor.editorControlPane.widget.rangeCount"`);
|
||||||
|
});
|
||||||
|
it('should enforce max when both min and max are set', () => {
|
||||||
|
const opts = {
|
||||||
|
field: fromJS({ options: stringOptions, multiple: true, min: 1, max: 2 }),
|
||||||
|
defaultValue: fromJS([stringOptions[0], stringOptions[1], stringOptions[2]]),
|
||||||
|
};
|
||||||
|
expect(validate(opts)).toMatchInlineSnapshot(`"editor.editorControlPane.widget.rangeCount"`);
|
||||||
|
});
|
||||||
|
it('should enforce min and max when they are the same value', () => {
|
||||||
|
const opts = {
|
||||||
|
field: fromJS({ options: stringOptions, multiple: true, min: 2, max: 2 }),
|
||||||
|
defaultValue: fromJS([stringOptions[0], stringOptions[1], stringOptions[2]]),
|
||||||
|
};
|
||||||
|
expect(validate(opts)).toMatchInlineSnapshot(
|
||||||
|
`"editor.editorControlPane.widget.rangeCountExact"`,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
it('should pass when min is met', () => {
|
||||||
|
const opts = {
|
||||||
|
field: fromJS({ options: stringOptions, multiple: true, min: 1 }),
|
||||||
|
defaultValue: fromJS([stringOptions[0]]),
|
||||||
|
};
|
||||||
|
expect(validate(opts)).toBeUndefined();
|
||||||
|
});
|
||||||
|
it('should pass when max is met', () => {
|
||||||
|
const opts = {
|
||||||
|
field: fromJS({ options: stringOptions, multiple: true, max: 1 }),
|
||||||
|
defaultValue: fromJS([stringOptions[0]]),
|
||||||
|
};
|
||||||
|
expect(validate(opts)).toBeUndefined();
|
||||||
|
});
|
||||||
|
it('should pass when both min and max are met', () => {
|
||||||
|
const opts = {
|
||||||
|
field: fromJS({ options: stringOptions, multiple: true, min: 2, max: 3 }),
|
||||||
|
defaultValue: fromJS([stringOptions[0], stringOptions[1]]),
|
||||||
|
};
|
||||||
|
expect(validate(opts)).toBeUndefined();
|
||||||
|
});
|
||||||
|
it('should pass when both min and max are met, and are the same value', () => {
|
||||||
|
const opts = {
|
||||||
|
field: fromJS({ options: stringOptions, multiple: true, min: 2, max: 2 }),
|
||||||
|
defaultValue: fromJS([stringOptions[0], stringOptions[1]]),
|
||||||
|
};
|
||||||
|
expect(validate(opts)).toBeUndefined();
|
||||||
|
});
|
||||||
|
it('should not fail on min/max if multiple is not true', () => {
|
||||||
|
const opts = {
|
||||||
|
field: fromJS({ options: stringOptions, min: 2, max: 2 }),
|
||||||
|
defaultValue: fromJS([stringOptions[0]]),
|
||||||
|
};
|
||||||
|
expect(validate(opts)).toBeUndefined();
|
||||||
|
});
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
@ -16,6 +16,8 @@ The select widget allows you to pick a string value from a dropdown menu.
|
|||||||
- string values: the label displayed in the dropdown is the value saved in the file
|
- string values: the label displayed in the dropdown is the value saved in the file
|
||||||
- object with `label` and `value` fields: the label displays in the dropdown; the value is saved in the file
|
- object with `label` and `value` fields: the label displays in the dropdown; the value is saved in the file
|
||||||
- `multiple`: accepts a boolean; defaults to `false`
|
- `multiple`: accepts a boolean; defaults to `false`
|
||||||
|
- `min`: minimum number of items; ignored if **multiple** is not `true`
|
||||||
|
- `max`: maximum number of items; ignored if **multiple** is not `true`
|
||||||
- **Example** (options as strings):
|
- **Example** (options as strings):
|
||||||
```yaml
|
```yaml
|
||||||
- label: "Align Content"
|
- label: "Align Content"
|
||||||
@ -42,4 +44,14 @@ The select widget allows you to pick a string value from a dropdown menu.
|
|||||||
options: ["Design", "UX", "Dev"]
|
options: ["Design", "UX", "Dev"]
|
||||||
default: ["Design"]
|
default: ["Design"]
|
||||||
```
|
```
|
||||||
|
- **Example** (min/max):
|
||||||
|
```yaml
|
||||||
|
- label: "Tags"
|
||||||
|
name: "tags"
|
||||||
|
widget: "select"
|
||||||
|
multiple: true
|
||||||
|
min: 1
|
||||||
|
max: 3
|
||||||
|
options: ["Design", "UX", "Dev"]
|
||||||
|
default: ["Design"]
|
||||||
|
```
|
||||||
|
Reference in New Issue
Block a user