@cellaware/utils 8.6.6 → 8.6.8

package/dist/chatwms/datagrid.d.ts

@@ -148,7 +148,7 @@ 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 **1,000 rows** and **8 columns**.
+ * **Important:** `html` and `teamsRows` output will be limited to **200 rows** and **8 columns**.
  *
  * All outputs respect and will be filtered by optional `condition` argument.
  */

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,12 +1039,12 @@ function createTeamsTableRow(columnNames, values, oddRow, rowStyles, columnStyle
     };
 }
 /**
- * **Important:** `html` and `teamsRows` output will be limited to **1,000 rows** and **8 columns**.
+ * **Important:** `html` and `teamsRows` output will be limited to **200 rows** and **8 columns**.
  *
  * All outputs respect and will be filtered by optional `condition` argument.
  */
 export function transformDatagrid(rows, datagridState, locale, condition) {
-    const HTML_ROWS = 1000;
+    const HTML_ROWS = 200;
     const HTML_COLS = 8;
     const columnState = datagridState.columnState ?? [];
     const filterModel = datagridState.filterModel ?? {};
@@ -1108,7 +1111,7 @@ export function transformDatagrid(rows, datagridState, locale, condition) {
             let teamsColumnStyles = [];
             columnFormats.forEach(columnFormat => {
                 if (columnFormat.name in row) {
-                    const formattedValue = evaluateValueFormat(columnFormat, row[columnFormat.name], locale);
+                    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);
@@ -1124,10 +1127,11 @@ export function transformDatagrid(rows, datagridState, locale, condition) {
                         for (const mappedColumnName of mappedColumnNamesArr) {
                             if (mappedColumnName in row) {
                                 const adjDisplayName = mappedColumnName.replace(columnFormat.name, columnFormat.displayName);
-                                const formattedValue = evaluateValueFormat(columnFormat, row[mappedColumnName], locale);
+                                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);
                                 }
@@ -1139,7 +1143,7 @@ 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));
+                teamsRows.push(createTeamsTableRow(htmlColumnNames, htmlRowValues, teamsRowStyles, teamsColumnStyles));
             }
             rowIdx++;
         });
@@ -1174,10 +1178,11 @@ export function transformDatagrid(rows, datagridState, locale, condition) {
             let teamsRowStyles = [];
             let teamsColumnStyles = [];
             visibleColumnFormats.forEach(columnFormat => {
-                const formattedValue = evaluateValueFormat(columnFormat, row[columnFormat.name], locale);
+                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);
                 if (rowIdx === 0) {
                     htmlColumnNames.push(columnFormat.displayName);
                 }
@@ -1185,7 +1190,7 @@ 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));
+                teamsRows.push(createTeamsTableRow(htmlColumnNames, htmlRowValues, teamsRowStyles, teamsColumnStyles));
             }
             rowIdx++;
         });

package/package.json

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