update search count

client/app/components/Pagination/Pagination.jsx

@@ -46,16 +46,17 @@ class Pagination extends React.PureComponent {
       currentPage,
       pageSize,
       totalCases,
-      currentCases
+      currentCases,
+      searchValue
     } = this.props;
 
     // If there are no pages, there is no data, so the range should be 0-0.
     // Otherwise, the beginning of the range is the previous amount of cases + 1
-    const beginningCaseNumber = totalCases === 0 ? 0 : ((currentPage * pageSize) - pageSize + 1);
+    const beginningCaseNumber = searchValue ? (totalCases === 0 ? 0 : 1) : (totalCases === 0 ? 0 : ((currentPage * pageSize) - pageSize + 1));
     // If there are no pages, there is no data, so the range should be 0-0.
     // Otherwise, the end of the range is the previous amount of cases +
     // the amount of data in the current page.
-    const endingCaseNumber = totalCases === 0 ? 0 : (beginningCaseNumber + currentCases - 1);
+    const endingCaseNumber = searchValue ? totalCases : totalCases === 0 ? 0 : (beginningCaseNumber + currentCases - 1);
     // Create the range
     let currentCaseRange = `${beginningCaseNumber}-${endingCaseNumber}`;
     // Create the entire summary
@@ -147,7 +148,8 @@ Pagination.propTypes = {
   totalCases: PropTypes.number,
   updatePage: PropTypes.func.isRequired,
   table: PropTypes.oneOfType([PropTypes.instanceOf(Table), PropTypes.object]),
-  enableTopPagination: PropTypes.bool
+  enableTopPagination: PropTypes.bool,
+  searchValue: PropTypes.string
 };
 
 export default Pagination;

client/app/queue/QueueTable.jsx

@@ -780,16 +780,23 @@ export default class QueueTable extends React.PureComponent {
     }
 
     let paginationElements = null;
+    let currentCases;
 
     if (enablePagination && !this.state.loadingComponent) {
+      if (searchValue) {
+        currentCases = totalTaskCount = this.filterTasksFromSearchbar(rowObjects, searchValue)?.length
+      } else {
+        currentCases = rowObjects ? rowObjects.length : 0
+      }
       paginationElements = (
         <Pagination
           pageSize={casesPerPage || DEFAULT_CASES_PER_PAGE}
           currentPage={this.state.currentPage + 1}
-          currentCases={rowObjects ? rowObjects.length : 0}
+          currentCases={currentCases}
           totalPages={numberOfPages}
           totalCases={totalTaskCount}
           updatePage={(newPage) => this.updateCurrentPage(newPage)}
+          searchValue={searchValue}
         />
       );
     }