drapcode-utility 1.4.5 → 1.4.6

package/build/utils/query-parser.js

@@ -456,6 +456,22 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
                 });
             });
         }
+        else {
+            var constantDataObj = [
+                { constantName: drapcode_constant_1.CURRENT_USER, data: currentUser },
+                { constantName: drapcode_constant_1.CURRENT_TENANT, data: currentTenant },
+                { constantName: drapcode_constant_1.CURRENT_SETTINGS, data: currentUserSetting },
+            ];
+            constantDataObj.forEach(function (cnst) {
+                if (value.includes(cnst.constantName)) {
+                    var currentDataValue = getCurrentDataValueFrom(value, cnst.constantName, cnst.data, true);
+                    if (currentDataValue) {
+                        valueList_1 = Array.isArray(currentDataValue)
+                            ? __spreadArray(__spreadArray([], valueList_1), currentDataValue) : __spreadArray(__spreadArray([], valueList_1), [currentDataValue]);
+                    }
+                }
+            });
+        }
         return valueList_1;
     }
     if (key === drapcode_constant_1.BETWEEN) {
@@ -494,130 +510,18 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
         else
             return startValue_1 + "---" + endValue_1;
     }
-    if (value.includes(drapcode_constant_1.CURRENT_USER)) {
-        if (value === drapcode_constant_1.CURRENT_USER) {
-            return currentUser["uuid"];
-        }
-        var splitValues = value.split("::");
-        console.log("splitValues", splitValues);
-        var refCollection = "", refCollectionField = "";
-        if (splitValues.length > 2) {
-            refCollection = splitValues[1];
-            refCollectionField = splitValues[2];
-        }
-        else if (splitValues.length === 2) {
-            refCollection = splitValues[0];
-            refCollectionField = splitValues[1];
-        }
-        else {
-            refCollection = splitValues[0];
-            refCollectionField = "";
-        }
-        console.log("refCollection", refCollection);
-        console.log("refCollectionField", refCollectionField);
-        console.log("first", refCollectionField && refCollection);
-        if (refCollection && refCollectionField) {
-            console.log("I have refCollection and Field");
-            if (refCollection === drapcode_constant_1.CURRENT_USER) {
-                return currentUser[refCollectionField];
-            }
-            else {
-                var refCollectionData = currentUser[refCollection];
-                if (!refCollectionData) {
-                    return "";
-                }
-                if (refCollectionData.length > 1) {
-                    //TODO: Need to handle multi ref
-                    return "";
-                }
-                refCollectionData = refCollectionData[0];
-                console.log("refCollectionData[refCollectionField]", refCollectionData[refCollectionField]);
-                return refCollectionData[refCollectionField];
-            }
-        }
-        //this means that data has to be match with currnet user field that is not ref type
-        if (refCollection) {
-            return currentUser[refCollection];
-        }
-        return currentUser["uuid"];
-    }
-    if (value.includes(drapcode_constant_1.CURRENT_TENANT)) {
-        if (value === drapcode_constant_1.CURRENT_TENANT) {
-            return currentTenant["uuid"];
-        }
-        var splitValues = value.split("::");
-        console.log("splitValues", splitValues);
-        var refCollection = "", refCollectionField = "";
-        if (splitValues.length > 2) {
-            refCollection = splitValues[1];
-            refCollectionField = splitValues[2];
-        }
-        else if (splitValues.length === 2) {
-            refCollection = splitValues[0];
-            refCollectionField = splitValues[1];
-        }
-        else {
-            refCollection = splitValues[0];
-            refCollectionField = "";
-        }
-        if (refCollection && refCollectionField) {
-            console.log("I have refCollection and Field");
-            if (refCollection === "CURRENT_TENANT") {
-                return currentTenant[refCollectionField];
-            }
-            else {
-                var refCollectionData = currentTenant[refCollection];
-                if (!refCollectionData)
-                    return "";
-                if (refCollectionData.length > 1)
-                    return "";
-                refCollectionData = refCollectionData[0];
-                return refCollectionData[refCollectionField];
-            }
-        }
-        //this means that data has to be match with currnet user field that is not ref type
-        if (refCollection)
-            return currentTenant[refCollection];
-        return currentTenant["uuid"];
-    }
-    if (value.includes(drapcode_constant_1.CURRENT_SETTINGS)) {
-        if (value === drapcode_constant_1.CURRENT_SETTINGS) {
-            return currentUserSetting["uuid"];
-        }
-        var splitValues = value.split("::");
-        console.log("splitValues", splitValues);
-        var refCollection = "", refCollectionField = "";
-        if (splitValues.length > 2) {
-            refCollection = splitValues[1];
-            refCollectionField = splitValues[2];
-        }
-        else if (splitValues.length === 2) {
-            refCollection = splitValues[0];
-            refCollectionField = splitValues[1];
-        }
-        else {
-            refCollection = splitValues[0];
-            refCollectionField = "";
-        }
-        if (refCollection && refCollectionField) {
-            console.log("I have refCollection and Field", refCollection, refCollectionField);
-            if (refCollection === "CURRENT_SETTINGS") {
-                return currentUserSetting[refCollectionField];
-            }
-            else {
-                var refCollectionData = currentUserSetting[refCollection];
-                if (!refCollectionData)
-                    return "";
-                if (refCollectionData.length > 1)
-                    return "";
-                refCollectionData = refCollectionData[0];
-                return refCollectionData[refCollectionField];
-            }
-        }
-        if (refCollection)
-            return currentUserSetting[refCollection];
-        return currentUserSetting["uuid"];
-    }
+    var currentUserValue = getCurrentDataValueFrom(value, drapcode_constant_1.CURRENT_USER, currentUser);
+    console.log("\n currentUserValue :>> ", currentUserValue);
+    if (currentUserValue)
+        return currentUserValue;
+    var currentTenantValue = getCurrentDataValueFrom(value, drapcode_constant_1.CURRENT_TENANT, currentTenant);
+    console.log("\n currentTenantValue :>> ", currentTenantValue);
+    if (currentTenantValue)
+        return currentTenantValue;
+    var currentUserSettingsValue = getCurrentDataValueFrom(value, drapcode_constant_1.CURRENT_SETTINGS, currentUserSetting);
+    console.log("\n currentUserSettingsValue :>> ", currentUserSettingsValue);
+    if (currentUserSettingsValue)
+        return currentUserSettingsValue;
     if (drapcode_constant_1.DateConstant.some(function (cnst) { return value.includes(cnst); })) {
         return getValueOfProjectConstant(value, {}, timezone);
     }
