drapcode-utility 2.4.4 → 2.4.6-preview

package/build/encryption/index.js

@@ -132,7 +132,6 @@ const drapcodeEncryptDecrypt = async (data, encrypt) => {
 };
 exports.drapcodeEncryptDecrypt = drapcodeEncryptDecrypt;
 const cryptFile = async (filePath, encryption, decrypt) => {
-    console.log("encryption cryptFile:>> ", encryption);
     const data = await (0, file_1.processFileEncryptionDecryption)(filePath, encryption, decrypt);
     return data;
 };

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

@@ -1,9 +1,10 @@
+interface ExtraFieldSetting {
+    dateDisplayType?: string;
+}
 interface DateField {
     fieldName: string;
     type: string;
-    extraFieldSetting?: {
-        dateDisplayType?: string;
-    };
+    extraFieldSetting?: Map<string, ExtraFieldSetting>;
 }
 interface DateRangeValue {
     [key: string]: {

package/build/utils/date-util.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatProjectDates = exports.timezoneDateParse = exports.nextDayDate = exports.getDateRangeValue = exports.getDateValue = exports.createLogsDateFormat = exports.createLoggerPreviousDateFormat = exports.createLoggerDateFormat = exports.DATE_REGEX = void 0;
 const drapcode_constant_1 = require("drapcode-constant");
+const lodash_1 = __importDefault(require("lodash"));
 const moment_1 = __importDefault(require("moment"));
 const dateFormat = "YYYY-MM-DDTHH:mm:ss.SSS";
 exports.DATE_REGEX = /^[12]\d{3}(-(0[1-9]|1[0-2])(-(0[1-9]|[12][0-9]|3[01]))?)(T| )?(([01][0-9]|2[0-3]):[0-5]\d(:[0-5]\d(\.\d+)?)?(Z|[+-]\d{2}:\d{2})?)?$/;
@@ -192,7 +193,17 @@ const formatItemDates = (item, fields, dateFormat, reverse) => {
     Object.keys(item).forEach((fieldName) => {
         const field = fields.find((field) => field.fieldName === fieldName);
         if (field?.type === "date") {
-            if (field?.extraFieldSetting?.dateDisplayType === "datetime-local") {
+            let dateDisplayType = "";
+            if (field?.extraFieldSetting) {
+                const extraFieldSetting = field?.extraFieldSetting;
+                if (lodash_1.default.isPlainObject(extraFieldSetting)) {
+                    dateDisplayType = extraFieldSetting?.dateDisplayType;
+                }
+                else if (extraFieldSetting instanceof Map) {
+                    dateDisplayType = extraFieldSetting?.get("dateDisplayType") || "";
+                }
+            }
+            if (dateDisplayType === "datetime-local") {
                 item[fieldName] = (0, moment_1.default)(item[fieldName], dateTimeFormat).isValid()
                     ? item[fieldName]
                     : "";

package/build/utils/rest-client.d.ts

@@ -3,4 +3,11 @@ export declare const callCurlRequest: (setting: any, user?: any, tenant?: any, u
     status: number;
     success: boolean;
     headers: {};
+    mysqlError: {};
+} | {
+    data: any;
+    status: number;
+    success: boolean;
+    headers: {};
+    mysqlError?: undefined;
 }>;

package/build/utils/rest-client.js

@@ -146,6 +146,13 @@ const callCurlRequest = async (setting, user = {}, tenant = {}, userSetting = {}
             const { setting: extDbSetting } = dtoExternalDb;
             data["searchQuery"] = dtoSearchString;
             result = await makeMySqlCall(projectId, data, extDbSetting);
+            if (!result) {
+                const errorMessage = "No Response from MySQL Server";
+                return prepareReturnObject(errorMessage);
+            }
+            drapcode_logger_1.logger.info(`MySQL result.status: ${result?.status}`, { label: projectId });
+            deleteLocalFiles(isMultipart, toDeleteFiles);
+            return prepareReturnObject(result.data, result.status, result?.success || (result.status >= 200 && result.status < 300), result?.headers, result?.mysqlError);
         }
         else {
             result = await makeAxiosCall(projectId, methodType, url, headerValue, data, timeout, wrapJsonDataInArray, awsSignPluginConfig);
@@ -208,13 +215,24 @@ const deleteLocalFiles = (isMultipart, toDeleteFiles) => {
         });
     }
 };
-const prepareReturnObject = (data, status = 400, success = false, headers = {}) => {
-    return {
-        data,
-        status,
-        success,
-        headers,
-    };
+const prepareReturnObject = (data, status = 400, success = false, headers = {}, mysqlError = {}) => {
+    if (mysqlError && Object.keys(mysqlError).length > 0) {
+        return {
+            data,
+            status,
+            success,
+            headers,
+            mysqlError
+        };
+    }
+    else {
+        return {
+            data,
+            status,
+            success,
+            headers
+        };
+    }
 };
 const makeAxiosCall = async (projectId, methodType, url, axiosConfig, data, timeout, wrapJsonDataInArray, awsSignPluginConfig) => {
     axiosConfig = { url, method: methodType, ...axiosConfig };
@@ -334,6 +352,7 @@ const makeMySqlCall = async (projectId, data, extDbSetting) => {
                     totalRecords: total,
                     lastInsertedId: insertedId,
                     lastUpdatedId: updatedId,
+                    lastModifiedId: insertedId || updatedId,
                     returned: Array.isArray(rows) ? rows.length : 0
                 },
                 totalRecords: total,
@@ -342,7 +361,12 @@ const makeMySqlCall = async (projectId, data, extDbSetting) => {
         }
         catch (err) {
             console.error(`==> MySQL projectID: ${projectId} ~ err:`, err);
-            return { status: 500, error: err };
+            result = {
+                status: 500,
+                success: false,
+                mysqlError: err
+            };
+            return result;
         }
         finally {
             await connection.end();
@@ -352,6 +376,6 @@ const makeMySqlCall = async (projectId, data, extDbSetting) => {
     }
     catch (error) {
         console.error(`==> MySQL projectID: ${projectId} ~ error:`, error);
-        return { status: 500, error };
+        return { status: 500, success: false, data: {}, mysqlError: error };
     }
 };

package/build/utils/s3-util.js

@@ -33,7 +33,6 @@ const createS3Client = (awsConfig) => {
 exports.createS3Client = createS3Client;
 const fileUploadToS3 = async (files, s3Client, s3Config, publicS3Client, publicS3Config, isGenerateIcons, encryption, options = {}, encrypted = false) => {
     if (Array.isArray(files)) {
-        console.log("Multiple file");
         const fileOptions = [];
         const s3Key = s3Config.key;
         for (const file of files) {
@@ -49,21 +48,17 @@ const fileUploadToS3 = async (files, s3Client, s3Config, publicS3Client, publicS
         return fileOptions;
     }
     else {
-        console.log("Single file");
         const fileSlug = slugifyFileName(files.originalname);
         if (s3Config.append) {
             s3Config.key = `${s3Config.key}/${(0, uuid_1.v4)()}/${fileSlug}`;
         }
-        console.log("encryption :>> ", encryption);
         return await processFileUploadToS3(files, s3Client, s3Config, publicS3Client, publicS3Config, isGenerateIcons, encryption, options, encrypted);
     }
 };
 exports.fileUploadToS3 = fileUploadToS3;
 const processFileUploadToS3 = async (file, s3Client, s3Config, publicS3Client, publicS3Config, isGenerateIcons, encryption, options = {}, encrypt = false) => {
     try {
-        console.log("encrypt :>> ", encrypt);
         const contentType = mime_types_1.default.lookup(file.originalname) || "";
-        console.log("s3Config :>> ", s3Config);
         const { acl, key, bucket } = s3Config;
         let params = null;
         let encryptedFilePath = null;
@@ -88,8 +83,6 @@ const processFileUploadToS3 = async (file, s3Client, s3Config, publicS3Client, p
                 ...options,
             };
         }
-        console.log("encryptedFilePath :>> ", encryptedFilePath);
-        console.log("params :>> ", params);
         const parallelUploads3 = new lib_storage_1.Upload({ client: s3Client, params });
         const data = await parallelUploads3.done();
         const { smallIcon, mediumIcon, largeIcon } = await handleIconUpload(file, contentType, publicS3Client, publicS3Config, isGenerateIcons, key, options);

package/build/utils/util.js

@@ -299,7 +299,6 @@ const replaceDataValueIntoExpression = (expression, data, user, tenant, userSett
     const contentList = expression
         .match(/{{(.*?)}}/g)
         ?.map((b) => b.replace(/{{(.*?)}}/g, "$1"));
-    console.log("1 replaceDataValueIntoExpression");
     contentList?.forEach((prop) => {
         const needle = `{{${prop}}}`;
         let dataOfItem = "";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "drapcode-utility",
-  "version": "2.4.4",
-  "description": "DrapCode Utility",
+  "version": "2.4.6-preview",
+  "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "files": [
@@ -42,9 +42,9 @@
     "axios": "^1.1.2",
     "date-fns": "^4.1.0",
     "dompurify": "^3.1.7",
-    "drapcode-constant": "^2.0.0",
+    "drapcode-constant": "^1.8.0",
     "drapcode-logger": "^1.3.5",
-    "drapcode-redis": "^1.4.7",
+    "drapcode-redis": "^1.3.5",
     "exiftool-vendored": "^28.2.1",
     "express": "^4.17.1",
     "gm": "^1.25.0",