hiro/Vulcan
1
0
Fork 0
mirror of https://github.com/vale981/Vulcan synced 2025-03-06 01:51:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor clean-ups

Browse source
This commit is contained in:
SachaG 2018-06-17 08:00:19 +09:00
parent d9bc8b8c88
commit 629e4c2c58
6 changed files with 21 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/vulcan-lib/lib/modules/components.js
View file

@ -36,7 +36,7 @@ export const registerComponent = (name, rawComponent, ...hocs) => {
hocs,
};
} else {
// backwards compatibility
// OpenCRUD backwards compatibility
// store the component in the table
ComponentsTable[name] = {
name,

2
packages/vulcan-lib/lib/modules/icons.js
View file

@ -1,3 +1,5 @@
// TODO: get rid of this?
/*
Utilities for displaying icons.

2
packages/vulcan-lib/lib/modules/mongo_redux.js
View file

@ -1,3 +1,5 @@
// TODO: get rid of this?
import Mingo from 'mingo';
Mongo.Collection.prototype.findInStore = function (store, selector = {}, options = {}) {

74
packages/vulcan-lib/lib/modules/validation.js
View file

@ -7,10 +7,7 @@ export const dataToModifier = data => ({ $set: pickBy(data, f => f !== null), $u
If document is not trusted, run validation steps:
1. Check that the current user has permission to edit each field
2. Check field lengths
3. Check field types
4. Check for missing fields
5. Run SimpleSchema validation step (for now)
2. Run SimpleSchema validation step
*/
export const validateDocument = (document, collection, context) => {
@ -30,32 +27,9 @@ export const validateDocument = (document, collection, context) => {
properties: { name: fieldName },
});
}
// 2. check field lengths
// if (fieldSchema.limit && value.length > fieldSchema.limit) {
// validationErrors.push({
// id: 'errors.field_is_too_long',
// data: { fieldName, limit: fieldSchema.limit },
// });
// }
// 3. check that fields have the proper type
// TODO
});
// 4. check that required fields have a value
// _.keys(schema).forEach(fieldName => {
// const fieldSchema = schema[fieldName];
// if ((fieldSchema.required || !fieldSchema.optional) && typeof document[fieldName] === 'undefined') {
// validationErrors.push({
// id: 'app.required_field_missing',
// data: { fieldName },
// });
// }
// });
// 5. still run SS validation for now for backwards compatibility
// 5. run SS validation
const validationContext = collection.simpleSchema().newContext();
validationContext.validate(document);
@ -80,10 +54,7 @@ export const validateDocument = (document, collection, context) => {
If document is not trusted, run validation steps:
1. Check that the current user has permission to insert each field
2. Check field lengths
3. Check field types
4. Check for missing fields
5. Run SimpleSchema validation step (for now)
2. Run SimpleSchema validation step
*/
export const validateModifier = (modifier, document, collection, context) => {
@ -106,41 +77,7 @@ export const validateModifier = (modifier, document, collection, context) => {
}
});
export const validateData = (data, document, collection, context) => {
return validateModifier(dataToModifier(data), document, collection, context);
}
// Check validity of set modifier
// _.forEach(set, (value, fieldName) => {
// const fieldSchema = schema[fieldName];
// // 2. check field lengths
// if (fieldSchema.limit && value.length > fieldSchema.limit) {
// validationErrors.push({
// id: 'app.field_is_too_long',
// data: { name: fieldName, limit: fieldSchema.limit },
// });
// }
// // 3. check that fields have the proper type
// // TODO
// });
// // 4. check that required fields have a value
// // when editing, we only want to require fields that are actually part of the form
// // so we make sure required keys are present in the $unset object
// _.keys(schema).forEach(fieldName => {
// const fieldSchema = schema[fieldName];
// if (unset[fieldName] && (fieldSchema.required || !fieldSchema.optional) && typeof set[fieldName] === 'undefined') {
// validationErrors.push({
// id: 'app.required_field_missing',
// data: { name: fieldName },
// });
// }
// });
// 5. still run SS validation for now for backwards compatibility
// 2. run SS validation
const validationContext = collection.simpleSchema().newContext();
validationContext.validate({ $set: set, $unset: unset }, { modifier: true });
@ -160,6 +97,9 @@ export const validateModifier = (modifier, document, collection, context) => {
return validationErrors;
};
export const validateData = (data, document, collection, context) => {
return validateModifier(dataToModifier(data), document, collection, context);
}
/*

14
packages/vulcan-lib/lib/server/mutators.js
View file

@ -79,7 +79,7 @@ export const createMutator = async ({ collection, document, data, currentUser, v
let autoValue;
if (schema[fieldName].onCreate) {
autoValue = await schema[fieldName].onCreate({ newDocument, currentUser });
} else {
} else if (schema[fieldName].onInsert) {
// OpenCRUD backwards compatibility
autoValue = await schema[fieldName].onInsert(newDocument, currentUser);
}
@ -183,12 +183,12 @@ export const updateMutator = async ({ collection, selector, data, set = {}, unse
delete newDocument[fieldName];
});
// run onEdit step
// run onUpdate step
for(let fieldName of _.keys(schema)) {
let autoValue;
if (schema[fieldName].onUpdate) {
autoValue = await schema[fieldName].onUpdate({ data, document, currentUser, newDocument });
} else {
} else if (schema[fieldName].onEdit) {
// OpenCRUD backwards compatibility
autoValue = await schema[fieldName].onEdit(modifier, document, currentUser, newDocument);
}
@ -283,9 +283,11 @@ export const deleteMutator = async ({ collection, selector, currentUser, validat
// run onRemove step
for(let fieldName of _.keys(schema)) {
const onDelete = schema[fieldName].onDelete || schema[fieldName].onRemove; // OpenCRUD backwards compatibility
if (onDelete) {
await onDelete(document, currentUser);
if (schema[fieldName].onDelete) {
await schema[fieldName].onDelete({ document, currentUser });
} else if (schema[fieldName].onRemove) {
// OpenCRUD backwards compatibility
await schema[fieldName].onRemove(document, currentUser);
}
}