civicrm · colemanw · Nov 16, 2022 · Nov 12, 2022 · Nov 12, 2022 · Nov 16, 2022
diff --git a/CRM/Campaign/DAO/Campaign.php b/CRM/Campaign/DAO/Campaign.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Campaign/Campaign.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:99376d5b37f09370bab36f3a3cd37e0a)
+ * (GenCodeChecksum:0db877ff95e04216a2c4553e5e1f0594)
  */
 
 /**
@@ -276,6 +276,7 @@ public static function &fields() {
           'localizable' => 0,
           'html' => [
             'type' => 'Number',
+            'label' => ts("ID"),
           ],
           'readonly' => TRUE,
           'add' => '3.3',
@@ -297,6 +298,7 @@ public static function &fields() {
           'localizable' => 0,
           'html' => [
             'type' => 'Text',
+            'label' => ts("Name"),
           ],
           'add' => '3.3',
         ],
@@ -316,6 +318,7 @@ public static function &fields() {
           'localizable' => 0,
           'html' => [
             'type' => 'Text',
+            'label' => ts("Title"),
           ],
           'add' => '3.3',
         ],
@@ -333,6 +336,7 @@ public static function &fields() {
           'localizable' => 0,
           'html' => [
             'type' => 'TextArea',
+            'label' => ts("Description"),
           ],
           'add' => '3.3',
         ],
@@ -352,6 +356,7 @@ public static function &fields() {
           'html' => [
             'type' => 'Select Date',
             'formatType' => 'activityDateTime',
+            'label' => ts("Start Date"),
           ],
           'add' => '3.3',
         ],
@@ -371,6 +376,7 @@ public static function &fields() {
           'html' => [
             'type' => 'Select Date',
             'formatType' => 'activityDateTime',
+            'label' => ts("End Date"),
           ],
           'add' => '3.3',
         ],
@@ -389,6 +395,7 @@ public static function &fields() {
           'localizable' => 0,
           'html' => [
             'type' => 'Select',
+            'label' => ts("Type"),
           ],
           'pseudoconstant' => [
             'optionGroupName' => 'campaign_type',
@@ -411,6 +418,7 @@ public static function &fields() {
           'localizable' => 0,
           'html' => [
             'type' => 'Select',
+            'label' => ts("Status"),
           ],
           'pseudoconstant' => [
             'optionGroupName' => 'campaign_status',
@@ -436,6 +444,7 @@ public static function &fields() {
           'localizable' => 0,
           'html' => [
             'type' => 'Text',
+            'label' => ts("External ID"),
           ],
           'add' => '3.3',
         ],

diff --git a/CRM/Core/I18n/SchemaStructure.php b/CRM/Core/I18n/SchemaStructure.php
@@ -624,14 +624,17 @@ public static function &widgets() {
         ],
         'civicrm_event' => [
           'title' => [
+            'label' => "Title",
             'type' => "Text",
           ],
           'summary' => [
+            'label' => "Summary",
             'type' => "TextArea",
             'rows' => "4",
             'cols' => "60",
           ],
           'description' => [
+            'label' => "Description",
             'type' => "RichTextEditor",
             'rows' => "8",
             'cols' => "60",
@@ -640,6 +643,7 @@ public static function &widgets() {
             'type' => "Text",
           ],
           'event_full_text' => [
+            'label' => "Event Full Message",
             'type' => "TextArea",
             'rows' => "4",
             'cols' => "60",

diff --git a/CRM/Event/DAO/Event.php b/CRM/Event/DAO/Event.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Event/Event.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:52019312abec7e5c00cc499d0c547ef0)
+ * (GenCodeChecksum:82ed6a487ce2639e83cada1ac876c895)
  */
 
 /**
@@ -740,6 +740,7 @@ public static function &fields() {
           'localizable' => 0,
           'html' => [
             'type' => 'Number',
+            'label' => ts("ID"),
           ],
           'readonly' => TRUE,
           'add' => '1.7',
@@ -761,6 +762,7 @@ public static function &fields() {
           'localizable' => 1,
           'html' => [
             'type' => 'Text',
+            'label' => ts("Title"),
           ],
           'add' => '1.7',
         ],
@@ -778,6 +780,7 @@ public static function &fields() {
           'localizable' => 1,
           'html' => [
             'type' => 'TextArea',
+            'label' => ts("Summary"),
           ],
           'add' => '1.7',
         ],
@@ -795,6 +798,7 @@ public static function &fields() {
           'localizable' => 1,
           'html' => [
             'type' => 'RichTextEditor',
+            'label' => ts("Description"),
           ],
           'add' => '1.7',
         ],
@@ -811,6 +815,7 @@ public static function &fields() {
           'localizable' => 0,
           'html' => [
             'type' => 'Select',
+            'label' => ts("Type"),
           ],
           'pseudoconstant' => [
             'optionGroupName' => 'event_type',
@@ -852,6 +857,7 @@ public static function &fields() {
           'localizable' => 0,
           'html' => [
             'type' => 'CheckBox',
+            'label' => ts("Public"),
           ],
           'add' => '1.7',
         ],
@@ -871,6 +877,7 @@ public static function &fields() {
           'html' => [
             'type' => 'Select Date',
             'formatType' => 'activityDateTime',
+            'label' => ts("Start Date"),
           ],
           'add' => '1.7',
         ],
@@ -890,6 +897,7 @@ public static function &fields() {
           'html' => [
             'type' => 'Select Date',
             'formatType' => 'activityDateTime',
+            'label' => ts("End Date"),
           ],
           'add' => '1.7',
         ],
@@ -907,6 +915,7 @@ public static function &fields() {
           'localizable' => 0,
           'html' => [
             'type' => 'CheckBox',
+            'label' => ts("Online Registration"),
           ],
           'add' => '1.7',
         ],
@@ -991,6 +1000,7 @@ public static function &fields() {
           'localizable' => 1,
           'html' => [
             'type' => 'TextArea',
+            'label' => ts("Event Full Message"),
           ],
           'add' => '1.7',
         ],
@@ -1008,6 +1018,7 @@ public static function &fields() {
           'localizable' => 0,
           'html' => [
             'type' => 'CheckBox',
+            'label' => ts("Paid Event"),
           ],
           'add' => '1.7',
         ],

diff --git a/Civi/Api4/Service/Autocomplete/CountryAutocompleteProvider.php b/Civi/Api4/Service/Autocomplete/CountryAutocompleteProvider.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+
+namespace Civi\Api4\Service\Autocomplete;
+
+use Civi\Core\Event\GenericHookEvent;
+use Civi\Core\HookInterface;
+
+/**
+ * @service
+ * @internal
+ */
+class CountryAutocompleteProvider extends \Civi\Core\Service\AutoService implements HookInterface {
+
+  /**
+   * Provide default SearchDisplay for Country autocompletes
+   *
+   * @param \Civi\Core\Event\GenericHookEvent $e
+   */
+  public static function on_civi_search_defaultDisplay(GenericHookEvent $e) {
+    if ($e->display['settings'] || $e->display['type'] !== 'autocomplete' || $e->savedSearch['api_entity'] !== 'Country') {
+      return;
+    }
+    $e->display['settings'] = [
+      'sort' => [
+        ['name', 'ASC'],
+      ],
+      'columns' => [
+        [
+          'type' => 'field',
+          'key' => 'name',
+        ],
+        [
+          'type' => 'field',
+          'key' => 'iso_code',
+        ],
+      ],
+    ];
+  }
+
+}
diff --git a/ang/crmUi.js b/ang/crmUi.js
@@ -777,7 +777,8 @@
             $timeout(function() {
               $element.crmAutocomplete(ctrl.entity, ctrl.crmAutocompleteParams, {
                 multiple: ctrl.multi,
-                minimumInputLength: ctrl.autoOpen && !ctrl.staticOptions ? 0 : 1,
+                // Only auto-open if there are no static options
+                minimumInputLength: ctrl.autoOpen && _.isEmpty(ctrl.staticOptions) ? 0 : 1,
                 static: ctrl.staticOptions || [],
               });
             });

