Merge pull request #25053 from colemanw/fixStateCampaignSelectors

SearchKit - Fix Campaign, State, Country selectors (again)
civicrm · Nov 30, 2022 · 66daecc · 66daecc
2 parents c8af6e2 + 5511ef1
commit 66daecc
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/Civi/Api4/Service/Spec/Provider/AddressGetSpecProvider.php b/Civi/Api4/Service/Spec/Provider/AddressGetSpecProvider.php
@@ -27,7 +27,12 @@ class AddressGetSpecProvider extends \Civi\Core\Service\AutoService implements G
    * @param \Civi\Api4\Service\Spec\RequestSpec $spec
    */
   public function modifySpec(RequestSpec $spec) {
-    // Groups field
+    // These fields do not have any sensible "name" pseudoconstant so should just use the ID
+    foreach (['state_province_id', 'country_id', 'county_id'] as $name) {
+      $spec->getFieldByName($name)->setSuffixes(['label', 'abbr']);
+    }
+
+    // Proximity search field
     $field = new FieldSpec('proximity', 'Address', 'Boolean');
     $field->setLabel(ts('Address Proximity'))
       ->setTitle(ts('Address Proximity'))

diff --git a/ext/search_kit/ang/crmSearchAdmin.module.js b/ext/search_kit/ang/crmSearchAdmin.module.js
@@ -401,7 +401,7 @@
                 // For fields with both an FK and an option list, prefer the FK
                 // because it's more efficient to render an autocomplete than to
                 // pre-load potentially thousands of options into a select dropdown.
-                where: [['options', '!=', false], ['fk_entity', 'IS NULL']],
+                where: [['options', '!=', false], ['suffixes', 'CONTAINS', 'name']],
                 select: ['options']
               }, {name: 'options'}];
             }

diff --git a/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.component.js b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.component.js
@@ -532,8 +532,8 @@
           prefix = typeof prefix === 'undefined' ? '' : prefix;
           _.each(fields, function(field) {
             var item = {
-              // Use suffix only if the field is not an FK. EntityRef fields look-up by id.
-              id: prefix + field.name + (!field.fk_entity && _.includes(field.suffixes || [], suffix.replace(':', '')) ? suffix : ''),
+              // Use options suffix if available.
+              id: prefix + field.name + (field.options && _.includes(field.suffixes || [], suffix.replace(':', '')) ? suffix : ''),
               text: field.label,
               description: field.description
             };

diff --git a/ext/search_kit/ang/crmSearchTasks/crmSearchInput/crmSearchInputVal.component.js b/ext/search_kit/ang/crmSearchTasks/crmSearchInput/crmSearchInputVal.component.js
@@ -143,15 +143,13 @@
         }
 
         if (!_.includes(['>', '<', '>=', '<='], ctrl.op)) {
-          // For fields with both an FK and an option list, prefer the FK
-          // because it's more efficient to render an autocomplete than to
-          // pre-load potentially thousands of options into a select dropdown.
-          if ((field.fk_entity || field.name === 'id')) {
-            return '~/crmSearchTasks/crmSearchInput/entityRef.html';
-          }
-          if (field.options) {
+          // Only use option list if the field has a "name" suffix
+          if (field.options && field.suffixes && field.suffixes.includes('name')) {
             return '~/crmSearchTasks/crmSearchInput/select.html';
           }
+          if (field.fk_entity || field.name === 'id') {
+            return '~/crmSearchTasks/crmSearchInput/entityRef.html';
+          }
         }
 
         if (field.data_type === 'Integer') {