From 6374af6cc4ed0a03c8529355d9afede00d24a9ff Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 20 Apr 2022 18:41:00 -0400
Subject: [PATCH] SearchKit - Fix selection of fields when creating a Data
 Segment

---
 .../crmSearchAdminSegment.component.js             | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/ext/search_kit/ang/crmSearchAdmin/searchSegment/crmSearchAdminSegment.component.js b/ext/search_kit/ang/crmSearchAdmin/searchSegment/crmSearchAdminSegment.component.js
index 18c63adbca..e059acddd8 100644
--- a/ext/search_kit/ang/crmSearchAdmin/searchSegment/crmSearchAdminSegment.component.js
+++ b/ext/search_kit/ang/crmSearchAdmin/searchSegment/crmSearchAdminSegment.component.js
@@ -6,7 +6,7 @@
       segmentId: '<',
     },
     templateUrl: '~/crmSearchAdmin/searchSegment/crmSearchAdminSegment.html',
-    controller: function ($scope, searchMeta, dialogService, crmApi4, crmStatus, formatForSelect2) {
+    controller: function ($scope, searchMeta, dialogService, crmApi4, crmStatus) {
       var ts = $scope.ts = CRM.ts('org.civicrm.search_kit'),
         ctrl = this,
         originalEntity,
@@ -86,8 +86,18 @@
         return searchMeta.getField(fieldName, ctrl.segment.entity_name);
       };
 
+      // Select2-formatted fields that can be used in "when" clause, including :name suffix if applicable
       this.selectFields = function() {
-        return {results: formatForSelect2(searchMeta.getEntity(ctrl.segment.entity_name).fields, 'name', 'label', ['description'])};
+        var fields = {results: []};
+        _.each(searchMeta.getEntity(ctrl.segment.entity_name).fields, function(field) {
+          var item = {
+            id: field.name + (field.suffixes && _.includes(field.suffixes, 'name') ? ':name' : ''),
+            text: field.label,
+            description: field.description
+          };
+          fields.results.push(item);
+        });
+        return fields;
       };
 
       this.save = function() {
-- 
2.25.1