drapcode-utility 1.7.8 → 1.8.0

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

@@ -1,11 +1,14 @@
 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<string>;
 export declare const isEntityInCondition: (value: any) => boolean;
+export declare const isFixedValueQuery: (value: any) => boolean;
 export declare const getMinMaxValue: (value: any) => {
     startValue: any;
     endValue: any;
     isInteger: any;
+    isFixedValue: boolean;
 } | {
     startValue: string;
     endValue: string;
+    isFixedValue: boolean;
     isInteger?: undefined;
 };

package/build/utils/query-parser.js

@@ -48,7 +48,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMinMaxValue = exports.isEntityInCondition = exports.queryParser = void 0;
+exports.getMinMaxValue = exports.isFixedValueQuery = exports.isEntityInCondition = exports.queryParser = void 0;
 var moment_1 = __importDefault(require("moment"));
 var drapcode_constant_1 = require("drapcode-constant");
 var date_util_1 = require("./date-util");
@@ -272,7 +272,7 @@ var modifyQuery = function (obj, hasAndQueryConjunction) {
     return arr;
 };
 var queryToMongo = function (query, requiredExternal, externalParams, constants, currentUser, currentTenant, currentUserSetting, 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;
+    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;
     if (currentUser === void 0) { currentUser = {}; }
     if (currentTenant === void 0) { currentTenant = {}; }
     if (currentUserSetting === void 0) { currentUserSetting = {}; }
@@ -407,21 +407,25 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
         return _z = {}, _z[field] = "".concat(fieldValue), _z;
     }
     if (key == drapcode_constant_1.NOT_EQUAL)
-        return _0 = {},
-            _0[field] = {
-                $ne: fieldType === "boolean" && fieldValue
-                    ? JSON.parse(fieldValue)
-                    : fieldValue,
-            },
-            _0;
+        if (fieldType === "number") {
+            return _0 = {}, _0[field] = { $ne: +fieldValue }, _0;
+        }
+        else
+            return _1 = {},
+                _1[field] = {
+                    $ne: fieldType === "boolean" && fieldValue
+                        ? JSON.parse(fieldValue)
+                        : fieldValue,
+                },
+                _1;
     if (key == drapcode_constant_1.BETWEEN) {
-        var _2 = (0, exports.getMinMaxValue)(fieldValue), startValue = _2.startValue, endValue = _2.endValue, isInteger = _2.isInteger;
-        return _1 = {},
-            _1[field] = {
+        var _3 = (0, exports.getMinMaxValue)(fieldValue), startValue = _3.startValue, endValue = _3.endValue, isInteger = _3.isInteger;
+        return _2 = {},
+            _2[field] = {
                 $gte: isInteger ? +startValue : startValue,
                 $lte: isInteger ? +endValue : endValue,
             },
-            _1;
+            _2;
     }
 };
 var isEntityInCondition = function (value) {
@@ -439,6 +443,22 @@ var isEntityInCondition = function (value) {
     return isEntity;
 };
 exports.isEntityInCondition = isEntityInCondition;
+// TODO: can be refactor with entity condition
+var isFixedValueQuery = function (value) {
+    var isFixeValue = false;
+    if (value && Array.isArray(value)) {
+        value.forEach(function (val) {
+            if (typeof val === "string" || val instanceof String)
+                isFixeValue = val.startsWith("FIXED_VALUE::");
+        });
+    }
+    else {
+        if (value && (typeof value === "string" || value instanceof String))
+            isFixeValue = value.startsWith("FIXED_VALUE::");
+    }
+    return isFixeValue;
+};
+exports.isFixedValueQuery = isFixedValueQuery;
 var replaceExternalParams = function (query, requiredExternal, externalParams, constants, currentUser, currentTenant, currentUserSetting, timezone) {
     var key = query.key, value = query.value, fieldType = query.fieldType;
     if (fieldType &&
@@ -503,7 +523,7 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
         return valueList_1;
     }
     if (key === drapcode_constant_1.BETWEEN) {
-        var _a = (0, exports.getMinMaxValue)(value), startValue_1 = _a.startValue, endValue_1 = _a.endValue, isInteger = _a.isInteger;
+        var _a = (0, exports.getMinMaxValue)(value), startValue_1 = _a.startValue, endValue_1 = _a.endValue, isInteger = _a.isInteger, isFixedValue = _a.isFixedValue;
         if (requiredExternal) {
             startValue_1 = "".concat(externalParams[startValue_1]);
             endValue_1 = "".concat(externalParams[endValue_1]);
@@ -514,13 +534,13 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
             })) {
                 startValue_1 = getValueOfProjectConstant(startValue_1, currentUser, timezone);
             }
-            else {
+            else if (!isFixedValue) {
                 startValue_1 = constants.filter(function (constant) { return constant.name == startValue_1; });
             }
             if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant, true).some(function (cnst) { return endValue_1.includes(cnst); })) {
                 endValue_1 = getValueOfProjectConstant(endValue_1, currentUser, timezone);
             }
