@cellaware/utils 8.11.14 → 8.11.15

package/dist/chatwms/datagrid.js

@@ -1250,6 +1250,7 @@ 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 => {
             let chartRow = {};
@@ -1339,6 +1340,7 @@ export function transformDatagrid(rows, datagridState, locale, condition) {
             rows = groupAndAggregate(rows, rowGroupCols, [], valueCols);
         }
         rows = sortModel.length > 0 ? sortRows(rows, sortModel) : rows;
+        const visibleColumnState = columnState.filter(column => !column.hide);
         const hiddenColumnNames = columnState.filter(column => !!column.hide && !column.rowGroup).map(column => column.colId) ?? [];
         const visibleColumnFormats = columnFormats.filter(column => !hiddenColumnNames.includes(column.name)) ?? [];
         let rowIdx = 0;
@@ -1353,20 +1355,24 @@ export function transformDatagrid(rows, datagridState, locale, condition) {
             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 = visibleColumnFormats.find(columnFormat => columnFormat.name === column.colId);
+                if (!!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];
+                    }
                 }
             });
             chartRows.push(chartRow);

package/package.json

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