From d70a909c10f40f38060574167edd572efb19fd40 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Sat, 5 Nov 2022 15:53:26 -0400 Subject: [PATCH] SearchKit - Add UI for configuring autocomplete fields --- .../crmSearchAdminDisplay.component.js | 14 ++++++- ....html => crmSearchAdminDisplayHeader.html} | 6 +-- .../displays/common/addColMenu.html | 4 +- .../crmSearchDisplayAutocomplete.component.js | 24 +++++++++++ ...earchAdminDisplayAutocomplete.component.js | 42 +++++++++++++++++++ .../searchAdminDisplayAutocomplete.html | 39 +++++++++++++++++ .../searchAdminDisplayGrid.component.js | 11 ++--- .../displays/searchAdminDisplayGrid.html | 1 + .../searchAdminDisplayList.component.js | 11 ++--- .../displays/searchAdminDisplayList.html | 1 + .../searchAdminDisplayTable.component.js | 8 ++-- .../displays/searchAdminDisplayTable.html | 1 + .../displays/searchDisplayAutocomplete.html | 3 ++ ext/search_kit/css/crmSearchAdmin.css | 1 + 14 files changed, 147 insertions(+), 19 deletions(-) rename ext/search_kit/ang/crmSearchAdmin/{crmSearchAdminDisplay.html => crmSearchAdminDisplayHeader.html} (67%) create mode 100644 ext/search_kit/ang/crmSearchAdmin/displays/crmSearchDisplayAutocomplete.component.js create mode 100644 ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayAutocomplete.component.js create mode 100644 ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayAutocomplete.html create mode 100644 ext/search_kit/ang/crmSearchAdmin/displays/searchDisplayAutocomplete.html diff --git a/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplay.component.js b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplay.component.js index 6e78b8446d..44192f1cd5 100644 --- a/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplay.component.js +++ b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplay.component.js @@ -12,7 +12,6 @@ template: function() { // Dynamic template generates switch condition for each display type var html = - '
\n' + '
\n'; _.each(CRM.crmSearchAdmin.displayTypes, function(type) { html += @@ -326,6 +325,19 @@ } }; + this.getDefaultLimit = function() { + return CRM.crmSearchAdmin.defaultPagerSize; + }; + + this.getDefaultSort = function() { + var apiEntity = ctrl.savedSearch.api_entity, + sort = []; + if (searchMeta.getEntity(apiEntity).order_by) { + sort.push([searchMeta.getEntity(apiEntity).order_by, 'ASC']); + } + return sort; + }; + this.fieldsForSort = function() { function disabledIf(key) { return _.findIndex(ctrl.display.settings.sort, [key]) >= 0; diff --git a/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplay.html b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplayHeader.html similarity index 67% rename from ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplay.html rename to ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplayHeader.html index 5600bdd3f2..173701dbcc 100644 --- a/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplay.html +++ b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplayHeader.html @@ -2,9 +2,9 @@
-
+
- + {{:: ts('View Display') }} diff --git a/ext/search_kit/ang/crmSearchAdmin/displays/common/addColMenu.html b/ext/search_kit/ang/crmSearchAdmin/displays/common/addColMenu.html index bfe415a80a..7ce59d1a95 100644 --- a/ext/search_kit/ang/crmSearchAdmin/displays/common/addColMenu.html +++ b/ext/search_kit/ang/crmSearchAdmin/displays/common/addColMenu.html @@ -3,10 +3,10 @@ {{:: ts('Add') }}