From 76fdf2d3fd2dac653b8119116a3f3596567d31c3 Mon Sep 17 00:00:00 2001 From: Johnny Hausman Date: Mon, 5 Jan 2026 13:50:06 -0600 Subject: [PATCH 1/2] [sync] with core, and include AB.defaultsDeep() method --- src/js/AppBuilder/ABFactory.js | 4 ++++ src/js/AppBuilder/core | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/js/AppBuilder/ABFactory.js b/src/js/AppBuilder/ABFactory.js index 5f890d8..be5ea4d 100644 --- a/src/js/AppBuilder/ABFactory.js +++ b/src/js/AppBuilder/ABFactory.js @@ -868,6 +868,10 @@ class ABFactory extends ABFactoryCore { return _.cloneDeep(value); } + defaultsDeep(target, source) { + return _.defaultsDeep(target, source); + } + error(message, ...rest) { var emitData = { message: `ABFactory[${this.Tenant.id()}]:${message.toString()}`, diff --git a/src/js/AppBuilder/core b/src/js/AppBuilder/core index 9f045df..d52cad3 160000 --- a/src/js/AppBuilder/core +++ b/src/js/AppBuilder/core @@ -1 +1 @@ -Subproject commit 9f045dff479e0ef57c7d4deb56ba58e40f0dce88 +Subproject commit d52cad32a380c54a88f91e61e8ad62434f7ca3dd From ab82f4dafd83e6d5cf3fb980a833142b4d7fee11 Mon Sep 17 00:00:00 2001 From: Johnny Hausman Date: Mon, 5 Jan 2026 13:50:30 -0600 Subject: [PATCH 2/2] [fix] remove improper warnings from ABProcessTaskServiceAPI --- .../process/tasks/ABProcessTaskServiceApi.js | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/js/AppBuilder/platform/process/tasks/ABProcessTaskServiceApi.js b/src/js/AppBuilder/platform/process/tasks/ABProcessTaskServiceApi.js index e79a00a..6a18d25 100644 --- a/src/js/AppBuilder/platform/process/tasks/ABProcessTaskServiceApi.js +++ b/src/js/AppBuilder/platform/process/tasks/ABProcessTaskServiceApi.js @@ -8,25 +8,25 @@ export default class ABProcessTaskServiceAPI extends ServiceAPICore { warningsEval() { super.warningsEval(); - if (!this.formulaText) { - this.warningMessage("is missing a formula."); - } + // if (!this.formulaText) { + // this.warningMessage("is missing a formula."); + // } - if (this.formulaText) { - const hash = {}; - (this.process.processDataFields(this) || []).forEach((item) => { - hash[`{${item.label}}`] = item; - }); + // if (this.formulaText) { + // const hash = {}; + // (this.process.processDataFields(this) || []).forEach((item) => { + // hash[`{${item.label}}`] = item; + // }); - let exp = new RegExp(`{[^}]*}`, "g"); - let entries = this.formulaText.match(exp) || []; - entries.forEach((entry) => { - if (!hash[entry]) { - this.warningMessage( - `could not resolve process value [${entry}]` - ); - } - }); - } + // let exp = new RegExp(`{[^}]*}`, "g"); + // let entries = this.formulaText.match(exp) || []; + // entries.forEach((entry) => { + // if (!hash[entry]) { + // this.warningMessage( + // `could not resolve process value [${entry}]` + // ); + // } + // }); + // } } }