From 011fd821ac9218edc211f15099d19157335ff952 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 31 Aug 2021 17:29:53 -0400
Subject: [PATCH] SearchKit - Fix pager count and add 'None Found' text in
 empty tables

---
 ext/search_kit/ang/crmSearchDisplay/Pager.html            | 2 +-
 ext/search_kit/ang/crmSearchDisplay/SearchButton.html     | 2 +-
 .../traits/searchDisplayBaseTrait.service.js              | 6 ++++++
 .../crmSearchDisplayTable/crmSearchDisplayTableBody.html  | 8 +++++++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ext/search_kit/ang/crmSearchDisplay/Pager.html b/ext/search_kit/ang/crmSearchDisplay/Pager.html
index d33473c687..00bd38b32b 100644
--- a/ext/search_kit/ang/crmSearchDisplay/Pager.html
+++ b/ext/search_kit/ang/crmSearchDisplay/Pager.html
@@ -30,7 +30,7 @@
       <label for="crm-search-results-page-size" >
         {{:: ts('Page Size') }}
       </label>
-      <input class="form-control" id="crm-search-results-page-size" type="number" ng-model="$ctrl.limit" min="10" step="10" ng-change="onChangeLimit()">
+      <input class="form-control" id="crm-search-results-page-size" type="number" ng-model="$ctrl.limit" min="10" step="10">
     </div>
   </div>
 </div>
diff --git a/ext/search_kit/ang/crmSearchDisplay/SearchButton.html b/ext/search_kit/ang/crmSearchDisplay/SearchButton.html
index 542d61996d..9f20d5e955 100644
--- a/ext/search_kit/ang/crmSearchDisplay/SearchButton.html
+++ b/ext/search_kit/ang/crmSearchDisplay/SearchButton.html
@@ -1,4 +1,4 @@
-<button type="button" class="btn btn-primary" ng-click="$ctrl.getResults()" ng-disabled="$ctrl.loading">
+<button type="button" class="btn btn-primary" ng-click="$ctrl.onClickSearchButton()" ng-disabled="$ctrl.loading">
   <i ng-if="$ctrl.loading" class="crm-i fa-spin fa-spinner"></i>
   <i ng-if="!$ctrl.loading" class="crm-i fa-search"></i>
   {{:: $ctrl.settings.button }}
diff --git a/ext/search_kit/ang/crmSearchDisplay/traits/searchDisplayBaseTrait.service.js b/ext/search_kit/ang/crmSearchDisplay/traits/searchDisplayBaseTrait.service.js
index b2a4e9d7f6..5dd5b827db 100644
--- a/ext/search_kit/ang/crmSearchDisplay/traits/searchDisplayBaseTrait.service.js
+++ b/ext/search_kit/ang/crmSearchDisplay/traits/searchDisplayBaseTrait.service.js
@@ -131,6 +131,12 @@
         };
       },
 
+      onClickSearchButton: function() {
+        this.rowCount = null;
+        this.page = 1;
+        this.getResults();
+      },
+
       // Call SearchDisplay.run and update ctrl.results and ctrl.rowCount
       runSearch: function(editedRow) {
         var ctrl = this,
diff --git a/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTableBody.html b/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTableBody.html
index 3bdf16c9bc..af14b31abe 100644
--- a/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTableBody.html
+++ b/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTableBody.html
@@ -4,5 +4,11 @@
   </td>
   <td ng-repeat="col in $ctrl.settings.columns" ng-include="'~/crmSearchDisplay/colType/' + col.type + '.html'" title="{{:: $ctrl.replaceTokens(col.title, row) }}" class="{{:: col.alignment }}">
   </td>
-  <td></td>
+</tr>
+<tr ng-if="$ctrl.rowCount === 0">
+  <td colspan="{{ $ctrl.settings.columns.length + 2 }}">
+    <p class="alert alert-info text-center">
+      {{:: ts('None Found') }}
+    </p>
+  </td>
 </tr>
-- 
2.25.1