fix: Context value with evaluator.

EdwinBetanc0urt · Jun 14, 2024 · 1010be6 · 1010be6
1 parent 702a5d6
commit 1010be6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/utils/ADempiere/contextUtils/evaluator.js b/src/utils/ADempiere/contextUtils/evaluator.js
@@ -194,10 +194,9 @@ export class evaluator {
     // Handling of ID compare (null => 0)
     if (
       !isEmptyValue(firstEval) &&
-      typeof firstEval === 'string' &&
-      (firstEval.endsWith('_ID') || firstEval.endsWith('_ID_To') ||
-      firstEval === 'AD_Key' || firstEval === 'AD_Display' ||
-      firstEval.endsWith('atedBy') || firstEval.endsWith('_Acct'))
+      (first.endsWith('_ID') || first.endsWith('_ID_To') ||
+      first === 'AD_Key' || first === 'AD_Display' ||
+      first.endsWith('atedBy') || first.endsWith('_Acct'))
     ) {
       // TODO: Evaluate with -1
       firstEval = '0'

diff --git a/src/utils/ADempiere/valueUtils.js b/src/utils/ADempiere/valueUtils.js
@@ -433,12 +433,13 @@ export function parsedValueComponent({
       if (!isEmptyValue(value)) {
         // Table (18) or Table Direct (19)
         if (
-          TABLE_DIRECT.id === displayType || IMAGE.id || ACCOUNT_ELEMENT.id ||
-          LOCATOR_WAREHOUSE.id || PRODUCT_ATTRIBUTE.id || RESOURCE_ASSIGNMENT.id
+          [TABLE_DIRECT.id, IMAGE.id, ACCOUNT_ELEMENT.id,
+            LOCATOR_WAREHOUSE.id, PRODUCT_ATTRIBUTE.id, RESOURCE_ASSIGNMENT.id
+          ].includes(displayType)
         ) {
           value = Number(value)
         } else if (
-          (TABLE.id === displayType || SEARCH.id) &&
+          ([TABLE.id, SEARCH.id].includes(displayType)) &&
           (columnName.endsWith('_ID') || columnName.endsWith('_ID_To') ||
           columnName === 'AD_Key' || columnName === 'AD_Display' ||
           columnName.endsWith('atedBy') || columnName.endsWith('_Acct'))