gcg/static-cms
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: allow widgets to control value to be validated (#3448)

Browse Source
This commit is contained in:
Erez Rokah 2020-03-23 16:33:29 +02:00 committed by GitHub
parent 228c6b41e2
commit ae1917c818
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/netlify-cms-core/src/components/Editor/EditorControlPane/Widget.js
View File

@ -97,7 +97,7 @@ export default class Widget extends Component {
}; };
validate = (skipWrapped = false) => { validate = (skipWrapped = false) => {
let value = this.props.value; let value = this.innerWrappedControl?.getValidateValue?.() || this.props.value;
// Convert list input widget value to string for validation test // Convert list input widget value to string for validation test
List.isList(value) && (value = value.join(',')); List.isList(value) && (value = value.join(','));

9
packages/netlify-cms-widget-file/src/withFileControl.js
View File

@ -7,6 +7,7 @@ import { once } from 'lodash';
import uuid from 'uuid/v4'; import uuid from 'uuid/v4';
import { oneLine } from 'common-tags'; import { oneLine } from 'common-tags';
import { lengths, components, buttons, borders, effects, shadows } from 'netlify-cms-ui-default'; import { lengths, components, buttons, borders, effects, shadows } from 'netlify-cms-ui-default';
import { basename } from 'netlify-cms-lib-util';
const MAX_DISPLAY_LENGTH = 50; const MAX_DISPLAY_LENGTH = 50;
@ -175,6 +176,14 @@ export default function withFileControl({ forImage } = {}) {
return this.props.onChange(''); return this.props.onChange('');
}; };
getValidateValue = () => {
if (this.props.value) {
return basename(this.props.value);
}
return this.props.value;
};
renderFileLink = value => { renderFileLink = value => {
const size = MAX_DISPLAY_LENGTH; const size = MAX_DISPLAY_LENGTH;
if (!value || value.length <= size) { if (!value || value.length <= size) {