-            else {
+            else if (!isFixedValue) {
                 endValue_1 = constants.filter(function (constant) { return constant.name == endValue_1; });
             }
         }
@@ -557,6 +577,8 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
         var key_1 = value.replace("ENTITY::", "");
         return externalParams[key_1] ? externalParams[key_1] : "";
     }
+    if ((0, exports.isFixedValueQuery)(value))
+        return value.replace("FIXED_VALUE::", "");
     //TODO: This is just to confirm if external then it should be get from externalParams
     if (requiredExternal) {
         //TODO: Value returns from here undefined.
@@ -573,6 +595,9 @@ var checkDate = function (queryValue) {
     return ("" + queryValue).match(date_util_1.DATE_REGEX);
 };
 var getMinMaxValue = function (value) {
+    var isFixedValue = (0, exports.isFixedValueQuery)(value);
+    if (isFixedValue)
+        value = value.replace("FIXED_VALUE::", "");
     var isValid = value && value.includes("---");
     if (isValid) {
         var isInteger = value.includes("^");
@@ -580,10 +605,10 @@ var getMinMaxValue = function (value) {
         var endValue = result[1];
         if (isInteger && result.length)
             endValue = endValue.slice(0, -1);
-        return { startValue: result[0], endValue: endValue, isInteger: isInteger };
+        return { startValue: result[0], endValue: endValue, isInteger: isInteger, isFixedValue: isFixedValue };
     }
     else {
-        return { startValue: "", endValue: "" };
+        return { startValue: "", endValue: "", isFixedValue: isFixedValue };
     }
 };
 exports.getMinMaxValue = getMinMaxValue;

package/build/utils/s3-util.js

@@ -213,7 +213,14 @@ var processFileUploadToS3 = function (file, s3Client, s3Config, publicS3Client,
         });
     });
 };
-var imageTypeFiles = ["image/png", "image/jpeg", "image/jpg"];
+var imageTypeFiles = [
+    "image/png",
+    "image/jpeg",
+    "image/jpg",
+    "image/heic",
+    "image/webp",
+    "image/heif",
+];
 var processAndRemoveExifDataFromImg = function (files) { return __awaiter(void 0, void 0, void 0, function () {
     var promises, error_2;
     return __generator(this, function (_a) {
@@ -333,7 +340,15 @@ var handleIconUpload = function (file, contentType, publicS3Client, publicS3Conf
                     _b.trys.push([1, 6, , 7]);
                     if (!(isGenerateIcons &&
                         fileSize < 157286400 && //150mb
-                        ["image/png", "image/jpeg", "image/gif", "application/pdf"].includes(contentType))) return [3 /*break*/, 4];
+                        [
+                            "image/png",
+                            "image/jpeg",
+                            "image/gif",
+                            "image/webp",
+                            "image/heif",
+                            "image/heic",
+                            "application/pdf",
+                        ].includes(contentType))) return [3 /*break*/, 4];
                     return [4 /*yield*/, generateDynamicIcons(filePath, iconSizes, contentType)];
                 case 2:
                     iconFiles = _b.sent();
@@ -410,6 +425,9 @@ var generateStaticIcons = function (type) {
         case "image/png":
         case "image/jpeg":
         case "image/gif":
+        case "image/heif":
+        case "image/webp":
+        case "image/heic":
             smallIcon =
                 "https://drapcode-static.s3.amazonaws.com/img/placeholder-img.png";
             mediumIcon =

package/package.json

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