@cellaware/utils 8.6.7 → 8.6.10

package/dist/chatwms/datagrid.d.ts

@@ -148,9 +148,10 @@ interface TeamsColumnStyle {
 }
 export declare function mapTeamsStyles(columnNames: string[], htmlRowStyles: string[], htmlColumnStyles: HtmlColumnStyle[], teamsRowStyles: string[], teamsColumnStyles: TeamsColumnStyle[]): [string[], TeamsColumnStyle[]];
 /**
- * **Important:** `html` and `teamsRows` output will be limited to **200 rows** and **8 columns**.
+ * **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.
  */
+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

@@ -998,6 +998,7 @@ function createTeamsTableCellText(value, columnStyle) {
             isSubtle = styles.isSubtle;
         }
     }
+    console.log('HERE: ' + columnStyle);
     return {
         type: "TextBlock",
         text: italic ? `*${value}*` : value,
@@ -1010,17 +1011,19 @@ function createTeamsTableCellText(value, columnStyle) {
         isSubtle
     };
 }
-function createTeamsTableRow(columnNames, values, oddRow, rowStyles, columnStyles) {
+function createTeamsTableRow(columnNames, values, rowStyles, columnStyles) {
     let rowStyle = undefined;
     for (const style of rowStyles) {
         rowStyle = style;
+        console.log(style);
     }
     return {
         type: "TableRow",
-        ...(rowStyle ? { style: rowStyle } : (oddRow ? { style: "emphasis" } : {})),
+        style: rowStyle,
         cells: values.map((value, idx) => {
             const columnName = columnNames[idx];
             const columnStyle = columnStyles.find(columnStyle => columnStyle.columnName === columnName);
+            console.log(columnStyle);
             let style = undefined;
             for (const styles of columnStyle?.styles ?? []) {
                 if (!!styles.style) {
@@ -1036,13 +1039,14 @@ function createTeamsTableRow(columnNames, values, oddRow, rowStyles, columnStyle
     };
 }
 /**
- * **Important:** `html` and `teamsRows` output will be limited to **200 rows** and **8 columns**.
+ * **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.
  */
-export function transformDatagrid(rows, datagridState, locale, condition) {
-    const HTML_ROWS = 200;
+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;
@@ -1062,6 +1066,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.
+        let rowIdx = 0;
         rows.forEach(row => {
             columnFormats.forEach(columnFormat => {
                 if (columnFormat.name in row) {
@@ -1069,6 +1074,9 @@ export function transformDatagrid(rows, datagridState, locale, condition) {
                     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);
@@ -1089,16 +1097,20 @@ export function transformDatagrid(rows, datagridState, locale, condition) {
                                     displayColumnNames = new Set([adjDisplayName]);
                                     mappedDisplayColumnNames.set(columnFormat.displayName, displayColumnNames);
                                 }
+                                if (rowIdx === 0) {
+                                    htmlColumnNames.push(columnFormat.displayName);
+                                }
                             }
                         }
                     }
                 }
             });
+            rowIdx++;
         });
         if (!!condition) {
             rows = evaluatePivotDatagridCondition(rows, condition, mappedDisplayColumnNames);
         }
-        let rowIdx = 0;
+        rowIdx = 0;
         rows.forEach(row => {
             let chartRow = {};
             let htmlRowValues = [];
@@ -1113,9 +1125,6 @@ export function transformDatagrid(rows, datagridState, locale, condition) {
                     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);
-                    }
                 }
                 else {
                     const mappedColumnNamesSet = pivotOutput.mappedColumnNames.get(columnFormat.name);
@@ -1140,7 +1149,9 @@ export function transformDatagrid(rows, datagridState, locale, condition) {
             chartRows.push(chartRow);
             if (rowIdx < HTML_ROWS) {
                 htmlBuf += buildHtmlRow(htmlRowValues, htmlRowStyles, htmlColumnStyles, HTML_COLS);
-                teamsRows.push(createTeamsTableRow(htmlColumnNames, htmlRowValues, rowIdx % 2 === 1, teamsRowStyles, teamsColumnStyles));
+                if (rowIdx < TEAMS_ROWS) {
+                    teamsRows.push(createTeamsTableRow(htmlColumnNames, htmlRowValues, teamsRowStyles, teamsColumnStyles));
+                }
             }
             rowIdx++;
         });
@@ -1180,14 +1191,13 @@ export function transformDatagrid(rows, datagridState, locale, condition) {
                 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);
-                teamsRows.push(createTeamsTableRow(htmlColumnNames, htmlRowValues, rowIdx % 2 === 1, teamsRowStyles, teamsColumnStyles));
+                if (rowIdx < TEAMS_ROWS) {
+                    teamsRows.push(createTeamsTableRow(htmlColumnNames, htmlRowValues, teamsRowStyles, teamsColumnStyles));
+                }
             }
             rowIdx++;
         });
@@ -1203,3 +1213,153 @@ export function transformDatagrid(rows, datagridState, locale, condition) {
         ]
     };
 }
