From 4fef6e156b0ca461b7b374d838a920b10f3341d7 Mon Sep 17 00:00:00 2001
From: jokob-sk <jokob-sk@gmail.com>
Date: Sat, 28 Dec 2024 09:19:25 +1100
Subject: [PATCH] Archived devices were shown #920

---
 front/css/app.css                       | 27 ++++++++
 front/deviceDetailsEdit.php             |  2 +-
 front/devices.php                       | 85 +++++++++++++------------
 front/js/device.js                      | 45 +++++++++----
 front/js/modal.js                       |  7 +-
 front/js/settings_utils.js              |  3 +-
 front/php/templates/language/en_us.json |  1 +
 front/php/templates/language/es_es.json |  0
 log/.gitignore                          |  0
 log/plugins/.gitignore                  |  0
 server/const.py                         |  2 +-
 server/graphql_server/graphql_schema.py |  3 +-
 12 files changed, 119 insertions(+), 56 deletions(-)
 mode change 100644 => 100755 front/php/templates/language/es_es.json
 mode change 100644 => 100755 log/.gitignore
 mode change 100644 => 100755 log/plugins/.gitignore

diff --git a/front/css/app.css b/front/css/app.css
index 7088a33e..c9c44960 100755
--- a/front/css/app.css
+++ b/front/css/app.css
@@ -1416,6 +1416,7 @@ input[readonly] {
     display: inline-block;
     padding: 0.1em;
     margin: 0.1em;
+    /* transition: font-size 0.3s;*/
 }
 
 .devicePropAction:hover
@@ -1426,6 +1427,32 @@ input[readonly] {
     
 }
 
+
+#panDetails .dataTables_wrapper .bottom div
+{
+    max-width: 34%;
+    display: block;
+    float:inline-end;
+    height: 2em;
+} 
+
+#panDetails .dataTables_wrapper .bottom .dataTables_info
+{
+    float:inline-start;
+}
+
+#panDetails .dataTables_wrapper .bottom .dataTables_length
+{
+    padding: 0.3em;
+}
+/* #panDetails .dataTables_wrapper .bottom .paging_simple_numbers */
+
+
+#panDetails #NEWDEV_devCustomProps_label
+{
+    display: none;
+}
+
 /* ----------------------------------------------------------------- */
 /* MODAL popups */
 /* ----------------------------------------------------------------- */
