drapcode-utility 1.5.3 → 1.5.5

package/build/utils/s3-util.d.ts

@@ -12,7 +12,7 @@ interface S3Config {
     append: boolean;
 }
 export declare const createS3Client: (awsConfig: AWSConfig) => S3Client | null;
-export declare const fileUploadToS3: (files: any, s3Client: S3Client, s3Config: S3Config, publicS3Client: S3Client, publicS3Config: S3Config, encryption: Encryption, options?: {}) => Promise<{
+export declare const fileUploadToS3: (files: any, s3Client: S3Client, s3Config: S3Config, publicS3Client: S3Client, publicS3Config: S3Config, isGenerateIcons: boolean, encryption: Encryption, options?: {}) => Promise<{
     status: string;
     data: string;
     message: string;

package/build/utils/s3-util.js

@@ -74,7 +74,7 @@ var createS3Client = function (awsConfig) {
     return s3client;
 };
 exports.createS3Client = createS3Client;
-var fileUploadToS3 = function (files, s3Client, s3Config, publicS3Client, publicS3Config, encryption, options) {
+var fileUploadToS3 = function (files, s3Client, s3Config, publicS3Client, publicS3Config, isGenerateIcons, encryption, options) {
     if (options === void 0) { options = {}; }
     return __awaiter(void 0, void 0, void 0, function () {
         var awsConfig, encryptionType, dataKey, accessKeyId, secretAccessKey, region, config, plainTextData, fileOptions, s3Key, _a, _b, _i, index, file, fileSlug, fileObj, fileSlug, fileObj;
@@ -120,7 +120,7 @@ var fileUploadToS3 = function (files, s3Client, s3Config, publicS3Client, public
                     if (s3Config.append) {
                         s3Config.key = s3Key + "/" + uuid_1.v4() + "/" + fileSlug;
                     }
-                    return [4 /*yield*/, processFileUploadToS3(file, s3Client, s3Config, publicS3Client, publicS3Config, encryption, options, encryption ? true : false)];
+                    return [4 /*yield*/, processFileUploadToS3(file, s3Client, s3Config, publicS3Client, publicS3Config, isGenerateIcons, encryption, options, encryption ? true : false)];
                 case 4:
                     fileObj = _c.sent();
                     if (fileObj) {
@@ -141,7 +141,7 @@ var fileUploadToS3 = function (files, s3Client, s3Config, publicS3Client, public
                     if (s3Config.append) {
                         s3Config.key = s3Config.key + "/" + uuid_1.v4() + "/" + fileSlug;
                     }
-                    return [4 /*yield*/, processFileUploadToS3(files, s3Client, s3Config, publicS3Client, publicS3Config, encryption, options, encryption ? true : false)];
+                    return [4 /*yield*/, processFileUploadToS3(files, s3Client, s3Config, publicS3Client, publicS3Config, isGenerateIcons, encryption, options, encryption ? true : false)];
                 case 8:
                     fileObj = _c.sent();
                     return [2 /*return*/, fileObj];
@@ -150,7 +150,7 @@ var fileUploadToS3 = function (files, s3Client, s3Config, publicS3Client, public
     });
 };
 exports.fileUploadToS3 = fileUploadToS3;
-var processFileUploadToS3 = function (file, s3Client, s3Config, publicS3Client, publicS3Config, encryption, options, encrypt) {
+var processFileUploadToS3 = function (file, s3Client, s3Config, publicS3Client, publicS3Config, isGenerateIcons, encryption, options, encrypt) {
     if (options === void 0) { options = {}; }
     if (encrypt === void 0) { encrypt = false; }
     return __awaiter(void 0, void 0, void 0, function () {
@@ -177,13 +177,15 @@ var processFileUploadToS3 = function (file, s3Client, s3Config, publicS3Client,
                     return [4 /*yield*/, parallelUploads3.done()];
                 case 4:
                     data = _b.sent();
-                    return [4 /*yield*/, handleIconUpload(file.path, contentType, publicS3Client, publicS3Config, key, options)];
+                    return [4 /*yield*/, handleIconUpload(file, contentType, publicS3Client, publicS3Config, isGenerateIcons, key, options)];
                 case 5:
                     _a = _b.sent(), smallIcon = _a.smallIcon, mediumIcon = _a.mediumIcon, largeIcon = _a.largeIcon;
-                    if (encryptedFilePath) {
-                        fs_1.default.unlinkSync(encryptedFilePath);
+                    if (data) {
+                        if (encryptedFilePath) {
+                            fs_1.default.unlinkSync(encryptedFilePath);
+                        }
+                        fs_1.default.unlinkSync(file.path);
                     }
-                    fs_1.default.unlinkSync(file.path);
                     originalname = file.originalname, mimetype = file.mimetype, size = file.size;
                     return [2 /*return*/, {
                             originalname: originalname,
@@ -204,20 +206,23 @@ var processFileUploadToS3 = function (file, s3Client, s3Config, publicS3Client,
         });
     });
 };
-var handleIconUpload = function (filePath, contentType, publicS3Client, publicS3Config, key, options) {
+var handleIconUpload = function (file, contentType, publicS3Client, publicS3Config, isGenerateIcons, key, options) {
     if (options === void 0) { options = {}; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var iconSizes, iconLabels, iconFiles, bucket_1, acl_1, iconUploads, _a, smallKey, mediumKey, largeKey, iconError_1;
+        var filePath, fileSize, iconSizes, iconLabels, iconFiles, bucket_1, acl_1, iconUploads, _a, smallKey, mediumKey, largeKey, iconError_1;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
+                    filePath = file.path, fileSize = file.size;
                     iconSizes = [200, 300, 500];
                     iconLabels = ["small", "medium", "large"];
                     _b.label = 1;
                 case 1:
                     _b.trys.push([1, 6, , 7]);
-                    if (!["image/png", "image/jpeg", "image/gif", "application/pdf"].includes(contentType)) return [3 /*break*/, 4];
-                    return [4 /*yield*/, generateDynamicIcons(filePath, iconSizes)];
+                    if (!(isGenerateIcons &&
+                        fileSize < 157286400 && //150mb
+                        ["image/png", "image/jpeg", "image/gif", "application/pdf"].includes(contentType))) return [3 /*break*/, 4];
+                    return [4 /*yield*/, generateDynamicIcons(filePath, iconSizes, contentType)];
                 case 2:
                     iconFiles = _b.sent();
                     bucket_1 = publicS3Config.bucket, acl_1 = publicS3Config.acl;
@@ -266,13 +271,15 @@ var handleIconUpload = function (filePath, contentType, publicS3Client, publicS3
         });
     });
 };
-var generateDynamicIcons = function (filePath, sizes) {
+var generateDynamicIcons = function (filePath, sizes, contentType) {
     return Promise.all(sizes.map(function (size) {
         var outputFilePath = filePath + "_" + size + ".png";
         return new Promise(function (resolve, reject) {
-            gm_1.default(filePath)
-                .resize(size, size)
-                .write(outputFilePath, function (err) {
+            var gmInstance = gm_1.default(filePath);
+            if (contentType === "application/pdf") {
+                gmInstance = gmInstance.selectFrame(0);
+            }
+            gmInstance.resize(size, size).write(outputFilePath, function (err) {
                 if (err) {
                     reject(err);
                 }

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, sessionValue: any, envConstants: any, sessionFormValue: any) => string;
+export declare const replaceDataValueIntoExpression: (expression: string, data: any, user: any, tenant: 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

@@ -287,7 +287,7 @@ var formatCustomCSSClasses = function (customClasses) {
     return projectCustomCSSClassesData;
 };
 exports.formatCustomCSSClasses = formatCustomCSSClasses;
-var replaceDataValueIntoExpression = function (expression, data, user, tenant, sessionValue, envConstants, sessionFormValue) {
+var replaceDataValueIntoExpression = function (expression, data, user, tenant, 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"); });
@@ -320,6 +320,27 @@ var replaceDataValueIntoExpression = function (expression, data, user, tenant, s
                 dataOfItem = lodash_1.default.get(sessionFormValue, prop);
             }
         }
+        else if (prop.includes("SESSION_STORAGE")) {
+            prop = prop.replace("SESSION_STORAGE.", "");
+            if (Object.keys(sessionValue).length > 0) {
+                //Session will contain multi level data
+                dataOfItem = lodash_1.default.get(sessionValue, prop);
+            }
+        }
+        else if (prop.includes("LOCAL_STORAGE")) {
+            prop = prop.replace("LOCAL_STORAGE.", "");
+            if (Object.keys(localStorageValue).length > 0) {
+                //Session will contain multi level data
+                dataOfItem = lodash_1.default.get(localStorageValue, prop);
+            }
+        }
+        else if (prop.includes("COOKIES")) {
+            prop = prop.replace("COOKIES.", "");
+            if (Object.keys(cookiesValue).length > 0) {
+                //Session will contain multi level data
+                dataOfItem = lodash_1.default.get(cookiesValue, prop);
+            }
+        }
         else if (prop.includes("environment_variable")) {
             prop = prop.replace("environment_variable.", "");
             if (Object.keys(envConstants).length > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "1.5.3",
+  "version": "1.5.5",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -34,8 +34,8 @@
     "@types/gm": "^1.25.4",
     "@types/voca": "^1.4.2",
     "axios": "^1.1.2",
-    "drapcode-constant": "^1.4.5",
-    "drapcode-logger": "^1.1.6",
+    "drapcode-constant": "^1.4.7",
+    "drapcode-logger": "^1.1.7",
     "drapcode-redis": "^1.0.5",
     "express": "^4.17.1",
     "gm": "^1.25.0",