@cellaware/utils 8.6.12 → 8.6.14

package/dist/chatwms/datagrid.d.ts

@@ -150,8 +150,7 @@ export declare function mapTeamsStyles(columnNames: string[], htmlRowStyles: str
 /**
  * **Important:** `html` and `teamsRows` output will be limited to **1,000 rows/64 rows** and **8 columns**, respectively.
  *
- * All outputs respect and will be filtered by optional `condition` argument.
+ * ~All outputs respect and will be filtered by optional `condition` argument.~
  */
-export declare function _transformDatagrid(rows: any[], datagridState: DatagridStateBase, locale: string, condition?: DatagridCondition): VisualDatagridState;
 export declare function transformDatagrid(rows: any[], datagridState: DatagridStateBase, locale: string, condition?: DatagridCondition): VisualDatagridState;
 export {};

package/dist/chatwms/datagrid.js

@@ -780,9 +780,9 @@ function sortRows(data, sortModel) {
         return 0;
     });
 }
-function processHtmlStyles(value, columnFormat, rowStyles, columnStyles) {
+function processHtmlStyles(value, columnName, columnFormat, rowStyles, columnStyles) {
     let columnStyle = {
-        columnName: '',
+        columnName,
         styles: []
     };
     // Reminder: Value Formatting is performed **before** Conditional Formatting.
@@ -861,6 +861,7 @@ export function mapTeamsStyles(columnNames, htmlRowStyles, htmlColumnStyles, tea
                 return {};
         }
     };
+    console.log('COUNT: ' + htmlColumnStyles.length);
     for (const htmlColumnStyle of htmlColumnStyles) {
         teamsColumnStyles.push({
             columnName: htmlColumnStyle.columnName,
@@ -1024,7 +1025,9 @@ function createTeamsTableRow(columnNames, values, rowStyles, columnStyles) {
         style: rowStyle,
         cells: values.map((value, idx) => {
             const columnName = columnNames[idx];
-            const columnStyle = columnStyles.find(columnStyle => columnStyle.columnName === columnName);
+            const columnStyle = columnStyles.find(cs => cs.columnName === columnName);
+            console.log('C.');
+            console.log(columnStyle);
             let style = undefined;
             for (const styles of columnStyle?.styles ?? []) {
                 if (!!styles.style) {
@@ -1042,178 +1045,8 @@ function createTeamsTableRow(columnNames, values, rowStyles, columnStyles) {
 /**
  * **Important:** `html` and `teamsRows` output will be limited to **1,000 rows/64 rows** and **8 columns**, respectively.
  *
- * All outputs respect and will be filtered by optional `condition` argument.
+ * ~All outputs respect and will be filtered by optional `condition` argument.~
  */
-export function _transformDatagrid(rows, datagridState, locale, condition) {
-    const HTML_ROWS = 1000;
-    const HTML_COLS = 8;
-    const TEAMS_ROWS = 64;
-    const columnState = datagridState.columnState ?? [];
-    const filterModel = datagridState.filterModel ?? {};
-    const isPivotMode = !!datagridState.isPivotMode;
-    const columnFormats = datagridState.columnFormats ?? [];
-    const { rowGroupCols, pivotCols, valueCols, sortModel } = parseColumnState(columnState);
-    rows = filterRows(rows, filterModel);
-    const chartRows = [];
-    let htmlBuf = '';
-    const htmlColumnNames = [];
-    const teamsRows = [];
-    // IMPORTANT: we evaluate the datagrid condition AFTER we are done with all transformations.
-    // NOTE: we do not need any pivot columns for pivot mode to be valid.
-    // https://chatwms.io/user-manual/chatwms/faq#q-do-i-have-to-have-a-group-column-to-just-display-a-count-in-the-datagrid
-    if (isPivotMode && valueCols.length > 0) {
-        const pivotOutput = pivotData(rows, rowGroupCols, pivotCols, valueCols);
-        rows = pivotOutput.rows;
-        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.
-        let rowIdx = 0;
-        rows.forEach(row => {
-            columnFormats.forEach(columnFormat => {
-                if (columnFormat.name in row) {
-                    row[columnFormat.displayName] = evaluateValueFormat(columnFormat, row[columnFormat.name], locale);
-                    if (columnFormat.displayName !== columnFormat.name) { // Remove name in favor of display name.
-                        delete row[columnFormat.name];
-                    }
-                    if (rowIdx === 0) {
-                        htmlColumnNames.push(columnFormat.displayName);
-                    }
-                }
-                else {
-                    const mappedColumnNamesSet = pivotOutput.mappedColumnNames.get(columnFormat.name);
-                    if (!!mappedColumnNamesSet) {
-                        const mappedColumnNamesArr = Array.from(mappedColumnNamesSet);
-                        for (const mappedColumnName of mappedColumnNamesArr) {
-                            if (mappedColumnName in row) {
-                                const adjDisplayName = mappedColumnName.replace(columnFormat.name, columnFormat.displayName);
-                                row[adjDisplayName] = evaluateValueFormat(columnFormat, row[mappedColumnName], locale);
-                                if (adjDisplayName !== mappedColumnName) { // Remove name in favor of display name.
-                                    delete row[mappedColumnName];
-                                }
-                                let displayColumnNames = mappedDisplayColumnNames.get(columnFormat.displayName);
-                                if (!!displayColumnNames) {
-                                    displayColumnNames.add(adjDisplayName);
-                                }
-                                else {
-                                    displayColumnNames = new Set([adjDisplayName]);
-                                    mappedDisplayColumnNames.set(columnFormat.displayName, displayColumnNames);
-                                }
-                                if (rowIdx === 0) {
-                                    htmlColumnNames.push(columnFormat.displayName);
-                                }
-                            }
-                        }
-                    }
-                }
-            });
-            rowIdx++;
-        });
-        if (!!condition) {
-            rows = evaluatePivotDatagridCondition(rows, condition, mappedDisplayColumnNames);
-        }
-        rowIdx = 0;
-        rows.forEach(row => {
-            let chartRow = {};
-            let htmlRowValues = [];
-            let htmlRowStyles = [];
-            let htmlColumnStyles = [];
-            let teamsRowStyles = [];
-            let teamsColumnStyles = [];
-            columnFormats.forEach(columnFormat => {
-                if (columnFormat.name in row) {
-                    const formattedValue = evaluateValueFormat(columnFormat, row[columnFormat.displayName], locale);
-                    chartRow[columnFormat.displayName] = formatNumberEnabled(columnFormat.valueFormat) ? stripNumericValueFormat(formattedValue) : formattedValue;
-                    htmlRowValues.push(formattedValue);
-                    [htmlRowStyles, htmlColumnStyles] = processHtmlStyles(formattedValue, columnFormat, htmlRowStyles, htmlColumnStyles);
-                    [teamsRowStyles, teamsColumnStyles] = mapTeamsStyles(htmlColumnNames, htmlRowStyles, htmlColumnStyles, teamsRowStyles, teamsColumnStyles);
-                }
-                else {
-                    const mappedColumnNamesSet = pivotOutput.mappedColumnNames.get(columnFormat.name);
-                    if (!!mappedColumnNamesSet) {
-                        const mappedColumnNamesArr = Array.from(mappedColumnNamesSet);
-                        for (const mappedColumnName of mappedColumnNamesArr) {
-                            if (mappedColumnName in row) {
-                                const adjDisplayName = mappedColumnName.replace(columnFormat.name, columnFormat.displayName);
-                                const formattedValue = row[adjDisplayName];
-                                chartRow[adjDisplayName] = formatNumberEnabled(columnFormat.valueFormat) ? stripNumericValueFormat(formattedValue) : formattedValue;
-                                htmlRowValues.push(formattedValue);
-                                [htmlRowStyles, htmlColumnStyles] = processHtmlStyles(formattedValue, columnFormat, htmlRowStyles, htmlColumnStyles);
-                                [teamsRowStyles, teamsColumnStyles] = mapTeamsStyles(htmlColumnNames, htmlRowStyles, htmlColumnStyles, teamsRowStyles, teamsColumnStyles);
-                                if (rowIdx === 0) {
-                                    htmlColumnNames.push(columnFormat.displayName);
-                                }
-                            }
-                        }
-                    }
-                }
-            });
-            chartRows.push(chartRow);
-            if (rowIdx < HTML_ROWS) {
-                htmlBuf += buildHtmlRow(htmlRowValues, htmlRowStyles, htmlColumnStyles, HTML_COLS);
-                if (rowIdx < TEAMS_ROWS) {
-                    teamsRows.push(createTeamsTableRow(htmlColumnNames, htmlRowValues, teamsRowStyles, teamsColumnStyles));
-                }
-            }
-            rowIdx++;
-        });
-    }
-    else {
-        if (rowGroupCols.length > 0) {
-            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)) ?? [];
-        rows.forEach(row => {
-            hiddenColumnNames.forEach(columnName => {
-                delete row[columnName];
-            });
-            visibleColumnFormats.forEach(columnFormat => {
-                row[columnFormat.displayName] = evaluateValueFormat(columnFormat, row[columnFormat.name], locale);
-                if (columnFormat.displayName !== columnFormat.name) { // Remove name in favor of display name.
-                    delete row[columnFormat.name];
-                }
-            });
-        });
-        if (!!condition) {
-            rows = evaluateDatagridCondition(rows, condition);
-        }
-        let rowIdx = 0;
-        rows.forEach(row => {
-            let chartRow = {};
-            let htmlRowValues = [];
-            let htmlRowStyles = [];
-            let htmlColumnStyles = [];
-            let teamsRowStyles = [];
-            let teamsColumnStyles = [];
-            visibleColumnFormats.forEach(columnFormat => {
-                const formattedValue = row[columnFormat.displayName];
-                chartRow[columnFormat.displayName] = formatNumberEnabled(columnFormat.valueFormat) ? stripNumericValueFormat(formattedValue) : formattedValue;
-                htmlRowValues.push(formattedValue);
-                [htmlRowStyles, htmlColumnStyles] = processHtmlStyles(formattedValue, columnFormat, htmlRowStyles, htmlColumnStyles);
-                [teamsRowStyles, teamsColumnStyles] = mapTeamsStyles(htmlColumnNames, htmlRowStyles, htmlColumnStyles, teamsRowStyles, teamsColumnStyles);
-            });
-            chartRows.push(chartRow);
-            if (rowIdx < HTML_ROWS) {
-                htmlBuf += buildHtmlRow(htmlRowValues, htmlRowStyles, htmlColumnStyles, HTML_COLS);
-                if (rowIdx < TEAMS_ROWS) {
-                    teamsRows.push(createTeamsTableRow(htmlColumnNames, htmlRowValues, teamsRowStyles, teamsColumnStyles));
-                }
-            }
-            rowIdx++;
-        });
-    }
-    return {
-        ...datagridState,
-        adjRows: rows,
-        chartRows,
-        html: `${buildHtmlTableHeader(htmlColumnNames.slice(0, HTML_COLS))}${htmlBuf}${buildHtmlTableFooter()}`,
-        teamsRows: [
-            createTeamsTableColumns(htmlColumnNames),
-            ...teamsRows
-        ]
-    };
-}
 export function transformDatagrid(rows, datagridState, locale, condition) {
     const HTML_ROWS = 1000;
     const HTML_COLS = 8;
@@ -1252,7 +1085,7 @@ export function transformDatagrid(rows, datagridState, locale, condition) {
                     row[columnFormat.displayName] = formattedValue;
                     chartRow[columnFormat.displayName] = formatNumberEnabled(columnFormat.valueFormat) ? value : formattedValue;
                     htmlRowValues.push(formattedValue);
-                    [htmlRowStyles, htmlColumnStyles] = processHtmlStyles(formattedValue, columnFormat, htmlRowStyles, htmlColumnStyles);
+                    [htmlRowStyles, htmlColumnStyles] = processHtmlStyles(formattedValue, columnFormat.displayName, columnFormat, htmlRowStyles, htmlColumnStyles);
                     [teamsRowStyles, teamsColumnStyles] = mapTeamsStyles(htmlColumnNames, htmlRowStyles, htmlColumnStyles, teamsRowStyles, teamsColumnStyles);
                     if (rowIdx === 0) {
                         htmlColumnNames.push(columnFormat.displayName);
@@ -1274,7 +1107,7 @@ export function transformDatagrid(rows, datagridState, locale, condition) {
                                 row[adjDisplayName] = formattedValue;
                                 chartRow[adjDisplayName] = formatNumberEnabled(columnFormat.valueFormat) ? value : formattedValue;
                                 htmlRowValues.push(formattedValue);
-                                [htmlRowStyles, htmlColumnStyles] = processHtmlStyles(formattedValue, columnFormat, htmlRowStyles, htmlColumnStyles);
+                                [htmlRowStyles, htmlColumnStyles] = processHtmlStyles(formattedValue, adjDisplayName, columnFormat, htmlRowStyles, htmlColumnStyles);
                                 [teamsRowStyles, teamsColumnStyles] = mapTeamsStyles(htmlColumnNames, htmlRowStyles, htmlColumnStyles, teamsRowStyles, teamsColumnStyles);
                                 if (rowIdx === 0) {
                                     htmlColumnNames.push(adjDisplayName);
@@ -1333,7 +1166,7 @@ export function transformDatagrid(rows, datagridState, locale, condition) {
                 row[columnFormat.displayName] = formattedValue;
                 chartRow[columnFormat.displayName] = formatNumberEnabled(columnFormat.valueFormat) ? value : formattedValue;
                 htmlRowValues.push(formattedValue);
-                [htmlRowStyles, htmlColumnStyles] = processHtmlStyles(formattedValue, columnFormat, htmlRowStyles, htmlColumnStyles);
+                [htmlRowStyles, htmlColumnStyles] = processHtmlStyles(formattedValue, columnFormat.displayName, columnFormat, htmlRowStyles, htmlColumnStyles);
                 [teamsRowStyles, teamsColumnStyles] = mapTeamsStyles(htmlColumnNames, htmlRowStyles, htmlColumnStyles, teamsRowStyles, teamsColumnStyles);
                 if (rowIdx === 0) {
                     htmlColumnNames.push(columnFormat.displayName);
@@ -1361,6 +1194,9 @@ export function transformDatagrid(rows, datagridState, locale, condition) {
         adjRows: rows,
         chartRows,
         html: `${buildHtmlTableHeader(htmlColumnNames.slice(0, HTML_COLS))}${htmlBuf}${buildHtmlTableFooter()}`,
-        teamsRows
+        teamsRows: [
+            createTeamsTableColumns(htmlColumnNames),
+            ...teamsRows
+        ]
     };
 }

package/package.json

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