Ports UI update (#16115)

* WIP Device Ports porting to Laravel

* WIP port links

* Port Links WIP

* Port Links

* in_array -> isset

* Add request to DeviceTab data

* Add initial Pagination

* Missing select component

* Collapsed and expandable port neighbors
New expandable component

* Port sorting

* Fix port transfer

* Use menu entries to filter ports

* Add translatable strings

* style fixes and cleanup

* update css

* graph views and tidy controller
basic port link view

* cleanup

* port row blade to reuse in legacy port view

* Legacy tab url handling
work properly in subdirectory
remove includes from sub tab directory to prevent oddity

* fallback to detail list when the view doesn't exist

* Use named variable to simplify

* Fix issue from file that was a symlink

* Submenu handle sub items and query string urls

* extract pageLinks to improve readability

* fix typo

* Apply fixes from StyleCI

* phpstan was not happy using the relationship HasMany query

* Don't allow *bps etc to be on a second line

* Improve table on small screens

* Fix sort

---------

Co-authored-by: Tony Murray <murrant@users.noreply.github.com>

LibreNMS/Interfaces/UI/DeviceTab.php

@@ -26,6 +26,7 @@
 namespace LibreNMS\Interfaces\UI;
 
 use App\Models\Device;
+use Illuminate\Http\Request;
 
 interface DeviceTab
 {
@@ -62,7 +63,8 @@ public function name(): string;
      * Collect data to send to the view
      *
      * @param  Device  $device
+     * @param  Request  $request
      * @return array
      */
-    public function data(Device $device): array;
+    public function data(Device $device, Request $request): array;
 }

LibreNMS/Util/Color.php

@@ -85,6 +85,15 @@ public static function percentage($percentage, $component_perc_warn = null): arr
         ];
     }
 
+    public static function percent(int|float $numerator = null, int|float $denominator = null, int|float $percent = null): string
+    {
+        $percent = $percent ? round($percent) : Number::calculatePercent($numerator, $denominator, 0);
+        $r = min(255, 5 * ($percent - 25));
+        $b = max(0, 255 - (5 * ($percent + 25)));
+
+        return sprintf('#%02x%02x%02x', $r, $b, $b);
+    }
+
     /**
      * Get highlight color based on device status
      */

LibreNMS/Util/Rewrite.php

@@ -210,6 +210,18 @@ public static function location($location)
         return $location;
     }
 
+    public static function dslLineType(string $lineType): string
+    {
+        return match ($lineType) {
+            'noChannel' => 'No Channel',
+            'fastOnly' => 'Fastpath',
+            'interleavedOnly' => 'Interleaved',
+            'fastOrInterleaved' => 'Fast/Interleaved',
+            'fastAndInterleaved' => 'Fast+Interleaved',
+            default => $lineType,
+        };
+    }
+
     public static function vmwareGuest($guest_id)
     {
         $guests = [

app/Http/Controllers/Device/Tabs/AccessPointsController.php

@@ -26,6 +26,7 @@
 namespace App\Http\Controllers\Device\Tabs;
 
 use App\Models\Device;
+use Illuminate\Http\Request;
 use LibreNMS\Interfaces\UI\DeviceTab;
 
 class AccessPointsController implements DeviceTab
@@ -50,7 +51,7 @@ public function name(): string
         return __('Access Points');
     }
 
-    public function data(Device $device): array
+    public function data(Device $device, Request $request): array
     {
         return [];
     }

app/Http/Controllers/Device/Tabs/AlertStatsController.php

@@ -26,6 +26,7 @@
 namespace App\Http\Controllers\Device\Tabs;
 
 use App\Models\Device;
+use Illuminate\Http\Request;
 use LibreNMS\Interfaces\UI\DeviceTab;
 
 class AlertStatsController implements DeviceTab
@@ -50,7 +51,7 @@ public function name(): string
         return __('Alert Stats');
     }
 
-    public function data(Device $device): array
+    public function data(Device $device, Request $request): array
     {
         return [];
     }

app/Http/Controllers/Device/Tabs/AlertsController.php

@@ -26,6 +26,7 @@
 namespace App\Http\Controllers\Device\Tabs;
 
 use App\Models\Device;
+use Illuminate\Http\Request;
 use LibreNMS\Interfaces\UI\DeviceTab;
 
 class AlertsController implements DeviceTab
@@ -50,7 +51,7 @@ public function name(): string
         return __('Alerts');
     }
 
-    public function data(Device $device): array
+    public function data(Device $device, Request $request): array
     {
         return [];
     }

app/Http/Controllers/Device/Tabs/AppsController.php

@@ -26,6 +26,7 @@
 namespace App\Http\Controllers\Device\Tabs;
 
 use App\Models\Device;
