From e35ea0352d7fac0bdc523b9af499f78d04329f94 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 29 Oct 2020 16:58:29 -0400
Subject: [PATCH] Search ext: Add option to format table cell as link in search
 display

---
 .../searchAdminDisplayTable.component.js      |  8 ++++--
 .../displays/searchAdminDisplayTable.html     | 10 ++++---
 ext/search/ang/crmSearchDisplay.ang.php       |  2 +-
 .../crmSearchDisplayTable.component.js        | 26 ++++++++++++++-----
 .../crmSearchDisplayTable.html                |  3 +--
 5 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayTable.component.js b/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayTable.component.js
index 871d5f7805..706366cc11 100644
--- a/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayTable.component.js
+++ b/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayTable.component.js
@@ -25,8 +25,8 @@
       }
 
       this.sortableOptions = {
-        connectWith: '.crm-search-admin-table-columns',
-        containment: '.crm-search-admin-table-columns-wrapper'
+        connectWith: '.crm-search-admin-edit-columns',
+        containment: '.crm-search-admin-edit-columns-wrapper'
       };
 
       this.removeCol = function(index) {
@@ -39,6 +39,10 @@
         ctrl.hiddenColumns.splice(index, 1);
       };
 
+      this.toggleLink = function(col) {
+        col.link = col.link ? '' : (window.location.pathname + window.location.search).replace('civicrm/admin/search', 'civicrm/');
+      };
+
       this.$onInit = function () {
         ctrl.getFieldLabel = ctrl.crmSearchAdmin.getFieldLabel;
         if (!ctrl.display.settings.columns) {
diff --git a/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayTable.html b/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayTable.html
index e65c0b6ba0..3777818fce 100644
--- a/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayTable.html
+++ b/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayTable.html
@@ -6,8 +6,8 @@
     <label><input type="checkbox" ng-model="$ctrl.display.settings.actions"> {{ ts('Enable Actions') }}</label>
   </div>
 </fieldset>
-<div class="crm-flex-box crm-search-admin-table-columns-wrapper">
-  <fieldset class="crm-search-admin-table-columns" ng-model="$ctrl.display.settings.columns" ui-sortable="$ctrl.sortableOptions">
+<div class="crm-flex-box crm-search-admin-edit-columns-wrapper">
+  <fieldset class="crm-search-admin-edit-columns" ng-model="$ctrl.display.settings.columns" ui-sortable="$ctrl.sortableOptions">
     <legend>{{:: ts('Columns') }}</legend>
     <fieldset ng-repeat="col in $ctrl.display.settings.columns" class="crm-draggable">
       <legend>{{ $ctrl.getFieldLabel(col.expr) }}</legend>
@@ -17,9 +17,13 @@
           <i class="crm-i fa-ban"></i>
         </button>
       </div>
+      <div class="form-inline">
+        <label>{{ ts('Link:') }} <input type="checkbox" ng-checked="!!col.link" ng-click="$ctrl.toggleLink(col)" /></label>
+        <input class="form-control" type="text" ng-model="col.link" ng-model-options="{updateOn: 'blur'}" ng-show="!!col.link" />
+      </div>
     </fieldset>
   </fieldset>
-  <fieldset class="crm-search-admin-table-columns" ng-model="$ctrl.hiddenColumns" ui-sortable="$ctrl.sortableOptions">
+  <fieldset class="crm-search-admin-edit-columns" ng-model="$ctrl.hiddenColumns" ui-sortable="$ctrl.sortableOptions">
     <legend>{{:: ts('Hidden Columns') }}</legend>
     <fieldset ng-repeat="col in $ctrl.hiddenColumns" class="crm-draggable">
       <legend>{{ $ctrl.getFieldLabel(col.expr) }}</legend>
diff --git a/ext/search/ang/crmSearchDisplay.ang.php b/ext/search/ang/crmSearchDisplay.ang.php
index 31d98189de..84d0b762b0 100644
--- a/ext/search/ang/crmSearchDisplay.ang.php
+++ b/ext/search/ang/crmSearchDisplay.ang.php
@@ -10,7 +10,7 @@ return [
     'ang/crmSearchDisplay',
   ],
   'basePages' => [],
-  'requires' => ['crmUi', 'api4', 'crmSearchActions', 'ui.bootstrap'],
+  'requires' => ['ngSanitize', 'crmUi', 'api4', 'crmSearchActions', 'ui.bootstrap'],
   'exports' => [
     'crm-search-display-table' => 'E',
   ],
diff --git a/ext/search/ang/crmSearchDisplay/crmSearchDisplayTable.component.js b/ext/search/ang/crmSearchDisplay/crmSearchDisplayTable.component.js
index 09fa60a56f..6e190bb755 100644
--- a/ext/search/ang/crmSearchDisplay/crmSearchDisplayTable.component.js
+++ b/ext/search/ang/crmSearchDisplay/crmSearchDisplayTable.component.js
@@ -81,26 +81,38 @@
 
       $scope.formatResult = function(row, col) {
         var value = row[col.key];
-        return formatFieldValue(col, value);
+        return formatFieldValue(row, col, value);
       };
 
-      function formatFieldValue(col, value) {
-        var type = col.dataType;
+      function formatFieldValue(row, col, value) {
+        var type = col.dataType,
+          result = value;
         if (_.isArray(value)) {
           return _.map(value, function(val) {
             return formatFieldValue(col, val);
           }).join(', ');
         }
         if (value && (type === 'Date' || type === 'Timestamp') && /^\d{4}-\d{2}-\d{2}/.test(value)) {
-          return CRM.utils.formatDate(value, null, type === 'Timestamp');
+          result = CRM.utils.formatDate(value, null, type === 'Timestamp');
         }
         else if (type === 'Boolean' && typeof value === 'boolean') {
-          return value ? ts('Yes') : ts('No');
+          result = value ? ts('Yes') : ts('No');
         }
         else if (type === 'Money' && typeof value === 'number') {
-          return CRM.formatMoney(value);
+          result = CRM.formatMoney(value);
         }
-        return value;
+        result = _.escape(result);
+        if (col.link) {
+          result = '<a href="' + replaceTokens(col.link, row) + '">' + result + '</a>';
+        }
+        return result;
+      }
+
+      function replaceTokens(str, data) {
+        _.each(data, function(value, key) {
+          str = str.replace('[' + key + ']', value);
+        });
+        return str;
       }
 
       $scope.selectAllRows = function() {
diff --git a/ext/search/ang/crmSearchDisplay/crmSearchDisplayTable.html b/ext/search/ang/crmSearchDisplay/crmSearchDisplayTable.html
index cf006e89df..e49fd6742f 100644
--- a/ext/search/ang/crmSearchDisplay/crmSearchDisplayTable.html
+++ b/ext/search/ang/crmSearchDisplay/crmSearchDisplayTable.html
@@ -18,8 +18,7 @@
       <td ng-if="$ctrl.settings.actions">
         <input type="checkbox" ng-checked="isRowSelected(row)" ng-click="selectRow(row)" ng-disabled="!(!loadingAllRows && row.id)">
       </td>
-      <td ng-repeat="col in $ctrl.columns">
-        {{ formatResult(row, col) }}
+      <td ng-repeat="col in $ctrl.columns" ng-bind-html="formatResult(row, col)">
       </td>
       <td></td>
     </tr>
-- 
2.25.1