From 9f7ef7ae2c428f93b322fdeae8c8a02e544d0899 Mon Sep 17 00:00:00 2001
From: Samuel Vanhove <samuel@symbiotic.coop>
Date: Mon, 26 Jun 2023 12:28:40 -0400
Subject: [PATCH] #4360 #4384 fixing multiple regressions with legacy path
 civicrm/contact/search

---
 .../ang/afsearchContactSearch.aff.json        |  2 +-
 .../SavedSearch_Contact_Search.mgd.php        | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/ext/civicrm_admin_ui/ang/afsearchContactSearch.aff.json b/ext/civicrm_admin_ui/ang/afsearchContactSearch.aff.json
index 0afcb460e5..9e3865e50a 100644
--- a/ext/civicrm_admin_ui/ang/afsearchContactSearch.aff.json
+++ b/ext/civicrm_admin_ui/ang/afsearchContactSearch.aff.json
@@ -2,7 +2,7 @@
     "type": "search",
     "title": "Find Contacts",
     "icon": "fa-list-alt",
-    "server_route": "civicrm/contact/search",
+    "server_route": "civicrm/adminui/contact/search",
     "permission": "access CiviCRM",
     "navigation": null,
     "requires": [],
diff --git a/ext/civicrm_admin_ui/managed/SavedSearch_Contact_Search.mgd.php b/ext/civicrm_admin_ui/managed/SavedSearch_Contact_Search.mgd.php
index f6884f933f..a297cf824e 100644
--- a/ext/civicrm_admin_ui/managed/SavedSearch_Contact_Search.mgd.php
+++ b/ext/civicrm_admin_ui/managed/SavedSearch_Contact_Search.mgd.php
@@ -3,6 +3,32 @@
 use CRM_CivicrmAdminUi_ExtensionUtil as E;
 
 return [
+  // using a temporary alternate path to avoid breaking legacy path
+  [
+    'name' => 'Navigation_Find_Contacts',
+    'entity' => 'Navigation',
+    'cleanup' => 'unused',
+    'update' => 'unmodified',
+    'params' => [
+      'version' => 4,
+      'values' => [
+        'domain_id' => 'current_domain',
+        'label' => E::ts('Find Contacts'),
+        'name' => 'Find Contacts',
+        'url' => 'civicrm/adminui/contact/search',
+        'icon' => NULL,
+        'permission' => NULL,
+        'permission_operator' => '',
+        'parent_id.name' => 'Search',
+        'is_active' => TRUE,
+        'has_separator' => NULL,
+        'weight' => 1,
+      ],
+      'match' => [
+        'name',
+      ],
+    ],
+  ],
   [
     'name' => 'SavedSearch_Find_Contacts',
     'entity' => 'SavedSearch',
-- 
2.25.1