From 18423daae3e418967323fde7d5998a8d99828cd2 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 9 Nov 2022 19:21:50 -0500
Subject: [PATCH] SearchKit - Expose SavedSearch descriptions to admins

---
 CRM/Contact/DAO/SavedSearch.php                          | 9 ++++++++-
 .../crmSearchAdminSearchListing.component.js             | 8 +++++++-
 ext/search_kit/ang/crmSearchAdmin/tabs.html              | 3 +++
 xml/schema/Contact/SavedSearch.xml                       | 7 +++++++
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/CRM/Contact/DAO/SavedSearch.php b/CRM/Contact/DAO/SavedSearch.php
index 00da28b045..21b9343227 100644
--- a/CRM/Contact/DAO/SavedSearch.php
+++ b/CRM/Contact/DAO/SavedSearch.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/SavedSearch.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b3d3b267309f4b11cd3960f4df2bca20)
+ * (GenCodeChecksum:d27c4dd8f8baa98d833e4b2b4d60d350)
  */
 
 /**
@@ -224,6 +224,7 @@ class CRM_Contact_DAO_SavedSearch extends CRM_Core_DAO {
           'localizable' => 0,
           'html' => [
             'type' => 'Number',
+            'label' => ts("ID"),
           ],
           'readonly' => TRUE,
           'add' => '1.1',
@@ -243,6 +244,7 @@ class CRM_Contact_DAO_SavedSearch extends CRM_Core_DAO {
           'localizable' => 0,
           'html' => [
             'type' => 'Text',
+            'label' => ts("Name"),
           ],
           'add' => '1.0',
         ],
@@ -320,6 +322,10 @@ class CRM_Contact_DAO_SavedSearch extends CRM_Core_DAO {
           'entity' => 'SavedSearch',
           'bao' => 'CRM_Contact_BAO_SavedSearch',
           'localizable' => 0,
+          'html' => [
+            'type' => 'Select',
+            'label' => ts("For"),
+          ],
           'pseudoconstant' => [
             'callback' => 'CRM_Contact_BAO_SavedSearch::getApiEntityOptions',
           ],
@@ -428,6 +434,7 @@ class CRM_Contact_DAO_SavedSearch extends CRM_Core_DAO {
           'localizable' => 0,
           'html' => [
             'type' => 'TextArea',
+            'label' => ts("Description"),
           ],
           'add' => '5.36',
         ],
diff --git a/ext/search_kit/ang/crmSearchAdmin/searchListing/crmSearchAdminSearchListing.component.js b/ext/search_kit/ang/crmSearchAdmin/searchListing/crmSearchAdminSearchListing.component.js
index 383099e9c7..69d59c8010 100644
--- a/ext/search_kit/ang/crmSearchAdmin/searchListing/crmSearchAdminSearchListing.component.js
+++ b/ext/search_kit/ang/crmSearchAdmin/searchListing/crmSearchAdminSearchListing.component.js
@@ -29,6 +29,7 @@
             'id',
             'name',
             'label',
+            'description',
             'api_entity',
             'api_entity:label',
             'api_params',
@@ -193,8 +194,13 @@
                 title: ts('Edit Label'),
                 editable: true
               }),
+              searchMeta.fieldToColumn('description', {
+                label: true,
+                title: ts('Edit Description'),
+                editable: true
+              }),
               searchMeta.fieldToColumn('api_entity:label', {
-                label: ts('For'),
+                label: true,
                 empty_value: ts('Missing'),
                 cssRules: [
                   ['font-italic', 'api_entity:label', 'IS EMPTY']
diff --git a/ext/search_kit/ang/crmSearchAdmin/tabs.html b/ext/search_kit/ang/crmSearchAdmin/tabs.html
index b738e7d99d..c7f7b9e406 100644
--- a/ext/search_kit/ang/crmSearchAdmin/tabs.html
+++ b/ext/search_kit/ang/crmSearchAdmin/tabs.html
@@ -1,3 +1,6 @@
+<li>
+  <textarea placeholder="{{:: ts('Enter description (only shown to admins)') }}" ng-model="$ctrl.savedSearch.description"></textarea>
+</li>
 <li>
   <crm-search-admin-tags tag-ids="$ctrl.savedSearch.tag_id" class="btn-group btn-group-sm"></crm-search-admin-tags>
 </li>
diff --git a/xml/schema/Contact/SavedSearch.xml b/xml/schema/Contact/SavedSearch.xml
index 4eafe74051..c26b8ded1e 100644
--- a/xml/schema/Contact/SavedSearch.xml
+++ b/xml/schema/Contact/SavedSearch.xml
@@ -15,6 +15,7 @@
     <required>true</required>
     <comment>Saved Search ID</comment>
     <html>
+      <label>ID</label>
       <type>Number</type>
     </html>
     <add>1.1</add>
@@ -32,6 +33,7 @@
     <default>NULL</default>
     <comment>Unique name of saved search</comment>
     <html>
+      <label>Name</label>
       <type>Text</type>
     </html>
     <add>1.0</add>
@@ -129,6 +131,10 @@
     <length>255</length>
     <comment>Entity name for API based search</comment>
     <add>5.24</add>
+    <html>
+      <label>For</label>
+      <type>Select</type>
+    </html>
     <pseudoconstant>
       <callback>CRM_Contact_BAO_SavedSearch::getApiEntityOptions</callback>
     </pseudoconstant>
@@ -209,6 +215,7 @@
     <type>text</type>
     <title>Saved Search Description</title>
     <html>
+      <label>Description</label>
       <type>TextArea</type>
       <rows>2</rows>
       <cols>60</cols>
-- 
2.25.1