@cellaware/utils 8.11.14 → 8.11.16

package/dist/chatwms/datagrid.js

@@ -1235,6 +1235,7 @@ export function transformDatagrid(rows, datagridState, locale, condition) {
     const columnFormats = datagridState.columnFormats ?? [];
     const { rowGroupCols, pivotCols, valueCols, sortModel } = parseColumnState(columnState);
     rows = filterRows(rows, filterModel);
+    let adjRows = [];
     const chartRows = [];
     let htmlBuf = '';
     let htmlTransposeBuf = '';
@@ -1250,8 +1251,10 @@ export function transformDatagrid(rows, datagridState, locale, condition) {
         rows = sortModel.length > 0 ? sortRows(rows, sortModel) : rows;
         let mappedDisplayColumnNames = new Map();
         // Should not need to do hidden/visible column analysis -- pivoting creates new results with only the necessary columns.
+        // Also should not need to analyze column sequence -- our newly created results *should* respect the correct sequence.
         let rowIdx = 0;
-        rows.forEach(row => {
+        rows.forEach((row) => {
+            let adjRow = {};
             let chartRow = {};
             let htmlRowValues = [];
             let htmlRowStyles = [];
@@ -1263,7 +1266,7 @@ export function transformDatagrid(rows, datagridState, locale, condition) {
                 if (columnFormat.name in row) {
                     const value = row[columnFormat.name];
                     const formattedValue = evaluateValueFormat(columnFormat, value, locale);
-                    row[columnFormat.displayName] = formattedValue;
+                    adjRow[columnFormat.displayName] = formattedValue;
                     chartRow[columnFormat.displayName] = formatNumberEnabled(columnFormat.valueFormat) ? value : formattedValue;
                     htmlRowValues.push(formattedValue);
                     [htmlRowStyles, htmlColumnStyles] = processHtmlStyles(formattedValue, columnFormat.displayName, columnFormat, htmlRowStyles, htmlColumnStyles);
@@ -1271,10 +1274,6 @@ export function transformDatagrid(rows, datagridState, locale, condition) {
                     if (rowIdx === 0) {
                         htmlColumnNames.push(columnFormat.displayName);
                     }
-                    // Remove name in favor of display name.
-                    if (columnFormat.displayName !== columnFormat.name) {
-                        delete row[columnFormat.name];
-                    }
                 }
                 else {
                     const mappedColumnNamesSet = pivotOutput.mappedColumnNames.get(columnFormat.name);
@@ -1285,7 +1284,7 @@ export function transformDatagrid(rows, datagridState, locale, condition) {
                                 const adjDisplayName = mappedColumnName.replace(columnFormat.name, columnFormat.displayName);
                                 const value = row[mappedColumnName];
                                 const formattedValue = evaluateValueFormat(columnFormat, value, locale);
-                                row[adjDisplayName] = formattedValue;
+                                adjRow[adjDisplayName] = formattedValue;
                                 chartRow[adjDisplayName] = formatNumberEnabled(columnFormat.valueFormat) ? value : formattedValue;
                                 htmlRowValues.push(formattedValue);
                                 [htmlRowStyles, htmlColumnStyles] = processHtmlStyles(formattedValue, adjDisplayName, columnFormat, htmlRowStyles, htmlColumnStyles);
@@ -1293,10 +1292,6 @@ export function transformDatagrid(rows, datagridState, locale, condition) {
                                 if (rowIdx === 0) {
                                     htmlColumnNames.push(adjDisplayName);
                                 }
-                                // Remove name in favor of display name.
-                                if (adjDisplayName !== mappedColumnName) {
-                                    delete row[mappedColumnName];
-                                }
                                 let displayColumnNames = mappedDisplayColumnNames.get(columnFormat.displayName);
                                 if (!!displayColumnNames) {
                                     displayColumnNames.add(adjDisplayName);
@@ -1339,10 +1334,10 @@ export function transformDatagrid(rows, datagridState, locale, condition) {
             rows = groupAndAggregate(rows, rowGroupCols, [], valueCols);
         }
         rows = sortModel.length > 0 ? sortRows(rows, sortModel) : rows;
-        const hiddenColumnNames = columnState.filter(column => !!column.hide && !column.rowGroup).map(column => column.colId) ?? [];
-        const visibleColumnFormats = columnFormats.filter(column => !hiddenColumnNames.includes(column.name)) ?? [];
+        const visibleColumnState = columnState.filter(column => !column.hide);
         let rowIdx = 0;
-        rows.forEach(row => {
+        rows.forEach((row) => {
+            let adjRow = {};
             let chartRow = {};
             let htmlRowValues = [];
             let htmlRowStyles = [];
@@ -1350,25 +1345,23 @@ export function transformDatagrid(rows, datagridState, locale, condition) {
             let htmlTransposeColumnStyles = [];
             let teamsRowStyles = [];
             let teamsColumnStyles = [];
-            hiddenColumnNames.forEach(columnName => {
-                delete row[columnName];
-            });
-            visibleColumnFormats.forEach(columnFormat => {
-                const value = row[columnFormat.name];
-                const formattedValue = evaluateValueFormat(columnFormat, value, locale);
-                row[columnFormat.displayName] = formattedValue;
-                chartRow[columnFormat.displayName] = formatNumberEnabled(columnFormat.valueFormat) ? value : formattedValue;
-                htmlRowValues.push(formattedValue);
-                [htmlRowStyles, htmlColumnStyles] = processHtmlStyles(formattedValue, columnFormat.displayName, columnFormat, htmlRowStyles, htmlColumnStyles);
-                htmlTransposeColumnStyles = processHtmlTransposeStyles(formattedValue, columnFormat.displayName, columnFormat, htmlTransposeColumnStyles);
-                if (rowIdx === 0) {
-                    htmlColumnNames.push(columnFormat.displayName);
-                }
-                // Remove name in favor of display name.
-                if (columnFormat.displayName !== columnFormat.name) {
-                    delete row[columnFormat.name];
+            // Important: anchoring to column state will ensure we add columns in the correct sequence.
+            visibleColumnState.forEach(column => {
+                const columnFormat = columnFormats.find(columnFormat => columnFormat.name === column.colId);
+                if (!!columnFormat) {
+                    const value = row[columnFormat.name];
+                    const formattedValue = evaluateValueFormat(columnFormat, value, locale);
+                    adjRow[columnFormat.displayName] = formattedValue;
+                    chartRow[columnFormat.displayName] = formatNumberEnabled(columnFormat.valueFormat) ? value : formattedValue;
+                    htmlRowValues.push(formattedValue);
+                    [htmlRowStyles, htmlColumnStyles] = processHtmlStyles(formattedValue, columnFormat.displayName, columnFormat, htmlRowStyles, htmlColumnStyles);
+                    htmlTransposeColumnStyles = processHtmlTransposeStyles(formattedValue, columnFormat.displayName, columnFormat, htmlTransposeColumnStyles);
+                    if (rowIdx === 0) {
+                        htmlColumnNames.push(columnFormat.displayName);
+                    }
                 }
             });
+            adjRows.push(adjRow);
             chartRows.push(chartRow);
             if (rowIdx < DATAGRID_HTML_ROWS) {
                 htmlBuf += buildHtmlRow(htmlRowValues, htmlRowStyles, htmlColumnStyles, DATAGRID_HTML_COLS);
@@ -1390,12 +1383,12 @@ export function transformDatagrid(rows, datagridState, locale, condition) {
             rowIdx++;
         });
         if (!!condition) {
-            rows = evaluateDatagridCondition(rows, condition);
+            adjRows = evaluateDatagridCondition(rows, condition);
         }
     }
     return {
         ...datagridState,
-        adjRows: rows,
+        adjRows,
         chartRows,
         html: `<p style="font-size: 12px;">Displaying first <b>${DATAGRID_HTML_ROWS} rows</b> and <b>${DATAGRID_HTML_COLS} columns</b></p>\n\n${buildHtmlTableHeader(htmlColumnNames.slice(0, DATAGRID_HTML_COLS))}${htmlBuf}${buildHtmlTableFooter()}`,
         teamsRows: [

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cellaware/utils",
-    "version": "8.11.14",
+    "version": "8.11.16",
     "description": "Cellaware Utilities for Node.js",
     "author": "Cellaware Technologies",
     "type": "module",