From 05e5432bd89caab2f86053ee6fa382d457ddbc69 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 28 Oct 2022 11:25:37 -0400
Subject: [PATCH] SearchKit - New setting to "Show Count in Header"

---
 .../displays/common/searchAdminPagerConfig.html           | 2 +-
 .../displays/common/searchButtonConfig.html               | 8 ++++++++
 .../traits/searchDisplayBaseTrait.service.js              | 2 +-
 .../ang/crmSearchDisplayGrid/crmSearchDisplayGrid.html    | 1 +
 .../ang/crmSearchDisplayList/crmSearchDisplayList.html    | 1 +
 .../ang/crmSearchDisplayTable/crmSearchDisplayTable.html  | 2 +-
 6 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ext/search_kit/ang/crmSearchAdmin/displays/common/searchAdminPagerConfig.html b/ext/search_kit/ang/crmSearchAdmin/displays/common/searchAdminPagerConfig.html
index 5dcc09c1f7..c2edebe9dd 100644
--- a/ext/search_kit/ang/crmSearchAdmin/displays/common/searchAdminPagerConfig.html
+++ b/ext/search_kit/ang/crmSearchAdmin/displays/common/searchAdminPagerConfig.html
@@ -20,7 +20,7 @@
     <div class="checkbox-inline form-control">
       <label>
         <input type="checkbox" ng-model="$ctrl.display.settings.pager.show_count" >
-        <span>{{:: ts('Show Count') }}</span>
+        <span>{{:: ts('Show Count in Pager') }}</span>
       </label>
     </div>
     <div class="checkbox-inline form-control">
diff --git a/ext/search_kit/ang/crmSearchAdmin/displays/common/searchButtonConfig.html b/ext/search_kit/ang/crmSearchAdmin/displays/common/searchButtonConfig.html
index 1424ee30dd..268c3a1e08 100644
--- a/ext/search_kit/ang/crmSearchAdmin/displays/common/searchButtonConfig.html
+++ b/ext/search_kit/ang/crmSearchAdmin/displays/common/searchButtonConfig.html
@@ -11,6 +11,14 @@
   </div>
   <input type="text" ng-show="$ctrl.display.settings.button" ng-model="$ctrl.display.settings.button" ng-model-options="{updateOn: 'blur'}" class="form-control" title="{{:: ts('Search button text') }}" placeholder="{{:: ts('Search button text') }}">
 </div>
+<div class="input-group">
+  <div class="checkbox-inline form-control">
+    <label>
+      <input type="checkbox" ng-model="$ctrl.display.settings.headerCount" >
+      <span>{{:: ts('Show Count in Header') }}</span>
+    </label>
+  </div>
+</div>
 <div class="input-group">
   <div class="checkbox-inline form-control" title="{{:: ts('Display a button for creating a new record') }}">
     <label>
diff --git a/ext/search_kit/ang/crmSearchDisplay/traits/searchDisplayBaseTrait.service.js b/ext/search_kit/ang/crmSearchDisplay/traits/searchDisplayBaseTrait.service.js
index 3146e9bf98..f83e7f1504 100644
--- a/ext/search_kit/ang/crmSearchDisplay/traits/searchDisplayBaseTrait.service.js
+++ b/ext/search_kit/ang/crmSearchDisplay/traits/searchDisplayBaseTrait.service.js
@@ -158,7 +158,7 @@
           if (!ctrl.rowCount || editedRow) {
             if (!ctrl.limit || ctrl.results.length < ctrl.limit) {
               ctrl.rowCount = ctrl.results.length;
-            } else if (ctrl.settings.pager) {
+            } else if (ctrl.settings.pager || ctrl.settings.headerCount) {
               var params = ctrl.getApiParams('row_count');
               crmApi4('SearchDisplay', 'run', params).then(function(result) {
                 ctrl.rowCount = result.count;
diff --git a/ext/search_kit/ang/crmSearchDisplayGrid/crmSearchDisplayGrid.html b/ext/search_kit/ang/crmSearchDisplayGrid/crmSearchDisplayGrid.html
index 5e34daf997..7b7706b8cc 100644
--- a/ext/search_kit/ang/crmSearchDisplayGrid/crmSearchDisplayGrid.html
+++ b/ext/search_kit/ang/crmSearchDisplayGrid/crmSearchDisplayGrid.html
@@ -1,6 +1,7 @@
 <div class="crm-search-display crm-search-display-grid">
   <div class="form-inline">
     <div class="btn-group" ng-include="'~/crmSearchDisplay/SearchButton.html'" ng-if="$ctrl.settings.button"></div>
+    <span ng-if="$ctrl.settings.headerCount" ng-include="'~/crmSearchDisplay/ResultCount.html'"></span>
     <div class="btn-group pull-right" ng-include="'~/crmSearchDisplay/AddButton.html'" ng-if="$ctrl.settings.addButton.path"></div>
   </div>
   <div
diff --git a/ext/search_kit/ang/crmSearchDisplayList/crmSearchDisplayList.html b/ext/search_kit/ang/crmSearchDisplayList/crmSearchDisplayList.html
index ec1eaac3a7..494ef0a601 100644
--- a/ext/search_kit/ang/crmSearchDisplayList/crmSearchDisplayList.html
+++ b/ext/search_kit/ang/crmSearchDisplayList/crmSearchDisplayList.html
@@ -1,6 +1,7 @@
 <div class="crm-search-display crm-search-display-list">
   <div class="form-inline">
     <div class="btn-group" ng-include="'~/crmSearchDisplay/SearchButton.html'" ng-if="$ctrl.settings.button"></div>
+    <span ng-if="$ctrl.settings.headerCount" ng-include="'~/crmSearchDisplay/ResultCount.html'"></span>
     <div class="btn-group pull-right" ng-include="'~/crmSearchDisplay/AddButton.html'" ng-if="$ctrl.settings.addButton.path"></div>
   </div>
   <ol ng-if=":: $ctrl.settings.style === 'ol'" ng-include="'~/crmSearchDisplayList/crmSearchDisplayList' + ($ctrl.loading ? 'Loading' : 'Items') + '.html'" ng-style="{'list-style': $ctrl.settings.symbol}"></ol>
diff --git a/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTable.html b/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTable.html
index 6e457e69bf..3b1da3d641 100644
--- a/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTable.html
+++ b/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTable.html
@@ -2,7 +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>
+    <span ng-if="$ctrl.settings.headerCount" ng-include="'~/crmSearchDisplay/ResultCount.html'"></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