SearchKit - remove extra irrelevant fields from bridge joins

diff --git a/ext/search/Civi/Search/Admin.php b/ext/search/Civi/Search/Admin.php
index 5b77712b89887fd971bf350a6a29031287241713..92b2f605656f0a8d13cca89d47f0d68a5c02f628 100644 (file)
--- a/ext/search/Civi/Search/Admin.php
+++ b/ext/search/Civi/Search/Admin.php
@@ -133,15 +133,17 @@ class Admin {
     // Add in FK fields for implicit joins
     // For example, add a `campaign.title` field to the Contribution entity
     foreach ($schema as &$entity) {
-      foreach (array_reverse($entity['fields'], TRUE) as $index => $field) {
-        if (!empty($field['fk_entity']) && !$field['options'] && !empty($schema[$field['fk_entity']]['label_field'])) {
-          // The original field will get title instead of label since it represents the id (title usually ends in ID but label does not)
-          $entity['fields'][$index]['label'] = $field['title'];
-          // Add the label field from the other entity to this entity's list of fields
-          $newField = \CRM_Utils_Array::findAll($schema[$field['fk_entity']]['fields'], ['name' => $schema[$field['fk_entity']]['label_field']])[0];
-          $newField['name'] = str_replace('_id', '', $field['name']) . '.' . $schema[$field['fk_entity']]['label_field'];
-          $newField['label'] = $field['label'] . ' ' . $newField['label'];
-          array_splice($entity['fields'], $index, 0, [$newField]);
+      if (in_array('DAOEntity', $entity['type'], TRUE) && !in_array('EntityBridge', $entity['type'], TRUE)) {
+        foreach (array_reverse($entity['fields'], TRUE) as $index => $field) {
+          if (!empty($field['fk_entity']) && !$field['options'] && !empty($schema[$field['fk_entity']]['label_field'])) {
+            // The original field will get title instead of label since it represents the id (title usually ends in ID but label does not)
+            $entity['fields'][$index]['label'] = $field['title'];
+            // Add the label field from the other entity to this entity's list of fields
+            $newField = \CRM_Utils_Array::findAll($schema[$field['fk_entity']]['fields'], ['name' => $schema[$field['fk_entity']]['label_field']])[0];
+            $newField['name'] = str_replace('_id', '', $field['name']) . '.' . $schema[$field['fk_entity']]['label_field'];
+            $newField['label'] = $field['label'] . ' ' . $newField['label'];
+            array_splice($entity['fields'], $index, 0, [$newField]);
+          }
         }
       }
     }