diff --git a/front/deviceDetailsEdit.php b/front/deviceDetailsEdit.php
index 5ac7a10e..f4b1ad88 100755
--- a/front/deviceDetailsEdit.php
+++ b/front/deviceDetailsEdit.php
@@ -211,7 +211,7 @@ function getDeviceData(readAllData){
 
                     // Generate the input field HTML
                     const inputFormHtml = `<div class="form-group col-xs-12">
-                                              <label class="${obj.labelClasses}"> ${setting.setName}    
+                                              <label id="${setting.setKey}_label" class="${obj.labelClasses}" > ${setting.setName}    
                                                   <i my-set-key="${setting.setKey}"
                                                       title="${getString("Settings_Show_Description")}" 
                                                       class="fa fa-circle-info pointer helpIconSmallTopRight" 
diff --git a/front/devices.php b/front/devices.php
index 2dd99ee2..eef26129 100755
--- a/front/devices.php
+++ b/front/devices.php
@@ -295,46 +295,46 @@ function renderInfoboxes(customData) {
     });
   }
 
-// -----------------------------------------------------------------------------
-// Define a function to filter data based on deviceStatus
-function filterDataByStatus(data, status) {
-  return data.filter(function(item) {
-    switch (status) {
-      case 'my_devices':
-        to_display = getSetting('UI_MY_DEVICES');
+// // -----------------------------------------------------------------------------
+// // Define a function to filter data based on deviceStatus
+// function filterDataByStatus(data, status) {
+//   return data.filter(function(item) {
+//     switch (status) {
+//       case 'my_devices':
+//         to_display = getSetting('UI_MY_DEVICES');
         
-        let result = true;
-
-        if (!to_display.includes('down') && item.devPresentLastScan === 0 && item.devAlertDown !== 0) {
-            result = false;
-        } else if (!to_display.includes('new') && item.devIsNew === 1) {
-            result = false;
-        } else if (!to_display.includes('archived') && item.devIsArchived === 1) {
-            result = false;
-        } else if (!to_display.includes('offline') && item.devPresentLastScan === 0) {
-            result = false;
-        } else if (!to_display.includes('online') && item.devPresentLastScan === 1) {
-            result = false;
-        }  
-
-        return result; // Include all items for 'my_devices' status
-      case 'connected':
-        return item.devPresentLastScan === 1;
-      case 'favorites':
-        return item.devFavorite === 1;
-      case 'new':
-        return item.devIsNew === 1;
-      case 'offline':
-        return item.devPresentLastScan === 0;
-      case 'down':
-        return (item.devPresentLastScan === 0 && item.devAlertDown  !== 0);
-      case 'archived':
-        return item.devIsArchived === 1;
-      default:
-        return true; // Include all items for unknown statuses
-    }
-  });
-}
+//         let result = true;
+
+//         if (!to_display.includes('down') && item.devPresentLastScan === 0 && item.devAlertDown !== 0) {
+//             result = false;
+//         } else if (!to_display.includes('new') && item.devIsNew === 1) {
+//             result = false;
+//         } else if (!to_display.includes('archived') && item.devIsArchived === 1) {
+//             result = false;
+//         } else if (!to_display.includes('offline') && item.devPresentLastScan === 0) {
+//             result = false;
+//         } else if (!to_display.includes('online') && item.devPresentLastScan === 1) {
+//             result = false;
+//         }  
+
+//         return result; // Include all items for 'my_devices' status
+//       case 'connected':
+//         return item.devPresentLastScan === 1;
+//       case 'favorites':
+//         return item.devFavorite === 1;
+//       case 'new':
+//         return item.devIsNew === 1;
+//       case 'offline':
+//         return item.devPresentLastScan === 0;
+//       case 'down':
+//         return (item.devPresentLastScan === 0 && item.devAlertDown  !== 0);
+//       case 'archived':
+//         return item.devIsArchived === 1;
+//       default:
+//         return true; // Include all items for unknown statuses
+//     }
+//   });
+// }
 
 
 // Map column index to column name for GraphQL query
@@ -792,6 +792,11 @@ function initializeDatatable (status) {
           
           hideSpinner();
           
+    },
+    createdRow: function(row, data, dataIndex) {
+        // add devMac to the table row
+        $(row).attr('my-devMac', data[mapIndx(11)]); 
+                
     }
     
   });
@@ -919,7 +924,7 @@ function renderCustomProps(custProps, mac) {
           onClickEvent = `alert('Not implemented')`;
           break;
         case "delete_dev":
-          onClickEvent = `deleteDeviceByMac('${mac}')`;
+          onClickEvent = `askDelDevDTInline('${mac}')`;
           break;
         default:
           break;
diff --git a/front/js/device.js b/front/js/device.js
index c714e2a8..9f239b7e 100755
--- a/front/js/device.js
+++ b/front/js/device.js
@@ -1,28 +1,47 @@
 
 
 // -----------------------------------------------------------------------------
-function askDeleteDevice () {
+function askDeleteDevice() {
   // Check MAC
   if (mac == '') {
     return;
   }
 
   // Ask delete device
-  showModalWarning ('Delete Device', 'Are you sure you want to delete this device?<br>(maybe you prefer to archive it)',
-    getString('Gen_Cancel'), getString('Gen_Delete'), 'deleteDevice');
+  showModalWarning(
+    getString("DevDetail_button_Delete"),
+    getString("DevDetail_button_Delete_ask"),
+    getString('Gen_Cancel'), 
+    getString('Gen_Delete'), 
+    'deleteDevice');
+}
+
+// -----------------------------------------------------------------------------
+function askDelDevDTInline(mac) {
+  // Check MAC
+  if (mac == '') {
+    return;
+  }
+
+  showModalWarning(
+    getString("DevDetail_button_Delete"), 
+    getString("DevDetail_button_Delete_ask"),
+    getString('Gen_Cancel'), 
+    getString('Gen_Delete'), 
+    () => deleteDeviceByMac(mac))
 }
 
 
 // -----------------------------------------------------------------------------
-function deleteDevice () {
+function deleteDevice() {
   // Check MAC
   if (mac == '') {
     return;
   }
 
   // Delete device
-  $.get('php/server/devices.php?action=deleteDevice&mac='+ mac, function(msg) {
-    showMessage (msg);
+  $.get('php/server/devices.php?action=deleteDevice&mac=' + mac, function (msg) {
+    showMessage(msg);
   });
 
   // refresh API
@@ -30,18 +49,22 @@ function deleteDevice () {
 }
 
 // -----------------------------------------------------------------------------
-function deleteDeviceByMac (mac) {
+function deleteDeviceByMac(mac) {
   // Check MAC
   if (mac == '') {
-      return;
+    return;
   }
 
+  // alert(mac)
+  // return;
+
   // Delete device
-  $.get('php/server/devices.php?action=deleteDevice&mac='+ mac, function(msg) {
-      showMessage (msg);
+  $.get('php/server/devices.php?action=deleteDevice&mac=' + mac, function (msg) {
+    showMessage(msg);
   });
 
   // refresh API
   updateApi("devices,appevents")
 }
-    
\ No newline at end of file
+
+
diff --git a/front/js/modal.js b/front/js/modal.js
index 04e3f81d..24b24b55 100755
--- a/front/js/modal.js
+++ b/front/js/modal.js
@@ -65,7 +65,8 @@ function showModalWarning(
     message,
     btnCancel = getString("Gen_Cancel"),
     btnOK = getString("Gen_Okay"),
-    callbackFunction = null
+    callbackFunction = null,
+    triggeredBy = null
 ) {
     // set captions
     $("#modal-warning-title").html(title);
@@ -77,6 +78,10 @@ function showModalWarning(
         modalCallbackFunction = callbackFunction;
     }
 
+    if (triggeredBy != null) {
+        $('#'+prefix).attr("data-myparam-triggered-by", triggeredBy)
+    }
+
     // Show modal
     $("#modal-warning").modal("show");
 }
diff --git a/front/js/settings_utils.js b/front/js/settings_utils.js
index 898961e7..6e3400a1 100755
--- a/front/js/settings_utils.js
+++ b/front/js/settings_utils.js
@@ -1159,7 +1159,8 @@ function generateFormHtml(settingsData, set, overrideValue, overrideOptions, ori
         $(document).ready(() => {
           $(`#${tableId}`).DataTable({
             ordering: false, // Disables sorting on all columns
-            searching: false // Disables the search box
+            searching: false, // Disables the search box
+            dom: "<'top'rt><'bottom'ipl>", // Move length dropdown to the bottom
           });
         });
 
