From 75c4214ed6c09b72d7e8b09d06f55fe87dc8ffaa Mon Sep 17 00:00:00 2001 From: BenWirachot Date: Thu, 23 Jul 2026 17:32:29 +0700 Subject: [PATCH 1/2] Resolve potential undefined errors by normalizing data types and adding nullish coalescing operators --- AppBuilder/core | 2 +- AppBuilder/platform/dataFields/ABFieldList.js | 3 ++- AppBuilder/platform/plugins/ABClassUIPlugin.js | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/AppBuilder/core b/AppBuilder/core index 03d42060..3cb8a7f7 160000 --- a/AppBuilder/core +++ b/AppBuilder/core @@ -1 +1 @@ -Subproject commit 03d4206039de2805ef40f971e0b5228eadcc212c +Subproject commit 3cb8a7f7aea01448a4819b4742cb8e4e10360773 diff --git a/AppBuilder/platform/dataFields/ABFieldList.js b/AppBuilder/platform/dataFields/ABFieldList.js index 5fb3b8b8..bd225f5a 100644 --- a/AppBuilder/platform/dataFields/ABFieldList.js +++ b/AppBuilder/platform/dataFields/ABFieldList.js @@ -472,9 +472,10 @@ function _getSelectedOptions(field, rowData = {}) { // Pull text with current language if (field.settings) { + const resultArray = Array.isArray(result) ? result : [result]; result = (field.settings.options || []).filter((opt) => { return ( - (result || []).filter( + resultArray.filter( (v) => opt && v && (opt.id || opt) == (v.id || v) ).length > 0 ); diff --git a/AppBuilder/platform/plugins/ABClassUIPlugin.js b/AppBuilder/platform/plugins/ABClassUIPlugin.js index 1b262d2b..de5d47fc 100644 --- a/AppBuilder/platform/plugins/ABClassUIPlugin.js +++ b/AppBuilder/platform/plugins/ABClassUIPlugin.js @@ -182,7 +182,7 @@ export default class ABClassUIPlugin extends ClassUI { get CurrentView() { return this.CurrentApplication?.views( (v) => v.id == this.CurrentViewID - )[0]; + )?.[0]; } /** @@ -204,7 +204,7 @@ export default class ABClassUIPlugin extends ClassUI { * icon: {string} the icon to display */ datacollectionsIncluded() { - return this.CurrentApplication?.datacollectionsIncluded() + return (this.CurrentApplication?.datacollectionsIncluded() || []) .filter((dc) => { const obj = dc.datasource; return ( From b12f5d61016f5dc2ef7826d8de2c557d4ad1e043 Mon Sep 17 00:00:00 2001 From: BenWirachot Date: Thu, 23 Jul 2026 17:32:51 +0700 Subject: [PATCH 2/2] Provide the code changes or file diffs you would like me to summarize. --- AppBuilder/core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AppBuilder/core b/AppBuilder/core index 3cb8a7f7..f6531c1c 160000 --- a/AppBuilder/core +++ b/AppBuilder/core @@ -1 +1 @@ -Subproject commit 3cb8a7f7aea01448a4819b4742cb8e4e10360773 +Subproject commit f6531c1c37911d45f48a69a5c224e7f1b1ecb3b5