Merge pull request #15932 from GordonSmith/HPCC-27392

HPCC-27392: FluentUI Grid not honouring clearSelection of refresh

Reviewed-By: Jeremy Clements <jeremy.clements@lexisnexisrisk.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

esp/src/package-lock.json

@@ -5376,9 +5376,9 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
     "node_modules/mkdirp": {
@@ -12118,9 +12118,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
     "mkdirp": {

esp/src/package.json

@@ -4,7 +4,7 @@
   "description": "'ECL Watch' Web interface for HPCC Platform.",
   "scripts": {
     "clean": "rimraf ./build ./lib ./src/nlsHPCCType.ts",
-    "lint": "eslint eclwatch/**/*.js src/**/*.ts? src-react/**/*.ts?",
+    "lint": "eslint ./eclwatch ./src ./src-react",
     "lint-fix": "eslint --fix eclwatch/**/*.js src/**/*.ts src-react/**/*.ts?",
     "copy-res-es6-promise": "copyfiles -u 3 \"./node_modules/es6-promise/dist/es6-promise.auto.min.js\" ./build/node_modules/es6-promise/dist/",
     "copy-res-eclwatch-img": "copyfiles -u 2 \"./eclwatch/img/**/*.{png,jpg,gif}\" ./build/eclwatch/img/",

esp/src/src-react/hooks/activity.ts

@@ -23,7 +23,7 @@ export function useActivity(): [Activity, number, () => void] {
         return () => {
             active = false;
             handle.release();
-        }
+        };
     }, [count]);
 
     return [activity, lastUpdate, increment];

esp/src/src-react/hooks/grid.tsx

@@ -125,7 +125,7 @@ interface useFluentStoreGridResponse {
     selection: any[],
     copyButtons: ICommandBarItemProps[],
     total: number,
-    refreshTable: () => void
+    refreshTable: (clearSelection?: boolean) => void
 }
 
 function useFluentStoreGrid({
@@ -144,8 +144,17 @@ function useFluentStoreGrid({
     const [items, setItems] = React.useState<any[]>([]);
     const [total, setTotal] = React.useState<number>(0);
 
-    const refreshTable = React.useCallback(() => {
+    const selectionHandler = useConst(new Selection({
+        onSelectionChanged: () => {
+            setSelection(selectionHandler.getSelection());
+        }
+    }));
+
+    const refreshTable = React.useCallback((clearSelection = false) => {
         if (isNaN(start) || (isNaN(count) || count === 0)) return;
+        if (clearSelection) {
+            selectionHandler.setItems([], true);
+        }
         const storeQuery = store.query(query ?? {}, { start, count, sort: sorted ? [sorted] : undefined });
         storeQuery.total.then(total => {
             setTotal(total);
@@ -153,7 +162,7 @@ function useFluentStoreGrid({
         storeQuery.then(items => {
             setItems(items);
         });
-    }, [count, query, sorted, start, store]);
+    }, [count, query, selectionHandler, sorted, start, store]);
 
     React.useEffect(() => {
         refreshTable();
@@ -183,12 +192,6 @@ function useFluentStoreGrid({
         });
     }, [constColumns]);
 
-    const selectionHandler = useConst(new Selection({
-        onSelectionChanged: () => {
-            setSelection(selectionHandler.getSelection());
-        }
-    }));
-
     const renderDetailsHeader = React.useCallback((props: IDetailsHeaderProps, defaultRender?: any) => {
         return defaultRender({
             ...props,
@@ -262,7 +265,7 @@ interface useFluentPagedGridResponse {
     Grid: React.FunctionComponent<{ height?: string }>,
     GridPagination: React.FunctionComponent<Partial<IStackProps>>,
     selection: any[],
-    refreshTable: (full?: boolean) => void,
+    refreshTable: (clearSelection?: boolean) => void,
     copyButtons: ICommandBarItemProps[]
 }
 

esp/src/src-react/hooks/metrics.ts

@@ -36,11 +36,11 @@ export function useMetricsOptions(): [MetricsOptions, (opts: MetricsOptions) =>
             options[key] = opts[key];
         }
         refresh();
-    }, [options, refresh]);
+    }, [refresh]);
 
     const save = React.useCallback(() => {
         store?.set("MetricOptions", JSON.stringify(options), true);
-    }, [options, store]);
+    }, [store]);
 
     const reset = React.useCallback((toDefaults: boolean = false) => {
         if (toDefaults) {

esp/src/src/ECLArchiveWidget.ts

@@ -412,10 +412,10 @@ export class ECLArchiveWidget {
         function updateSummary(markers) {
             const propCounts = {};
             const propFormats = {};
-            const propSums = markers.reduce((ret, n)=>{
-                n.properties.forEach(prop=>{
-                    if(prop.Measure !== undefined){
-                        if(!propCounts[prop.Name]){
+            const propSums = markers.reduce((ret, n) => {
+                n.properties.forEach(prop => {
+                    if (prop.Measure !== undefined) {
+                        if (!propCounts[prop.Name]) {
                             propCounts[prop.Name] = 0;
                             propFormats[prop.Name] = prop.Measure;
                             ret[prop.Name] = 0;
@@ -426,21 +426,21 @@ export class ECLArchiveWidget {
                 });
                 return ret;
             }, {});
-            const propAvgs = Object.keys(propSums).reduce((ret, k)=>{
+            const propAvgs = Object.keys(propSums).reduce((ret, k) => {
                 ret[k] = propSums[k] / propCounts[k];
                 return ret;
             }, {});
             context.summaryTable
                 .columns(["Name", "Cnt", "Avg", "Sum"])
                 .data([
-                    ...Object.keys(propSums).map(k=>{
+                    ...Object.keys(propSums).map(k => {
                         let avg = propAvgs[k];
                         let sum = propSums[k];
 
                         const isTime = propFormats[k] === "ns";
                         const isSize = propFormats[k] === "sz";
 
-                        if(isTime) {
+                        if (isTime) {
                             avg = _formatTime(avg);
                             sum = _formatTime(sum);
                         } else if (isSize) {
@@ -460,17 +460,17 @@ export class ECLArchiveWidget {
                 ])
                 .lazyRender()
                 ;
-            function _formatTime(v){
-                if(v > 1000000000) {
+            function _formatTime(v) {
+                if (v > 1000000000) {
                     return (v / 1000000000).toFixed(3) + "s";
                 }
                 return (v / 1000000).toFixed(3) + "ms";
             }
-            function _formatSize(v){
-                if(v > 1000000000) {
+            function _formatSize(v) {
+                if (v > 1000000000) {
                     return (v * 0.000000000931).toFixed(3) + "Gb";
                 }
-                else if(v > 1000000) {
+                else if (v > 1000000) {
                     return (v * 0.0000009537).toFixed(3) + "Mb";
                 }
                 return (v * 0.000977).toFixed(3) + "Kb";
@@ -579,10 +579,10 @@ export class ECLArchiveWidget {
                     marker.color,
                     "Verdana",
                     "12px",
-                    () => {},
-                    () => {},
+                    () => { },
+                    () => { },
                     () => {
-                        if(context.selectedMarker === marker.lineNum) {
+                        if (context.selectedMarker === marker.lineNum) {
                             updateSummary(markers);
                             context.selectedMarker = -1;
                             const columnArr = context.summaryTable.columns();
@@ -594,9 +594,9 @@ export class ECLArchiveWidget {
                         } else {
 
                             const _data = markerTableData(marker);
-                            
+
                             context.summaryTable
-                                .columns(["Line: "+marker.lineNum, ...Array(_data[0].length).fill("")])
+                                .columns(["Line: " + marker.lineNum, ...Array(_data[0].length).fill("")])
                                 .data(_data)
                                 .lazyRender()
                                 ;
@@ -675,16 +675,16 @@ export class ECLArchiveWidget {
             return ret;
 
             function nsToTime(nanoseconds) {
-                let subSecond:string|number = Math.floor(nanoseconds % 100000000);
-                let seconds:string|number = Math.floor((nanoseconds / 1000000000) % 60);
-                let minutes:string|number = Math.floor((nanoseconds / (1000000000 * 60)) % 60);
-                let hours:string|number = Math.floor((nanoseconds / (1000000000 * 60 * 60)) % 24);
-                
+                const subSecond: string | number = Math.floor(nanoseconds % 100000000);
+                let seconds: string | number = Math.floor((nanoseconds / 1000000000) % 60);
+                let minutes: string | number = Math.floor((nanoseconds / (1000000000 * 60)) % 60);
+                let hours: string | number = Math.floor((nanoseconds / (1000000000 * 60 * 60)) % 24);
+
                 hours = (hours < 10) ? "0" + hours : hours;
                 minutes = (minutes < 10) ? "0" + minutes : minutes;
                 seconds = (seconds < 10) ? "0" + seconds : seconds;
-                
-                return String(hours).padStart(2,"0") + ":" + String(minutes) + ":" + String(seconds) + "." + String(subSecond).padStart(9,"0");
+
+                return String(hours).padStart(2, "0") + ":" + String(minutes) + ":" + String(seconds) + "." + String(subSecond).padStart(9, "0");
             }
         }
     }

esp/src/src/ESPSearch.ts

@@ -343,7 +343,7 @@ export function searchAll(searchText: string,
         searchParams.text = searchParams.text.trim();
 
         return searchParams;
-    }
+    };
 
     const searchArray = [];
     const searchParams = generateSearchParams(searchText);

esp/src/src/ws_access.ts

@@ -21,7 +21,7 @@ class UsersStore extends ESPRequest.Store {
     startProperty = "PageStartFrom";
     countProperty = "PageSize";
 
-    SortbyProperty = "SortBy"
+    SortbyProperty = "SortBy";
 
     groupname: string;
 
@@ -398,7 +398,7 @@ class PermissionsStore extends Memory {
         const tmp = id.split(CONCAT_SYMBOL);
         if (tmp.length > 0) {
             const parentID = tmp[0];
-            const parent = super.get(parentID);  
+            const parent = super.get(parentID);
             if (tmp.length === 1) {
                 return parent;
             }