+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 => {
+            let chartRow = {};
+            let htmlRowValues = [];
+            let htmlRowStyles = [];
+            let htmlColumnStyles = [];
+            let teamsRowStyles = [];
+            let teamsColumnStyles = [];
+            columnFormats.forEach(columnFormat => {
+                if (columnFormat.name in row) {
+                    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, htmlRowStyles, htmlColumnStyles);
+                    [teamsRowStyles, teamsColumnStyles] = mapTeamsStyles(htmlColumnNames, htmlRowStyles, htmlColumnStyles, teamsRowStyles, teamsColumnStyles);
+                    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);
+                    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 value = row[mappedColumnName];
+                                const formattedValue = evaluateValueFormat(columnFormat, value, locale);
+                                row[adjDisplayName] = formattedValue;
+                                chartRow[adjDisplayName] = formatNumberEnabled(columnFormat.valueFormat) ? value : 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);
+                                }
+                                // Remove name in favor of display name.
+                                if (adjDisplayName !== mappedColumnName) {
+                                    delete row[mappedColumnName];
+                                }
+                                let displayColumnNames = mappedDisplayColumnNames.get(columnFormat.displayName);
+                                if (!!displayColumnNames) {
+                                    displayColumnNames.add(adjDisplayName);
+                                }
+                                else {
+                                    displayColumnNames = new Set([adjDisplayName]);
+                                    mappedDisplayColumnNames.set(columnFormat.displayName, displayColumnNames);
+                                }
+                            }
+                        }
+                    }
+                }
+            });
+            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++;
+        });
+        if (!!condition) {
+            rows = evaluatePivotDatagridCondition(rows, condition, mappedDisplayColumnNames);
+        }
+    }
+    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)) ?? [];
+        let rowIdx = 0;
+        rows.forEach(row => {
+            let chartRow = {};
+            let htmlRowValues = [];
+            let htmlRowStyles = [];
+            let htmlColumnStyles = [];
+            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, htmlRowStyles, htmlColumnStyles);
+                [teamsRowStyles, teamsColumnStyles] = mapTeamsStyles(htmlColumnNames, htmlRowStyles, htmlColumnStyles, teamsRowStyles, teamsColumnStyles);
+                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);
+            if (rowIdx < HTML_ROWS) {
+                htmlBuf += buildHtmlRow(htmlRowValues, htmlRowStyles, htmlColumnStyles, HTML_COLS);
+                if (rowIdx < TEAMS_ROWS) {
+                    teamsRows.push(createTeamsTableRow(htmlColumnNames, htmlRowValues, teamsRowStyles, teamsColumnStyles));
+                }
+            }
+            rowIdx++;
+        });
+        if (!!condition) {
+            rows = evaluateDatagridCondition(rows, condition);
+        }
+    }
+    return {
+        ...datagridState,
+        adjRows: rows,
+        chartRows,
+        html: `${buildHtmlTableHeader(htmlColumnNames.slice(0, HTML_COLS))}${htmlBuf}${buildHtmlTableFooter()}`,
+        teamsRows
+    };
+}

package/package.json

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