BE+FE: work on bulk deleting devices and code cleanup #1493

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

front/deviceDetailsEdit.php

@@ -17,7 +17,7 @@ require_once $_SERVER["DOCUMENT_ROOT"] . "/php/templates/security.php"; ?>
         class="btn btn-default pa-btn pa-btn-delete"
         style="margin-left:0px;"
         id="btnDelete"
-        onclick="askDeleteDevice()">
+        onclick="askDeleteDeviceByMac()">
           <i class="fas fa-trash-alt"></i>
           <?= lang("DevDetail_button_Delete") ?>
     </button>

front/devices.php

@@ -1148,7 +1148,7 @@ function renderCustomProps(custProps, mac) {
             onClickEvent = `alert('Not implemented')`;
             break;
           case "delete_dev":
-            onClickEvent = `askDelDevDTInline('${mac}')`;
+            onClickEvent = `askDeleteDeviceByMac('${mac}')`;
             break;
           default:
             break;

front/js/device.js

@@ -1,21 +1,5 @@
-
-
 // -----------------------------------------------------------------------------
-function askDeleteDevice() {
-
-  mac = getMac()
-
-  // Ask delete device
-  showModalWarning(
-    getString("DevDetail_button_Delete"),
-    getString("DevDetail_button_Delete_ask"),
-    getString('Gen_Cancel'),
-    getString('Gen_Delete'),
-    'deleteDevice');
-}
-
-// -----------------------------------------------------------------------------
-function askDelDevDTInline(mac) {
+function askDeleteDeviceByMac(mac) {
 
   // only try getting mac from URL if not supplied - used in inline buttons on in the my devices listing pages
   if(isEmpty(mac))
@@ -31,34 +15,9 @@ function askDelDevDTInline(mac) {
     () => deleteDeviceByMac(mac))
 }
 
-
-// -----------------------------------------------------------------------------
-function deleteDevice() {
-  // Check MAC
-  mac = getMac()
-
-  const apiBase = getApiBase();
-  const apiToken = getSetting("API_TOKEN");
-  const url = `${apiBase}/device/${mac}/delete`;
-
-  $.ajax({
-    url,
-    method: "DELETE",
-    headers: { "Authorization": `Bearer ${apiToken}` },
-    success: function(response) {
-      showMessage(response.success ? "Device deleted successfully" : (response.error || "Unknown error"));
-      updateApi("devices,appevents");
-    },
-    error: function(xhr, status, error) {
-      console.error("Error deleting device:", status, error);
-      showMessage("Error: " + (xhr.responseJSON?.error || error));
-    }
-  });
-}
-
 // -----------------------------------------------------------------------------
 function deleteDeviceByMac(mac) {
-  // only try getting mac from URL if not supplied - used in inline buttons on in teh my devices listing pages
+  // only try getting mac from URL if not supplied - used in inline buttons on in the my devices listing pages
   if(isEmpty(mac))
   {
     mac = getMac()

front/maintenance.php

@@ -373,7 +373,10 @@ function deleteAllDevices()
     url,
     method: "DELETE",
     headers: { "Authorization": `Bearer ${apiToken}` },
-    data: JSON.stringify({ macs: null }),
+    data: JSON.stringify({
+      macs: [],
+    confirm_delete_all: true
+    }),
     contentType: "application/json",
     success: function(response) {
       showMessage(response.success ? "All devices deleted successfully" : (response.error || "Unknown error"));