diff --git a/ext/search_kit/ang/crmSearchAdmin.module.js b/ext/search_kit/ang/crmSearchAdmin.module.js
@@ -398,7 +398,10 @@
               entity.optionsLoaded = false;
               entitiesToLoad[entityName] = [entityName, 'getFields', {
                 loadOptions: ['id', 'name', 'label', 'description', 'color', 'icon'],
-                where: [['options', '!=', false]],
+                // 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']],
                 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,7 +532,8 @@
           prefix = typeof prefix === 'undefined' ? '' : prefix;
           _.each(fields, function(field) {
             var item = {
-              id: prefix + field.name + (field.suffixes && _.includes(field.suffixes, suffix.replace(':', '')) ? suffix : ''),
+              // 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 : ''),
               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
@@ -142,12 +142,16 @@
           return '~/crmSearchTasks/crmSearchInput/boolean.html';
         }
 
-        if (field.options) {
-          return '~/crmSearchTasks/crmSearchInput/select.html';
-        }
-
-        if ((field.fk_entity || field.name === 'id') && !_.includes(['>', '<', '>=', '<='], ctrl.op)) {
-          return '~/crmSearchTasks/crmSearchInput/entityRef.html';
+        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) {
+            return '~/crmSearchTasks/crmSearchInput/select.html';
+          }
         }
 
         if (field.data_type === 'Integer') {

diff --git a/tests/phpunit/CRM/Utils/TokenConsistencyTest.php b/tests/phpunit/CRM/Utils/TokenConsistencyTest.php
@@ -903,7 +903,7 @@ protected function getEventTokens(): array {
       '{event.title}' => 'Event Title',
       '{event.start_date}' => 'Event Start Date',
       '{event.end_date}' => 'Event End Date',
-      '{event.event_type_id:label}' => 'Event Type',
+      '{event.event_type_id:label}' => 'Type',
       '{event.summary}' => 'Event Summary',
       '{event.contact_email}' => 'Event Contact Email',
       '{event.contact_phone}' => 'Event Contact Phone',

diff --git a/xml/schema/Campaign/Campaign.xml b/xml/schema/Campaign/Campaign.xml
@@ -23,6 +23,7 @@
     <import>true</import>
     <html>
       <type>Number</type>
+      <label>ID</label>
     </html>
     <add>3.3</add>
   </field>
@@ -41,6 +42,7 @@
     <import>true</import>
     <html>
       <type>Text</type>
+      <label>Name</label>
     </html>
     <add>3.3</add>
   </field>
@@ -58,6 +60,7 @@
     <import>true</import>
     <html>
       <type>Text</type>
+      <label>Title</label>
     </html>
     <add>3.3</add>
   </field>
@@ -70,6 +73,7 @@
       <type>TextArea</type>
       <rows>8</rows>
       <cols>60</cols>
+      <label>Description</label>
     </html>
     <comment>Full description of Campaign.</comment>
     <add>3.3</add>
@@ -83,6 +87,7 @@
     <comment>Date and time that Campaign starts.</comment>
     <import>true</import>
     <html>
+      <label>Start Date</label>
       <type>Select Date</type>
       <formatType>activityDateTime</formatType>
     </html>
@@ -97,6 +102,7 @@
     <comment>Date and time that Campaign ends.</comment>
     <import>true</import>
     <html>
+      <label>End Date</label>
       <type>Select Date</type>
       <formatType>activityDateTime</formatType>
     </html>
@@ -114,6 +120,7 @@
       <optionGroupName>campaign_type</optionGroupName>
     </pseudoconstant>
     <html>
+      <label>Type</label>
       <type>Select</type>
     </html>
     <add>3.3</add>
@@ -135,6 +142,7 @@
       <optionGroupName>campaign_status</optionGroupName>
     </pseudoconstant>
     <html>
+      <label>Status</label>
       <type>Select</type>
     </html>
     <add>3.3</add>
@@ -156,6 +164,7 @@
     <import>true</import>
     <add>3.3</add>
     <html>
+      <label>External ID</label>
       <type>Text</type>
     </html>
   </field>
@@ -196,6 +205,7 @@
     <comment>Is this Campaign enabled or disabled/cancelled?</comment>
     <add>3.3</add>
     <html>
+      <label>Enabled</label>
       <type>CheckBox</type>
       <label>Enabled</label>
     </html>