+use Illuminate\Http\Request;
 use LibreNMS\Interfaces\UI\DeviceTab;
 
 class AppsController implements DeviceTab
@@ -50,7 +51,7 @@ public function name(): string
         return __('Apps');
     }
 
-    public function data(Device $device): array
+    public function data(Device $device, Request $request): array
     {
         return [];
     }

app/Http/Controllers/Device/Tabs/CaptureController.php

@@ -26,6 +26,7 @@
 namespace App\Http\Controllers\Device\Tabs;
 
 use App\Models\Device;
+use Illuminate\Http\Request;
 
 class CaptureController implements \LibreNMS\Interfaces\UI\DeviceTab
 {
@@ -49,7 +50,7 @@ public function name(): string
         return __('Capture');
     }
 
-    public function data(Device $device): array
+    public function data(Device $device, Request $request): array
     {
         return [];
     }

app/Http/Controllers/Device/Tabs/CollectdController.php

@@ -26,6 +26,7 @@
 namespace App\Http\Controllers\Device\Tabs;
 
 use App\Models\Device;
+use Illuminate\Http\Request;
 use LibreNMS\Config;
 use LibreNMS\Interfaces\UI\DeviceTab;
 
@@ -51,7 +52,7 @@ public function name(): string
         return __('CollectD');
     }
 
-    public function data(Device $device): array
+    public function data(Device $device, Request $request): array
     {
         return [];
     }

app/Http/Controllers/Device/Tabs/EditController.php

@@ -26,6 +26,7 @@
 namespace App\Http\Controllers\Device\Tabs;
 
 use App\Models\Device;
+use Illuminate\Http\Request;
 
 class EditController implements \LibreNMS\Interfaces\UI\DeviceTab
 {
@@ -49,7 +50,7 @@ public function name(): string
         return __('Edit');
     }
 
-    public function data(Device $device): array
+    public function data(Device $device, Request $request): array
     {
         return [];
     }

app/Http/Controllers/Device/Tabs/GraphsController.php

@@ -26,6 +26,7 @@
 namespace App\Http\Controllers\Device\Tabs;
 
 use App\Models\Device;
+use Illuminate\Http\Request;
 use LibreNMS\Interfaces\UI\DeviceTab;
 
 class GraphsController implements DeviceTab
@@ -50,7 +51,7 @@ public function name(): string
         return __('Graphs');
     }
 
-    public function data(Device $device): array
+    public function data(Device $device, Request $request): array
     {
         return [];
     }

app/Http/Controllers/Device/Tabs/HealthController.php

@@ -26,6 +26,7 @@
 namespace App\Http\Controllers\Device\Tabs;
 
 use App\Models\Device;
+use Illuminate\Http\Request;
 use LibreNMS\Interfaces\UI\DeviceTab;
 
 class HealthController implements DeviceTab
@@ -50,7 +51,7 @@ public function name(): string
         return __('Health');
     }
 
-    public function data(Device $device): array
+    public function data(Device $device, Request $request): array
     {
         return [];
     }

app/Http/Controllers/Device/Tabs/InventoryController.php

@@ -27,6 +27,7 @@
 
 use App\Facades\DeviceCache;
 use App\Models\Device;
+use Illuminate\Http\Request;
 use LibreNMS\Config;
 use LibreNMS\Interfaces\UI\DeviceTab;
 
@@ -67,7 +68,7 @@ public function name(): string
         return __('Inventory');
     }
 
