FE+BE: init check work, removed legacy setDeviceData

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

front/deviceDetailsEdit.php

@@ -306,53 +306,93 @@
 
     showSpinner();
 
-    // Update data to server using POST
-    $.post('php/server/devices.php?action=setDeviceData', {
-        mac: $('#NEWDEV_devMac').val(),
-        name: encodeURIComponent($('#NEWDEV_devName').val().replace(/'/g, "’")),
-        owner: encodeURIComponent($('#NEWDEV_devOwner').val().replace(/'/g, "’")),
-        type: $('#NEWDEV_devType').val().replace(/'/g, ""),        
-        vendor: encodeURIComponent($('#NEWDEV_devVendor').val().replace(/'/g, "’")),
-        icon: encodeURIComponent($('#NEWDEV_devIcon').val()),
-        favorite: ($('#NEWDEV_devFavorite')[0].checked * 1),
-        group: encodeURIComponent($('#NEWDEV_devGroup').val().replace(/'/g, "’")),
-        location: encodeURIComponent($('#NEWDEV_devLocation').val().replace(/'/g, "’")),
-        comments: encodeURIComponent(encodeSpecialChars($('#NEWDEV_devComments').val())),
-        networknode: $('#NEWDEV_devParentMAC').val(),
-        networknodeport: $('#NEWDEV_devParentPort').val(),
-        ssid: $('#NEWDEV_devSSID').val(),
-        networksite: $('#NEWDEV_devSite').val(),
-        staticIP: ($('#NEWDEV_devStaticIP')[0].checked * 1),
-        scancycle: "1",
-        alertevents: ($('#NEWDEV_devAlertEvents')[0].checked * 1),
-        alertdown: ($('#NEWDEV_devAlertDown')[0].checked * 1),
-        skiprepeated: $('#NEWDEV_devSkipRepeated').val().split(' ')[0],
-        relType: $('#NEWDEV_devParentRelType').val().replace(/'/g, ""),
-        reqNics: ($('#NEWDEV_devReqNicsOnline')[0].checked * 1),
-        newdevice: ($('#NEWDEV_devIsNew')[0].checked * 1),
-        archived: ($('#NEWDEV_devIsArchived')[0].checked * 1),
-        devFirstConnection: ($('#NEWDEV_devFirstConnection').val()),
-        devLastConnection: ($('#NEWDEV_devLastConnection').val()),
-        devCustomProps: btoa(JSON.stringify(collectTableData("#NEWDEV_devCustomProps_table"))),
-        ip: ($('#NEWDEV_devLastIP').val()),
+    const apiToken = getSetting("API_TOKEN");   // dynamic token
+    const host     = window.location.hostname;
+    const port     = getSetting("GRAPHQL_PORT");
+
+    mac = $('#NEWDEV_devMac').val();
+
+    // Build payload for new endpoint
+    const payload = {
+        devName: $('#NEWDEV_devName').val().replace(/'/g, "’"),
+        devOwner: $('#NEWDEV_devOwner').val().replace(/'/g, "’"),
+        devType: $('#NEWDEV_devType').val().replace(/'/g, ""),
+        devVendor: $('#NEWDEV_devVendor').val().replace(/'/g, "’"),
+        devIcon: $('#NEWDEV_devIcon').val(),
+
+        devFavorite: ($('#NEWDEV_devFavorite')[0].checked * 1),
+        devGroup: $('#NEWDEV_devGroup').val().replace(/'/g, "’"),
+        devLocation: $('#NEWDEV_devLocation').val().replace(/'/g, "’"),
+        devComments: encodeSpecialChars($('#NEWDEV_devComments').val()),
+
+        devParentMAC: $('#NEWDEV_devParentMAC').val(),
+        devParentPort: $('#NEWDEV_devParentPort').val(),
+        devParentRelType: $('#NEWDEV_devParentRelType').val().replace(/'/g, ""),
+
+        devSSID: $('#NEWDEV_devSSID').val(),
+        devSite: $('#NEWDEV_devSite').val(),
+
+        devStaticIP: ($('#NEWDEV_devStaticIP')[0].checked * 1),
+        devScan: 1,
+
+        devAlertEvents: ($('#NEWDEV_devAlertEvents')[0].checked * 1),
+        devAlertDown: ($('#NEWDEV_devAlertDown')[0].checked * 1),
+        devSkipRepeated: $('#NEWDEV_devSkipRepeated').val().split(' ')[0],
+
+        devReqNicsOnline: ($('#NEWDEV_devReqNicsOnline')[0].checked * 1),
+        devIsNew: ($('#NEWDEV_devIsNew')[0].checked * 1),
+        devIsArchived: ($('#NEWDEV_devIsArchived')[0].checked * 1),
+
+        devFirstConnection: $('#NEWDEV_devFirstConnection').val(),
+        devLastConnection: $('#NEWDEV_devLastConnection').val(),
+        devLastIP: $('#NEWDEV_devLastIP').val(),
+
+        devCustomProps: btoa(
+            JSON.stringify(collectTableData("#NEWDEV_devCustomProps_table"))
+        ),
+
         createNew: createNew
-    }, function(msg) {
-        showMessage(msg);
+    };
 
-        // Remove navigation prompt "Are you sure you want to leave..."
-        window.onbeforeunload = null;
-        somethingChanged = false;
 
-        // refresh API
-        updateApi("devices,appevents");
+    $.ajax({
+        url: "http://" + host + ":" + port + "/device/" + encodeURIComponent(mac),
+        type: "POST",
+        headers: {
+            "Authorization": "Bearer " + apiToken,
+            "Content-Type": "application/json"
+        },
+        data: JSON.stringify(payload),
+        success: function (resp) {
 
-        // Callback function
-        if (typeof refreshCallback == 'function') {
-            refreshCallback(direction);
+            if (resp && resp.success) {
+                showMessage("Device saved successfully");
+            } else {
+                showMessage("Device update returned an unexpected response");
+            }
+
+            // Remove navigation prompt
+            window.onbeforeunload = null;
+            somethingChanged = false;
+
+            // Refresh API
+            updateApi("devices,appevents");
+
+            // Callback
+            if (typeof refreshCallback === "function") {
+                refreshCallback(direction);
+            }
+
+            hideSpinner();
+        },
+        error: function (xhr) {
+            if (xhr.status === 403) {
+                showMessage("Unauthorized – invalid API token");
+            } else {
+                showMessage("Failed to save device (" + xhr.status + ")");
+            }
+            hideSpinner();
         }
-
-        // Everything loaded
-        hideSpinner();
     });
   }
 

front/php/server/devices.php

@@ -32,7 +32,6 @@
     switch ($action) {
                                                                                       // check server/api_server/api_server_start.py for equivalents
       case 'getServerDeviceData':     getServerDeviceData();                   break; // equivalent: get_device_data  
-      case 'setDeviceData':           setDeviceData();                         break; // equivalent: set_device_data
       case 'deleteDevice':            deleteDevice();                          break; // equivalent: delete_device(mac)
       case 'deleteAllWithEmptyMACs':  deleteAllWithEmptyMACs();                break; // equivalent: delete_all_with_empty_macs
 

front/systeminfoNetwork.php

@@ -345,8 +345,7 @@ function formatDataSize(bytes) {
 
 
 function loadInterfaces() {
-    const apiToken = getSetting("API_TOKEN"); // replace with dynamic token if available
-
+    const apiToken = getSetting("API_TOKEN"); 
     const host = window.location.hostname;
     const port = getSetting("GRAPHQL_PORT");
 

server/models/device_instance.py

@@ -500,96 +500,112 @@ class DeviceInstance:
 
     def setDeviceData(self, mac, data):
         """Update or create a device."""
-        if data.get("createNew", False):
-            sql = """
-            INSERT INTO Devices (
-                devMac, devName, devOwner, devType, devVendor, devIcon,
-                devFavorite, devGroup, devLocation, devComments,
-                devParentMAC, devParentPort, devSSID, devSite,
-                devStaticIP, devScan, devAlertEvents, devAlertDown,
-                devParentRelType, devReqNicsOnline, devSkipRepeated,
-                devIsNew, devIsArchived, devLastConnection,
-                devFirstConnection, devLastIP, devGUID, devCustomProps,
-                devSourcePlugin
-            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-            """
+        try:
+            if data.get("createNew", False):
+                sql = """
+                INSERT INTO Devices (
+                    devMac, devName, devOwner, devType, devVendor, devIcon,
+                    devFavorite, devGroup, devLocation, devComments,
+                    devParentMAC, devParentPort, devSSID, devSite,
+                    devStaticIP, devScan, devAlertEvents, devAlertDown,
+                    devParentRelType, devReqNicsOnline, devSkipRepeated,
+                    devIsNew, devIsArchived, devLastConnection,
+                    devFirstConnection, devLastIP, devGUID, devCustomProps,
+                    devSourcePlugin
+                ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+                """
 
-            values = (
-                mac,
-                data.get("devName", ""),
-                data.get("devOwner", ""),
-                data.get("devType", ""),
-                data.get("devVendor", ""),
-                data.get("devIcon", ""),
-                data.get("devFavorite", 0),
-                data.get("devGroup", ""),
-                data.get("devLocation", ""),
-                data.get("devComments", ""),
-                data.get("devParentMAC", ""),
-                data.get("devParentPort", ""),
-                data.get("devSSID", ""),
-                data.get("devSite", ""),
-                data.get("devStaticIP", 0),
-                data.get("devScan", 0),
-                data.get("devAlertEvents", 0),
-                data.get("devAlertDown", 0),
-                data.get("devParentRelType", "default"),
-                data.get("devReqNicsOnline", 0),
-                data.get("devSkipRepeated", 0),
-                data.get("devIsNew", 0),
-                data.get("devIsArchived", 0),
-                data.get("devLastConnection", timeNowDB()),
-                data.get("devFirstConnection", timeNowDB()),
-                data.get("devLastIP", ""),
-                data.get("devGUID", ""),
-                data.get("devCustomProps", ""),
-                data.get("devSourcePlugin", "DUMMY"),
-            )
+                values = (
+                    mac,
+                    data.get("devName", ""),
+                    data.get("devOwner", ""),
+                    data.get("devType", ""),
+                    data.get("devVendor", ""),
+                    data.get("devIcon", ""),
+                    data.get("devFavorite", 0),
+                    data.get("devGroup", ""),
+                    data.get("devLocation", ""),
+                    data.get("devComments", ""),
+                    data.get("devParentMAC", ""),
+                    data.get("devParentPort", ""),
+                    data.get("devSSID", ""),
+                    data.get("devSite", ""),
+                    data.get("devStaticIP", 0),
+                    data.get("devScan", 0),
+                    data.get("devAlertEvents", 0),
+                    data.get("devAlertDown", 0),
+                    data.get("devParentRelType", "default"),
+                    data.get("devReqNicsOnline", 0),
+                    data.get("devSkipRepeated", 0),
+                    data.get("devIsNew", 0),
+                    data.get("devIsArchived", 0),
+                    data.get("devLastConnection", timeNowDB()),
+                    data.get("devFirstConnection", timeNowDB()),
+                    data.get("devLastIP", ""),
+                    data.get("devGUID", ""),
+                    data.get("devCustomProps", ""),
+                    data.get("devSourcePlugin", "DUMMY"),
+                )
 
-        else:
-            sql = """
-            UPDATE Devices SET
-                devName=?, devOwner=?, devType=?, devVendor=?, devIcon=?,
-                devFavorite=?, devGroup=?, devLocation=?, devComments=?,
-                devParentMAC=?, devParentPort=?, devSSID=?, devSite=?,
-                devStaticIP=?, devScan=?, devAlertEvents=?, devAlertDown=?,
-                devParentRelType=?, devReqNicsOnline=?, devSkipRepeated=?,
-                devIsNew=?, devIsArchived=?, devCustomProps=?
-            WHERE devMac=?
-            """
-            values = (
-                data.get("devName", ""),
-                data.get("devOwner", ""),
-                data.get("devType", ""),
-                data.get("devVendor", ""),
-                data.get("devIcon", ""),
-                data.get("devFavorite", 0),
-                data.get("devGroup", ""),
-                data.get("devLocation", ""),
-                data.get("devComments", ""),
-                data.get("devParentMAC", ""),
-                data.get("devParentPort", ""),
-                data.get("devSSID", ""),
-                data.get("devSite", ""),
-                data.get("devStaticIP", 0),
-                data.get("devScan", 0),
-                data.get("devAlertEvents", 0),
-                data.get("devAlertDown", 0),
-                data.get("devParentRelType", "default"),
-                data.get("devReqNicsOnline", 0),
-                data.get("devSkipRepeated", 0),
-                data.get("devIsNew", 0),
-                data.get("devIsArchived", 0),
-                data.get("devCustomProps", ""),
-                mac,
-            )
+            else:
+                sql = """
+                UPDATE Devices SET
+                    devName=?, devOwner=?, devType=?, devVendor=?, devIcon=?,
+                    devFavorite=?, devGroup=?, devLocation=?, devComments=?,
+                    devParentMAC=?, devParentPort=?, devSSID=?, devSite=?,
+                    devStaticIP=?, devScan=?, devAlertEvents=?, devAlertDown=?,
+                    devParentRelType=?, devReqNicsOnline=?, devSkipRepeated=?,
+                    devIsNew=?, devIsArchived=?, devCustomProps=?
+                WHERE devMac=?
+                """
+                values = (
+                    data.get("devName", ""),
+                    data.get("devOwner", ""),
+                    data.get("devType", ""),
+                    data.get("devVendor", ""),
+                    data.get("devIcon", ""),
+                    data.get("devFavorite", 0),
+                    data.get("devGroup", ""),
+                    data.get("devLocation", ""),
+                    data.get("devComments", ""),
+                    data.get("devParentMAC", ""),
+                    data.get("devParentPort", ""),
+                    data.get("devSSID", ""),
+                    data.get("devSite", ""),
+                    data.get("devStaticIP", 0),
+                    data.get("devScan", 0),
+                    data.get("devAlertEvents", 0),
+                    data.get("devAlertDown", 0),
+                    data.get("devParentRelType", "default"),
+                    data.get("devReqNicsOnline", 0),
+                    data.get("devSkipRepeated", 0),
+                    data.get("devIsNew", 0),
+                    data.get("devIsArchived", 0),
+                    data.get("devCustomProps", ""),
+                    mac,
+                )
 
-        conn = get_temp_db_connection()
-        cur = conn.cursor()
-        cur.execute(sql, values)
-        conn.commit()
-        conn.close()
-        return {"success": True}
+            conn = get_temp_db_connection()
+            cur = conn.cursor()
+            cur.execute(sql, values)
+            conn.commit()
+            conn.close()
+            return {"success": True}
+        except Exception as e:
+            if conn:
+                conn.rollback()
+
+            # Optional: your existing logger
+            mylog("none", f"[DeviceInstance] setDeviceData({mac}) failed: {e}")
+
+            return {
+                "success": False,
+                "error": str(e)
+            }
+
+        finally:
+            if conn:
+                conn.close()
 
     def deleteDeviceByMAC(self, mac):
         """Delete a device by MAC."""