From fde1b1ab43134d8e7c1f7c4dc30c5dea0b7d9710 Mon Sep 17 00:00:00 2001
From: SourceDoctor <sourcehhdoctor@googlemail.com>
Date: Sat, 21 Nov 2020 11:44:33 +0100
Subject: [PATCH] Interface description types to Global Settings (#12291)

* Special Ports to Global Settings

* customers_descr type fix

* add mix-manifests - move section

* move to webui :P

Co-authored-by: Tony Murray <murraytony@gmail.com>
---
 html/mix-manifest.json         |  2 +-
 misc/config_definitions.json   | 20 ++++++++++++++++----
 resources/lang/en/settings.php | 17 +++++++++++++++++
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/html/mix-manifest.json b/html/mix-manifest.json
index 3672f75739..33b77f767d 100644
--- a/html/mix-manifest.json
+++ b/html/mix-manifest.json
@@ -4,7 +4,7 @@
     "/js/manifest.js": "/js/manifest.js?id=3c768977c2574a34506e",
     "/js/vendor.js": "/js/vendor.js?id=4935c8e779ce375acbf4",
     "/js/lang/de.js": "/js/lang/de.js?id=2c4ad02fa89b684d4f57",
-    "/js/lang/en.js": "/js/lang/en.js?id=0cf66e62ff9db08879df",
+    "/js/lang/en.js": "/js/lang/en.js?id=a094c09a83b751d2aea3",
     "/js/lang/fr.js": "/js/lang/fr.js?id=9552304f4fd7338af018",
     "/js/lang/it.js": "/js/lang/it.js?id=514765c5399ffaa111b9",
     "/js/lang/ru.js": "/js/lang/ru.js?id=f6b7c078755312a0907c",
diff --git a/misc/config_definitions.json b/misc/config_definitions.json
index 040911aca6..7e37d7aaf7 100644
--- a/misc/config_definitions.json
+++ b/misc/config_definitions.json
@@ -755,7 +755,10 @@
         },
         "core_descr": {
             "default": ["core"],
-            "type": "array"
+            "type": "array",
+            "group": "webui",
+            "section": "port-descr",
+            "order": 2
         },
         "cpu_details_overview": {
             "default": false,
@@ -767,7 +770,10 @@
         },
         "customers_descr": {
             "default": ["cust"],
-            "type": "array"
+            "type": "array",
+            "group": "webui",
+            "section": "port-descr",
+            "order": 3
         },
         "dateformat.byminute": {
             "default": "Y-m-d H:i",
@@ -4087,7 +4093,10 @@
             "default": [
                 "peering"
             ],
-            "type": "array"
+            "type": "array",
+            "group": "webui",
+            "section": "port-descr",
+            "order": 0
         },
         "peeringdb.enabled": {
             "default": false,
@@ -5124,7 +5133,10 @@
         },
         "transit_descr": {
             "default": ["transit"],
-            "type": "array"
+            "type": "array",
+            "group": "webui",
+            "section": "port-descr",
+            "order": 1
         },
         "twofactor": {
             "type": "boolean",
diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php
index 909fba6321..12a21ebf7c 100644
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@@ -73,6 +73,7 @@ return [
             'availability-map' => 'Availability Map Settings',
             'graph' => 'Graph Settings',
             'dashboard' => 'Dashboard Settings',
+            'port-descr' => 'Interface Description Parsing',
             'search' => 'Search Settings',
             'style' => 'Style',
             'device' => 'Device Settings',
@@ -413,6 +414,22 @@ return [
             'description' => 'Auth log entries older than (days)',
             'help' => 'Cleanup done by daily.sh',
         ],
+        'peering_descr' => [
+            'description' => 'Peering Port Types',
+            'help' => 'Ports of the listed description type(s) will be shown under the peering ports menu entry.  See Interface Description Parsing docs for more info.',
+        ],
+        'transit_descr' => [
+            'description' => 'Transit Port Types',
+            'help' => 'Ports of the listed description type(s) will be shown under the transit ports menu entry.  See Interface Description Parsing docs for more info.',
+        ],
+        'core_descr' => [
+            'description' => 'Core Port Types',
+            'help' => 'Ports of the listed description type(s) will be shown under the core ports menu entry.  See Interface Description Parsing docs for more info.',
+        ],
+        'customers_descr' => [
+            'description' => 'Customer Port Types',
+            'help' => 'Ports of the listed description type(s) will be shown under the customers ports menu entry.  See Interface Description Parsing docs for more info.',
+        ],
         'base_url' => [
             'description' => 'Specific URL',
             'help' => 'This should *only* be set if you want to *force* a particular hostname/port. It will prevent the web interface being usable form any other hostname',