-    public function data(Device $device): array
+    public function data(Device $device, Request $request): array
     {
         return [
             'tab' => $this->type, // inject to load correct legacy file

app/Http/Controllers/Device/Tabs/LatencyController.php

@@ -27,10 +27,10 @@
 
 use App\Models\Device;
 use Carbon\Carbon;
+use Illuminate\Http\Request;
 use LibreNMS\Config;
 use LibreNMS\Interfaces\UI\DeviceTab;
 use LibreNMS\Util\Smokeping;
-use Request;
 
 class LatencyController implements DeviceTab
 {
@@ -54,10 +54,10 @@ public function name(): string
         return __('Latency');
     }
 
-    public function data(Device $device): array
+    public function data(Device $device, Request $request): array
     {
-        $from = Request::get('dtpickerfrom', Carbon::now(session('preferences.timezone'))->subDays(2)->format(Config::get('dateformat.byminute')));
-        $to = Request::get('dtpickerto', Carbon::now(session('preferences.timezone'))->format(Config::get('dateformat.byminute')));
+        $from = $request->get('dtpickerfrom', Carbon::now(session('preferences.timezone'))->subDays(2)->format(Config::get('dateformat.byminute')));
+        $to = $request->get('dtpickerto', Carbon::now(session('preferences.timezone'))->format(Config::get('dateformat.byminute')));
 
         $smokeping = new Smokeping($device);
         $smokeping_tabs = [];

app/Http/Controllers/Device/Tabs/LoadBalancerController.php

@@ -27,6 +27,7 @@
 
 use App\Facades\DeviceCache;
 use App\Models\Device;
+use Illuminate\Http\Request;
 use LibreNMS\Interfaces\UI\DeviceTab;
 
 class LoadBalancerController implements DeviceTab
@@ -93,7 +94,7 @@ public function name(): string
         return __('Load Balancer');
     }
 
-    public function data(Device $device): array
+    public function data(Device $device, Request $request): array
     {
         return [
             'loadbalancer_tabs' => $this->tabs,

app/Http/Controllers/Device/Tabs/LogsController.php

@@ -26,6 +26,7 @@
 namespace App\Http\Controllers\Device\Tabs;
 
 use App\Models\Device;
+use Illuminate\Http\Request;
 use LibreNMS\Interfaces\UI\DeviceTab;
 
 class LogsController implements DeviceTab
@@ -50,7 +51,7 @@ public function name(): string
         return __('Logs');
     }
 
-    public function data(Device $device): array
+    public function data(Device $device, Request $request): array
     {
         return [];
     }

app/Http/Controllers/Device/Tabs/MefController.php

@@ -26,6 +26,7 @@
 namespace App\Http\Controllers\Device\Tabs;
 
 use App\Models\Device;
+use Illuminate\Http\Request;
 use LibreNMS\Interfaces\UI\DeviceTab;
 
 class MefController implements DeviceTab
@@ -50,7 +51,7 @@ public function name(): string
         return __('Metro Ethernet');
     }
 
-    public function data(Device $device): array
+    public function data(Device $device, Request $request): array
     {
         return [];
     }

app/Http/Controllers/Device/Tabs/MuninController.php

@@ -26,6 +26,7 @@
 namespace App\Http\Controllers\Device\Tabs;
 
 use App\Models\Device;
+use Illuminate\Http\Request;
 use LibreNMS\Interfaces\UI\DeviceTab;
 
 class MuninController implements DeviceTab
@@ -50,7 +51,7 @@ public function name(): string
         return __('Munin');
     }
 
-    public function data(Device $device): array
+    public function data(Device $device, Request $request): array
     {
         return [];
     }

app/Http/Controllers/Device/Tabs/NacController.php

@@ -26,6 +26,7 @@
 namespace App\Http\Controllers\Device\Tabs;
 
 use App\Models\Device;
+use Illuminate\Http\Request;
 use LibreNMS\Interfaces\UI\DeviceTab;
 
 class NacController implements DeviceTab
@@ -50,7 +51,7 @@ public function name(): string
         return __('NAC');
     }
 
-    public function data(Device $device): array
+    public function data(Device $device, Request $request): array
     {
         return [];
     }

app/Http/Controllers/Device/Tabs/NeighboursController.php

@@ -27,6 +27,7 @@
 
 use App\Models\Device;
 use App\Models\Link;
+use Illuminate\Http\Request;
 use LibreNMS\Interfaces\UI\DeviceTab;
 
 class NeighboursController implements DeviceTab
@@ -53,7 +54,7 @@ public function name(): string
         return __('Neighbours');
     }
 
-    public function data(Device $device): array
+    public function data(Device $device, Request $request): array
     {
         return [];
     }

app/Http/Controllers/Device/Tabs/NetflowController.php

@@ -26,6 +26,7 @@
 namespace App\Http\Controllers\Device\Tabs;
 
 use App\Models\Device;
+use Illuminate\Http\Request;
 use LibreNMS\Config;
 use LibreNMS\Interfaces\UI\DeviceTab;
 
@@ -72,7 +73,7 @@ public function name(): string
         return __('Netflow');
     }
 
-    public function data(Device $device): array
+    public function data(Device $device, Request $request): array
     {
         return [
             'tab' => 'nfsen',

app/Http/Controllers/Device/Tabs/NotesController.php

@@ -54,7 +54,7 @@ public function name(): string
         return __('Notes');
     }
 
-    public function data(Device $device): array
+    public function data(Device $device, Request $request): array
     {
         return [];
     }

app/Http/Controllers/Device/Tabs/OverviewController.php

@@ -26,6 +26,7 @@
 namespace App\Http\Controllers\Device\Tabs;
 
 use App\Models\Device;
+use Illuminate\Http\Request;
 use LibreNMS\Interfaces\UI\DeviceTab;
 use Session;
 
@@ -51,7 +52,7 @@ public function name(): string
         return __('Overview');
     }
 
-    public function data(Device $device): array
+    public function data(Device $device, Request $request): array
     {
         return [];
     }