From 7d263144c5553f8b492dfd2a1d269f167551a9d0 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Mon, 17 Oct 2022 14:16:20 -0400 Subject: [PATCH] AdminUI - Always cleanup saved searches during uninstall This sets all AdminUI saved searches to be delted during uninstall, for a cleaner uninstall process. It also sets cleanup=always as the default for SavedSearch export, since the expectation is generally for packaged searches to be cleaned up along with their extensions. --- ...SavedSearch_Administer_Assigned_Financial_Accounts.mgd.php | 4 ++-- .../managed/SavedSearch_Administer_Contact_Types.mgd.php | 2 +- .../managed/SavedSearch_Administer_Custom_Fields.mgd.php | 4 ++-- .../managed/SavedSearch_Administer_Custom_Groups.mgd.php | 4 ++-- .../managed/SavedSearch_Administer_Financial_Types.mgd.php | 4 ++-- .../managed/SavedSearch_Administer_ProfileFields.mgd.php | 4 ++-- .../managed/SavedSearch_Administer_Profiles.mgd.php | 4 ++-- .../managed/SavedSearch_Administer_Relationship_Types.mgd.php | 4 ++-- .../ang/crmSearchAdmin/crmSearchAdminExport.component.js | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Assigned_Financial_Accounts.mgd.php b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Assigned_Financial_Accounts.mgd.php index 624f67d23e..8e270fdbcf 100644 --- a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Assigned_Financial_Accounts.mgd.php +++ b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Assigned_Financial_Accounts.mgd.php @@ -5,7 +5,7 @@ return [ [ 'name' => 'SavedSearch_Administer_Assigned_Financial_Accounts', 'entity' => 'SavedSearch', - 'cleanup' => 'unused', + 'cleanup' => 'always', 'update' => 'unmodified', 'params' => [ 'version' => 4, @@ -51,7 +51,7 @@ return [ [ 'name' => 'SavedSearch_Administer_Assigned_Financial_Accounts_SearchDisplay_Entity_Financial_Accounts_Table', 'entity' => 'SearchDisplay', - 'cleanup' => 'unused', + 'cleanup' => 'always', 'update' => 'unmodified', 'params' => [ 'version' => 4, diff --git a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Contact_Types.mgd.php b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Contact_Types.mgd.php index 8117c5da3f..90ed1950c1 100644 --- a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Contact_Types.mgd.php +++ b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Contact_Types.mgd.php @@ -5,7 +5,7 @@ return [ [ 'name' => 'SavedSearch_Administer_Contact_Types', 'entity' => 'SavedSearch', - 'cleanup' => 'unused', + 'cleanup' => 'always', 'update' => 'unmodified', 'params' => [ 'version' => 4, diff --git a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Custom_Fields.mgd.php b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Custom_Fields.mgd.php index 2d90956ce4..49829b1bd4 100644 --- a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Custom_Fields.mgd.php +++ b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Custom_Fields.mgd.php @@ -5,7 +5,7 @@ return [ [ 'name' => 'SavedSearch_Administer_Custom_Fields', 'entity' => 'SavedSearch', - 'cleanup' => 'unused', + 'cleanup' => 'always', 'update' => 'unmodified', 'params' => [ 'version' => 4, @@ -42,7 +42,7 @@ return [ [ 'name' => 'SavedSearch_Administer_Custom_Fields_SearchDisplay_Table', 'entity' => 'SearchDisplay', - 'cleanup' => 'unused', + 'cleanup' => 'always', 'update' => 'unmodified', 'params' => [ 'version' => 4, diff --git a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Custom_Groups.mgd.php b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Custom_Groups.mgd.php index 7a7a22f9f0..ee74c16705 100644 --- a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Custom_Groups.mgd.php +++ b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Custom_Groups.mgd.php @@ -5,7 +5,7 @@ return [ [ 'name' => 'SavedSearch_Administer_Custom_Groups', 'entity' => 'SavedSearch', - 'cleanup' => 'unused', + 'cleanup' => 'always', 'update' => 'unmodified', 'params' => [ 'version' => 4, @@ -53,7 +53,7 @@ return [ [ 'name' => 'SavedSearch_Administer_Custom_Groups_SearchDisplay_Table', 'entity' => 'SearchDisplay', - 'cleanup' => 'unused', + 'cleanup' => 'always', 'update' => 'unmodified', 'params' => [ 'version' => 4, diff --git a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Financial_Types.mgd.php b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Financial_Types.mgd.php index e8c32d7bf8..1549143935 100644 --- a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Financial_Types.mgd.php +++ b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Financial_Types.mgd.php @@ -5,7 +5,7 @@ return [ [ 'name' => 'SavedSearch_Administer_Financial_Types', 'entity' => 'SavedSearch', - 'cleanup' => 'unused', + 'cleanup' => 'always', 'update' => 'unmodified', 'params' => [ 'version' => 4, @@ -59,7 +59,7 @@ return [ [ 'name' => 'SavedSearch_Financial_Types_SearchDisplay_Financial_Types_Table_1', 'entity' => 'SearchDisplay', - 'cleanup' => 'unused', + 'cleanup' => 'always', 'update' => 'unmodified', 'params' => [ 'version' => 4, diff --git a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_ProfileFields.mgd.php b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_ProfileFields.mgd.php index fafeaae766..477a9c9b82 100644 --- a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_ProfileFields.mgd.php +++ b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_ProfileFields.mgd.php @@ -5,7 +5,7 @@ return [ [ 'name' => 'SavedSearch_Profile_Fields', 'entity' => 'SavedSearch', - 'cleanup' => 'unused', + 'cleanup' => 'always', 'update' => 'unmodified', 'params' => [ 'version' => 4, @@ -42,7 +42,7 @@ return [ [ 'name' => 'SavedSearch_Profile_Fields_SearchDisplay_Profile_Fields', 'entity' => 'SearchDisplay', - 'cleanup' => 'unused', + 'cleanup' => 'always', 'update' => 'unmodified', 'params' => [ 'version' => 4, diff --git a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Profiles.mgd.php b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Profiles.mgd.php index 1d80774b45..cddcdeca02 100644 --- a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Profiles.mgd.php +++ b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Profiles.mgd.php @@ -5,7 +5,7 @@ return [ [ 'name' => 'SavedSearch_User_defined_Profiles', 'entity' => 'SavedSearch', - 'cleanup' => 'unused', + 'cleanup' => 'always', 'update' => 'unmodified', 'params' => [ 'version' => 4, @@ -55,7 +55,7 @@ return [ [ 'name' => 'SavedSearch_User_defined_Profiles_SearchDisplay_User_defined_Profiles', 'entity' => 'SearchDisplay', - 'cleanup' => 'unused', + 'cleanup' => 'always', 'update' => 'unmodified', 'params' => [ 'version' => 4, diff --git a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Relationship_Types.mgd.php b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Relationship_Types.mgd.php index 73c9b6338a..49525c651b 100644 --- a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Relationship_Types.mgd.php +++ b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Relationship_Types.mgd.php @@ -5,7 +5,7 @@ return [ [ 'name' => 'SavedSearch_Administer_Relationship_Types', 'entity' => 'SavedSearch', - 'cleanup' => 'unused', + 'cleanup' => 'always', 'update' => 'unmodified', 'params' => [ 'version' => 4, @@ -39,7 +39,7 @@ return [ [ 'name' => 'SavedSearch_Administer_Relationship_Types_SearchDisplay_Administer_Relationship_Types_Table_1', 'entity' => 'SearchDisplay', - 'cleanup' => 'unused', + 'cleanup' => 'always', 'update' => 'unmodified', 'params' => [ 'version' => 4, diff --git a/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminExport.component.js b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminExport.component.js index 497400a562..7f1448835f 100644 --- a/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminExport.component.js +++ b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminExport.component.js @@ -20,7 +20,7 @@ ]; this.$onInit = function() { - this.apiExplorerLink = CRM.url('civicrm/api4#/explorer/SavedSearch/export?_format=php&id=' + ctrl.savedSearchId); + this.apiExplorerLink = CRM.url('civicrm/api4#/explorer/SavedSearch/export?_format=php&cleanup=always&id=' + ctrl.savedSearchId); var findDisplays = _.transform(ctrl.displayNames, function(findDisplays, displayName) { findDisplays.push(['search_displays', 'CONTAINS', ctrl.savedSearchName + '.' + displayName]); -- 2.25.1