From 9c33eb8e84cdcec1a27cbae86048b65dcb2fa00b Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 16 Aug 2021 15:34:45 -0400
Subject: [PATCH] SearchKit - Reset selection after bulk updates

---
 .../resultsTable/crmSearchAdminResultsTable.html            | 2 +-
 .../ang/crmSearchDisplayTable/crmSearchDisplayTable.html    | 2 +-
 .../traits/searchDisplayTasksTrait.service.js               | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ext/search_kit/ang/crmSearchAdmin/resultsTable/crmSearchAdminResultsTable.html b/ext/search_kit/ang/crmSearchAdmin/resultsTable/crmSearchAdminResultsTable.html
index 67ac27fef9..7d832e06bd 100644
--- a/ext/search_kit/ang/crmSearchAdmin/resultsTable/crmSearchAdminResultsTable.html
+++ b/ext/search_kit/ang/crmSearchAdmin/resultsTable/crmSearchAdminResultsTable.html
@@ -2,7 +2,7 @@
   <div ng-include="'~/crmSearchAdmin/resultsTable/debug.html'"></div>
   <div class="form-inline">
     <div class="btn-group" ng-include="'~/crmSearchDisplay/SearchButton.html'"></div>
-    <crm-search-tasks entity="$ctrl.apiEntity" ids="$ctrl.selectedRows" refresh="$ctrl.getResults()"></crm-search-tasks>
+    <crm-search-tasks entity="$ctrl.apiEntity" ids="$ctrl.selectedRows" refresh="$ctrl.refreshAfterTask()"></crm-search-tasks>
   </div>
   <table>
     <thead>
diff --git a/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTable.html b/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTable.html
index ed055562f9..dc890ce6ea 100644
--- a/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTable.html
+++ b/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTable.html
@@ -1,7 +1,7 @@
 <div class="crm-search-display crm-search-display-table">
   <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" refresh="$ctrl.getResults()"></crm-search-tasks>
+    <crm-search-tasks ng-if="$ctrl.settings.actions" entity="$ctrl.apiEntity" ids="$ctrl.selectedRows" refresh="$ctrl.refreshAfterTask()"></crm-search-tasks>
   </div>
   <table>
     <thead>
diff --git a/ext/search_kit/ang/crmSearchTasks/traits/searchDisplayTasksTrait.service.js b/ext/search_kit/ang/crmSearchTasks/traits/searchDisplayTasksTrait.service.js
index 27475eac63..47a1870985 100644
--- a/ext/search_kit/ang/crmSearchTasks/traits/searchDisplayTasksTrait.service.js
+++ b/ext/search_kit/ang/crmSearchTasks/traits/searchDisplayTasksTrait.service.js
@@ -52,6 +52,12 @@
         return this.allRowsSelected || _.includes(this.selectedRows, row.id);
       },
 
+      refreshAfterTask: function() {
+        this.selectedRows.length = 0;
+        this.allRowsSelected = false;
+        this.runSearch();
+      },
+
       // Overwrite empty onChangeFilters array from searchDisplayBaseTrait
       onChangeFilters: [function() {
         // Reset selection when filters are changed
-- 
2.25.1