Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 47 additions & 1 deletion src/ValidationsFactory.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { validators } from './mixins/ValidationRules';
import DataProvider from './DataProvider';
import { get, set } from 'lodash';
import { get, set, merge } from 'lodash';
import { Parser } from 'expr-eval';

let globalObject = typeof window === 'undefined'
Expand Down Expand Up @@ -113,8 +113,54 @@ class FormLoopValidations extends Validations {
set(validations, this.element.config.name, {});
const loopField = get(validations, this.element.config.name);
loopField['$each'] = {};
this.checkForSiblings(validations);
await ValidationsFactory(this.element.items, { screen: this.screen, data: {_parent: this.data, noData:true }, parentVisibilityRule: this.element.config.conditionalHide }).addValidations(loopField['$each']);
}
checkForSiblings(validations) {
const siblings = [];
const siblingValidations = [];
// Find loops that reference the same variable
this.screen.config.forEach(page => {
page.items.filter(item => {
if (item.component === 'FormLoop' && item.config.name === this.element.config.name) {
siblings.push(item);
}
});

// Get siblings validations
if (siblings) {
siblings.forEach(sibling => {
sibling.items.filter(item => {
if (!item.config.validation) {
return;
}

item.config.validation.forEach(validation => {
const rule = this.camelCase(validation.value.split(':')[0]);
const validationFn = validators[rule];
const obj = {};
let ruleObj = {};
ruleObj[rule] = validationFn;
obj[item.config.name] = ruleObj;
merge(siblingValidations, obj);
});
});
});
}
});

if (Object.keys(siblingValidations).length != 0) {
// Update the loop validations with its siblings.
const loopValidations = get(validations, this.element.config.name);
if (loopValidations.hasOwnProperty('$each')) {
merge(loopValidations['$each'], siblingValidations);
}
set(validations[this.element.config.name]['$each'], loopValidations);
}
}
camelCase(name) {
return name.replace(/_\w/g, m => m.substr(1, 1).toUpperCase());
}
}

/**
Expand Down
Loading