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

improvement(validation): use config schema definition for validation (#1363)

Browse Source
This commit is contained in:
Caleb
2018-08-07 10:27:15 -06:00
committed by Shawn Erquhart
parent 7bcdb2053d
commit 8cc6dc78ec
9 changed files with 321 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/netlify-cms-core/src/reducers/collections.js
View File

@ -1,10 +1,10 @@
import { List } from 'immutable';
import { escapeRegExp } from 'lodash';
import { get, escapeRegExp } from 'lodash';
import consoleError from 'Lib/consoleError';
import { CONFIG_SUCCESS } from 'Actions/config';
import { FILES, FOLDER } from 'Constants/collectionTypes';
import { INFERABLE_FIELDS, IDENTIFIER_FIELDS } from 'Constants/fieldInference';
import { formatToExtension } from 'Formats/formats';
import { formatExtensions } from 'Formats/formats';
const collections = (state = null, action) => {
switch (action.type) {
@ -30,7 +30,7 @@ const collections = (state = null, action) => {
const selectors = {
[FOLDER]: {
entryExtension(collection) {
return (collection.get('extension') || formatToExtension(collection.get('format') || 'frontmatter')).replace(/^\./, '');
return (collection.get('extension') || get(formatExtensions, (collection.get('format') || 'frontmatter'))).replace(/^\./, '');
},
fields(collection) {
return collection.get('fields');
@ -97,6 +97,7 @@ export const selectTemplateName = (collection, slug) => selectors[collection.get
export const selectIdentifier = collection => {
const fieldNames = collection.get('fields').map(field => field.get('name'));
return IDENTIFIER_FIELDS.find(id => fieldNames.find(name => name.toLowerCase().trim() === id));
// There must be a field whose `name` matches one of the IDENTIFIER_FIELDS.
};
export const selectInferedField = (collection, fieldName) => {
const inferableField = INFERABLE_FIELDS[fieldName];