Update config.json files to add 'ordeable' option and refactor cacheStrings function for consistency

jokob-sk · jokob-sk · commit 0a7ecb5b7c2f · 2026-03-17T09:22:25.000Z
diff --git a/front/js/cache.js b/front/js/cache.js
@@ -290,7 +290,7 @@ function getSetting (key) {
 // -----------------------------------------------------------------------------
 function cacheStrings() {
   return new Promise((resolve, reject) => {
-    if(getCache(CACHE_KEYS.initFlag('cacheStrings')) === "true")
+    if(getCache(CACHE_KEYS.initFlag('cacheStrings_v2')) === "true")
     {
       // Core strings are cached, but plugin strings may have failed silently on
       // the first load (non-fatal fetch).  Always re-fetch them so that plugin
@@ -370,7 +370,7 @@ function cacheStrings() {
         })
         .catch((error) => {
           // Handle failure in any of the language processing
-          handleFailure('cacheStrings');
+          handleFailure('cacheStrings_v2');
           reject(error);
         });
 
diff --git a/front/plugins/arp_scan/config.json b/front/plugins/arp_scan/config.json
@@ -338,7 +338,7 @@
         "elements": [
           {
             "elementType": "select",
-            "elementOptions": [{ "multiple": "true" }],
+            "elementOptions": [{ "multiple": "true", "ordeable": "true"}],
             "transformers": []
           }
         ]
@@ -387,7 +387,7 @@
         "elements": [
           {
             "elementType": "select",
-            "elementOptions": [{ "multiple": "true" }],
+            "elementOptions": [{ "multiple": "true", "ordeable": "true"}],
             "transformers": []
           }
         ]
diff --git a/front/plugins/ddns_update/config.json b/front/plugins/ddns_update/config.json
@@ -432,7 +432,7 @@
         "elements": [
           {
             "elementType": "select",
-            "elementOptions": [{ "multiple": "true" }],
+            "elementOptions": [{ "multiple": "true", "ordeable": "true"}],
             "transformers": []
           }
         ]
@@ -477,7 +477,7 @@
         "elements": [
           {
             "elementType": "select",
-            "elementOptions": [{ "multiple": "true" }],
+            "elementOptions": [{ "multiple": "true", "ordeable": "true"}],
             "transformers": []
           }
         ]
diff --git a/front/plugins/dhcp_leases/config.json b/front/plugins/dhcp_leases/config.json
@@ -753,7 +753,7 @@
         "elements": [
           {
             "elementType": "select",
-            "elementOptions": [{ "multiple": "true" }],
+            "elementOptions": [{ "multiple": "true", "ordeable": "true"}],
             "transformers": []
           }
         ]
@@ -802,7 +802,7 @@
         "elements": [
           {
             "elementType": "select",
-            "elementOptions": [{ "multiple": "true" }],
+            "elementOptions": [{ "multiple": "true", "ordeable": "true"}],
             "transformers": []
           }
         ]
diff --git a/front/plugins/dhcp_servers/config.json b/front/plugins/dhcp_servers/config.json
@@ -478,7 +478,7 @@
         "elements": [
           {
             "elementType": "select",
-            "elementOptions": [{ "multiple": "true" }],
+            "elementOptions": [{ "multiple": "true", "ordeable": "true"}],
             "transformers": []
           }
         ]
@@ -519,7 +519,7 @@
         "elements": [
           {
             "elementType": "select",
-            "elementOptions": [{ "multiple": "true" }],
+            "elementOptions": [{ "multiple": "true", "ordeable": "true"}],
             "transformers": []
           }
         ]
diff --git a/front/plugins/internet_ip/config.json b/front/plugins/internet_ip/config.json
@@ -324,7 +324,7 @@
         "elements": [
           {
             "elementType": "select",
-            "elementOptions": [{ "multiple": "true" }],
+            "elementOptions": [{ "multiple": "true", "ordeable": "true"}],
             "transformers": []
           }
         ]
@@ -369,7 +369,7 @@
         "elements": [
           {
             "elementType": "select",
-            "elementOptions": [{ "multiple": "true" }],
+            "elementOptions": [{ "multiple": "true", "ordeable": "true"}],
             "transformers": []
           }
         ]
diff --git a/front/plugins/internet_speedtest/config.json b/front/plugins/internet_speedtest/config.json
@@ -561,7 +561,7 @@
         "elements": [
           {
             "elementType": "select",
-            "elementOptions": [{ "multiple": "true" }],
+            "elementOptions": [{ "multiple": "true", "ordeable": "true"}],
             "transformers": []
           }
         ]
@@ -610,7 +610,7 @@
         "elements": [
           {
             "elementType": "select",
-            "elementOptions": [{ "multiple": "true" }],
+            "elementOptions": [{ "multiple": "true", "ordeable": "true"}],
             "transformers": []
           }
         ]
diff --git a/front/plugins/nmap_scan/config.json b/front/plugins/nmap_scan/config.json
@@ -553,7 +553,7 @@
         "elements": [
           {
             "elementType": "select",
-            "elementOptions": [{ "multiple": "true" }],
+            "elementOptions": [{ "multiple": "true", "ordeable": "true"}],
             "transformers": []
           }
         ]
@@ -594,7 +594,7 @@
         "elements": [
           {
             "elementType": "select",
-            "elementOptions": [{ "multiple": "true" }],
+            "elementOptions": [{ "multiple": "true", "ordeable": "true"}],
             "transformers": []
           }
         ]
diff --git a/front/plugins/omada_sdn_imp/config.json b/front/plugins/omada_sdn_imp/config.json
@@ -429,7 +429,7 @@
         "elements": [
           {
             "elementType": "select",
-            "elementOptions": [{ "multiple": "true" }],
+            "elementOptions": [{ "multiple": "true", "ordeable": "true"}],
             "transformers": []
           }
         ]
@@ -462,7 +462,7 @@
         "elements": [
           {
             "elementType": "select",
-            "elementOptions": [{ "multiple": "true" }],
+            "elementOptions": [{ "multiple": "true", "ordeable": "true"}],
             "transformers": []
           }
         ]
diff --git a/front/plugins/omada_sdn_openapi/config.json b/front/plugins/omada_sdn_openapi/config.json
@@ -402,7 +402,7 @@
         "elements": [
           {
             "elementType": "select",
-            "elementOptions": [{ "multiple": "true" }],
+            "elementOptions": [{ "multiple": "true", "ordeable": "true"}],
             "transformers": []
           }
         ]
@@ -435,7 +435,7 @@
         "elements": [
           {
             "elementType": "select",
-            "elementOptions": [{ "multiple": "true" }],
+            "elementOptions": [{ "multiple": "true", "ordeable": "true"}],
             "transformers": []
           }
         ]
diff --git a/front/plugins/pihole_scan/config.json b/front/plugins/pihole_scan/config.json
@@ -290,7 +290,7 @@
         "elements": [
           {
             "elementType": "select",
-            "elementOptions": [{ "multiple": "true" }],
+            "elementOptions": [{ "multiple": "true", "ordeable": "true"}],
             "transformers": []
           }
         ]
@@ -331,7 +331,7 @@
         "elements": [
           {
             "elementType": "select",
-            "elementOptions": [{ "multiple": "true" }],
+            "elementOptions": [{ "multiple": "true", "ordeable": "true"}],
             "transformers": []
           }
         ]
diff --git a/front/plugins/snmp_discovery/config.json b/front/plugins/snmp_discovery/config.json
@@ -658,7 +658,7 @@
         "elements": [
           {
             "elementType": "select",
-            "elementOptions": [{ "multiple": "true" }],
+            "elementOptions": [{ "multiple": "true", "ordeable": "true"}],
             "transformers": []
           }
         ]
@@ -699,7 +699,7 @@
         "elements": [
           {
             "elementType": "select",
-            "elementOptions": [{ "multiple": "true" }],
+            "elementOptions": [{ "multiple": "true", "ordeable": "true"}],
             "transformers": []
           }
         ]
diff --git a/front/plugins/unifi_import/config.json b/front/plugins/unifi_import/config.json
@@ -1026,7 +1026,7 @@
         "elements": [
           {
             "elementType": "select",
-            "elementOptions": [{ "multiple": "true" }],
+            "elementOptions": [{ "multiple": "true", "ordeable": "true"}],
             "transformers": []
           }
         ]
@@ -1067,7 +1067,7 @@
         "elements": [
           {
             "elementType": "select",
-            "elementOptions": [{ "multiple": "true" }],
+            "elementOptions": [{ "multiple": "true", "ordeable": "true"}],
             "transformers": []
           }
         ]
diff --git a/front/plugins/vendor_update/config.json b/front/plugins/vendor_update/config.json
@@ -299,7 +299,7 @@
         "elements": [
           {
             "elementType": "select",
-            "elementOptions": [{ "multiple": "true" }],
+            "elementOptions": [{ "multiple": "true", "ordeable": "true"}],
             "transformers": []
           }
         ]
@@ -344,7 +344,7 @@
         "elements": [
           {
             "elementType": "select",
-            "elementOptions": [{ "multiple": "true" }],
+            "elementOptions": [{ "multiple": "true", "ordeable": "true"}],
             "transformers": []
           }
         ]
diff --git a/front/plugins/website_monitor/config.json b/front/plugins/website_monitor/config.json
@@ -538,7 +538,7 @@
         "elements": [
           {
             "elementType": "select",
-            "elementOptions": [{ "multiple": "true" }],
+            "elementOptions": [{ "multiple": "true", "ordeable": "true"}],
             "transformers": []
           }
         ]
@@ -579,7 +579,7 @@
         "elements": [
           {
             "elementType": "select",
-            "elementOptions": [{ "multiple": "true" }],
+            "elementOptions": [{ "multiple": "true", "ordeable": "true"}],
             "transformers": []
           }
         ]
diff --git a/front/report.php b/front/report.php
@@ -174,7 +174,7 @@ function findIndexByGUID(data, guid) {
     } else {
 
         // Initial data load
-        updateData('HTML', -1); // Default format to HTML and load the latest report
+        updateData('html', -1); // Default format to HTML and load the latest report
     }
 });
 
diff --git a/server/db/db_upgrade.py b/server/db/db_upgrade.py
@@ -817,7 +817,7 @@ def migrate_to_camelcase(sql) -> bool:
 
     for table, column_map in _CAMELCASE_COLUMN_MAP.items():
         # Check table exists
-        sql.execute(f"SELECT name FROM sqlite_master WHERE type='table' AND name=?", (table,))
+        sql.execute("SELECT name FROM sqlite_master WHERE type='table' AND name=?", (table,))
         if not sql.fetchone():
             mylog("verbose", [f"[db_upgrade] Table '{table}' does not exist — skipping"])
             continue
diff --git a/server/initialise.py b/server/initialise.py
@@ -865,6 +865,10 @@ def renameSettings(config_file):
     # Session columns
     r"\bses_MAC\b": "sesMac",
     r"\bses_IP\b": "sesIp",
+    r"\bses_DateTimeConnection\b": "sesDateTimeConnection",
+    r"\bses_DateTimeDisconnection\b": "sesDateTimeDisconnection",
+    r"\bses_EventTypeConnection\b": "sesEventTypeConnection",
+    r"\bses_EventTypeDisconnection\b": "sesEventTypeDisconnection",
     r"\bses_StillConnected\b": "sesStillConnected",
     r"\bses_AdditionalInfo\b": "sesAdditionalInfo",
     # Plugin columns (templates + WATCH values)
diff --git a/server/scan/name_resolution.py b/server/scan/name_resolution.py
@@ -23,10 +23,10 @@ def resolve_from_plugin(self, plugin: str, pMAC: str, pIP: str) -> ResolvedName:
         nameNotFound = ResolvedName()
 
         # Check by MAC
-        sql.execute(f"""
+        sql.execute("""
             SELECT watchedValue2 FROM Plugins_Objects
-            WHERE plugin = '{plugin}' AND objectPrimaryId = '{pMAC}'
-        """)
+            WHERE plugin = ? AND objectPrimaryId = ?
+        """, (plugin, pMAC))
         result = sql.fetchall()
         # self.db.commitDB() # Issue #1251: Optimize name resolution lookup
         if result:
@@ -36,10 +36,10 @@ def resolve_from_plugin(self, plugin: str, pMAC: str, pIP: str) -> ResolvedName:
         # Check name by IP if enabled
         if get_setting_value('NEWDEV_IP_MATCH_NAME'):
 
-            sql.execute(f"""
+            sql.execute("""
                 SELECT watchedValue2 FROM Plugins_Objects
-                WHERE plugin = '{plugin}' AND objectSecondaryId = '{pIP}'
-            """)
+                WHERE plugin = ? AND objectSecondaryId = ?
+            """, (plugin, pIP))
             result = sql.fetchall()
             # self.db.commitDB() # Issue #1251: Optimize name resolution lookup
             if result:
diff --git a/test/backend/test_notification_templates.py b/test/backend/test_notification_templates.py
@@ -247,21 +247,21 @@ def test_down_reconnected_template(self, mock_setting):
 
         mock_setting.side_effect = self._setting_factory({
             "NTFPRCS_TEXT_SECTION_HEADERS": True,
-            "NTFPRCS_TEXT_TEMPLATE_down_reconnected": "{devName} ({eve_MAC}) reconnected at {eve_DateTime}",
+            "NTFPRCS_TEXT_TEMPLATE_down_reconnected": "{devName} ({eveMac}) reconnected at {eveDateTime}",
         })
 
         reconnected = [
             {
                 "devName": "Switch",
-                "eve_MAC": "aa:11:bb:22:cc:33",
+                "eveMac": "aa:11:bb:22:cc:33",
                 "devVendor": "Netgear",
-                "eve_IP": "10.0.0.2",
-                "eve_DateTime": "2025-01-15 09:30:00",
-                "eve_EventType": "Down Reconnected",
+                "eveIp": "10.0.0.2",
+                "eveDateTime": "2025-01-15 09:30:00",
+                "eveEventType": "Down Reconnected",
                 "devComments": "",
             }
         ]
-        columns = ["devName", "eve_MAC", "devVendor", "eve_IP", "eve_DateTime", "eve_EventType", "devComments"]
+        columns = ["devName", "eveMac", "devVendor", "eveIp", "eveDateTime", "eveEventType", "devComments"]
 
         json_data = _make_json("down_reconnected", reconnected, columns, "🔁 Reconnected down devices")
         _, text = construct_notifications(json_data, "down_reconnected")
@@ -288,7 +288,7 @@ def test_html_unchanged_with_template(self, mock_setting):
         # Get HTML with template
         mock_setting.side_effect = self._setting_factory({
             "NTFPRCS_TEXT_SECTION_HEADERS": True,
-            "NTFPRCS_TEXT_TEMPLATE_new_devices": "{devName} ({eve_MAC})",
+            "NTFPRCS_TEXT_TEMPLATE_new_devices": "{devName} ({eveMac})",
         })
         html_with, _ = construct_notifications(json_data, "new_devices")
 

Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@`
`338`	`338`	`"elements": [`
`339`	`339`	`{`
`340`	`340`	`"elementType": "select",`
`341`		`- "elementOptions": [{ "multiple": "true" }],`
	`341`	`+ "elementOptions": [{ "multiple": "true", "ordeable": "true"}],`
`342`	`342`	`"transformers": []`
`343`	`343`	`}`
`344`	`344`	`]`
`@@ -387,7 +387,7 @@`
`387`	`387`	`"elements": [`
`388`	`388`	`{`
`389`	`389`	`"elementType": "select",`
`390`		`- "elementOptions": [{ "multiple": "true" }],`
	`390`	`+ "elementOptions": [{ "multiple": "true", "ordeable": "true"}],`
`391`	`391`	`"transformers": []`
`392`	`392`	`}`
`393`	`393`	`]`
Original file line number	Diff line number	Diff line change
`@@ -432,7 +432,7 @@`
`432`	`432`	`"elements": [`
`433`	`433`	`{`
`434`	`434`	`"elementType": "select",`
`435`		`- "elementOptions": [{ "multiple": "true" }],`
	`435`	`+ "elementOptions": [{ "multiple": "true", "ordeable": "true"}],`
`436`	`436`	`"transformers": []`
`437`	`437`	`}`
`438`	`438`	`]`
`@@ -477,7 +477,7 @@`
`477`	`477`	`"elements": [`
`478`	`478`	`{`
`479`	`479`	`"elementType": "select",`
`480`		`- "elementOptions": [{ "multiple": "true" }],`
	`480`	`+ "elementOptions": [{ "multiple": "true", "ordeable": "true"}],`
`481`	`481`	`"transformers": []`
`482`	`482`	`}`
`483`	`483`	`]`
Original file line number	Diff line number	Diff line change
`@@ -753,7 +753,7 @@`
`753`	`753`	`"elements": [`
`754`	`754`	`{`
`755`	`755`	`"elementType": "select",`
`756`		`- "elementOptions": [{ "multiple": "true" }],`
	`756`	`+ "elementOptions": [{ "multiple": "true", "ordeable": "true"}],`
`757`	`757`	`"transformers": []`
`758`	`758`	`}`
`759`	`759`	`]`
`@@ -802,7 +802,7 @@`
`802`	`802`	`"elements": [`
`803`	`803`	`{`
`804`	`804`	`"elementType": "select",`
`805`		`- "elementOptions": [{ "multiple": "true" }],`
	`805`	`+ "elementOptions": [{ "multiple": "true", "ordeable": "true"}],`
`806`	`806`	`"transformers": []`
`807`	`807`	`}`
`808`	`808`	`]`
Original file line number	Diff line number	Diff line change
`@@ -478,7 +478,7 @@`
`478`	`478`	`"elements": [`
`479`	`479`	`{`
`480`	`480`	`"elementType": "select",`
`481`		`- "elementOptions": [{ "multiple": "true" }],`
	`481`	`+ "elementOptions": [{ "multiple": "true", "ordeable": "true"}],`
`482`	`482`	`"transformers": []`
`483`	`483`	`}`
`484`	`484`	`]`
`@@ -519,7 +519,7 @@`
`519`	`519`	`"elements": [`
`520`	`520`	`{`
`521`	`521`	`"elementType": "select",`
`522`		`- "elementOptions": [{ "multiple": "true" }],`
	`522`	`+ "elementOptions": [{ "multiple": "true", "ordeable": "true"}],`
`523`	`523`	`"transformers": []`
`524`	`524`	`}`
`525`	`525`	`]`
Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@`
`324`	`324`	`"elements": [`
`325`	`325`	`{`
`326`	`326`	`"elementType": "select",`
`327`		`- "elementOptions": [{ "multiple": "true" }],`
	`327`	`+ "elementOptions": [{ "multiple": "true", "ordeable": "true"}],`
`328`	`328`	`"transformers": []`
`329`	`329`	`}`
`330`	`330`	`]`
`@@ -369,7 +369,7 @@`
`369`	`369`	`"elements": [`
`370`	`370`	`{`
`371`	`371`	`"elementType": "select",`
`372`		`- "elementOptions": [{ "multiple": "true" }],`
	`372`	`+ "elementOptions": [{ "multiple": "true", "ordeable": "true"}],`
`373`	`373`	`"transformers": []`
`374`	`374`	`}`
`375`	`375`	`]`
Original file line number	Diff line number	Diff line change
`@@ -561,7 +561,7 @@`
`561`	`561`	`"elements": [`
`562`	`562`	`{`
`563`	`563`	`"elementType": "select",`
`564`		`- "elementOptions": [{ "multiple": "true" }],`
	`564`	`+ "elementOptions": [{ "multiple": "true", "ordeable": "true"}],`
`565`	`565`	`"transformers": []`
`566`	`566`	`}`
`567`	`567`	`]`
`@@ -610,7 +610,7 @@`
`610`	`610`	`"elements": [`
`611`	`611`	`{`
`612`	`612`	`"elementType": "select",`
`613`		`- "elementOptions": [{ "multiple": "true" }],`
	`613`	`+ "elementOptions": [{ "multiple": "true", "ordeable": "true"}],`
`614`	`614`	`"transformers": []`
`615`	`615`	`}`
`616`	`616`	`]`
Original file line number	Diff line number	Diff line change
`@@ -553,7 +553,7 @@`
`553`	`553`	`"elements": [`
`554`	`554`	`{`
`555`	`555`	`"elementType": "select",`
`556`		`- "elementOptions": [{ "multiple": "true" }],`
	`556`	`+ "elementOptions": [{ "multiple": "true", "ordeable": "true"}],`
`557`	`557`	`"transformers": []`
`558`	`558`	`}`
`559`	`559`	`]`
`@@ -594,7 +594,7 @@`
`594`	`594`	`"elements": [`
`595`	`595`	`{`
`596`	`596`	`"elementType": "select",`
`597`		`- "elementOptions": [{ "multiple": "true" }],`
	`597`	`+ "elementOptions": [{ "multiple": "true", "ordeable": "true"}],`
`598`	`598`	`"transformers": []`
`599`	`599`	`}`
`600`	`600`	`]`
Original file line number	Diff line number	Diff line change
`@@ -429,7 +429,7 @@`
`429`	`429`	`"elements": [`
`430`	`430`	`{`
`431`	`431`	`"elementType": "select",`
`432`		`- "elementOptions": [{ "multiple": "true" }],`
	`432`	`+ "elementOptions": [{ "multiple": "true", "ordeable": "true"}],`
`433`	`433`	`"transformers": []`
`434`	`434`	`}`
`435`	`435`	`]`
`@@ -462,7 +462,7 @@`
`462`	`462`	`"elements": [`
`463`	`463`	`{`
`464`	`464`	`"elementType": "select",`
`465`		`- "elementOptions": [{ "multiple": "true" }],`
	`465`	`+ "elementOptions": [{ "multiple": "true", "ordeable": "true"}],`
`466`	`466`	`"transformers": []`
`467`	`467`	`}`
`468`	`468`	`]`
Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,7 @@`
`402`	`402`	`"elements": [`
`403`	`403`	`{`
`404`	`404`	`"elementType": "select",`
`405`		`- "elementOptions": [{ "multiple": "true" }],`
	`405`	`+ "elementOptions": [{ "multiple": "true", "ordeable": "true"}],`
`406`	`406`	`"transformers": []`
`407`	`407`	`}`
`408`	`408`	`]`
`@@ -435,7 +435,7 @@`
`435`	`435`	`"elements": [`
`436`	`436`	`{`
`437`	`437`	`"elementType": "select",`
`438`		`- "elementOptions": [{ "multiple": "true" }],`
	`438`	`+ "elementOptions": [{ "multiple": "true", "ordeable": "true"}],`
`439`	`439`	`"transformers": []`
`440`	`440`	`}`
`441`	`441`	`]`