From 5ab2f685b4b72d8b6ad5dad18adc530fb380d31e Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Fri, 28 Jun 2024 08:45:50 -0500
Subject: [PATCH] Fix device ports VRF display (#16146)

impossible to display before
---
 app/Models/Port.php                                    |  5 +++++
 html/mix-manifest.json                                 | 10 +++++-----
 lang/en/port.php                                       |  1 +
 .../device/tabs/ports/includes/port_row.blade.php      |  9 ++++++---
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/Models/Port.php b/app/Models/Port.php
index 5bf452b3e5..a685289946 100644
--- a/app/Models/Port.php
+++ b/app/Models/Port.php
@@ -393,4 +393,9 @@ class Port extends DeviceRelatedModel
     {
         return $this->hasMany(PortVlan::class, 'port_id');
     }
+
+    public function vrf()
+    {
+        return $this->hasOne(Vrf::class, 'vrf_id', 'ifVrf');
+    }
 }
diff --git a/html/mix-manifest.json b/html/mix-manifest.json
index b7a9869db9..db46be2554 100644
--- a/html/mix-manifest.json
+++ b/html/mix-manifest.json
@@ -4,13 +4,13 @@
     "/css/vendor.css": "/css/vendor.css?id=d520734ded0ec75b0a572aa8db1c2161",
     "/css/app.css": "/css/app.css?id=71ba24df332b4132f71ad82f23679d4f",
     "/js/vendor.js": "/js/vendor.js?id=3b22b85b4e5a64e37dd954c0b147b3f3",
-    "/js/lang/de.js": "/js/lang/de.js?id=9a6f9c23a4b209504cce12ce85315a3c",
-    "/js/lang/en.js": "/js/lang/en.js?id=43cfd926c2a415bdbb2e59676ab29875",
-    "/js/lang/fr.js": "/js/lang/fr.js?id=d9dd782bb64e09dcca29d784c0417779",
-    "/js/lang/it.js": "/js/lang/it.js?id=40ad82368018e52347e3808571866e69",
+    "/js/lang/de.js": "/js/lang/de.js?id=f80b2c49bd4d1587d4747d189c566ffa",
+    "/js/lang/en.js": "/js/lang/en.js?id=5f909f26f3509a880924343a6acc7df4",
+    "/js/lang/fr.js": "/js/lang/fr.js?id=7e43fd1965beef315f0b416fd8607231",
+    "/js/lang/it.js": "/js/lang/it.js?id=7827375adf92766a477291c48fa1b360",
     "/js/lang/ru.js": "/js/lang/ru.js?id=f6b7c078755312a0907c4f983991cc52",
     "/js/lang/sr.js": "/js/lang/sr.js?id=388e38b41f63e35175061e849bf0d8e5",
     "/js/lang/uk.js": "/js/lang/uk.js?id=85ef43c7afe57a42b774f3cbae5a77e5",
-    "/js/lang/zh-CN.js": "/js/lang/zh-CN.js?id=6fdbd03cdf6b4868de1d3b5b557e5e13",
+    "/js/lang/zh-CN.js": "/js/lang/zh-CN.js?id=a113e5bb2699cdaf18c9c411ccfc28df",
     "/js/lang/zh-TW.js": "/js/lang/zh-TW.js?id=2cf0d871ec12cbd5ccb746b983d127df"
 }
diff --git a/lang/en/port.php b/lang/en/port.php
index a68a87c2ed..2b1c689bd2 100644
--- a/lang/en/port.php
+++ b/lang/en/port.php
@@ -28,6 +28,7 @@ return [
     'unknown_port' => 'Unknown Port',
     'vlan_count' => 'VLANs: :count',
     'vlan_label' => 'VLAN: :label',
+    'vrf_label' => 'VRF: :name',
     'xdsl' => [
         'sync_stat' => 'Sync: :down/:up',
         'attainable_stat' => 'Max: :down/:up',
diff --git a/resources/views/device/tabs/ports/includes/port_row.blade.php b/resources/views/device/tabs/ports/includes/port_row.blade.php
index 24dc9a8b26..0caa9cf982 100644
--- a/resources/views/device/tabs/ports/includes/port_row.blade.php
+++ b/resources/views/device/tabs/ports/includes/port_row.blade.php
@@ -58,7 +58,7 @@
             {{ \LibreNMS\Util\Number::formatBi($port->ifOutUcastPkts_rate, 2, 3, 'pps') }}
         </div>
     </td>
-    <td>
+    <td class="tw-whitespace-nowrap">
         @if($port->ifSpeed)
             <div>{{ \LibreNMS\Util\Number::formatSi($port->ifSpeed, 2, 3, 'bps') }}</div>
         @endif
@@ -72,12 +72,15 @@
                         <span title="{{ $port->vlans->pluck('vlan')->implode(',') }}">{{ __('port.vlan_count', ['count' => $port->vlans->count()]) }}</span>
                     @elseif($port->vlans->count() == 1 || $port->ifVlan)
                         {{ __('port.vlan_label', ['label' => $port->vlans->first()->vlan ?: $port->ifVlan]) }}
-                    @elseif($port->ifVrf)
-                        {{ Vrf::where('vrf_id', $port->ifVrf)->value('vrf_name') }}
                     @endif
                 </a>
             </div>
         @endif
+        @if($port->ifVrf)
+            <div>
+                {{ __('port.vrf_label', ['name' => $port->vrf?->vrf_name]) }}
+            </div>
+        @endif
     </td>
     <td @if($collapsing)class="tw-hidden sm:tw-table-cell"@endif>
         @if($port->adsl)