Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/appsmithorg/appsmith into release

Browse Source
This commit is contained in:
Automated Github Action 2020-09-25 06:45:46 +00:00
commit 5146e09f37
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/client/src/utils/DynamicBindingUtils.ts
View File

@ -240,10 +240,17 @@ export const getValidatedTree = (tree: any) => {
);
parsedEntity[property] = parsed;
if (!hasEvaluatedValue) {
const evaluatedValue = _.isUndefined(transformed)
const evaluatedValue = isValid
? parsed
: _.isUndefined(transformed)
? value
: transformed;
_.set(parsedEntity, `evaluatedValues.${property}`, evaluatedValue);
const safeEvaluatedValue = removeFunctions(evaluatedValue);
_.set(
parsedEntity,
`evaluatedValues.${property}`,
safeEvaluatedValue,
);
}
const hasValidation = _.has(parsedEntity, `invalidProps.${property}`);
@ -621,10 +628,13 @@ function validateAndParseWidgetProperty(
widget,
currentTree,
);
const evaluatedValue = _.isUndefined(transformed)
const evaluatedValue = isValid
? parsed
: _.isUndefined(transformed)
? evalPropertyValue
: transformed;
_.set(widget, `evaluatedValues.${propertyName}`, evaluatedValue);
const safeEvaluatedValue = removeFunctions(evaluatedValue);
_.set(widget, `evaluatedValues.${propertyName}`, safeEvaluatedValue);
if (!isValid) {
_.set(widget, `invalidProps.${propertyName}`, true);
_.set(widget, `validationMessages.${propertyName}`, message);
@ -757,6 +767,18 @@ const overwriteDefaultDependentProps = (
return propertyValue;
};
// We need to remove functions from data tree to avoid any unexpected identifier while JSON parsing
// Check issue https://github.com/appsmithorg/appsmith/issues/719
const removeFunctions = (value: any) => {
if (_.isFunction(value)) {
return "Function call";
} else if (_.isObject(value) && _.some(value, _.isFunction)) {
return JSON.parse(JSON.stringify(value));
} else {
return value;
}
};
/*
Need to evaluated values