BE+FE: new fields handling in views and filters

Signed-off-by: jokob-sk <jokob.sk@gmail.com>

front/devices.php

@@ -543,7 +543,10 @@ function mapColumnIndexToFieldName(index, tableColumnVisible) {
     "devCustomProps",          // 26
     "devFQDN",                 // 27
     "devParentRelType",        // 28
-    "devReqNicsOnline"         // 29
+    "devReqNicsOnline",        // 29
+    "devVlan",                 // 30
+    "devPrimaryIPv4",          // 31
+    "devPrimaryIPv6",          // 32
   ];
 
   // console.log("OrderBy: " + columnNames[tableColumnOrder[index]]);
@@ -660,6 +663,9 @@ function initializeDatatable (status) {
                 devFQDN
                 devParentRelType
                 devReqNicsOnline
+                devVlan
+                devPrimaryIPv4
+                devPrimaryIPv6
               }
               count
             }
@@ -743,7 +749,10 @@ function initializeDatatable (status) {
                 device.devCustomProps || "",
                 device.devFQDN || "",
                 device.devParentRelType || "",
-                device.devReqNicsOnline || 0
+                device.devReqNicsOnline || 0,
+                device.devVlan || "",
+                device.devPrimaryIPv4 || "",
+                device.devPrimaryIPv6 || "",
             ];
 
             const newRow = [];

front/plugins/newdev_template/config.json

@@ -1588,6 +1588,38 @@
         }
       ]
     },
+    {
+      "function": "devVlan",
+      "type": {
+        "dataType": "string",
+        "elements": [
+          {
+            "elementType": "input",
+            "elementOptions": [],
+            "transformers": []
+          }
+        ]
+      },
+      "maxLength": 50,
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "VLAN"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "The VLAN identifier or name the device belongs to. Database column name: <code>devVlan</code>."
+        }
+      ]
+    },
     {
       "function": "devSyncHubNode",
       "type": {
@@ -1901,38 +1933,6 @@
         }
       ]
     },
-    {
-      "function": "devVlan",
-      "type": {
-        "dataType": "string",
-        "elements": [
-          {
-            "elementType": "input",
-            "elementOptions": [],
-            "transformers": []
-          }
-        ]
-      },
-      "maxLength": 50,
-      "default_value": "",
-      "options": [],
-      "localized": [
-        "name",
-        "description"
-      ],
-      "name": [
-        {
-          "language_code": "en_us",
-          "string": "VLAN"
-        }
-      ],
-      "description": [
-        {
-          "language_code": "en_us",
-          "string": "The VLAN identifier or name the device belongs to. Database column name: <code>devVlan</code>."
-        }
-      ]
-    },
     {
       "function": "devForceStatus",
       "type": {

front/plugins/ui_settings/config.json

@@ -441,8 +441,9 @@
         "Device_TableHead_FQDN",
         "Device_TableHead_ParentRelType",
         "Device_TableHead_ReqNicsOnline",
-        "Device_TableHead_IPv6",
+        "Device_TableHead_Vlan",
-        "Device_TableHead_IPv4"
+        "Device_TableHead_IPv4",
+        "Device_TableHead_IPv6"
       ],
       "localized": ["name", "description"],
       "name": [

server/api_server/graphql_endpoint.py

@@ -339,6 +339,9 @@ class Query(ObjectType):
                     "devFQDN",
                     "devParentRelType",
                     "devParentMAC",
+                    "devVlan",
+                    "devPrimaryIPv4",
+                    "devPrimaryIPv6"
                 ]
 
                 search_term = options.search.lower()