From d944aabfc26855805146c6b6f35e5e39c29ca28e Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 22 Feb 2021 14:39:06 -0500
Subject: [PATCH] SearchKit - Move common displayAdmin fields into shared
 templates

---
 .../displays/common/fieldOptions.html         |  9 ++++++++
 .../displays/common/unusedColumns.html        | 12 ++++++++++
 .../displays/searchAdminDisplayList.html      | 23 ++-----------------
 .../displays/searchAdminDisplayTable.html     | 23 ++-----------------
 4 files changed, 25 insertions(+), 42 deletions(-)
 create mode 100644 ext/search/ang/crmSearchAdmin/displays/common/fieldOptions.html
 create mode 100644 ext/search/ang/crmSearchAdmin/displays/common/unusedColumns.html

diff --git a/ext/search/ang/crmSearchAdmin/displays/common/fieldOptions.html b/ext/search/ang/crmSearchAdmin/displays/common/fieldOptions.html
new file mode 100644
index 0000000000..8524d41091
--- /dev/null
+++ b/ext/search/ang/crmSearchAdmin/displays/common/fieldOptions.html
@@ -0,0 +1,9 @@
+<div class="form-inline">
+  <label>{{:: ts('Link:') }}</label>
+  <crm-search-admin-link-select column="col" api-entity="$ctrl.apiEntity" api-params="$ctrl.apiParams"></crm-search-admin-link-select>
+</div>
+<div class="form-inline">
+  <label>{{:: ts('Tooltip:') }}</label>
+  <input class="form-control" type="text" ng-model="col.title" />
+  <crm-search-admin-token-select api-entity="$ctrl.apiEntity" api-params="$ctrl.apiParams" model="col" field="title"></crm-search-admin-token-select>
+</div>
diff --git a/ext/search/ang/crmSearchAdmin/displays/common/unusedColumns.html b/ext/search/ang/crmSearchAdmin/displays/common/unusedColumns.html
new file mode 100644
index 0000000000..08132e97c6
--- /dev/null
+++ b/ext/search/ang/crmSearchAdmin/displays/common/unusedColumns.html
@@ -0,0 +1,12 @@
+<fieldset class="crm-search-admin-edit-columns" ng-model="$ctrl.parent.hiddenColumns" ui-sortable="$ctrl.parent.sortableOptions">
+  <legend>{{:: ts('Unused') }}</legend>
+  <fieldset ng-repeat="col in $ctrl.parent.hiddenColumns" class="crm-draggable">
+    <legend>{{ $ctrl.parent.getFieldLabel(col.key) }}</legend>
+    <div class="form-inline">
+      <label>{{:: ts('Label:') }}</label> <input disabled class="form-control" type="text" ng-model="col.label" />
+      <button type="button" class="btn-xs pull-right" ng-click="$ctrl.parent.restoreCol($index)" title="{{:: ts('Show') }}">
+        <i class="crm-i fa-undo"></i>
+      </button>
+    </div>
+  </fieldset>
+</fieldset>
diff --git a/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayList.html b/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayList.html
index a489f3734a..fb02a78279 100644
--- a/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayList.html
+++ b/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayList.html
@@ -44,27 +44,8 @@
           <label><input type="checkbox" ng-model="col.break"> <span>{{:: ts('New line') }}</span></label>
         </div>
       </div>
-      <div class="form-inline">
-        <label>{{:: ts('Link:') }}</label>
-        <crm-search-admin-link-select column="col" api-entity="$ctrl.apiEntity" api-params="$ctrl.apiParams"></crm-search-admin-link-select>
-      </div>
-      <div class="form-inline">
-        <label>{{:: ts('Tooltip:') }}</label>
-        <input class="form-control" type="text" ng-model="col.title" />
-        <crm-search-admin-token-select api-entity="$ctrl.apiEntity" api-params="$ctrl.apiParams" model="col" field="title"></crm-search-admin-token-select>
-      </div>
-    </fieldset>
-  </fieldset>
-  <fieldset class="crm-search-admin-edit-columns" ng-model="$ctrl.parent.hiddenColumns" ui-sortable="$ctrl.parent.sortableOptions">
-    <legend>{{:: ts('Hidden Fields') }}</legend>
-    <fieldset ng-repeat="col in $ctrl.parent.hiddenColumns" class="crm-draggable">
-      <legend>{{ $ctrl.parent.getFieldLabel(col.key) }}</legend>
-      <div class="form-inline">
-        <label>{{:: ts('Label:') }}</label> <input disabled class="form-control" type="text" ng-model="col.label" />
-        <button type="button" class="btn-xs pull-right" ng-click="$ctrl.parent.restoreCol($index)" title="{{:: ts('Show') }}">
-          <i class="crm-i fa-undo"></i>
-        </button>
-      </div>
+      <div ng-include="'~/crmSearchAdmin/displays/common/fieldOptions.html'"></div>
     </fieldset>
   </fieldset>
+  <div ng-include="'~/crmSearchAdmin/displays/common/unusedColumns.html'"></div>
 </div>
diff --git a/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayTable.html b/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayTable.html
index 3b62c79f87..1181480625 100644
--- a/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayTable.html
+++ b/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayTable.html
@@ -30,27 +30,8 @@
           <option value="text-right">{{:: ts('Right') }}</option>
         </select>
       </div>
-      <div class="form-inline">
-        <label>{{:: ts('Link:') }}</label>
-        <crm-search-admin-link-select column="col" api-entity="$ctrl.apiEntity" api-params="$ctrl.apiParams"></crm-search-admin-link-select>
-      </div>
-      <div class="form-inline">
-        <label>{{:: ts('Tooltip:') }}</label>
-        <input class="form-control" type="text" ng-model="col.title" />
-        <crm-search-admin-token-select api-entity="$ctrl.apiEntity" api-params="$ctrl.apiParams" model="col" field="title"></crm-search-admin-token-select>
-      </div>
-    </fieldset>
-  </fieldset>
-  <fieldset class="crm-search-admin-edit-columns" ng-model="$ctrl.parent.hiddenColumns" ui-sortable="$ctrl.parent.sortableOptions">
-    <legend>{{:: ts('Hidden Columns') }}</legend>
-    <fieldset ng-repeat="col in $ctrl.parent.hiddenColumns" class="crm-draggable">
-      <legend>{{ $ctrl.parent.getFieldLabel(col.key) }}</legend>
-      <div class="form-inline">
-        <label>{{:: ts('Label:') }}</label> <input disabled class="form-control" type="text" ng-model="col.label" />
-        <button type="button" class="btn-xs pull-right" ng-click="$ctrl.parent.restoreCol($index)" title="{{:: ts('Show') }}">
-          <i class="crm-i fa-undo"></i>
-        </button>
-      </div>
+      <div ng-include="'~/crmSearchAdmin/displays/common/fieldOptions.html'"></div>
     </fieldset>
   </fieldset>
+  <div ng-include="'~/crmSearchAdmin/displays/common/unusedColumns.html'"></div>
 </div>
-- 
2.25.1