drapcode-utility 1.9.5 → 1.9.7

package/build/utils/query-parser.d.ts

@@ -1,4 +1,4 @@
-export declare const queryParser: (collectionName: string, query: any, constants: any[], externalParams: any, currentUser: any, timezone: string, searchObj: any, refCollectionFieldsInItems: any, searchQueryTypeObj: any, currentTenant: any, currentUserSetting: any, lookupConfig: any, rowLevelSecurityFilter: any) => Promise<any>;
+export declare const queryParser: (collectionName: string, query: any, constants: any[], externalParams: any, currentUser: any, timezone: string, searchObj: any, refCollectionFieldsInItems: any, searchQueryTypeObj: any, currentTenant: any, currentUserSetting: any, currentSubTenant: any, lookupConfig: any, rowLevelSecurityFilter: any) => Promise<any>;
 export declare const isEntityInCondition: (value: any) => boolean;
 export declare const isFixedValueQuery: (value: any) => boolean;
 export declare const getMinMaxValue: (value: any) => {

package/build/utils/query-parser.js

@@ -54,19 +54,20 @@ var drapcode_constant_1 = require("drapcode-constant");
 var date_util_1 = require("./date-util");
 var util_1 = require("./util");
 var prepare_query_1 = require("./prepare-query");
-var queryParser = function (collectionName, query, constants, externalParams, currentUser, timezone, searchObj, refCollectionFieldsInItems, searchQueryTypeObj, currentTenant, currentUserSetting, lookupConfig, rowLevelSecurityFilter) {
+var queryParser = function (collectionName, query, constants, externalParams, currentUser, timezone, searchObj, refCollectionFieldsInItems, searchQueryTypeObj, currentTenant, currentUserSetting, currentSubTenant, lookupConfig, rowLevelSecurityFilter) {
     if (currentUser === void 0) { currentUser = {}; }
     if (searchObj === void 0) { searchObj = null; }
     if (refCollectionFieldsInItems === void 0) { refCollectionFieldsInItems = null; }
     if (searchQueryTypeObj === void 0) { searchQueryTypeObj = {}; }
     if (currentTenant === void 0) { currentTenant = {}; }
     if (currentUserSetting === void 0) { currentUserSetting = {}; }
+    if (currentSubTenant === void 0) { currentSubTenant = {}; }
     if (lookupConfig === void 0) { lookupConfig = []; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var filterQuery, rlsFilterQuery, aggregateQuery, queryStr, searchQueryObj, _a, searchAggregateQuery, likeQuery, finalQuery, _b, searchAggregateQuery, likeQuery, projection, finder, sortBy, orderBy, offset, limit, resetLimit, direction;
-        var _c, _d, _e;
-        return __generator(this, function (_f) {
-            switch (_f.label) {
+        var filterQuery, rlsFilterQuery, aggregateQuery, queryStr, searchQueryObj, _a, searchAggregateQuery, likeQuery, finalQuery, addTenantQuery, addSubTenantQuery, additionalFilters, subTenantUuids, _b, searchAggregateQuery, likeQuery, projection, finder, sortBy, orderBy, offset, limit, resetLimit, direction;
+        var _c, _d, _e, _f;
+        return __generator(this, function (_g) {
+            switch (_g.label) {
                 case 0:
                     if (!collectionName)
                         return [2 /*return*/, ""];
@@ -82,11 +83,11 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                     console.log("currentUser", JSON.stringify(currentUser));
                     console.log("searchObj", JSON.stringify(searchObj));
                     console.log("searchQueryTypeObj", JSON.stringify(searchQueryTypeObj));
-                    filterQuery = mongoFilterQuery(query, externalParams, constants, currentUser, currentTenant, currentUserSetting, timezone);
+                    filterQuery = mongoFilterQuery(query, externalParams, constants, currentUser, currentTenant, currentUserSetting, currentSubTenant, timezone);
                     console.log("filterQuery", JSON.stringify(filterQuery));
                     rlsFilterQuery = [];
                     if (rowLevelSecurityFilter && rowLevelSecurityFilter.conditions.length) {
-                        rlsFilterQuery = mongoFilterQuery(rowLevelSecurityFilter, externalParams, constants, currentUser, currentTenant, currentUserSetting, timezone);
+                        rlsFilterQuery = mongoFilterQuery(rowLevelSecurityFilter, externalParams, constants, currentUser, currentTenant, currentUserSetting, currentSubTenant, timezone);
                         console.log("**************************");
                         console.log("rlsFilterQuery", JSON.stringify(rlsFilterQuery));
                     }
@@ -116,7 +117,24 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                         if (searchQueryObj) {
                             (_d = finalQuery.$and).push.apply(_d, searchQueryObj);
                         }
-                        console.log("finalQuery after", JSON.stringify(finalQuery));
+                        addTenantQuery = query.addTenantQuery, addSubTenantQuery = query.addSubTenantQuery;
+                        additionalFilters = [];
+                        if (addTenantQuery && (currentTenant === null || currentTenant === void 0 ? void 0 : currentTenant.uuid)) {
+                            additionalFilters.push({ tenantId: currentTenant.uuid });
+                        }
+                        if (addSubTenantQuery &&
+                            Array.isArray(currentUser.subTenantId) &&
+                            currentUser.subTenantId.length > 0) {
+                            subTenantUuids = currentUser.subTenantId
+                                .map(function (item) { return item === null || item === void 0 ? void 0 : item.uuid; })
+                                .filter(function (uuid) { return uuid; });
+                            if (subTenantUuids.length > 0) {
+                                additionalFilters.push({ subTenantId: { $in: subTenantUuids } });
+                            }
+                        }
+                        if (additionalFilters.length > 0) {
+                            (_e = finalQuery.$and).push.apply(_e, additionalFilters);
+                        }
                         aggregateQuery.push({ $match: finalQuery });
                     }
                     else if (searchObj) {
@@ -137,8 +155,8 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                             return (0, prepare_query_1.commonLookupSetting)(field, lookupConfig, aggregateQuery);
                         }))];
                 case 1:
-                    _f.sent();
-                    _f.label = 2;
+                    _g.sent();
+                    _g.label = 2;
                 case 2:
                     if (finder != "COUNT" && !(0, util_1.isEmpty)(projection)) {
                         aggregateQuery.push({ $project: projection });
@@ -160,7 +178,7 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                     }
                     if (finder != "COUNT" && sortBy) {
                         direction = orderBy && orderBy == "asc" ? 1 : -1;
-                        aggregateQuery.push({ $sort: (_e = {}, _e[sortBy] = direction, _e._id = 1, _e) });
+                        aggregateQuery.push({ $sort: (_f = {}, _f[sortBy] = direction, _f._id = 1, _f) });
                     }
                     if (finder != "COUNT" && limit) {
                         aggregateQuery.push({ $skip: +offset }, { $limit: +limit });
@@ -186,17 +204,18 @@ var toBoolean = function (value) {
             return false;
     }
 };
-var mongoFilterQuery = function (query, externalParams, constants, currentUser, currentTenant, currentUserSetting, timezone) {
+var mongoFilterQuery = function (query, externalParams, constants, currentUser, currentTenant, currentUserSetting, currentSubTenant, timezone) {
     if (currentUser === void 0) { currentUser = {}; }
     if (currentTenant === void 0) { currentTenant = {}; }
     if (currentUserSetting === void 0) { currentUserSetting = {}; }
+    if (currentSubTenant === void 0) { currentSubTenant = {}; }
     var filterQuery = { $or0: [] };
     var conditions = query.conditions;
     var queryConjunctions = [];
     conditions.forEach(function (queryObj, index) {
         var query = queryObj.query, requiredExternal = queryObj.requiredExternal;
         console.log("query :>> ", JSON.stringify(query));
-        var mongoQuery = queryToMongo(query, requiredExternal, externalParams, constants, currentUser, currentTenant, currentUserSetting, timezone);
+        var mongoQuery = queryToMongo(query, requiredExternal, externalParams, constants, currentUser, currentTenant, currentUserSetting, currentSubTenant, timezone);
         console.log(":::::::::mongoQuery::::", JSON.stringify(mongoQuery));
         queryConjunctions.push(queryObj.conjunctionType);
         if (queryObj.conjunctionType == "OR") {
@@ -267,11 +286,12 @@ var modifyQuery = function (obj, hasAndQueryConjunction) {
     console.log("🚀 ~ file: query-parser.ts:303 ~ Object.entries ~ arr:", arr);
     return arr;
 };
-var queryToMongo = function (query, requiredExternal, externalParams, constants, currentUser, currentTenant, currentUserSetting, timezone) {
+var queryToMongo = function (query, requiredExternal, externalParams, constants, currentUser, currentTenant, currentUserSetting, currentSubTenant, timezone) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13;
     if (currentUser === void 0) { currentUser = {}; }
     if (currentTenant === void 0) { currentTenant = {}; }
     if (currentUserSetting === void 0) { currentUserSetting = {}; }
+    if (currentSubTenant === void 0) { currentSubTenant = {}; }
     var key = query.key, field = query.field, value = query.value, fieldType = query.fieldType;
     if ([drapcode_constant_1.EQUALS, drapcode_constant_1.NOT_EQUAL, drapcode_constant_1.EQUALS_OR_IGNORE].includes(key) &&
         typeof value === "string" &&
@@ -280,7 +300,7 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
         console.log("\n ===final getDateRangeValue", final);
         return final;
     }
-    var fieldValue = replaceExternalParams(query, requiredExternal, externalParams, constants, currentUser, currentTenant, currentUserSetting, timezone);
+    var fieldValue = replaceExternalParams(query, requiredExternal, externalParams, constants, currentUser, currentTenant, currentUserSetting, currentSubTenant, timezone);
     if (["undefined", "null", null, undefined, ""].includes(fieldValue)) {
         //TODO: In case field is not present in old record then fieldValue is undefined
         //TODO: In case of this, we assign some random string to avoid resulting all values
@@ -513,7 +533,7 @@ var isFixedValueQuery = function (value) {
     return isFixeValue;
 };
 exports.isFixedValueQuery = isFixedValueQuery;
-var replaceExternalParams = function (query, requiredExternal, externalParams, constants, currentUser, currentTenant, currentUserSetting, timezone) {
+var replaceExternalParams = function (query, requiredExternal, externalParams, constants, currentUser, currentTenant, currentUserSetting, currentSubTenant, timezone) {
     var key = query.key, value = query.value, fieldType = query.fieldType;
     if (fieldType &&
         !requiredExternal &&
@@ -533,6 +553,9 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
                 if (refCollection === drapcode_constant_1.CURRENT_SETTINGS) {
                     finalValue = currentUserSetting[refField];
                 }
+                if (refCollection === drapcode_constant_1.CURRENT_SUB_TENANT) {
+                    finalValue = currentSubTenant[refField];
+                }
             }
         }
         if (value === drapcode_constant_1.CURRENT_USER) {
@@ -563,6 +586,7 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
                 { constantName: drapcode_constant_1.CURRENT_USER, data: currentUser },
                 { constantName: drapcode_constant_1.CURRENT_TENANT, data: currentTenant },
                 { constantName: drapcode_constant_1.CURRENT_SETTINGS, data: currentUserSetting },
+                { constantName: drapcode_constant_1.CURRENT_SUB_TENANT, data: currentSubTenant },
             ];
             constantDataObj.forEach(function (cnst) {
                 if (value.includes(cnst.constantName)) {
@@ -624,6 +648,9 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
     console.log("\n currentUserSettingsValue :>> ", currentUserSettingsValue);
     if (currentUserSettingsValue)
         return currentUserSettingsValue;
+    var currentSubTenantValue = getCurrentDataValueFrom(value, drapcode_constant_1.CURRENT_SUB_TENANT, currentSubTenant);
+    if (currentSubTenantValue)
+        return currentSubTenantValue;
     if (drapcode_constant_1.DateConstant.some(function (cnst) { return value.includes(cnst); })) {
         return getValueOfProjectConstant(value, {}, timezone);
     }

package/build/utils/util.d.ts

@@ -20,7 +20,7 @@ export declare const arraysEqual: (array1: any, array2: any) => boolean;
 export declare const convertItemToArray: (itemValue: any) => any[];
 export declare const validateAlphanumericString: (str: string) => false | "String should contain only numbers and letters";
 export declare const formatCustomCSSClasses: (customClasses: any) => string;
-export declare const replaceDataValueIntoExpression: (expression: string, data: any, user: any, tenant: any, userSetting: any, sessionValue: any, envConstants: any, sessionFormValue: any, localStorageValue: any, cookiesValue: any) => string;
+export declare const replaceDataValueIntoExpression: (expression: string, data: any, user: any, tenant: any, userSetting: any, subTenant: any, sessionValue: any, envConstants: any, sessionFormValue: any, localStorageValue: any, cookiesValue: any) => string;
 export declare const parseJsonString: (str: string) => any;
 export declare const parseValueFromData: (data: any, fieldName: string) => any;
 export declare const unflattenObject: (obj: any) => {};

package/build/utils/util.js

@@ -294,7 +294,7 @@ var formatCustomCSSClasses = function (customClasses) {
     return projectCustomCSSClassesData;
 };
 exports.formatCustomCSSClasses = formatCustomCSSClasses;
-var replaceDataValueIntoExpression = function (expression, data, user, tenant, userSetting, sessionValue, envConstants, sessionFormValue, localStorageValue, cookiesValue) {
+var replaceDataValueIntoExpression = function (expression, data, user, tenant, userSetting, subTenant, sessionValue, envConstants, sessionFormValue, localStorageValue, cookiesValue) {
     var _a;
     var contentList = (_a = expression
         .match(/{{(.*?)}}/g)) === null || _a === void 0 ? void 0 : _a.map(function (b) { return b.replace(/{{(.*?)}}/g, "$1"); });
@@ -324,6 +324,12 @@ var replaceDataValueIntoExpression = function (expression, data, user, tenant, u
                 dataOfItem = (0, exports.parseValueFromData)(userSetting, prop);
             }
         }
+        else if (prop.includes("current_sub_tenant")) {
+            prop = prop.replace("current_sub_tenant.", "");
+            if (Object.keys(userSetting).length > 0) {
+                dataOfItem = (0, exports.parseValueFromData)(subTenant, prop);
+            }
+        }
         else if (prop.includes("current_session")) {
             console.log("Current Session");
             prop = prop.replace("current_session.", "");
@@ -675,9 +681,24 @@ var validateData = function (fields, data) {
                 break;
             case "reference":
             case "belongsTo":
-                if (!Array.isArray(fieldValue) ||
-                    fieldValue.some(function (item) { return typeof item !== "string"; })) {
-                    errors.push("".concat(fieldTitle, " must be an array of valid UUID strings"));
+                if (Array.isArray(fieldValue)) {
+                    var invalid = fieldValue.some(function (item) {
+                        if (typeof item === "string")
+                            return false;
+                        if (typeof item === "object" && typeof item.uuid === "string")
+                            return false;
+                        return true;
+                    });
+                    if (invalid) {
+                        errors.push("".concat(fieldTitle, " must be an array of UUID strings or objects with a uuid"));
+                    }
+                }
+                else {
+                    if (!(typeof fieldValue === "string" ||
+                        (typeof fieldValue === "object" &&
+                            typeof (fieldValue === null || fieldValue === void 0 ? void 0 : fieldValue.uuid) === "string"))) {
+                        errors.push("".concat(fieldTitle, " must be a UUID string or an object with a uuid"));
+                    }
                 }
                 break;
             case "createdAt":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "1.9.5",
+  "version": "1.9.7",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -37,9 +37,9 @@
     "@types/voca": "^1.4.2",
     "axios": "^1.1.2",
     "dompurify": "^3.1.7",
-    "drapcode-constant": "^1.6.7",
-    "drapcode-logger": "^1.3.3",
-    "drapcode-redis": "^1.2.3",
+    "drapcode-constant": "^1.6.9",
+    "drapcode-logger": "^1.3.4",
+    "drapcode-redis": "^1.2.4",
     "exiftool-vendored": "^28.2.1",
     "express": "^4.17.1",
     "gm": "^1.25.0",