From 8d4cef28507035c0fc77c4d305eff33f49cf99b5 Mon Sep 17 00:00:00 2001
From: Peca Nesovanovic <peca.nesovanovic@sattrakt.com>
Date: Sat, 20 Apr 2024 10:06:08 +0200
Subject: [PATCH 1/3] [webui] vlans blade sort

sort ports in VLANs blade

before:
gi1/0/1,gi1/0/10,gi1/0/2,gi1/0/23,gi1/0/24,gi1/0/3,gi1/0/4,gi1/0/5,gi1/0/6,gi1/0/7,gi1/0/8,gi1/0/9,Po1,te1/0/2,te1/0/3,te1/0/4

after:
gi1/0/1,gi1/0/2,gi1/0/3,gi1/0/4,gi1/0/5,gi1/0/6,gi1/0/7,gi1/0/8,gi1/0/9,gi1/0/10,gi1/0/23,gi1/0/24,te1/0/2,te1/0/3,te1/0/4,Po1

Signed-off-by: Peca Nesovanovic <peca.nesovanovic@sattrakt.com>
---
 resources/views/device/tabs/vlans.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/device/tabs/vlans.blade.php b/resources/views/device/tabs/vlans.blade.php
index 532769040e02..3424a8360a92 100644
--- a/resources/views/device/tabs/vlans.blade.php
+++ b/resources/views/device/tabs/vlans.blade.php
@@ -16,7 +16,7 @@
                 <td>{{ $vlan_number }}</td>
                 <td>{{ $vlans->first()->vlan_name }}</td>
                 <td>
-                @foreach($vlans as $port)
+                @foreach($vlans->sortBy('port') as $port)
                     @if(!$port->port)
                         @continue;
                     @endif

From 29f232e3de382d7ce3936cc4b007463774329774 Mon Sep 17 00:00:00 2001
From: Peca Nesovanovic <peca.nesovanovic@sattrakt.com>
Date: Sat, 20 Apr 2024 18:41:20 +0200
Subject: [PATCH 2/3] sort in controller

---
 app/Http/Controllers/Device/Tabs/VlansController.php | 2 +-
 resources/views/device/tabs/vlans.blade.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Device/Tabs/VlansController.php b/app/Http/Controllers/Device/Tabs/VlansController.php
index 75ed298bde9f..630bcf66e0bd 100644
--- a/app/Http/Controllers/Device/Tabs/VlansController.php
+++ b/app/Http/Controllers/Device/Tabs/VlansController.php
@@ -86,7 +86,7 @@ private static function getVlans(Device $device)
             ->select('ports_vlans.*', 'vlans.vlan_name')->orderBy('vlan_vlan')->orderBy('ports.ifName')->orderBy('ports.ifDescr')
             ->get();
 
-        $data = $portVlan->groupBy('vlan');
+        $data = $portVlan->sortBy('port')->groupBy('vlan');
 
         return $data;
     }
diff --git a/resources/views/device/tabs/vlans.blade.php b/resources/views/device/tabs/vlans.blade.php
index 3424a8360a92..532769040e02 100644
--- a/resources/views/device/tabs/vlans.blade.php
+++ b/resources/views/device/tabs/vlans.blade.php
@@ -16,7 +16,7 @@
                 <td>{{ $vlan_number }}</td>
                 <td>{{ $vlans->first()->vlan_name }}</td>
                 <td>
-                @foreach($vlans->sortBy('port') as $port)
+                @foreach($vlans as $port)
                     @if(!$port->port)
                         @continue;
                     @endif

From abaf8a66798de0e14e700aa51ac37f61855231a2 Mon Sep 17 00:00:00 2001
From: Peca Nesovanovic <peca.nesovanovic@sattrakt.com>
Date: Thu, 2 May 2024 02:39:29 +0200
Subject: [PATCH 3/3] sortby vlan,port

---
 app/Http/Controllers/Device/Tabs/VlansController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Device/Tabs/VlansController.php b/app/Http/Controllers/Device/Tabs/VlansController.php
index 630bcf66e0bd..20c6fcfde76a 100644
--- a/app/Http/Controllers/Device/Tabs/VlansController.php
+++ b/app/Http/Controllers/Device/Tabs/VlansController.php
@@ -84,9 +84,9 @@ private static function getVlans(Device $device)
             })
             ->with(['port.device'])
             ->select('ports_vlans.*', 'vlans.vlan_name')->orderBy('vlan_vlan')->orderBy('ports.ifName')->orderBy('ports.ifDescr')
-            ->get();
+            ->get()->sortBy(['vlan', 'port']);
 
-        $data = $portVlan->sortBy('port')->groupBy('vlan');
+        $data = $portVlan->groupBy('vlan');
 
         return $data;
     }