Merge branch 'main' into main

Author: durlabhjain

lib/business/business-base.mjs

@@ -315,10 +315,13 @@ class BusinessBase {
         return data;
     }
 
-    async save({ id, relations, relationsObject, ...values }) {
+    async save(options) {
+        let { id, relations, relationsObject, ...values } = options;
         if (this.beforeSave) {
-            const result = await this.beforeSave({ id, ...values });
-            values = { ...result };
+            const result = await this.beforeSave(options);
+            if (typeof result === 'object') {
+                values = result;
+            }
         }
         const { relations: definedRelations = [], isStandard = true, readOnlyColumns = [], user, clientBased, updateKeyField, multiSelectColumns = {} } = this;
         let { keyField } = this;
@@ -391,6 +394,10 @@ class BusinessBase {
 
         const result = await sql.insertUpdate({ tableName, keyField, id, json: requestValues, update: isUpdate, logger: this.logger });
 
+        if (this.afterSave) {
+            await this.afterSave(options);
+        }
+
         if (result.success) {
             if (!isUpdate) {
                 id = result.data[0].Id;
@@ -528,6 +535,10 @@ class BusinessBase {
     }
 
     async delete({ id, values = {} }) {
+        // Invoke optional beforeDelete hook for custom validation or pre-deletion logic.
+        if (this.beforeDelete) {
+            await this.beforeDelete({ id });
+        }
         if (this.softDelete === false) {
             return await this.hardDelete({ id });
         }

lib/middleware/response-transformer.mjs

@@ -40,7 +40,8 @@ const toHtmlTable = (rows, columns, summaryRow, exportColumns, isCustomExport, t
         const keys = Object.keys(isCustomExport ? exportColumns : rows[0]);
         columns = [];
         for (const dataKey of keys) {
-            columns.push({ dataKey, title: isCustomExport ? exportColumns[dataKey]?.name : dataKey });
+            const { name: title = dataKey, ...others } = exportColumns[dataKey] || {};
+            columns.push({ dataKey, title, ...others });
         }
     }
 
@@ -171,41 +172,45 @@ const updateKeys = function ({ data, keyMapping, columns, isForXML = false, user
         const updatedRecord = {};
 
         for (const ele of Object.keys(keyMapping)) {
-            const keyName = isForXML ? ele : keyMapping[ele];
-            const { valueType, keepUTC = false } = columns[ele];
-
-            let value = record[ele];
-
-            const isParsable = columns[ele]?.isParsable !== false ? true : columns[ele]?.isParsable;
-
-            if (util.dateTimeFields.includes(valueType)) {
-                if (value !== null && value !== undefined) {
-                    if (userTimezoneOffset && !keepUTC) {
-                        value = dayjs.utc(value).add(Number(userTimezoneOffset), 'minute')
+            if (columns[ele]) {
+                const keyName = isForXML ? ele : keyMapping[ele];
+                const { valueType, keepUTC = false } = columns[ele];
+
+                let value = record[ele];
+
+                const isParsable = columns[ele]?.isParsable !== false ? true : columns[ele]?.isParsable;
+
+                if (util.dateTimeFields.includes(valueType)) {
+                    if (value !== null && value !== undefined) {
+                        if (userTimezoneOffset && !keepUTC) {
+                            value = dayjs.utc(value).add(Number(userTimezoneOffset), 'minute')
+                        }
+                        value = formatDateTime({ value, format: valueType === 'date' ? userDateFormat : userDateTimeFormat });
+                    } else {
+                        value = '';
                     }
-                    value = formatDateTime({ value, format: valueType === 'date' ? userDateFormat : userDateTimeFormat });
-                } else {
-                    value = '';
+                } else if (valueType === 'boolean') {
+                    value = value === true || value === 1 ? 'Yes' : 'No';
+                } else if (valueType === 'number' && isParsable) {
+                    value = value !== null ? parseInt(value) : '';
+                } else if (valueType === 'percentage') {
+                    value = util.percentageFormatter(value);
                 }
-            } else if (valueType === 'boolean') {
-                value = value === true || value === 1 ? 'Yes' : 'No';
-            } else if (valueType === 'number' && isParsable) {
-                value = value !== null ? parseInt(value) : '';
-            }
 
-            for (const field in lookupFields) {
-                const lookupKeyName = lookupFields[field].keyName;
-                const key = isForXML ? keyName : ele;
-                if (lookupKeyName.includes(key)) {
-                    const lookupValue = lookupFields[field].lookupKey;
-                    const indexValue = lookups[lookupValue]?.findIndex(e => e.value === value);
-                    if (indexValue > -1) {
-                        value = lookups[lookupValue][indexValue].label;
+                for (const field in lookupFields) {
+                    const lookupKeyName = lookupFields[field].keyName;
+                    const key = isForXML ? keyName : ele;
+                    if (lookupKeyName.includes(key)) {
+                        const lookupValue = lookupFields[field].lookupKey;
+                        const indexValue = lookups[lookupValue]?.findIndex(e => e.value === value);
+                        if (indexValue > -1) {
+                            value = lookups[lookupValue][indexValue].label;
+                        }
                     }
                 }
-            }
 
-            updatedRecord[keyName] = [undefined, null].includes(value) ? '' : value;
+                updatedRecord[keyName] = [undefined, null].includes(value) ? '' : value;
+            }
         }
 
         return updatedRecord;
@@ -281,7 +286,9 @@ const sanitizeData = ({ data, columns = {}, responseType }) => {
     return data.map(record =>
         fieldsToKeep.reduce((acc, field) => {
             let name = columns[field]?.name || field;
-            const value = record[field];
+            // Fallback logic: check both the original field and the renamed column name.
+            // This handles cases where columns have been renamed and the original field name might not exist in the record.
+            const value = record[field] ?? record[name];
             if (responseType === mimeTypes.xml) {
                 // Ensure name is a string before calling replace
                 name = (typeof name === 'string' ? name : String(name || field)).replace(/[^a-zA-Z0-9._-]/g, '');
@@ -302,7 +309,7 @@ const responseTransformer = async function (req, res, next) {
         const exportColumns = others?.exportColumns, userDateFormat = others?.userDateFormat, isElastic = others?.isElastic, userTimezoneOffset = others?.userTimezoneOffset, lookups = others?.lookups, lookupFields = others?.lookupFields, addExecutionTimeLogger = others?.addExecutionTimeLogger;
         const dateTimeFormat = userDateFormat + util.dateTimeExportFormat;
         const isMultiSheetExport = others?.isMultiSheetExport || false;
-        
+
         // Safely handle req.path to prevent TypeError: r.replace is not a function
         const safePath = (req.path && typeof req.path === 'string') ? req.path.substr(1) : 'export';
         fileName = `${!fileName ? safePath.replace(util.fileNameRegex, '-') : fileName}-${dayjs().format(enums.fullDateFormat)}`;
@@ -374,26 +381,7 @@ const responseTransformer = async function (req, res, next) {
                     logger.info(`Execution time taken for updateKeys: ${endTimeUpdateKeys - updateKeysStartTime} ms`);
                 }
             }
-        }
-        // Iterates over each record to format Date fields using the appropriate date or datetime format.
-        // Also converts boolean values to strings based on the exportColumns configuration.
-        if (Array.isArray(data)) {
-            data = data.map(record => {
-                const formattedRecord = { ...record }; // create a shallow copy of the record
-                for (const [key, value] of Object.entries(record)) {
-                    if (exportColumns && !exportColumns[key]) {
-                        continue;
-                    }
-                    if (value && value instanceof Date) {
-                        formattedRecord[key] = formatDateTime({ value, format: dateTimeFormat || enums.dateTimeExportFormat }); // format date or datetime
-                        continue;
-                    }
-                    if (value !== null && value !== undefined && typeof value === 'boolean') {
-                        formattedRecord[key] = value.toString(); // convert boolean to string
-                    }
-                }
-                return formattedRecord;
-            });
+            data = sheets[0].rows;
         }
         switch (responseType) {
             case mimeTypes.json:
@@ -407,7 +395,6 @@ const responseTransformer = async function (req, res, next) {
                 }
                 return Object.keys(others).length === 1 ? res.json(data) : res.json(jsonResponse);
             case mimeTypes.xlsx:
-                data = data.data || data;
                 res.set('Content-Type', responseType);
                 res.set('Content-Disposition', `attachment; filename="${fileName}.xlsx"`);
                 return await toExcel({ sheets, stream: res, exportColumns: true, userDateFormat, userDateTimeFormat: dateTimeFormat, userTimezoneOffset, lookups, lookupFields, addExecutionTimeLogger });

lib/util.js

@@ -389,5 +389,6 @@ export default {
         nvarchar: 4000,
         decimal_precision: 38,
         decimal_scale: 17
-    }
+    },
+    percentageFormatter: (v) => (v !== null && v !== undefined) ? `${parseFloat(v).toFixed(1)}%` : '',
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@durlabh/dframework",
-  "version": "1.0.43",
+  "version": "1.0.47",
   "main": "index.js",
   "license": "MIT",
   "type": "module",
@@ -58,7 +58,7 @@
     "tough-cookie": "^6.0.0"
   },
   "devDependencies": {
-   "@azure/identity": "^4.12.0",
+    "@azure/identity": "^4.12.0",
     "@azure/msal-node": "^3.8.0",
     "@azure/storage-blob": "^12.28.0",
     "dayjs": "^1.11.18",
@@ -117,4 +117,4 @@
       "optional": true
     }
   }
-}
+}