Fix ports page submenu properties (librenms#18454)

Author: murrant

app/View/Components/Submenu.php

@@ -3,50 +3,23 @@
 namespace App\View\Components;
 
 use Illuminate\View\Component;
+use Illuminate\View\View;
 
 class Submenu extends Component
 {
-    /**
-     * Create a new component instance.
-     *
-     * @param  string  $title
-     * @param  string  $menu
-     * @param  string  $device_id
-     * @param  string  $current_tab
-     * @param  string  $selected
-     * @return void
-     */
     public function __construct(
-        /**
-         * The submenu title.
-         */
-        public $title,
-        /**
-         * The submenu menu.
-         */
-        public $menu,
-        /**
-         * The submenu device_id.
-         */
-        public $device_id,
-        /**
-         * The submenu current_tab.
-         */
-        public $current_tab,
-        /**
-         * The submenu selected.
-         */
-        public $selected
+        public string $title,
+        public array $menu,
+        public int $deviceId,
+        public string $currentTab,
+        public string $selected
     ) {
     }
 
     /**
      * Determine if the given option is the current selected option.
-     *
-     * @param  string  $url
-     * @return bool
      */
-    public function isSelected($url)
+    public function isSelected(string $url): bool
     {
         // check for get parameters
         $parsed_url = parse_url($url);
@@ -67,10 +40,8 @@ public function isSelected($url)
 
     /**
      * Get the view / contents that represent the component.
-     *
-     * @return \Illuminate\View\View|string
      */
-    public function render()
+    public function render(): View
     {
         return view('components.submenu');
     }

resources/views/components/submenu.blade.php

@@ -8,10 +8,10 @@
             @endif
 
             @foreach($m as $sm)
-                <span @if($isSelected($sm['url']))class="pagemenu-selected"@endif><a href="{{ route('device', ['device' => $device_id, 'tab' => $current_tab, 'vars' => $sm['url']]) }}">{{ $sm['name'] }}</a></span>
+                <span @if($isSelected($sm['url']))class="pagemenu-selected"@endif><a href="{{ route('device', ['device' => $deviceId, 'tab' => $currentTab, 'vars' => $sm['url']]) }}">{{ $sm['name'] }}</a></span>
 
                 @isset($sm['sub_name'])
-                    (<span @if($isSelected($sm['sub_url']))class="pagemenu-selected"@endif><a href="{{ route('device', ['device' => $device_id, 'tab' => $current_tab, 'vars' => $sm['sub_url']]) }}">{{ $sm['sub_name'] }}</a></span>)
+                    (<span @if($isSelected($sm['sub_url']))class="pagemenu-selected"@endif><a href="{{ route('device', ['device' => $deviceId, 'tab' => $currentTab, 'vars' => $sm['sub_url']]) }}">{{ $sm['sub_name'] }}</a></span>)
                 @endisset
 
                 @if(!$loop->last)

resources/views/device/tabs/ports.blade.php

@@ -3,7 +3,7 @@
 @section('content')
     <x-device.page :device="$device" :dropdown-links="$data['dropdownLinks'] ?? []">
     @isset($data['submenu'])
-        <x-submenu :title="$title" :menu="$data['submenu']" :device-id="$device_id" :current-tab="$current_tab" :selected="$vars" />
+        <x-submenu :title="$title" :menu="$data['submenu']" :device-id="$device->device_id" :current-tab="$current_tab" :selected="$vars" />
     @endisset
 
     @includeFirst(['device.tabs.ports.' . $data['tab'], 'device.tabs.ports.detail'])