From 16f9dbd91da700a4204bde140f88209866a8877f Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 27 Oct 2022 11:59:53 -0400
Subject: [PATCH] SearchKit - Show result count at top of table

Fixes dev/core#3944
Shows result count at the top of the table, not just in the pager.
Only shows the count if the search button or actions are enabled.
---
 .../resultsTable/crmSearchAdminResultsTable.html          | 1 +
 ext/search_kit/ang/crmSearchDisplay/Pager.html            | 8 +-------
 ext/search_kit/ang/crmSearchDisplay/ResultCount.html      | 6 ++++++
 .../ang/crmSearchDisplayTable/crmSearchDisplayTable.html  | 1 +
 4 files changed, 9 insertions(+), 7 deletions(-)
 create mode 100644 ext/search_kit/ang/crmSearchDisplay/ResultCount.html

diff --git a/ext/search_kit/ang/crmSearchAdmin/resultsTable/crmSearchAdminResultsTable.html b/ext/search_kit/ang/crmSearchAdmin/resultsTable/crmSearchAdminResultsTable.html
index 31e8b6f0e8..da300b4a96 100644
--- a/ext/search_kit/ang/crmSearchAdmin/resultsTable/crmSearchAdminResultsTable.html
+++ b/ext/search_kit/ang/crmSearchAdmin/resultsTable/crmSearchAdminResultsTable.html
@@ -3,6 +3,7 @@
   <div class="form-inline">
     <div class="btn-group" ng-include="'~/crmSearchDisplay/SearchButton.html'"></div>
     <crm-search-tasks entity="$ctrl.apiEntity" ids="$ctrl.selectedRows" search="$ctrl.search" display="$ctrl.display" display-controller="$ctrl" refresh="$ctrl.refreshAfterTask()"></crm-search-tasks>
+    <span ng-include="'~/crmSearchDisplay/ResultCount.html'"></span>
   </div>
   <table class="{{:: $ctrl.settings.classes.join(' ') }}">
     <thead>
diff --git a/ext/search_kit/ang/crmSearchDisplay/Pager.html b/ext/search_kit/ang/crmSearchDisplay/Pager.html
index 00bd38b32b..5c35f17c88 100644
--- a/ext/search_kit/ang/crmSearchDisplay/Pager.html
+++ b/ext/search_kit/ang/crmSearchDisplay/Pager.html
@@ -1,12 +1,6 @@
 <div class="crm-flex-box crm-search-display-pager" ng-if="$ctrl.rowCount && $ctrl.settings.pager">
   <div>
-    <div class="form-inline" ng-if="$ctrl.settings.pager.show_count">
-      <label ng-if="$ctrl.rowCount === 1">
-        {{ $ctrl.selectedRows && $ctrl.selectedRows.length ? ts('%1 selected of 1 result', {1: $ctrl.selectedRows.length}) : ts('1 result') }}
-      </label>
-      <label ng-if="$ctrl.rowCount === 0 || $ctrl.rowCount > 1">
-        {{ $ctrl.selectedRows && $ctrl.selectedRows.length ? ts('%1 selected of %2 results', {1: $ctrl.selectedRows.length, 2: $ctrl.rowCount}) : ts('%1 results', {1: $ctrl.rowCount}) }}
-      </label>
+    <div class="form-inline" ng-if="$ctrl.settings.pager.show_count" ng-include="'~/crmSearchDisplay/ResultCount.html'">
     </div>
   </div>
   <div class="text-center crm-flex-2">
diff --git a/ext/search_kit/ang/crmSearchDisplay/ResultCount.html b/ext/search_kit/ang/crmSearchDisplay/ResultCount.html
new file mode 100644
index 0000000000..803a63d389
--- /dev/null
+++ b/ext/search_kit/ang/crmSearchDisplay/ResultCount.html
@@ -0,0 +1,6 @@
+<label ng-if="$ctrl.rowCount === 1">
+  {{ $ctrl.selectedRows && $ctrl.selectedRows.length ? ts('%1 selected of 1 result', {1: $ctrl.selectedRows.length}) : ts('1 result') }}
+</label>
+<label ng-if="$ctrl.rowCount === 0 || $ctrl.rowCount > 1">
+  {{ $ctrl.selectedRows && $ctrl.selectedRows.length ? ts('%1 selected of %2 results', {1: $ctrl.selectedRows.length, 2: $ctrl.rowCount}) : ts('%1 results', {1: $ctrl.rowCount}) }}
+</label>
diff --git a/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTable.html b/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTable.html
index 73e4104970..6e457e69bf 100644
--- a/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTable.html
+++ b/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTable.html
@@ -2,6 +2,7 @@
   <div class="form-inline">
     <div class="btn-group" ng-include="'~/crmSearchDisplay/SearchButton.html'" ng-if="$ctrl.settings.button"></div>
     <crm-search-tasks ng-if="$ctrl.settings.actions" entity="$ctrl.apiEntity" ids="$ctrl.selectedRows" search="$ctrl.search" display="$ctrl.display" display-controller="$ctrl" refresh="$ctrl.refreshAfterTask()"></crm-search-tasks>
+    <span ng-include="'~/crmSearchDisplay/ResultCount.html'" ng-if="$ctrl.settings.button || $ctrl.settings.actions"></span>
     <div class="btn-group pull-right" ng-include="'~/crmSearchDisplay/AddButton.html'" ng-if="$ctrl.settings.addButton.path"></div>
   </div>
   <table class="{{:: $ctrl.settings.classes.join(' ') }}">
-- 
2.25.1