Merge pull request #19578 from jeclrsg/hpcc-33392-metrics-kind-formatting

HPCC-33392 ECL Watch v9 Metrics Kind formatting

Author: GordonSmith

esp/src/package-lock.json

@@ -47,7 +47,7 @@
     "@hpcc-js/chart": "2.86.0",
     "@hpcc-js/codemirror": "2.65.0",
     "@hpcc-js/common": "2.73.0",
-    "@hpcc-js/comms": "2.99.0",
+    "@hpcc-js/comms": "2.99.1",
     "@hpcc-js/dataflow": "8.1.7",
     "@hpcc-js/eclwatch": "2.76.1",
     "@hpcc-js/graph": "2.87.0",

esp/src/package.json

@@ -41,14 +41,16 @@ export class ScopesTable extends Table {
                 field = filter.substring(0, colonIdx);
             }
             if (field) {
-                const value: string = !matchCase ? row[field]?.toString().toLowerCase() : row[field]?.toString();
+                const rawValue: string = !matchCase ? row[field]?.toString().toLowerCase() : row[field]?.toString();
+                const formattedValue: string = !matchCase ? row.__formattedProps[field]?.toString().toLowerCase() : row.__formattedProps[field]?.toString();
                 const filterValue: string = !matchCase ? filter.toLowerCase() : filter;
-                return value?.indexOf(filterValue.substring(colonIdx + 1)) >= 0 ?? false;
+                return (rawValue?.indexOf(filterValue.substring(colonIdx + 1)) >= 0 || formattedValue?.indexOf(filterValue.substring(colonIdx + 1)) >= 0) ?? false;
             }
             for (const field in row) {
-                const value: string = !matchCase ? row[field].toString().toLowerCase() : row[field].toString();
+                const rawValue: string = !matchCase ? row[field]?.toString().toLowerCase() : row[field]?.toString();
+                const formattedValue: string = !matchCase ? row.__formattedProps[field]?.toString().toLowerCase() : row.__formattedProps[field]?.toString();
                 const filterValue: string = !matchCase ? filter.toLowerCase() : filter;
-                return value?.indexOf(filterValue) >= 0 ?? false;
+                return (rawValue?.indexOf(filterValue) >= 0 || formattedValue?.indexOf(filterValue) >= 0) ?? false;
             }
             return false;
         }