From feba5f915377238dcd930d9782f3397130b7eee4 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 25 Nov 2024 11:35:33 +0100
Subject: [PATCH] interfaces: rearrange menu files to be a bit more aligned

Define the entry in the core, use it in interfaces, define
diagnostics there and move diagnostics where  they belong.

Ordering for explicit interfaces or groupings is a bit harder
than it should be... ideally we would want to move all "["
entries to the front and just let the other entries order itself
but that would require more hacking than just setting order
property on all the child entries in the XML.
---
 .../app/models/OPNsense/Core/Menu/Menu.xml    | 29 +------------------
 .../models/OPNsense/Diagnostics/Menu/Menu.xml |  5 ++++
 .../models/OPNsense/Interfaces/Menu/Menu.xml  | 22 ++++++++++++--
 3 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/src/opnsense/mvc/app/models/OPNsense/Core/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Core/Menu/Menu.xml
index 6e518f341..73bf73a01 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Core/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Core/Menu/Menu.xml
@@ -86,34 +86,7 @@
             <Services url="/ui/core/service"/>
         </Diagnostics>
     </System>
-    <Interfaces order="30" cssClass="fa fa-sitemap">
-        <Assignments url="/interfaces_assign.php" cssClass="fa fa-pencil fa-fw"/>
-        <Devices cssClass="fa fa-archive fa-fw">
-            <Bridge url="/interfaces_bridge.php">
-                <Edit url="/interfaces_bridge_edit.php*" visibility="hidden"/>
-            </Bridge>
-            <GIF url="/ui/interfaces/gif"/>
-            <GRE url="/ui/interfaces/gre"/>
-            <PPP VisibleName="Point-to-Point" url="/interfaces_ppps.php">
-                <Edit url="/interfaces_ppps_edit.php*" visibility="hidden"/>
-            </PPP>
-        </Devices>
-        <Neighbors url="/ui/interfaces/neighbor" cssClass="fa fa-users fa-fw"/>
-        <Overview url="/ui/interfaces/overview" cssClass="fa fa-tasks fa-fw"/>
-        <Settings url="/system_advanced_network.php" cssClass="fa fa-cogs fa-fw"/>
-        <Wireless cssClass="fa fa-wifi fa-fw">
-            <Devices url="/interfaces_wireless.php">
-                <Edit url="/interfaces_wireless_edit.php*" visibility="hidden"/>
-            </Devices>
-        </Wireless>
-        <Diagnostics order="100" cssClass="fa fa-medkit fa-fw">
-            <DNSLookup VisibleName="DNS Lookup" url="/ui/diagnostics/dns_diagnostics"/>
-            <PacketCapture VisibleName="Packet Capture" url="/ui/diagnostics/packet_capture"/>
-            <Ping url="/ui/diagnostics/ping"/>
-            <TestPort VisibleName="Port Probe" url="/ui/diagnostics/portprobe"/>
-            <Traceroute VisibleName="Trace Route" url="/ui/diagnostics/traceroute"/>
-        </Diagnostics>
-    </Interfaces>
+    <Interfaces order="30" cssClass="fa fa-sitemap"/>
     <Firewall order="40" cssClass="glyphicon glyphicon-fire">
         <Aliases url="/ui/firewall/alias" cssClass="fa fa-list-alt fa-fw">
             <Edit url="/ui/firewall/alias/*" visibility="hidden"/>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Menu/Menu.xml
index 375d70b91..c36b3fb29 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Menu/Menu.xml
@@ -16,8 +16,13 @@
     <Interfaces>
         <Diagnostics>
             <ARPTable VisibleName="ARP Table" url="/ui/diagnostics/interface/arp"/>
+            <DNSLookup VisibleName="DNS Lookup" url="/ui/diagnostics/dns_diagnostics"/>
             <NDPTable VisibleName="NDP Table" url="/ui/diagnostics/interface/ndp"/>
             <Netstat VisibleName="Netstat" url="/ui/diagnostics/interface/netstat"/>
+            <PacketCapture VisibleName="Packet Capture" url="/ui/diagnostics/packet_capture"/>
+            <Ping url="/ui/diagnostics/ping"/>
+            <TestPort VisibleName="Port Probe" url="/ui/diagnostics/portprobe"/>
+            <Traceroute VisibleName="Trace Route" url="/ui/diagnostics/traceroute"/>
         </Diagnostics>
     </Interfaces>
 </menu>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Interfaces/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Interfaces/Menu/Menu.xml
index 5f4bc2105..b838bb307 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Interfaces/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Interfaces/Menu/Menu.xml
@@ -1,14 +1,32 @@
 <menu>
     <Interfaces>
-        <Devices>
+        <Assignments order="200" url="/interfaces_assign.php" cssClass="fa fa-pencil fa-fw"/>
+        <Devices order="210" cssClass="fa fa-archive fa-fw">
+            <Bridge url="/interfaces_bridge.php">
+                <Edit url="/interfaces_bridge_edit.php*" visibility="hidden"/>
+            </Bridge>
+            <GIF url="/ui/interfaces/gif"/>
+            <GRE url="/ui/interfaces/gre"/>
             <LAGG url="/ui/interfaces/lagg"/>
             <Loopback url="/ui/interfaces/loopback"/>
+            <PPP VisibleName="Point-to-Point" url="/interfaces_ppps.php">
+                <Edit url="/interfaces_ppps_edit.php*" visibility="hidden"/>
+            </PPP>
             <VLAN url="/ui/interfaces/vlan"/>
             <VXLAN url="/ui/interfaces/vxlan"/>
         </Devices>
-        <VIP VisibleName="Virtual IPs" cssClass="fa fa-clone fa-fw">
+        <Neighbors order="220" url="/ui/interfaces/neighbor" cssClass="fa fa-users fa-fw"/>
+        <Overview order="230" url="/ui/interfaces/overview" cssClass="fa fa-tasks fa-fw"/>
+        <Settings order="240" url="/system_advanced_network.php" cssClass="fa fa-cogs fa-fw"/>
+        <VIP order="250" VisibleName="Virtual IPs" cssClass="fa fa-clone fa-fw">
             <Settings url="/ui/interfaces/vip"/>
             <Status url="/ui/diagnostics/interface/vip"/>
         </VIP>
+        <Wireless order="260" cssClass="fa fa-wifi fa-fw">
+            <Devices url="/interfaces_wireless.php">
+                <Edit url="/interfaces_wireless_edit.php*" visibility="hidden"/>
+            </Devices>
+        </Wireless>
+        <Diagnostics order="270" cssClass="fa fa-medkit fa-fw"/>
     </Interfaces>
 </menu>