diff --git a/front/php/templates/language/en_us.json b/front/php/templates/language/en_us.json
index 9245b248..166dfbd1 100755
--- a/front/php/templates/language/en_us.json
+++ b/front/php/templates/language/en_us.json
@@ -183,6 +183,7 @@
     "DevDetail_button_AddIcon_Help": "Paste in an SVG html tag or Font Awesome html tag icon. Read the <a href=\"https://github.com/jokob-sk/NetAlertX/blob/main/docs/ICONS.md\" target=\"_blank\">Icons docs</a> for details.",
     "DevDetail_button_AddIcon_Tooltip": "Add a new Icon to this device that is not yet available in the dropdown.",
     "DevDetail_button_Delete": "Delete Device",
+    "DevDetail_button_Delete_ask": "Are you sure you want to delete this device? You may also archive it instead.",
     "DevDetail_button_DeleteEvents": "Delete Events",
     "DevDetail_button_DeleteEvents_Warning": "Are you sure you want to delete all Events of this device?<br><br>(this will clear the <b>Events history</b> and the <b>Sessions</b> and might help with constant (persistent) notifications)",
     "DevDetail_button_OverwriteIcons": "Overwrite Icons",
diff --git a/front/php/templates/language/es_es.json b/front/php/templates/language/es_es.json
old mode 100644
new mode 100755
diff --git a/log/.gitignore b/log/.gitignore
old mode 100644
new mode 100755
diff --git a/log/plugins/.gitignore b/log/plugins/.gitignore
old mode 100644
new mode 100755
diff --git a/server/const.py b/server/const.py
index 82647122..7625a3ab 100755
--- a/server/const.py
+++ b/server/const.py
@@ -88,7 +88,7 @@
                             FROM Devices
                             WHERE
                                 (instr((SELECT setValue FROM Statuses), 'online') > 0 AND devPresentLastScan = 1) OR
-                                (instr((SELECT setValue FROM Statuses), 'offline') > 0 AND devPresentLastScan = 0) OR
+                                (instr((SELECT setValue FROM Statuses), 'offline') > 0 AND devPresentLastScan = 0 AND devIsArchived = 0) OR
                                 (instr((SELECT setValue FROM Statuses), 'down') > 0 AND devPresentLastScan = 0 AND devAlertDown = 1) OR
                                 (instr((SELECT setValue FROM Statuses), 'new') > 0 AND devIsNew = 1) OR
                                 (instr((SELECT setValue FROM Statuses), 'archived') > 0 AND devIsArchived = 1)
diff --git a/server/graphql_server/graphql_schema.py b/server/graphql_server/graphql_schema.py
index 02e97727..699f16b7 100755
--- a/server/graphql_server/graphql_schema.py
+++ b/server/graphql_server/graphql_schema.py
@@ -142,7 +142,8 @@ def resolve_devices(self, info, options=None):
                             (device["devPresentLastScan"] == 1 and 'online' in allowed_statuses) or
                             (device["devIsNew"] == 1 and 'new' in allowed_statuses) or
                             (device["devPresentLastScan"] == 0 and device["devAlertDown"] and 'down' in allowed_statuses) or
-                            (device["devPresentLastScan"] == 0 and 'offline' in allowed_statuses)
+                            (device["devPresentLastScan"] == 0  and 'offline' in allowed_statuses) and device["devIsArchived"] == 0 or 
+                            (device["devIsArchived"] == 1 and 'archived' in allowed_statuses)  
                         )
                     ]
                 elif status == "connected":