Merge pull request #27199 from colemanw/fixSkTotals

SearchKit - Fix broken totals row and query output
civicrm · Sep 3, 2023 · 6918fed · 6918fed
2 parents 0f7ea0f + 7dc1a37
commit 6918fed
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/ext/search_kit/ang/crmSearchAdmin/resultsTable/crmSearchAdminResultsTable.component.js b/ext/search_kit/ang/crmSearchAdmin/resultsTable/crmSearchAdminResultsTable.component.js
@@ -43,10 +43,12 @@
 
       // Add callbacks for pre & post run
       this.onPreRun.push(function(apiCalls) {
-        apiCalls.run.debug = true;
+        // So the raw SQL can be shown in the "Query Info" tab
+        apiCalls.run[2].debug = true;
       });
 
       this.onPostRun.push(function(apiResults) {
+        // Add debug output (e.g. raw SQL) to the "Query Info" tab
         ctrl.debug = _.extend(_.pick(ctrl.debug, 'apiParams'), apiResults.run.debug);
       });
 

diff --git a/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTable.component.js b/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTable.component.js
@@ -22,10 +22,11 @@
       this.$onInit = function() {
         var tallyParams;
 
+        // Copy API params from the run and adapt them in a secondary `tally` call for the "Totals" row
         if (ctrl.settings.tally) {
           ctrl.onPreRun.push(function (apiCalls) {
             ctrl.tally = null;
-            tallyParams = _.cloneDeep(apiCalls.run);
+            tallyParams = _.cloneDeep(apiCalls.run[2]);
           });
 
           ctrl.onPostRun.push(function (apiResults, status) {