From 04b6ba35eed67fb1c7236ec597d2d3ad1266ccd2 Mon Sep 17 00:00:00 2001
From: Jeremy Clements <79224539+jeclrsg@users.noreply.github.com>
Date: Fri, 29 Sep 2023 12:44:03 -0400
Subject: [PATCH] HPCC-29723 ECL Watch v9 show count of selected rows on list
 pages

Signed-off-by: Jeremy Clements <79224539+jeclrsg@users.noreply.github.com>
---
 esp/src/src-react/components/DFUWorkunits.tsx   | 1 +
 esp/src/src-react/components/EventScheduler.tsx | 1 +
 esp/src/src-react/components/Files.tsx          | 1 +
 esp/src/src-react/components/GroupMembers.tsx   | 1 +
 esp/src/src-react/components/Groups.tsx         | 1 +
 esp/src/src-react/components/Logs.tsx           | 1 +
 esp/src/src-react/components/Queries.tsx        | 1 +
 esp/src/src-react/components/Users.tsx          | 1 +
 esp/src/src-react/components/Workunits.tsx      | 1 +
 esp/src/src-react/components/controls/Grid.tsx  | 4 +++-
 esp/src/src/nls/hpcc.ts                         | 1 +
 11 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/esp/src/src-react/components/DFUWorkunits.tsx b/esp/src/src-react/components/DFUWorkunits.tsx
index 94401b8541b..2c5e941c813 100644
--- 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
index 4321b9b6301..7ce97d0951e 100644
--- 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
index bf3ac13c21e..e759a3d5d22 100644
--- 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
index 5830ceb9dfe..53a714191c1 100644
--- 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
index 3bca83f8067..e685faf0544 100644
--- 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
index f404080986c..5ff36ba9762 100644
--- 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
index c3421a928b5..b069b7b0c4c 100644
--- 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
index 995bf3a490f..b7986a55ea0 100644
--- 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
index 9e3b46d2b57..c4592d5835a 100644
--- 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
index 52cc86c8d27..2d52e195a71 100644
--- 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
index 2478f135613..158814f741c 100644
--- 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",