From 81911ba3b0500fbdd6c762b6f493a4b971c31860 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 17 May 2021 22:26:50 -0400
Subject: [PATCH] SearchKit - Use default_pager_size setting

---
 ext/search_kit/Civi/Search/Admin.php                          | 1 +
 ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.component.js | 4 +---
 .../displays/searchAdminDisplayList.component.js              | 2 +-
 .../displays/searchAdminDisplayTable.component.js             | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ext/search_kit/Civi/Search/Admin.php b/ext/search_kit/Civi/Search/Admin.php
index b516429806..f39a25a606 100644
--- a/ext/search_kit/Civi/Search/Admin.php
+++ b/ext/search_kit/Civi/Search/Admin.php
@@ -32,6 +32,7 @@ class Admin {
       'functions' => \CRM_Api4_Page_Api4Explorer::getSqlFunctions(),
       'displayTypes' => Display::getDisplayTypes(['id', 'name', 'label', 'description', 'icon']),
       'styles' => \CRM_Utils_Array::makeNonAssociative(self::getStyles()),
+      'defaultPagerSize' => \Civi::settings()->get('default_pager_size'),
       'afformEnabled' => $extensions->isActiveModule('afform'),
       'afformAdminEnabled' => $extensions->isActiveModule('afform_admin'),
     ];
diff --git a/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.component.js b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.component.js
index 84eef3d1e8..e74f79a6d0 100644
--- a/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.component.js
+++ b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.component.js
@@ -13,7 +13,7 @@
       this.DEFAULT_AGGREGATE_FN = 'GROUP_CONCAT';
 
       this.selectedRows = [];
-      this.limit = CRM.cache.get('searchPageSize', 30);
+      this.limit = CRM.crmSearchAdmin.defaultPagerSize;
       this.page = 1;
       this.displayTypes = _.indexBy(CRM.crmSearchAdmin.displayTypes, 'id');
       // After a search this.results is an object of result arrays keyed by page,
@@ -569,8 +569,6 @@
       $scope.onChangeLimit = function() {
         // Refresh only if search has already been run
         if (ctrl.autoSearch || ctrl.results) {
-          // Save page size in localStorage
-          CRM.cache.set('searchPageSize', ctrl.limit);
           ctrl.refreshAll();
         }
       };
diff --git a/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayList.component.js b/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayList.component.js
index ac8e3483db..081b45393f 100644
--- a/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayList.component.js
+++ b/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayList.component.js
@@ -34,7 +34,7 @@
         if (!ctrl.display.settings) {
           ctrl.display.settings = {
             style: 'ul',
-            limit: 20,
+            limit: CRM.crmSearchAdmin.defaultPagerSize,
             pager: true
           };
         }
diff --git a/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayTable.component.js b/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayTable.component.js
index 343c14cfc8..937b85d174 100644
--- a/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayTable.component.js
+++ b/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayTable.component.js
@@ -18,7 +18,7 @@
       this.$onInit = function () {
         if (!ctrl.display.settings) {
           ctrl.display.settings = {
-            limit: 20,
+            limit: CRM.crmSearchAdmin.defaultPagerSize,
             pager: true
           };
         }
-- 
2.25.1