SearchKit - Fix display of links in aggregated columns

ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php

@@ -364,9 +364,36 @@ protected function augmentSelectClause(&$apiParams): void {
     preg_match_all('/\\[([^]]+)\\]/', $possibleTokens, $tokens);
     // Only add fields not already in SELECT clause
     $additions = array_diff(array_merge($additions, $tokens[1]), $existing);
+    // Tokens for aggregated columns start with 'GROUP_CONCAT_'
+    foreach ($additions as $index => $alias) {
+      if (strpos($alias, 'GROUP_CONCAT_') === 0) {
+        $additions[$index] = 'GROUP_CONCAT(' . $this->getJoinFromAlias(explode('_', $alias, 3)[2]) . ') AS ' . $alias;
+      }
+    }
     $apiParams['select'] = array_unique(array_merge($apiParams['select'], $additions));
   }
 
+  /**
+   * Given an alias like Contact_Email_01_location_type_id
+   * this will return Contact_Email_01.location_type_id
+   * @param string $alias
+   * @return string
+   */
+  protected function getJoinFromAlias(string $alias) {
+    $result = '';
+    foreach ($this->savedSearch['api_params']['join'] ?? [] as $join) {
+      $joinName = explode(' AS ', $join[0])[1];
+      if (strpos($alias, $joinName) === 0) {
+        $parsed = $joinName . '.' . substr($alias, strlen($joinName) + 1);
+        // Ensure we are using the longest match
+        if (strlen($parsed) > strlen($result)) {
+          $result = $parsed;
+        }
+      }
+    }
+    return $result;
+  }
+
   /**
    * Checks if a filter contains a non-empty value
    *

ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.component.js

@@ -300,7 +300,7 @@
           if (ctrl.canAggregate(col)) {
             // Ensure all non-grouped columns are aggregated if using GROUP BY
             if (!info.fn || info.fn.category !== 'aggregate') {
-              ctrl.savedSearch.api_params.select[pos] = ctrl.DEFAULT_AGGREGATE_FN + '(DISTINCT ' + fieldExpr + ') AS ' + ctrl.DEFAULT_AGGREGATE_FN + '_DISTINCT_' + fieldExpr.replace(/[.:]/g, '_');
+              ctrl.savedSearch.api_params.select[pos] = ctrl.DEFAULT_AGGREGATE_FN + '(DISTINCT ' + fieldExpr + ') AS ' + ctrl.DEFAULT_AGGREGATE_FN + '_' + fieldExpr.replace(/[.:]/g, '_');
             }
           } else {
             // Remove aggregate functions when no grouping
@@ -620,11 +620,12 @@
             joinEntity = searchMeta.getEntity(join.entity),
             primaryKey = joinEntity.primary_key[0],
             isAggregate = ctrl.canAggregate(join.alias + '.' + primaryKey),
+            joinPrefix = (isAggregate ? 'GROUP_CONCAT_' : '') + join.alias + '.',
             bridgeEntity = _.isString(joinClause[2]) ? searchMeta.getEntity(joinClause[2]) : null;
           _.each(joinEntity.paths, function(path) {
             var link = _.cloneDeep(path);
             link.isAggregate = isAggregate;
-            link.path = link.path.replace(/\[/g, '[' + join.alias + '.');
+            link.path = link.path.replace(/\[/g, '[' + joinPrefix).replace(/[.:]/g, '_');
             link.join = join.alias;
             addTitle(link, join.label);
             links.push(link);

ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplay.component.js

@@ -181,6 +181,14 @@
         return !col.image && !col.rewrite && !col.link && !info.fn && info.field && !info.field.readonly;
       };
 
+      // Aggregate functions (COUNT, AVG, MAX) cannot display as links, except for GROUP_CONCAT
+      // which gets special treatment in APIv4 to convert it to an array.
+      this.canBeLink = function(col) {
+        var expr = ctrl.getExprFromSelect(col.key),
+          info = searchMeta.parseExpr(expr);
+        return !info.fn || info.fn.category !== 'aggregate' || info.fn.name === 'GROUP_CONCAT';
+      };
+
       this.toggleLink = function(column) {
         if (column.link) {
           ctrl.onChangeLink(column, column.link.path, '');

ext/search_kit/ang/crmSearchAdmin/crmSearchFunction.component.js

@@ -87,7 +87,7 @@
 
       // Make a sql-friendly alias for this expression
       function makeAlias() {
-        return (ctrl.fn + '_' + (ctrl.modifier ? ctrl.modifier + '_' : '') + ctrl.path).replace(/[.:]/g, '_');
+        return (ctrl.fn + '_' + ctrl.path).replace(/[.:]/g, '_');
       }
 
       this.writeExpr = function() {

ext/search_kit/ang/crmSearchAdmin/displays/colType/field.html

@@ -1,4 +1,4 @@
-<div class="form-inline crm-search-admin-flex-row">
+<div class="form-inline crm-search-admin-flex-row" ng-if=":: $ctrl.parent.canBeLink(col)">
   <label title="{{:: ts('Display as clickable link') }}" >
     <input type="checkbox" ng-checked="col.link" ng-click="$ctrl.parent.toggleLink(col)" >
     {{:: ts('Link') }}

ext/search_kit/ang/crmSearchAdmin/resultsTable/crmSearchAdminResultsTable.component.js

@@ -19,7 +19,7 @@
       function getViewLink(fieldExpr, links) {
         var info = searchMeta.parseExpr(fieldExpr),
           entity = searchMeta.getEntity(info.field.entity);
-        if (!info.fn && entity && info.field.fieldName === entity.label_field) {
+        if (entity && info.field.fieldName === entity.label_field) {
           var joinEntity = searchMeta.getJoinEntity(info);
           return _.find(links, {join: joinEntity, action: 'view'});
         }

ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchAfformTest.php

@@ -35,7 +35,7 @@ public function testRunWithAfform() {
           'select' => [
             'id',
             'display_name',
-            'GROUP_CONCAT(DISTINCT Contact_Email_contact_id_01.email) AS GROUP_CONCAT_DISTINCT_Contact_Email_contact_id_01_email',
+            'GROUP_CONCAT(DISTINCT Contact_Email_contact_id_01.email) AS GROUP_CONCAT_Contact_Email_contact_id_01_email',
           ],
           'orderBy' => [],
           'where' => [
@@ -77,7 +77,7 @@ public function testRunWithAfform() {
               'type' => 'field',
             ],
             [
-              'key' => 'GROUP_CONCAT_DISTINCT_Contact_Email_contact_id_01_email',
+              'key' => 'GROUP_CONCAT_Contact_Email_contact_id_01_email',
               'label' => 'Emails',
               'dataType' => 'String',
               'type' => 'field',