From 4f3a2f4ee9506259235356ffd1f61081308b5632 Mon Sep 17 00:00:00 2001
From: colemanw <coleman@civicrm.org>
Date: Tue, 24 Oct 2023 12:36:42 -0400
Subject: [PATCH] Remove domain references from managed entities

Follow-up to f69aa75265634cdb48b5c1f00701adaf8e237a2a
---
 .../managed/Navigation_afform_admin.mgd.php   |  2 +-
 ext/afform/core/afform.php                    | 54 ++++++++-----------
 .../managed/Navigation_search_kit.mgd.php     |  2 +-
 3 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/ext/afform/admin/managed/Navigation_afform_admin.mgd.php b/ext/afform/admin/managed/Navigation_afform_admin.mgd.php
index 3c5253e8f8..730c3a7db6 100644
--- a/ext/afform/admin/managed/Navigation_afform_admin.mgd.php
+++ b/ext/afform/admin/managed/Navigation_afform_admin.mgd.php
@@ -3,7 +3,7 @@ use CRM_AfformAdmin_ExtensionUtil as E;
 
 return [
   [
-    'name' => 'Navigation_afform_admin_domain',
+    'name' => 'Navigation_afform_admin',
     'entity' => 'Navigation',
     'cleanup' => 'always',
     'update' => 'unmodified',
diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index bd812e89a5..ad422e8aa1 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -99,7 +99,6 @@ function afform_civicrm_managed(&$entities, $modules) {
     // This AfformScanner instance only lives during this method call, and it feeds off the regular cache.
     $scanner = new CRM_Afform_AfformScanner();
   }
-  $domains = NULL;
 
   foreach ($scanner->getMetas() as $afform) {
     if (empty($afform['name'])) {
@@ -120,8 +119,6 @@ function afform_civicrm_managed(&$entities, $modules) {
         'params' => [
           'version' => 4,
           'values' => [
-            // Q: Should we loop through all domains?
-            'domain_id' => 'current_domain',
             'is_active' => TRUE,
             'name' => $afform['name'],
             'label' => $afform['title'] ?? E::ts('(Untitled)'),
@@ -133,35 +130,30 @@ function afform_civicrm_managed(&$entities, $modules) {
       ];
     }
     if (!empty($afform['navigation']) && !empty($afform['server_route'])) {
-      $domains = $domains ?: \Civi\Api4\Domain::get(FALSE)->addSelect('id')->execute();
-      foreach ($domains as $domain) {
-        $params = [
-          'version' => 4,
-          'values' => [
-            'name' => $afform['name'],
-            'label' => $afform['navigation']['label'] ?: $afform['title'],
-            'permission' => $afform['permission'],
-            'permission_operator' => $afform['permission_operator'] ?? 'AND',
-            'weight' => $afform['navigation']['weight'] ?? 0,
-            'url' => $afform['server_route'],
-            'is_active' => 1,
-            'icon' => !empty($afform['icon']) ? 'crm-i ' . $afform['icon'] : '',
-            'domain_id' => $domain['id'],
-          ],
-          'match' => ['domain_id', 'name'],
-        ];
-        if (!empty($afform['navigation']['parent'])) {
-          $params['values']['parent_id.name'] = $afform['navigation']['parent'];
-        }
-        $entities[] = [
-          'module' => E::LONG_NAME,
-          'name' => 'navigation_' . $afform['name'] . '_' . $domain['id'],
-          'cleanup' => 'always',
-          'update' => 'unmodified',
-          'entity' => 'Navigation',
-          'params' => $params,
-        ];
+      $params = [
+        'version' => 4,
+        'values' => [
+          'name' => $afform['name'],
+          'label' => $afform['navigation']['label'] ?: $afform['title'],
+          'permission' => $afform['permission'],
+          'permission_operator' => $afform['permission_operator'] ?? 'AND',
+          'weight' => $afform['navigation']['weight'] ?? 0,
+          'url' => $afform['server_route'],
+          'icon' => !empty($afform['icon']) ? 'crm-i ' . $afform['icon'] : '',
+        ],
+        'match' => ['domain_id', 'name'],
+      ];
+      if (!empty($afform['navigation']['parent'])) {
+        $params['values']['parent_id.name'] = $afform['navigation']['parent'];
       }
+      $entities[] = [
+        'module' => E::LONG_NAME,
+        'name' => 'navigation_' . $afform['name'],
+        'cleanup' => 'always',
+        'update' => 'unmodified',
+        'entity' => 'Navigation',
+        'params' => $params,
+      ];
     }
   }
 }
diff --git a/ext/search_kit/managed/Navigation_search_kit.mgd.php b/ext/search_kit/managed/Navigation_search_kit.mgd.php
index 6e1809cd3f..dbaaae9add 100644
--- a/ext/search_kit/managed/Navigation_search_kit.mgd.php
+++ b/ext/search_kit/managed/Navigation_search_kit.mgd.php
@@ -3,7 +3,7 @@ use CRM_Search_ExtensionUtil as E;
 
 return [
   [
-    'name' => 'Navigation_search_kit_domain',
+    'name' => 'Navigation_search_kit',
     'entity' => 'Navigation',
     'cleanup' => 'always',
     'update' => 'unmodified',
-- 
2.25.1