drapcode-utility 1.2.4 → 1.2.6

package/build/utils/query-parser.js

@@ -488,7 +488,20 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
     if (fieldType &&
         !requiredExternal &&
         ["dynamic_option", "reference", "static_option", "belongsTo"].includes(fieldType)) {
-        return value === drapcode_constant_1.CURRENT_USER ? currentUser["uuid"] : value;
+        var refCollection = query.refCollection, refField = query.refField;
+        var finalValue = "";
+        if (refCollection === drapcode_constant_1.CURRENT_USER) {
+            finalValue = currentUser[refField];
+        }
+        if (refCollection === drapcode_constant_1.CURRENT_TENANT) {
+            finalValue = currentTenant[refField];
+        }
+        if (value === drapcode_constant_1.CURRENT_USER) {
+            finalValue = currentUser["uuid"];
+        }
+        if (!finalValue)
+            finalValue = value;
+        return finalValue;
     }
     if (fieldType &&
         fieldType === "boolean" &&
@@ -544,8 +557,6 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
         else
             return startValue_1 + "---" + endValue_1;
     }
-    console.log("==> value", value);
-    console.log("==> currentUser", currentUser);
     if (value.includes(drapcode_constant_1.CURRENT_USER)) {
         if (value === drapcode_constant_1.CURRENT_USER) {
             return currentUser["uuid"];
@@ -612,8 +623,6 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
             refCollection = splitValues[0];
             refCollectionField = "";
         }
-        console.log("\n refCollection", refCollection);
-        console.log("\n refCollectionField", refCollectionField);
         if (refCollection && refCollectionField) {
             console.log("I have refCollection and Field");
             if (refCollection === "CURRENT_TENANT") {
@@ -621,7 +630,6 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
             }
             else {
                 var refCollectionData = currentTenant[refCollection];
-                console.log("\n refCollectionData", refCollectionData);
                 if (!refCollectionData)
                     return "";
                 if (refCollectionData.length > 1)

package/build/utils/query-paser-new.js

@@ -550,7 +550,17 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
     if (fieldType &&
         !requiredExternal &&
         ["dynamic_option", "static_option", "reference"].includes(fieldType)) {
-        return value;
+        var refCollection = query.refCollection, refField = query.refField;
+        var finalValue = "";
+        if (refCollection === drapcode_constant_1.CURRENT_USER) {
+            finalValue = currentUser[refField];
+        }
+        if (value === drapcode_constant_1.CURRENT_USER) {
+            finalValue = currentUser["uuid"];
+        }
+        if (!finalValue)
+            finalValue = value;
+        return finalValue;
     }
     if (fieldType &&
         fieldType === "boolean" &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",