@@ -789,3 +693,59 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
     console.log("==> likeQuery", JSON.stringify(likeQuery));
     return { searchAggregateQuery: searchAggregateQuery, likeQuery: likeQuery };
 };
+var getCurrentDataValueFrom = function (value, constantName, data, isMultiRef) {
+    if (isMultiRef === void 0) { isMultiRef = false; }
+    if (value.includes(constantName)) {
+        if (value === constantName)
+            return data["uuid"];
+        var splitValues = value.split("::");
+        console.log("splitValues", splitValues);
+        var refCollection = "", refCollectionField_1 = "";
+        if (splitValues.length > 2) {
+            refCollection = splitValues[1];
+            refCollectionField_1 = splitValues[2];
+        }
+        else if (splitValues.length === 2) {
+            refCollection = splitValues[0];
+            refCollectionField_1 = splitValues[1];
+        }
+        else {
+            refCollection = splitValues[0];
+            refCollectionField_1 = "";
+        }
+        console.log("refCollection", refCollection);
+        console.log("refCollectionField", refCollectionField_1);
+        console.log("first", refCollectionField_1 && refCollection);
+        if (refCollection && refCollectionField_1) {
+            console.log("I have refCollection and Field");
+            if (refCollection === constantName) {
+                return data[refCollectionField_1];
+            }
+            else {
+                var refCollectionData = data[refCollection];
+                console.log("refCollectionData", refCollectionData);
+                if (!refCollectionData)
+                    return "";
+                if (refCollectionData.length > 1) {
+                    //TODO: Need to handle multi ref
+                    // Handled For IN_LIST and NOT_IN_LIST Condition
+                    if (!isMultiRef)
+                        return "";
+                    var finalValue_1 = [];
+                    refCollectionData.forEach(function (refData) {
+                        if (refData[refCollectionField_1])
+                            finalValue_1.push(refData[refCollectionField_1]);
+                    });
+                    return finalValue_1;
+                }
+                refCollectionData = refCollectionData[0];
+                console.log("refCollectionData[refCollectionField]", refCollectionData[refCollectionField_1]);
+                return refCollectionData[refCollectionField_1];
+            }
+        }
+        //this means that data has to be match with currnet user field that is not ref type
+        if (refCollection)
+            return data[refCollection];
+        return data["uuid"];
+    }
+};

package/package.json

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