From f69aa75265634cdb48b5c1f00701adaf8e237a2a Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 20 Oct 2023 20:33:56 -0700
Subject: [PATCH] Fix warnings about self-multiplied records

---
 .../managed/Navigation_afform_admin.mgd.php   | 16 ++++---------
 .../managed/Navigation.mgd.php                | 24 +++++++------------
 .../managed/Navigation_search_kit.mgd.php     | 16 ++++---------
 3 files changed, 18 insertions(+), 38 deletions(-)

diff --git a/ext/afform/admin/managed/Navigation_afform_admin.mgd.php b/ext/afform/admin/managed/Navigation_afform_admin.mgd.php
index b154173fce..3c5253e8f8 100644
--- a/ext/afform/admin/managed/Navigation_afform_admin.mgd.php
+++ b/ext/afform/admin/managed/Navigation_afform_admin.mgd.php
@@ -1,13 +1,9 @@
 <?php
 use CRM_AfformAdmin_ExtensionUtil as E;
 
-$menuItems = [];
-$domains = \Civi\Api4\Domain::get(FALSE)
-  ->addSelect('id')
-  ->execute();
-foreach ($domains as $domain) {
-  $menuItems[] = [
-    'name' => 'Navigation_afform_admin_domain_' . $domain['id'],
+return [
+  [
+    'name' => 'Navigation_afform_admin_domain',
     'entity' => 'Navigation',
     'cleanup' => 'always',
     'update' => 'unmodified',
@@ -26,10 +22,8 @@ foreach ($domains as $domain) {
         'url' => 'civicrm/admin/afform',
         'is_active' => 1,
         'icon' => 'crm-i fa-list-alt',
-        'domain_id' => $domain['id'],
       ],
       'match' => ['domain_id', 'name'],
     ],
-  ];
-}
-return $menuItems;
+  ],
+];
diff --git a/ext/legacycustomsearches/managed/Navigation.mgd.php b/ext/legacycustomsearches/managed/Navigation.mgd.php
index 4175908fb7..1503cbca7b 100644
--- a/ext/legacycustomsearches/managed/Navigation.mgd.php
+++ b/ext/legacycustomsearches/managed/Navigation.mgd.php
@@ -1,15 +1,10 @@
 <?php
 
-use Civi\Api4\Domain;
 use CRM_Legacycustomsearches_ExtensionUtil as E;
 
-$menuItems = [];
-$domains = Domain::get(FALSE)
-  ->addSelect('id')
-  ->execute();
-foreach ($domains as $domain) {
-  $menuItems[] = [
-    'name' => 'Custom Searches' . $domain['id'],
+return [
+  [
+    'name' => 'Custom Searches',
     'entity' => 'Navigation',
     'cleanup' => 'always',
     'update' => 'unmodified',
@@ -25,13 +20,12 @@ foreach ($domains as $domain) {
         'is_active' => TRUE,
         'has_separator' => 2,
         'weight' => 15,
-        'domain_id' => $domain['id'],
       ],
       'match' => ['domain_id', 'name'],
     ],
-  ];
-  $menuItems[] = [
-    'name' => 'Manage Custom Searches' . $domain['id'],
+  ],
+  [
+    'name' => 'Manage Custom Searches',
     'entity' => 'Navigation',
     'cleanup' => 'always',
     'update' => 'unmodified',
@@ -46,10 +40,8 @@ foreach ($domains as $domain) {
         'parent_id.name' => 'Customize Data and Screens',
         'is_active' => TRUE,
         'weight' => 15,
-        'domain_id' => $domain['id'],
       ],
       'match' => ['domain_id', 'name'],
     ],
-  ];
-}
-return $menuItems;
+  ],
+];
diff --git a/ext/search_kit/managed/Navigation_search_kit.mgd.php b/ext/search_kit/managed/Navigation_search_kit.mgd.php
index e132bcb8aa..6e1809cd3f 100644
--- a/ext/search_kit/managed/Navigation_search_kit.mgd.php
+++ b/ext/search_kit/managed/Navigation_search_kit.mgd.php
@@ -1,13 +1,9 @@
 <?php
 use CRM_Search_ExtensionUtil as E;
 
-$menuItems = [];
-$domains = \Civi\Api4\Domain::get(FALSE)
-  ->addSelect('id')
-  ->execute();
-foreach ($domains as $domain) {
-  $menuItems[] = [
-    'name' => 'Navigation_search_kit_domain_' . $domain['id'],
+return [
+  [
+    'name' => 'Navigation_search_kit_domain',
     'entity' => 'Navigation',
     'cleanup' => 'always',
     'update' => 'unmodified',
@@ -27,10 +23,8 @@ foreach ($domains as $domain) {
         'is_active' => TRUE,
         'has_separator' => 2,
         'weight' => 13,
-        'domain_id' => $domain['id'],
       ],
       'match' => ['domain_id', 'name'],
     ],
-  ];
-}
-return $menuItems;
+  ],
+];
-- 
2.25.1