@cellaware/utils 8.6.14 → 8.6.16

package/dist/chatwms/datagrid.d.ts

@@ -102,6 +102,21 @@ export declare const CONDITIONAL_FORMAT_RULES: string[];
 export declare const CONDITIONAL_FORMAT_RULES_TEXT: string[];
 export declare const CONDITIONAL_FORMAT_RULES_NUMBER: string[];
 export declare const CONDITIONAL_FORMAT_RULES_BOOLEAN: string[];
+export declare enum ConditionalFormatStyle {
+    NONE = "conditional-format-style-none",
+    GREEN_BACKGROUND = "conditional-format-style-green-background",
+    YELLOW_BACKGROUND = "conditional-format-style-yellow-background",
+    RED_BACKGROUND = "conditional-format-style-red-background",
+    BLUE_BACKGROUND = "conditional-format-style-blue-background",
+    PURPLE_BACKGROUND = "conditional-format-style-purple-background",
+    BOLD = "conditional-format-style-bold",
+    GREEN_BOLD = "conditional-format-style-green-bold",
+    YELLOW_BOLD = "conditional-format-style-yellow-bold",
+    RED_BOLD = "conditional-format-style-red-bold",
+    BLUE_BOLD = "conditional-format-style-blue-bold",
+    PURPLE_BOLD = "conditional-format-style-purple-bold",
+    NOT_IMPORTANT = "conditional-format-style-not-important"
+}
 export interface ConditionalFormat {
     sequence: number;
     rule: string;

package/dist/chatwms/datagrid.js

@@ -237,6 +237,22 @@ export const CONDITIONAL_FORMAT_RULES_BOOLEAN = [
     ConditionalFormatRule.BLANK,
     ConditionalFormatRule.NOT_BLANK
 ];
+export var ConditionalFormatStyle;
+(function (ConditionalFormatStyle) {
+    ConditionalFormatStyle["NONE"] = "conditional-format-style-none";
+    ConditionalFormatStyle["GREEN_BACKGROUND"] = "conditional-format-style-green-background";
+    ConditionalFormatStyle["YELLOW_BACKGROUND"] = "conditional-format-style-yellow-background";
+    ConditionalFormatStyle["RED_BACKGROUND"] = "conditional-format-style-red-background";
+    ConditionalFormatStyle["BLUE_BACKGROUND"] = "conditional-format-style-blue-background";
+    ConditionalFormatStyle["PURPLE_BACKGROUND"] = "conditional-format-style-purple-background";
+    ConditionalFormatStyle["BOLD"] = "conditional-format-style-bold";
+    ConditionalFormatStyle["GREEN_BOLD"] = "conditional-format-style-green-bold";
+    ConditionalFormatStyle["YELLOW_BOLD"] = "conditional-format-style-yellow-bold";
+    ConditionalFormatStyle["RED_BOLD"] = "conditional-format-style-red-bold";
+    ConditionalFormatStyle["BLUE_BOLD"] = "conditional-format-style-blue-bold";
+    ConditionalFormatStyle["PURPLE_BOLD"] = "conditional-format-style-purple-bold";
+    ConditionalFormatStyle["NOT_IMPORTANT"] = "conditional-format-style-not-important";
+})(ConditionalFormatStyle || (ConditionalFormatStyle = {}));
 export function evaluateConditionalFormat(condFmt, dataType, value) {
     const isBlank = (v) => v === null || v === undefined || (dataType !== 'number' && dataType !== 'boolean' && v === '');
     const v1 = condFmt.value;
@@ -808,51 +824,53 @@ export function mapTeamsStyles(columnNames, htmlRowStyles, htmlColumnStyles, tea
     // We can simply iterate over all the matched styles and accumulate them.
     const getColumnStyle = (style) => {
         switch (style) {
-            case 'conditional-format-style-green-background':
+            case ConditionalFormatStyle.GREEN_BACKGROUND:
                 return {
                     color: 'Good',
                     style: 'good'
                 };
-            case 'conditional-format-style-yellow-background':
+            case ConditionalFormatStyle.YELLOW_BACKGROUND:
                 return {
                     color: 'Warning',
                     style: 'warning'
                 };
-            case 'conditional-format-style-red-background':
+            case ConditionalFormatStyle.RED_BACKGROUND:
                 return {
                     color: 'Attention',
                     style: 'attention'
                 };
-            case 'conditional-format-style-blue-background':
+            case ConditionalFormatStyle.BLUE_BACKGROUND:
+            case ConditionalFormatStyle.PURPLE_BACKGROUND:
                 return {
                     color: 'Accent',
                     style: 'accent'
                 };
-            case 'conditional-format-style-bold':
+            case ConditionalFormatStyle.BOLD:
                 return {
                     weight: 'Bolder'
                 };
-            case 'conditional-format-style-green-bold':
+            case ConditionalFormatStyle.GREEN_BOLD:
                 return {
                     color: 'Good',
                     weight: 'Bolder'
                 };
-            case 'conditional-format-style-yellow-bold':
+            case ConditionalFormatStyle.YELLOW_BOLD:
                 return {
                     color: 'Warning',
                     weight: 'Bolder'
                 };
-            case 'conditional-format-style-red-bold':
+            case ConditionalFormatStyle.RED_BOLD:
                 return {
                     color: 'Attention',
                     weight: 'Bolder'
                 };
-            case 'conditional-format-style-blue-bold':
+            case ConditionalFormatStyle.BLUE_BOLD:
+            case ConditionalFormatStyle.PURPLE_BOLD:
                 return {
                     color: 'Accent',
                     weight: 'Bolder'
                 };
-            case 'conditional-format-style-not-important':
+            case ConditionalFormatStyle.NOT_IMPORTANT:
                 return {
                     isSubtle: true,
                     italic: true
@@ -861,15 +879,12 @@ export function mapTeamsStyles(columnNames, htmlRowStyles, htmlColumnStyles, tea
                 return {};
         }
     };
-    console.log('COUNT: ' + htmlColumnStyles.length);
     for (const htmlColumnStyle of htmlColumnStyles) {
         teamsColumnStyles.push({
             columnName: htmlColumnStyle.columnName,
             styles: htmlColumnStyle.styles.map(style => getColumnStyle(style))
         });
     }
-    console.log('A.');
-    console.log(JSON.stringify(teamsColumnStyles));
     const applyRowStyleToColumns = (style) => {
         for (const columnName of columnNames) {
             const columnStyle = getColumnStyle(style);
@@ -887,39 +902,41 @@ export function mapTeamsStyles(columnNames, htmlRowStyles, htmlColumnStyles, tea
     };
     for (const htmlRowStyle of htmlRowStyles) {
         switch (htmlRowStyle) {
-            case 'conditional-format-style-green-background':
+            case ConditionalFormatStyle.GREEN_BACKGROUND:
                 teamsRowStyles.push('good');
-                applyRowStyleToColumns('conditional-format-style-green-background');
+                applyRowStyleToColumns(htmlRowStyle);
                 break;
-            case 'conditional-format-style-yellow-background':
+            case ConditionalFormatStyle.YELLOW_BACKGROUND:
                 teamsRowStyles.push('warning');
-                applyRowStyleToColumns('conditional-format-style-yellow-background');
+                applyRowStyleToColumns(htmlRowStyle);
                 break;
-            case 'conditional-format-style-red-background':
+            case ConditionalFormatStyle.RED_BACKGROUND:
                 teamsRowStyles.push('attention');
-                applyRowStyleToColumns('conditional-format-style-red-background');
+                applyRowStyleToColumns(htmlRowStyle);
                 break;
-            case 'conditional-format-style-blue-background':
+            case ConditionalFormatStyle.BLUE_BACKGROUND:
+            case ConditionalFormatStyle.PURPLE_BACKGROUND:
                 teamsRowStyles.push('accent');
-                applyRowStyleToColumns('conditional-format-style-blue-background');
+                applyRowStyleToColumns(htmlRowStyle);
                 break;
-            case 'conditional-format-style-bold':
-                applyRowStyleToColumns('conditional-format-style-bold');
+            case ConditionalFormatStyle.BOLD:
+                applyRowStyleToColumns(htmlRowStyle);
                 break;
-            case 'conditional-format-style-green-bold':
-                applyRowStyleToColumns('conditional-format-style-green-bold');
+            case ConditionalFormatStyle.GREEN_BOLD:
+                applyRowStyleToColumns(htmlRowStyle);
                 break;
-            case 'conditional-format-style-yellow-bold':
-                applyRowStyleToColumns('conditional-format-style-yellow-bold');
+            case ConditionalFormatStyle.YELLOW_BOLD:
+                applyRowStyleToColumns(htmlRowStyle);
                 break;
-            case 'conditional-format-style-red-bold':
-                applyRowStyleToColumns('conditional-format-style-red-bold');
+            case ConditionalFormatStyle.RED_BOLD:
+                applyRowStyleToColumns(htmlRowStyle);
                 break;
-            case 'conditional-format-style-blue-bold':
-                applyRowStyleToColumns('conditional-format-style-blue-bold');
+            case ConditionalFormatStyle.BLUE_BOLD:
+            case ConditionalFormatStyle.PURPLE_BOLD:
+                applyRowStyleToColumns(htmlRowStyle);
                 break;
-            case 'conditional-format-style-not-important':
-                applyRowStyleToColumns('conditional-format-style-not-important');
+            case ConditionalFormatStyle.NOT_IMPORTANT:
+                applyRowStyleToColumns(htmlRowStyle);
                 break;
             default:
                 break;
@@ -1000,6 +1017,9 @@ function createTeamsTableCellText(value, columnStyle) {
         if (!!styles.isSubtle) {
             isSubtle = styles.isSubtle;
         }
+        if (!!styles.italic) {
+            italic = styles.italic;
+        }
     }
     return {
         type: "TextBlock",
@@ -1018,16 +1038,12 @@ function createTeamsTableRow(columnNames, values, rowStyles, columnStyles) {
     for (const style of rowStyles) {
         rowStyle = style;
     }
-    console.log('B.');
-    console.log(JSON.stringify(columnStyles));
     return {
         type: "TableRow",
         style: rowStyle,
         cells: values.map((value, idx) => {
             const columnName = columnNames[idx];
             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) {
@@ -1086,7 +1102,6 @@ export function transformDatagrid(rows, datagridState, locale, condition) {
                     chartRow[columnFormat.displayName] = formatNumberEnabled(columnFormat.valueFormat) ? value : formattedValue;
                     htmlRowValues.push(formattedValue);
                     [htmlRowStyles, htmlColumnStyles] = processHtmlStyles(formattedValue, columnFormat.displayName, columnFormat, htmlRowStyles, htmlColumnStyles);
-                    [teamsRowStyles, teamsColumnStyles] = mapTeamsStyles(htmlColumnNames, htmlRowStyles, htmlColumnStyles, teamsRowStyles, teamsColumnStyles);
                     if (rowIdx === 0) {
                         htmlColumnNames.push(columnFormat.displayName);
                     }
@@ -1108,7 +1123,6 @@ export function transformDatagrid(rows, datagridState, locale, condition) {
                                 chartRow[adjDisplayName] = formatNumberEnabled(columnFormat.valueFormat) ? value : formattedValue;
                                 htmlRowValues.push(formattedValue);
                                 [htmlRowStyles, htmlColumnStyles] = processHtmlStyles(formattedValue, adjDisplayName, columnFormat, htmlRowStyles, htmlColumnStyles);
-                                [teamsRowStyles, teamsColumnStyles] = mapTeamsStyles(htmlColumnNames, htmlRowStyles, htmlColumnStyles, teamsRowStyles, teamsColumnStyles);
                                 if (rowIdx === 0) {
                                     htmlColumnNames.push(adjDisplayName);
                                 }
@@ -1133,6 +1147,7 @@ export function transformDatagrid(rows, datagridState, locale, condition) {
             if (rowIdx < HTML_ROWS) {
                 htmlBuf += buildHtmlRow(htmlRowValues, htmlRowStyles, htmlColumnStyles, HTML_COLS);
                 if (rowIdx < TEAMS_ROWS) {
+                    [teamsRowStyles, teamsColumnStyles] = mapTeamsStyles(htmlColumnNames, htmlRowStyles, htmlColumnStyles, teamsRowStyles, teamsColumnStyles);
                     teamsRows.push(createTeamsTableRow(htmlColumnNames, htmlRowValues, teamsRowStyles, teamsColumnStyles));
                 }
             }
@@ -1167,7 +1182,6 @@ export function transformDatagrid(rows, datagridState, locale, condition) {
                 chartRow[columnFormat.displayName] = formatNumberEnabled(columnFormat.valueFormat) ? value : formattedValue;
                 htmlRowValues.push(formattedValue);
                 [htmlRowStyles, htmlColumnStyles] = processHtmlStyles(formattedValue, columnFormat.displayName, columnFormat, htmlRowStyles, htmlColumnStyles);
-                [teamsRowStyles, teamsColumnStyles] = mapTeamsStyles(htmlColumnNames, htmlRowStyles, htmlColumnStyles, teamsRowStyles, teamsColumnStyles);
                 if (rowIdx === 0) {
                     htmlColumnNames.push(columnFormat.displayName);
                 }
@@ -1180,6 +1194,7 @@ export function transformDatagrid(rows, datagridState, locale, condition) {
             if (rowIdx < HTML_ROWS) {
                 htmlBuf += buildHtmlRow(htmlRowValues, htmlRowStyles, htmlColumnStyles, HTML_COLS);
                 if (rowIdx < TEAMS_ROWS) {
+                    [teamsRowStyles, teamsColumnStyles] = mapTeamsStyles(htmlColumnNames, htmlRowStyles, htmlColumnStyles, teamsRowStyles, teamsColumnStyles);
                     teamsRows.push(createTeamsTableRow(htmlColumnNames, htmlRowValues, teamsRowStyles, teamsColumnStyles));
                 }
             }

package/dist/chatwms/teams.js

@@ -35,14 +35,18 @@ export function createTeamsTableCard(title, table, summary) {
     };
 }
 export function createTeamsValueCard(title, columnName, value, styles, summary) {
-    let teamsStyles = [];
-    let _ = [];
-    [teamsStyles, _] = mapTeamsStyles([columnName], styles, [], _, teamsStyles);
+    let rowStyles = [];
+    let columnStyles = [];
+    [rowStyles, columnStyles] = mapTeamsStyles([columnName], styles, [], rowStyles, columnStyles);
+    console.log(styles);
+    console.log('--==--==--==--==--==--==--==--==--');
+    console.log(columnStyles);
     let color = undefined;
     let style = undefined;
     let weight = undefined;
     let isSubtle = undefined;
-    for (const styles of teamsStyles) {
+    let italic = undefined;
+    for (const styles of columnStyles) {
         if (!!styles.color) {
             color = styles.color;
         }
@@ -55,6 +59,9 @@ export function createTeamsValueCard(title, columnName, value, styles, summary)
         if (!!styles.isSubtle) {
             isSubtle = styles.isSubtle;
         }
+        if (!!styles.italic) {
+            italic = styles.italic;
+        }
     }
     return {
         type: "AdaptiveCard",
@@ -68,7 +75,7 @@ export function createTeamsValueCard(title, columnName, value, styles, summary)
                 items: [
                     {
                         type: "TextBlock",
-                        text: value,
+                        text: italic ? `*${value}*` : value,
                         wrap: true,
                         size: "ExtraLarge",
                         color,

package/package.json

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