HPCC-32425 ECL Watch v9 copy to clipboard missing columns

fixes some missing headers and columns when using the copy selection to clipboard from the Files, Workunits and Queries list pages Signed-off-by: Jeremy Clements <[email protected]>
hpcc-systems · Aug 19, 2024 · a4cc067 · a4cc067
1 parent 44f7563
commit a4cc067
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/esp/src/src-react/components/Files.tsx b/esp/src/src-react/components/Files.tsx
@@ -156,6 +156,7 @@ export const Files: React.FunctionComponent<FilesProps> = ({
                     }
                     return "";
                 },
+                field: nlsHPCC.Protected,
             },
             IsCompressed: {
                 headerIcon: "ZipFolder",
@@ -168,6 +169,7 @@ export const Files: React.FunctionComponent<FilesProps> = ({
                     }
                     return "";
                 },
+                field: nlsHPCC.Compressed,
             },
             Name: {
                 label: nlsHPCC.LogicalName,
@@ -194,18 +196,21 @@ export const Files: React.FunctionComponent<FilesProps> = ({
                 formatter: (value, row) => {
                     return Utility.formatNum(row.IntRecordCount);
                 },
+                csvFormatter: (value, row) => row.IntRecordCount,
             },
             FileSize: {
                 label: nlsHPCC.Size,
                 formatter: (value, row) => {
                     return Utility.convertedSize(row.IntSize);
                 },
+                csvFormatter: (value, row) => row.IntSize,
             },
             CompressedFileSizeString: {
                 label: nlsHPCC.CompressedSize,
                 formatter: (value, row) => {
                     return Utility.convertedSize(row.CompressedFileSize);
-                }
+                },
+                csvFormatter: (value, row) => row.CompressedFileSize,
             },
             Parts: {
                 label: nlsHPCC.Parts, width: 40,

diff --git a/esp/src/src-react/components/Queries.tsx b/esp/src/src-react/components/Queries.tsx
@@ -112,7 +112,8 @@ export const Queries: React.FunctionComponent<QueriesProps> = ({
                         return <Icon iconName="Pause" />;
                     }
                     return "";
-                }
+                },
+                field: nlsHPCC.Suspended,
             },
             ErrorCount: {
                 headerIcon: "Warning",
@@ -124,7 +125,8 @@ export const Queries: React.FunctionComponent<QueriesProps> = ({
                         return <Icon iconName="Warning" />;
                     }
                     return "";
-                }
+                },
+                field: nlsHPCC.ErrorWarnings,
             },
             MixedNodeStates: {
                 headerIcon: "Error",
@@ -136,7 +138,7 @@ export const Queries: React.FunctionComponent<QueriesProps> = ({
                         return <Icon iconName="Error" />;
                     }
                     return "";
-                }
+                },
             },
             Activated: {
                 headerIcon: "SkypeCircleCheck",
@@ -147,7 +149,8 @@ export const Queries: React.FunctionComponent<QueriesProps> = ({
                         return <Icon iconName="SkypeCircleCheck" />;
                     }
                     return "";
-                }
+                },
+                field: nlsHPCC.Active,
             },
             Id: {
                 label: nlsHPCC.ID,

diff --git a/esp/src/src-react/components/Workunits.tsx b/esp/src/src-react/components/Workunits.tsx
@@ -116,7 +116,8 @@ export const Workunits: React.FunctionComponent<WorkunitsProps> = ({
                         return <Icon iconName="LockSolid" />;
                     }
                     return "";
-                }
+                },
+                field: nlsHPCC.Protected,
             },
             Wuid: {
                 label: nlsHPCC.WUID, width: 120,
@@ -143,23 +144,20 @@ export const Workunits: React.FunctionComponent<WorkunitsProps> = ({
             "Compile Cost": {
                 label: nlsHPCC.CompileCost, width: 100,
                 justify: "right",
-                formatter: (cost, row) => {
-                    return `${formatCost(row.CompileCost)}`;
-                }
+                formatter: (cost, row) => `${formatCost(row.CompileCost)}`,
+                csvFormatter: (cost, row) => row.CompileCost,
             },
             "Execution Cost": {
                 label: nlsHPCC.ExecuteCost, width: 100,
                 justify: "right",
-                formatter: (cost, row) => {
-                    return `${formatCost(row.ExecuteCost)}`;
-                }
+                formatter: (cost, row) => `${formatCost(row.ExecuteCost)}`,
+                csvFormatter: (cost, row) => row.ExecuteCost,
             },
             "File Access Cost": {
                 label: nlsHPCC.FileAccessCost, width: 100,
                 justify: "right",
-                formatter: (cost, row) => {
-                    return `${formatCost(row.FileAccessCost)}`;
-                }
+                formatter: (cost, row) => `${formatCost(row.FileAccessCost)}`,
+                csvFormatter: (cost, row) => row.FileAccessCost,
             }
         };
     }, [filter]);