From bece7e9bf684ba3f8a5e1858799f3dba1193ed1d Mon Sep 17 00:00:00 2001
From: Aidan Saunders <aidan.saunders@squiffle.uk>
Date: Mon, 24 Jul 2023 14:21:56 +0100
Subject: [PATCH] Move 'Find Contacts' upgrader steps from AdminUI to SearchUI

---
 .../CRM/CivicrmAdminUi/Upgrader.php           | 33 -----------------
 .../CRM/CivicrmSearchUi/Upgrader.php          | 36 +++++++++++++++++++
 .../ang/afsearchContactSearch.aff.json        |  2 +-
 ext/civicrm_search_ui/info.xml                |  1 +
 4 files changed, 38 insertions(+), 34 deletions(-)
 create mode 100644 ext/civicrm_search_ui/CRM/CivicrmSearchUi/Upgrader.php

diff --git a/ext/civicrm_admin_ui/CRM/CivicrmAdminUi/Upgrader.php b/ext/civicrm_admin_ui/CRM/CivicrmAdminUi/Upgrader.php
index 09dd44c6b6..b88e7de595 100644
--- a/ext/civicrm_admin_ui/CRM/CivicrmAdminUi/Upgrader.php
+++ b/ext/civicrm_admin_ui/CRM/CivicrmAdminUi/Upgrader.php
@@ -8,37 +8,4 @@ use CRM_CivicrmAdminUi_ExtensionUtil as E;
  */
 class CRM_CivicrmAdminUi_Upgrader extends CRM_Extension_Upgrader_Base {
 
-  protected function replaceFindContactMenuPath($path) {
-    // point Find Contacts menu to the FB/SK version or back to the original path
-    // this is temporary until everything is in FB/SK and we can use the original path
-    $results = \Civi\Api4\Navigation::update(FALSE)
-      ->addValue('url', $path)
-      ->addWhere('name', '=', 'Find Contacts')
-      ->execute();
-  }
-
-  /**
-   * @todo "install" and "uninstall" may not be needed if enable and disable are present. See https://github.com/civicrm/civicrm-core/pull/26669
-   */
-  public function install(): void {
-    $this->replaceFindContactMenuPath('civicrm/adminui/contact/search');
-  }
-
-  public function uninstall(): void {
-    $this->replaceFindContactMenuPath('civicrm/contact/search');
-  }
-
-  public function enable(): void {
-    $this->replaceFindContactMenuPath('civicrm/adminui/contact/search');
-  }
-
-  public function disable(): void {
-    $this->replaceFindContactMenuPath('civicrm/contact/search');
-  }
-
-  public function upgrade_1000(): bool {
-    $this->replaceFindContactMenuPath('civicrm/adminui/contact/search');
-    return TRUE;
-  }
-
 }
diff --git a/ext/civicrm_search_ui/CRM/CivicrmSearchUi/Upgrader.php b/ext/civicrm_search_ui/CRM/CivicrmSearchUi/Upgrader.php
new file mode 100644
index 0000000000..9efb2f06ef
--- /dev/null
+++ b/ext/civicrm_search_ui/CRM/CivicrmSearchUi/Upgrader.php
@@ -0,0 +1,36 @@
+<?php
+// phpcs:disable
+use CRM_CivicrmSearchUi_ExtensionUtil as E;
+// phpcs:enable
+
+/**
+ * Collection of upgrade steps.
+ */
+class CRM_CivicrmSearchUi_Upgrader extends CRM_Extension_Upgrader_Base {
+
+  protected function replaceFindContactMenuPath($path) {
+    // point Find Contacts menu to the FB/SK version or back to the original path
+    // this is temporary until everything is in FB/SK and we can use the original path
+    $results = \Civi\Api4\Navigation::update(FALSE)
+      ->addValue('url', $path)
+      ->addWhere('name', '=', 'Find Contacts')
+      ->execute();
+  }
+
+  /**
+   * See https://github.com/civicrm/civicrm-core/pull/26669
+   */
+  public function enable(): void {
+    $this->replaceFindContactMenuPath('civicrm/searchui/contact/search');
+  }
+
+  public function disable(): void {
+    $this->replaceFindContactMenuPath('civicrm/contact/search');
+  }
+
+  public function upgrade_1000(): bool {
+    $this->replaceFindContactMenuPath('civicrm/searchui/contact/search');
+    return TRUE;
+  }
+
+}
diff --git a/ext/civicrm_search_ui/ang/afsearchContactSearch.aff.json b/ext/civicrm_search_ui/ang/afsearchContactSearch.aff.json
index 9e3865e50a..f56ff6fda1 100644
--- a/ext/civicrm_search_ui/ang/afsearchContactSearch.aff.json
+++ b/ext/civicrm_search_ui/ang/afsearchContactSearch.aff.json
@@ -2,7 +2,7 @@
     "type": "search",
     "title": "Find Contacts",
     "icon": "fa-list-alt",
-    "server_route": "civicrm/adminui/contact/search",
+    "server_route": "civicrm/searchui/contact/search",
     "permission": "access CiviCRM",
     "navigation": null,
     "requires": [],
diff --git a/ext/civicrm_search_ui/info.xml b/ext/civicrm_search_ui/info.xml
index 417ea3355f..cba7969b8f 100644
--- a/ext/civicrm_search_ui/info.xml
+++ b/ext/civicrm_search_ui/info.xml
@@ -39,4 +39,5 @@
     <mixin>setting-php@1.0.0</mixin>
     <mixin>smarty-v2@1.0.1</mixin>
   </mixins>
+  <upgrader>CRM_CivicrmSearchUi_Upgrader</upgrader>
 </extension>
-- 
2.25.1