From aa20ccba4c3cecacdb83d09f4cb90a7a71b546c9 Mon Sep 17 00:00:00 2001
From: vnxme <46669194+vnxme@users.noreply.github.com>
Date: Tue, 28 Dec 2021 11:07:41 +0300
Subject: [PATCH] Firewall/Scrub: Display interface descriptions (#5433)

---
 src/www/firewall_scrub.php | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/www/firewall_scrub.php b/src/www/firewall_scrub.php
index c087f7c73..aac32ca4c 100644
--- a/src/www/firewall_scrub.php
+++ b/src/www/firewall_scrub.php
@@ -205,6 +205,15 @@ $( document ).ready(function() {
   // watch scroll position and set to last known on page load
   watchScrollPosition();
 
+  // add titles to the fields having long text cut with ellipsis
+  $('.mightOverflow').on('mouseenter', function(){
+      var $this = $(this);
+
+      if(this.offsetWidth < this.scrollWidth && !$this.attr('title')){
+          $this.attr('title', $this.text());
+      }
+  });
+    
 });
 </script>
 
@@ -313,6 +322,7 @@ $( document ).ready(function() {
 <?php
                 $special_nets = get_specialnets();
                 legacy_html_escape_form_data($special_nets);
+                $configured_interfaces = legacy_config_get_interfaces();
                 foreach ($a_scrub as $i => $scrubEntry):?>
                   <tr>
                     <td>
@@ -321,7 +331,14 @@ $( document ).ready(function() {
                           <span class="fa fa-play fa-fw <?=(empty($scrubEntry['disabled'])) ? "text-success" : "text-muted";?>"></span>
                         </a>
                     </td>
-                    <td><?=strtoupper($scrubEntry['interface']);?></td>
+<?php
+                    $scrubEntryInterfaceDescrs = [];
+                    foreach (explode(',', $scrubEntry['interface']) as $scrubEntryInterfaceName) {
+                        if (array_key_exists($scrubEntryInterfaceName, $configured_interfaces)) {
+                            $scrubEntryInterfaceDescrs[] = $configured_interfaces[$scrubEntryInterfaceName]['descr'] ?? strtoupper($scrubEntryInterfaceName);
+                        }
+                    }?>
+                    <td class="mightOverflow" style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 30ch;"><?=implode(', ', $scrubEntryInterfaceDescrs);?></td>
                     <td class="hidden-xs hidden-sm">
 <?php
                         if (is_alias($scrubEntry['src'])):?>