Merge pull request #17849 from jeclrsg/hpcc-29723-grid-selection-count

HPCC-29723 ECL Watch v9 show count of selected rows on list pages Reviewed-by: Gordon Smith <[email protected]> Merged-by: Gavin Halliday <[email protected]>
hpcc-systems · Oct 4, 2023 · c37a140 · c37a140
2 parents cd7bc2f + 04b6ba3
commit c37a140
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 1 deletion.
diff --git a/esp/src/src-react/components/DFUWorkunits.tsx b/esp/src/src-react/components/DFUWorkunits.tsx
@@ -277,6 +277,7 @@ export const DFUWorkunits: React.FunctionComponent<DFUWorkunitsProps> = ({
         footer={<FluentPagedFooter
             persistID={"dfuworkunits"}
             pageNum={pageNum}
+            selectionCount={selection.length}
             setPageNum={setPageNum}
             setPageSize={setPageSize}
             total={total}

diff --git a/esp/src/src-react/components/EventScheduler.tsx b/esp/src/src-react/components/EventScheduler.tsx
@@ -187,6 +187,7 @@ export const EventScheduler: React.FunctionComponent<EventSchedulerProps> = ({
         footer={<FluentPagedFooter
             persistID={"events"}
             pageNum={pageNum}
+            selectionCount={selection.length}
             setPageNum={setPageNum}
             setPageSize={setPageSize}
             total={total}

diff --git a/esp/src/src-react/components/Files.tsx b/esp/src/src-react/components/Files.tsx
@@ -357,6 +357,7 @@ export const Files: React.FunctionComponent<FilesProps> = ({
         footer={<FluentPagedFooter
             persistID={"files"}
             pageNum={pageNum}
+            selectionCount={selection.length}
             setPageNum={setPageNum}
             setPageSize={setPageSize}
             total={total}

diff --git a/esp/src/src-react/components/GroupMembers.tsx b/esp/src/src-react/components/GroupMembers.tsx
@@ -149,6 +149,7 @@ export const GroupMembers: React.FunctionComponent<GroupMembersProps> = ({
             footer={<FluentPagedFooter
                 persistID={"username"}
                 pageNum={pageNum}
+                selectionCount={selection.length}
                 setPageNum={setPageNum}
                 setPageSize={setPageSize}
                 total={total}

diff --git a/esp/src/src-react/components/Groups.tsx b/esp/src/src-react/components/Groups.tsx
@@ -169,6 +169,7 @@ export const Groups: React.FunctionComponent<GroupsProps> = ({
             footer={<FluentPagedFooter
                 persistID={"Name"}
                 pageNum={pageNum}
+                selectionCount={selection.length}
                 setPageNum={setPageNum}
                 setPageSize={setPageSize}
                 total={total}

diff --git a/esp/src/src-react/components/Logs.tsx b/esp/src/src-react/components/Logs.tsx
@@ -184,6 +184,7 @@ export const Logs: React.FunctionComponent<LogsProps> = ({
         footer={<FluentPagedFooter
             persistID={"cloudlogs"}
             pageNum={pageNum}
+            selectionCount={selection.length}
             setPageNum={setPageNum}
             setPageSize={setPageSize}
             total={total}

diff --git a/esp/src/src-react/components/Queries.tsx b/esp/src/src-react/components/Queries.tsx
@@ -301,6 +301,7 @@ export const Queries: React.FunctionComponent<QueriesProps> = ({
         footer={<FluentPagedFooter
             persistID={"queries"}
             pageNum={pageNum}
+            selectionCount={selection.length}
             setPageNum={setPageNum}
             setPageSize={setPageSize}
             total={total}

diff --git a/esp/src/src-react/components/Users.tsx b/esp/src/src-react/components/Users.tsx
@@ -199,6 +199,7 @@ export const Users: React.FunctionComponent<UsersProps> = ({
         footer={<FluentPagedFooter
             persistID={"username"}
             pageNum={pageNum}
+            selectionCount={selection.length}
             setPageNum={setPageNum}
             setPageSize={setPageSize}
             total={total}

diff --git a/esp/src/src-react/components/Workunits.tsx b/esp/src/src-react/components/Workunits.tsx
@@ -328,6 +328,7 @@ export const Workunits: React.FunctionComponent<WorkunitsProps> = ({
         footer={<FluentPagedFooter
             persistID={"workunits"}
             pageNum={pageNum}
+            selectionCount={selection.length}
             setPageNum={setPageNum}
             setPageSize={setPageSize}
             total={total}

diff --git a/esp/src/src-react/components/controls/Grid.tsx b/esp/src/src-react/components/controls/Grid.tsx
@@ -375,6 +375,7 @@ interface FluentPagedFooterProps {
     persistID: string,
     pageNum?: number,
     total: number,
+    selectionCount?: number,
     setPageNum: (pageNum: number) => void,
     setPageSize: (pageNum: number) => void
 }
@@ -383,6 +384,7 @@ export const FluentPagedFooter: React.FunctionComponent<FluentPagedFooterProps>
     persistID,
     pageNum = 1,
     total,
+    selectionCount = 0,
     setPageNum,
     setPageSize
 }) => {
@@ -463,7 +465,7 @@ export const FluentPagedFooter: React.FunctionComponent<FluentPagedFooterProps>
                     const start = props.selectedPageIndex === 0 ? 1 : (props.selectedPageIndex * props.itemsPerPage) + 1;
                     const end = (props.itemsPerPage * (props.selectedPageIndex + 1)) > props.totalItemCount ? props.totalItemCount : props.itemsPerPage * (props.selectedPageIndex + 1);
                     return <div className={paginationStyles.paginationLabel}>
-                        {start} {props.strings.divider} {end} {nlsHPCC.Of.toLowerCase()} {props.totalItemCount} {nlsHPCC.Rows}
+                        {start} {props.strings.divider} {end} {nlsHPCC.Of.toLowerCase()} {props.totalItemCount} {nlsHPCC.Rows} {selectionCount ? `(${selectionCount} ${nlsHPCC.Selected})` : ""}
                     </div>;
                 }}
             />

diff --git a/esp/src/src/nls/hpcc.ts b/esp/src/src/nls/hpcc.ts
@@ -818,6 +818,7 @@ export = {
         SecurityMessageHTML: "Only view HTML from trusted users.  This workunit was created by \"{__placeholder__}\".  \nRender HTML?",
         SeeConfigurationManager: "See Configuration Manager",
         SelectA: "Select a",
+        Selected: "Selected",
         SelectValue: "Select a value",
         SelectEllipsis: "Select...",
         SelectPackageFile: "Select Package File",