From 404a97fb89d8c286caeb2cf1c2f08f53d14a11fd Mon Sep 17 00:00:00 2001 From: jokob-sk Date: Sun, 27 Jul 2025 08:58:54 +1000 Subject: [PATCH] network devices list, strings cleanup --- front/devices.php | 18 ++-- front/php/templates/header.php | 5 +- front/php/templates/language/ar_ar.json | 3 +- front/php/templates/language/ca_ca.json | 3 +- front/php/templates/language/cs_cz.json | 3 +- front/php/templates/language/de_de.json | 3 +- front/php/templates/language/en_us.json | 109 ++++++++++++------------ front/php/templates/language/es_es.json | 3 +- front/php/templates/language/fr_fr.json | 3 +- front/php/templates/language/it_it.json | 3 +- front/php/templates/language/nb_no.json | 3 +- front/php/templates/language/pl_pl.json | 3 +- front/php/templates/language/pt_br.json | 3 +- front/php/templates/language/ru_ru.json | 3 +- front/php/templates/language/tr_tr.json | 3 +- front/php/templates/language/uk_ua.json | 3 +- front/php/templates/language/zh_cn.json | 3 +- server/graphql_server/graphql_schema.py | 4 +- 18 files changed, 100 insertions(+), 78 deletions(-) diff --git a/front/devices.php b/front/devices.php index 5fd88e9d..e11a032a 100755 --- a/front/devices.php +++ b/front/devices.php @@ -266,14 +266,16 @@ function getDevicesTotals() { function processDeviceTotals(devicesData) { // Define filter conditions and corresponding objects const filters = [ - { status: 'my_devices', color: 'bg-aqua', label: getString('Device_Shortcut_AllDevices'), icon: 'fa-laptop' }, - { status: 'all', color: 'bg-aqua', label: getString('Gen_All_Devices'), icon: 'fa-laptop' }, - { status: 'connected', color: 'bg-green', label: getString('Device_Shortcut_Connected'), icon: 'fa-plug' }, - { status: 'favorites', color: 'bg-yellow', label: getString('Device_Shortcut_Favorites'), icon: 'fa-star' }, - { status: 'new', color: 'bg-yellow', label: getString('Device_Shortcut_NewDevices'), icon: 'fa-plus' }, - { status: 'down', color: 'bg-red', label: getString('Device_Shortcut_DownOnly'), icon: 'fa-warning' }, - { status: 'archived', color: 'bg-gray', label: getString('Device_Shortcut_Archived'), icon: 'fa-eye-slash' }, - { status: 'offline', color: 'bg-gray', label: getString('Gen_Offline'), icon: 'fa-xmark' } + { status: 'my_devices', color: 'bg-aqua', label: getString('Device_Shortcut_AllDevices'), icon: 'fa-laptop' }, + { status: 'all', color: 'bg-aqua', label: getString('Gen_All_Devices'), icon: 'fa-laptop' }, + { status: 'connected', color: 'bg-green', label: getString('Device_Shortcut_Connected'), icon: 'fa-plug' }, + { status: 'favorites', color: 'bg-yellow', label: getString('Device_Shortcut_Favorites'), icon: 'fa-star' }, + { status: 'new', color: 'bg-yellow', label: getString('Device_Shortcut_NewDevices'), icon: 'fa-plus' }, + { status: 'down', color: 'bg-red', label: getString('Device_Shortcut_DownOnly'), icon: 'fa-warning' }, + { status: 'archived', color: 'bg-gray', label: getString('Device_Shortcut_Archived'), icon: 'fa-eye-slash' }, + { status: 'offline', color: 'bg-gray', label: getString('Gen_Offline'), icon: 'fa-xmark' }, + { status: 'offline', color: 'bg-gray', label: getString('Gen_Offline'), icon: 'fa-xmark' }, + { status: 'network_devices', color: 'bg-aqua', label: getString('Network_Devices'), icon: 'fa-sitemap fa-rotate-270' } ]; // Initialize an empty array to store the final objects diff --git a/front/php/templates/header.php b/front/php/templates/header.php index 7a3fa581..cedab08f 100755 --- a/front/php/templates/header.php +++ b/front/php/templates/header.php @@ -312,7 +312,10 @@
  • - + +
    • +
  • +
    • diff --git a/front/php/templates/language/ar_ar.json b/front/php/templates/language/ar_ar.json index 825d8f75..1afc8039 100755 --- a/front/php/templates/language/ar_ar.json +++ b/front/php/templates/language/ar_ar.json @@ -494,6 +494,7 @@ "Network_Cant_Assign_No_Node_Selected": "", "Network_Configuration_Error": "خطأ في التكوين", "Network_Connected": "متصل", + "Network_Devices": "", "Network_ManageAdd": "إضافة إدارة", "Network_ManageAdd_Name": "اسم الإدارة", "Network_ManageAdd_Name_text": "نص اسم الإدارة", @@ -754,4 +755,4 @@ "settings_system_label": "تسمية النظام", "settings_update_item_warning": "تحذير تحديث العنصر", "test_event_tooltip": "تلميح اختبار الحدث" -} +} \ No newline at end of file diff --git a/front/php/templates/language/ca_ca.json b/front/php/templates/language/ca_ca.json index a8425fe8..64b9285b 100755 --- a/front/php/templates/language/ca_ca.json +++ b/front/php/templates/language/ca_ca.json @@ -494,6 +494,7 @@ "Network_Cant_Assign_No_Node_Selected": "", "Network_Configuration_Error": "Error de configuració", "Network_Connected": "Dispositius connectats", + "Network_Devices": "", "Network_ManageAdd": "Afegir dispositiu", "Network_ManageAdd_Name": "Nom del dispositiu", "Network_ManageAdd_Name_text": "Nom sense caràcters especials", @@ -754,4 +755,4 @@ "settings_system_label": "Sistema", "settings_update_item_warning": "Actualitza el valor sota. Sigues curós de seguir el format anterior. No hi ha validació.", "test_event_tooltip": "Deseu els canvis primer abans de comprovar la configuració." -} +} \ No newline at end of file diff --git a/front/php/templates/language/cs_cz.json b/front/php/templates/language/cs_cz.json index 2fc4ae1a..2c66bb5f 100755 --- a/front/php/templates/language/cs_cz.json +++ b/front/php/templates/language/cs_cz.json @@ -494,6 +494,7 @@ "Network_Cant_Assign_No_Node_Selected": "", "Network_Configuration_Error": "", "Network_Connected": "", + "Network_Devices": "", "Network_ManageAdd": "", "Network_ManageAdd_Name": "", "Network_ManageAdd_Name_text": "", @@ -754,4 +755,4 @@ "settings_system_label": "", "settings_update_item_warning": "", "test_event_tooltip": "" -} +} \ No newline at end of file diff --git a/front/php/templates/language/de_de.json b/front/php/templates/language/de_de.json index 567e93d7..ae02620c 100755 --- a/front/php/templates/language/de_de.json +++ b/front/php/templates/language/de_de.json @@ -531,6 +531,7 @@ "Network_Cant_Assign_No_Node_Selected": "", "Network_Configuration_Error": "Konfigurationsfehler", "Network_Connected": "Verbundene Geräte", + "Network_Devices": "", "Network_ManageAdd": "Gerät hinzufügen", "Network_ManageAdd_Name": "Name des Gerätes", "Network_ManageAdd_Name_text": "Name ohne Sonderzeichen", @@ -835,4 +836,4 @@ "settings_system_label": "System", "settings_update_item_warning": "", "test_event_tooltip": "Speichere die Änderungen, bevor Sie die Einstellungen testen." -} +} \ No newline at end of file diff --git a/front/php/templates/language/en_us.json b/front/php/templates/language/en_us.json index 0d73003a..b13b7fcd 100755 --- a/front/php/templates/language/en_us.json +++ b/front/php/templates/language/en_us.json @@ -39,8 +39,8 @@ "BackDevices_Backup_CopError": "The original database could not be saved.", "BackDevices_Backup_Failed": "The backup executed partially successfully. The archive could not be created or is empty.", "BackDevices_Backup_okay": "The backup executed successfully with the new archive", - "BackDevices_DBTools_DelDevError_a": "Error deleting Device", - "BackDevices_DBTools_DelDevError_b": "Error deleting Devices", + "BackDevices_DBTools_DelDevError_a": "Error deleting device", + "BackDevices_DBTools_DelDevError_b": "Error deleting devices", "BackDevices_DBTools_DelDev_a": "Device deleted", "BackDevices_DBTools_DelDev_b": "Devices deleted", "BackDevices_DBTools_DelEvents": "Events deleted", @@ -72,18 +72,18 @@ "DevDetail_CustomProperties_Title": "Custom Properties", "DevDetail_CustomProps_reset_info": "This will remove your custom properties on this device and reset them to the default value.", "DevDetail_DisplayFields_Title": "Display", - "DevDetail_EveandAl_AlertAllEvents": "Alert Events", - "DevDetail_EveandAl_AlertDown": "Alert Down", + "DevDetail_EveandAl_AlertAllEvents": "Alert events", + "DevDetail_EveandAl_AlertDown": "Alert down", "DevDetail_EveandAl_Archived": "Archived", - "DevDetail_EveandAl_NewDevice": "New Device", - "DevDetail_EveandAl_NewDevice_Tooltip": "Will show the New status for the device and include it in lists when the New Devices filter is active. Doesn't affect notifications.", + "DevDetail_EveandAl_NewDevice": "New device", + "DevDetail_EveandAl_NewDevice_Tooltip": "Will show the New status for the device and include it in lists when the New devices filter is active. Doesn't affect notifications.", "DevDetail_EveandAl_RandomMAC": "Random MAC", "DevDetail_EveandAl_ScanCycle": "Scan device", - "DevDetail_EveandAl_ScanCycle_a": "Scan Device", - "DevDetail_EveandAl_ScanCycle_z": "Don't Scan Device", + "DevDetail_EveandAl_ScanCycle_a": "Scan device", + "DevDetail_EveandAl_ScanCycle_z": "Don't scan device", "DevDetail_EveandAl_Skip": "Skip repeated notifications for", "DevDetail_EveandAl_Title": "Notifications config", - "DevDetail_Events_CheckBox": "Hide Connection Events", + "DevDetail_Events_CheckBox": "Hide connection events", "DevDetail_GoToNetworkNode": "Navigate to the Network page of the given node.", "DevDetail_Icon": "Icon", "DevDetail_Icon_Descr": "Enter a font awesome icon name without the fa- prefix or with complete class, e.g.: fa fa-brands fa-apple.", @@ -201,7 +201,7 @@ "Device_MultiEdit_MassActions": "Mass actions:", "Device_MultiEdit_Tooltip": "Careful. Clicking this will apply the value on the left to all devices selected above.", "Device_Searchbox": "Search", - "Device_Shortcut_AllDevices": "My Devices", + "Device_Shortcut_AllDevices": "My devices", "Device_Shortcut_AllNodes": "All Nodes", "Device_Shortcut_Archived": "Archived", "Device_Shortcut_Connected": "Connected", @@ -209,7 +209,7 @@ "Device_Shortcut_DownAlerts": "Down & Offline", "Device_Shortcut_DownOnly": "Down", "Device_Shortcut_Favorites": "Favorites", - "Device_Shortcut_NewDevices": "New Devices", + "Device_Shortcut_NewDevices": "New devices", "Device_Shortcut_OnlineChart": "Device presence", "Device_TableHead_AlertDown": "Alert Down", "Device_TableHead_Connected_Devices": "Connections", @@ -267,7 +267,7 @@ "Events_Shortcut_DownAlerts": "Down Alerts", "Events_Shortcut_Events": "Events", "Events_Shortcut_MissSessions": "Missing Sessions", - "Events_Shortcut_NewDevices": "New Devices", + "Events_Shortcut_NewDevices": "New devices", "Events_Shortcut_Sessions": "Sessions", "Events_Shortcut_VoidSessions": "Voided Sessions", "Events_TableHead_AdditionalInfo": "Additional Info", @@ -293,9 +293,9 @@ "GRAPHQL_PORT_name": "GraphQL port", "Gen_Action": "Action", "Gen_Add": "Add", - "Gen_AddDevice": "Add Device", + "Gen_AddDevice": "Add device", "Gen_Add_All": "Add all", - "Gen_All_Devices": "All Devices", + "Gen_All_Devices": "All devices", "Gen_AreYouSure": "Are you sure?", "Gen_Backup": "Run Backup", "Gen_Cancel": "Cancel", @@ -325,7 +325,7 @@ "Gen_Select": "Select", "Gen_SelectIcon": "", "Gen_SelectToPreview": "Select to preview", - "Gen_Selected_Devices": "Selected Devices:", + "Gen_Selected_Devices": "Selected devices:", "Gen_Switch": "Switch", "Gen_Upd": "Updated successfully", "Gen_Upd_Fail": "Update failed", @@ -338,9 +338,9 @@ "Gen_create_new_device_info": "Devices are typically discovered using plugins. However, in certain cases, you may need to add devices manually. To explore specific scenarios check the Remote Networks documentation.", "General_display_name": "General", "General_icon": "", - "HRS_TO_KEEP_NEWDEV_description": "This is a maintenance setting DELETING devices. If enabled (0 is disabled), devices marked as New Device will be deleted if their First Session time was older than the specified hours in this setting. Use this setting if you want to auto-delete New Devices after X hours.", + "HRS_TO_KEEP_NEWDEV_description": "This is a maintenance setting DELETING devices. If enabled (0 is disabled), devices marked as New device will be deleted if their First Session time was older than the specified hours in this setting. Use this setting if you want to auto-delete New devices after X hours.", "HRS_TO_KEEP_NEWDEV_name": "Delete new devices after", - "HRS_TO_KEEP_OFFDEV_description": "This is a maintenance setting DELETING devices. If enabled (0 is disabled), devices that are Offline and their Last Connection date time is older than the specified hours in this setting, will be deleted. Use this setting if you want to auto-delete Offline Devices after X hours being offline.", + "HRS_TO_KEEP_OFFDEV_description": "This is a maintenance setting DELETING devices. If enabled (0 is disabled), devices that are Offline and their Last Connection date time is older than the specified hours in this setting, will be deleted. Use this setting if you want to auto-delete Offline devices after X hours being offline.", "HRS_TO_KEEP_OFFDEV_name": "Delete offline devices after", "LOADED_PLUGINS_description": "Which Plugins to load. Adding plugins might slow the application. Read more about which plugins need to be enabled, types, or scanning options in the plugins docs. Unloaded plugins will lose your settings. Only disabled plugins can be unloaded.", "LOADED_PLUGINS_name": "Loaded plugins", @@ -372,12 +372,12 @@ "Maintenance_Running_Version": "Installed version", "Maintenance_Status": "Status", "Maintenance_Title": "Maintenance tools", - "Maintenance_Tool_DownloadConfig": "Settings Export", + "Maintenance_Tool_DownloadConfig": "Settings export", "Maintenance_Tool_DownloadConfig_text": "Download a full backup of your Settings configuration stored in the app.conf file.", - "Maintenance_Tool_DownloadWorkflows": "Workflows Export", + "Maintenance_Tool_DownloadWorkflows": "Workflows export", "Maintenance_Tool_DownloadWorkflows_text": "Download a full backup of your Workflows stored in the workflows.json file.", - "Maintenance_Tool_ExportCSV": "Devices Export (csv)", - "Maintenance_Tool_ExportCSV_noti": "Devices Export (csv)", + "Maintenance_Tool_ExportCSV": "Devices export (csv)", + "Maintenance_Tool_ExportCSV_noti": "Devices export (csv)", "Maintenance_Tool_ExportCSV_noti_text": "Are you sure you want to generate a CSV file?", "Maintenance_Tool_ExportCSV_text": "Generate a CSV (comma separated value) file containing the list of Devices including the Network relationships between Network Nodes and connected devices. You can also trigger this by accessing this URL your_NetAlertX_url/php/server/devices.php?action=ExportCSV or by enabling the CSV Backup plugin.", "Maintenance_Tool_ImportCSV": "Devices Import (csv)", @@ -408,26 +408,26 @@ "Maintenance_Tool_del_ActHistory_noti": "Delete network activity", "Maintenance_Tool_del_ActHistory_noti_text": "Are you sure you want to reset the network activity?", "Maintenance_Tool_del_ActHistory_text": "The network activity graph is reset. This does not affect the events.", - "Maintenance_Tool_del_alldev": "Delete all Devices", - "Maintenance_Tool_del_alldev_noti": "Delete Devices", + "Maintenance_Tool_del_alldev": "Delete all devices", + "Maintenance_Tool_del_alldev_noti": "Delete devices", "Maintenance_Tool_del_alldev_noti_text": "Are you sure you want to delete all devices?", "Maintenance_Tool_del_alldev_text": "Before using this function, please make a backup. The deletion cannot be undone. All devices will be deleted from the database.", "Maintenance_Tool_del_allevents": "Delete Events (Reset Presence)", "Maintenance_Tool_del_allevents30": "Delete all Events older than 30 days", "Maintenance_Tool_del_allevents30_noti": "Delete Events", - "Maintenance_Tool_del_allevents30_noti_text": "Are you sure you want to delete all Events older than 30 days? This resets Presence of all Devices.", + "Maintenance_Tool_del_allevents30_noti_text": "Are you sure you want to delete all Events older than 30 days? This resets presence of all devices.", "Maintenance_Tool_del_allevents30_text": "Before using this function, please make a backup. The deletion cannot be undone. All events older than 30 days in the database will be deleted. At that moment the presence of all devices will be reset. This can lead to invalid sessions. This means that devices are displayed as \"present\" although they are offline. A scan while the device in question is online solves the problem.", "Maintenance_Tool_del_allevents_noti": "Delete Events", - "Maintenance_Tool_del_allevents_noti_text": "Are you sure you want to delete all Events? This resets Presence of all Devices.", + "Maintenance_Tool_del_allevents_noti_text": "Are you sure you want to delete all Events? This resets presence of all devices.", "Maintenance_Tool_del_allevents_text": "Before using this function, please make a backup. The deletion cannot be undone. All events in the database will be deleted. At that moment the presence of all devices will be reset. This can lead to invalid sessions. This means that devices are displayed as \"present\" although they are offline. A scan while the device in question is online solves the problem.", - "Maintenance_Tool_del_empty_macs": "Delete Devices with empty MACs", - "Maintenance_Tool_del_empty_macs_noti": "Delete Devices", + "Maintenance_Tool_del_empty_macs": "Delete devices with empty MACs", + "Maintenance_Tool_del_empty_macs_noti": "Delete devices", "Maintenance_Tool_del_empty_macs_noti_text": "Are you sure you want to delete all devices with empty MAC addresses?
    (maybe you prefer to archive it)", "Maintenance_Tool_del_empty_macs_text": "Before using this function, please make a backup. The deletion cannot be undone. All devices without MAC will be deleted from the database.", "Maintenance_Tool_del_selecteddev": "Delete selected devices", "Maintenance_Tool_del_selecteddev_text": "Before using this function, please make a backup. The deletion cannot be undone. Selected devices will be deleted from the database.", - "Maintenance_Tool_del_unknowndev": "Delete (unknown) Devices", - "Maintenance_Tool_del_unknowndev_noti": "Delete (unknown) Devices", + "Maintenance_Tool_del_unknowndev": "Delete (unknown) devices", + "Maintenance_Tool_del_unknowndev_noti": "Delete (unknown) devices", "Maintenance_Tool_del_unknowndev_noti_text": "Are you sure you want to delete all (unknown) and (name not found) devices?", "Maintenance_Tool_del_unknowndev_text": "Before using this function, please make a backup. The deletion cannot be undone. All devices named (unknown) will be deleted from the database.", "Maintenance_Tool_displayed_columns_text": "Change the visibility and order of the columns in the Devices page.", @@ -471,7 +471,7 @@ "Maintenance_themeselector_lable": "Select Skin", "Maintenance_themeselector_text": "The change takes place on the server side, so it affects all devices in use.", "Maintenance_version": "App updates", - "NETWORK_DEVICE_TYPES_description": "Which device types are allowed to be used as network devices in the Network view. The device type has to match exactly the Type setting on a specific device in Device details. Add it on the Device via the + button. Do not remove existing types, only add new ones.", + "NETWORK_DEVICE_TYPES_description": "Which device types are allowed to be used as network devices in the Network view. The device type has to match exactly the Type setting on a specific device in Device details. Add it on the device via the + button. Do not remove existing types, only add new ones.", "NETWORK_DEVICE_TYPES_name": "Network device types", "Navigation_About": "About", "Navigation_AppEvents": "App Events", @@ -494,30 +494,31 @@ "Network_Cant_Assign_No_Node_Selected": "Can't assign, no parent node selected.", "Network_Configuration_Error": "Configuration Error", "Network_Connected": "Connected devices", - "Network_ManageAdd": "Add Device", - "Network_ManageAdd_Name": "Device Name", + "Network_Devices": "Network devices", + "Network_ManageAdd": "Add device", + "Network_ManageAdd_Name": "Device name", "Network_ManageAdd_Name_text": "Name without special characters", "Network_ManageAdd_Port": "Port Count", "Network_ManageAdd_Port_text": "leave blank for wifi and powerline", - "Network_ManageAdd_Submit": "Add Device", - "Network_ManageAdd_Type": "Device Type", + "Network_ManageAdd_Submit": "Add device", + "Network_ManageAdd_Type": "Device type", "Network_ManageAdd_Type_text": "-- Select Type --", "Network_ManageAssign": "Assign", - "Network_ManageDel": "Delete Device", + "Network_ManageDel": "Delete device", "Network_ManageDel_Name": "Device to delete", - "Network_ManageDel_Name_text": "-- Select Device --", + "Network_ManageDel_Name_text": "-- Select device --", "Network_ManageDel_Submit": "Delete", - "Network_ManageDevices": "Manage Devices", - "Network_ManageEdit": "Update Device", + "Network_ManageDevices": "Manage devices", + "Network_ManageEdit": "Update device", "Network_ManageEdit_ID": "Device to update", - "Network_ManageEdit_ID_text": "-- Select Device for editing --", - "Network_ManageEdit_Name": "New Device Name", + "Network_ManageEdit_ID_text": "-- Select device for editing --", + "Network_ManageEdit_Name": "New device name", "Network_ManageEdit_Name_text": "Name without special characters", "Network_ManageEdit_Port": " New Port Count", "Network_ManageEdit_Port_text": "leave blank for wifi and powerline", "Network_ManageEdit_Submit": "Save Changes", - "Network_ManageEdit_Type": "New Device Type", - "Network_ManageEdit_Type_text": "-- Select Type --", + "Network_ManageEdit_Type": "New device type", + "Network_ManageEdit_Type_text": "-- Select type --", "Network_ManageLeaf": "Manage assignment", "Network_ManageUnassign": "Unassign", "Network_NoAssignedDevices": "This network node does not have any assigned devices (leaf nodes). Assign one from bellow or go to the Details tab of any device in Devices, and assign it to a network Node (MAC) and Port there.", @@ -565,14 +566,14 @@ "Presence_Key_OnlinePastMiss_desc": "Device online in the past, but currently offline, but the start session might be missing or has conflicting data. (might be a bug - please submit a PR if you know how to fix it - I'm a bit lost in code here)", "Presence_Key_OnlinePast_desc": "Device online in the past, but currently offline.", "Presence_Loading": "Loading…", - "Presence_Shortcut_AllDevices": "My Devices", + "Presence_Shortcut_AllDevices": "My devices", "Presence_Shortcut_Archived": "Archived", "Presence_Shortcut_Connected": "Connected", "Presence_Shortcut_Devices": "Devices", "Presence_Shortcut_DownAlerts": "Down Alerts", "Presence_Shortcut_Favorites": "Favorites", - "Presence_Shortcut_NewDevices": "New Devices", - "Presence_Title": "Presence by Device", + "Presence_Shortcut_NewDevices": "New devices", + "Presence_Title": "Presence by device", "REFRESH_FQDN_description": "Rescans all devices and refreshes their Fully Qualified Domain Name (FQDN). If disabled, only devices without a known name are scanned to improve performance. In this case, FQDN is updated only during initial device discovery.", "REFRESH_FQDN_name": "Refresh FQDN", "REPORT_DASHBOARD_URL_description": "This URL is used as the base for generating links in HTML reports (e.g.: emails). Enter full URL starting with http:// including the port number (no trailing slash /).", @@ -583,7 +584,7 @@ "REPORT_TITLE": "Report", "RandomMAC_hover": "Autodetected - indicates if the device randomizes it's MAC address. You can exclude specific MACs with the UI_NOT_RANDOM_MAC setting. Click to find out more.", "Reports_Sent_Log": "Sent Reports Log", - "SCAN_SUBNETS_description": "Most on-network scanners (ARP-SCAN, NMAP, NSLOOKUP, DIG) rely on scanning specific network interfaces and subnets. Check the subnets documentation for help on this setting, especially VLANs, what VLANs are supported, or how to figure out the network mask and your interface.

    An alternative to on-network scanners is to enable some other Device scanners/importers that don't rely on NetAlertX having access to the network (UNIFI, dhcp.leases, PiHole, etc.).

    Note: The scan time itself depends on the number of IP addresses to check, so set this up carefully with the appropriate network mask and interface.", + "SCAN_SUBNETS_description": "Most on-network scanners (ARP-SCAN, NMAP, NSLOOKUP, DIG) rely on scanning specific network interfaces and subnets. Check the subnets documentation for help on this setting, especially VLANs, what VLANs are supported, or how to figure out the network mask and your interface.

    An alternative to on-network scanners is to enable some other device scanners/importers that don't rely on NetAlertX having access to the network (UNIFI, dhcp.leases, PiHole, etc.).

    Note: The scan time itself depends on the number of IP addresses to check, so set this up carefully with the appropriate network mask and interface.", "SCAN_SUBNETS_name": "Networks to scan", "SYSTEM_TITLE": "System Information", "Setting_Override": "Override value", @@ -591,7 +592,7 @@ "Settings_Metadata_Toggle": "Show/hide metadata for the given setting.", "Settings_Show_Description": "Show setting description.", "Settings_device_Scanners_desync": "⚠ Device scanner schedules are out-of-sync.", - "Settings_device_Scanners_desync_popup": "Schedules of devices scanners (*_RUN_SCHD) are not the same. This will result into inconsistent device online/offline notifications. Unless this is intended, please use the same schedule for all enabled 🔍Device scanners.", + "Settings_device_Scanners_desync_popup": "Schedules of devices scanners (*_RUN_SCHD) are not the same. This will result into inconsistent device online/offline notifications. Unless this is intended, please use the same schedule for all enabled 🔍device scanners.", "Speedtest_Results": "Speedtest Results", "Systeminfo_CPU": "CPU", "Systeminfo_CPU_Cores": "CPU Cores:", @@ -666,18 +667,18 @@ "Systeminfo_System_Uname": "Uname:", "Systeminfo_System_Uptime": "Uptime:", "Systeminfo_This_Client": "This Client", - "Systeminfo_USB_Devices": "USB Devices", + "Systeminfo_USB_Devices": "USB devices", "TICKER_MIGRATE_TO_NETALERTX": "⚠ Old mount locations detected. Follow this guide to migrate to the new /app/config and /app/db folders and the netalertx container.", "TIMEZONE_description": "Time zone to display stats correctly. Find your time zone here.", "TIMEZONE_name": "Time zone", - "UI_DEV_SECTIONS_description": "Select which UI elements to hide in the Devices pages.", - "UI_DEV_SECTIONS_name": "Hide Devices Sections", + "UI_DEV_SECTIONS_description": "Select which UI elements to hide in the devices pages.", + "UI_DEV_SECTIONS_name": "Hide devices sections", "UI_ICONS_description": "A list of pre-defined icons. Proceed with caution, the preferred way to add icons is described in the Icons documentation. You can add a base64-encoded SVG HTML or Font-awesome HTML tag.", "UI_ICONS_name": "Pre-defined icons", "UI_LANG_description": "Select the preferred UI language. Help translating or suggest languages in the online portal of Weblate.", "UI_LANG_name": "UI Language", - "UI_MY_DEVICES_description": "Devices of which statuses should be shown in the default My Devices view.", - "UI_MY_DEVICES_name": "Show in My Devices view", + "UI_MY_DEVICES_description": "Devices of which statuses should be shown in the default My devices view.", + "UI_MY_DEVICES_name": "Show in My devices view", "UI_NOT_RANDOM_MAC_description": "Mac prefixes which shouldn't be marked as Random devices. Enter for example 52 to exclude devices starting with 52:xx:xx:xx:xx:xx from being marked as devices with a random MAC address.", "UI_NOT_RANDOM_MAC_name": "Don't mark as Random", "UI_PRESENCE_description": "Select what statuses should be shown in the Device presence chart in the Devices page.", @@ -718,7 +719,7 @@ "devices_old": "Refreshing…", "general_event_description": "The event you have triggered might take a while until background processes finish. The execution ended once the below execution queue empties (Check the error log if you encounter issues).

    Execution queue:", "general_event_title": "Executing an ad-hoc event", - "go_to_device_event_tooltip": "Navigate to the Device", + "go_to_device_event_tooltip": "Navigate to the device", "go_to_node_event_tooltip": "Navigate to the Network page of the given node", "new_version_available": "A new version is available.", "report_guid": "Notification guid:", @@ -731,7 +732,7 @@ "settings_core_label": "Core", "settings_device_scanners": "Device scanners used to discover devices that write into the CurrentScan database table.", "settings_device_scanners_icon": "fa-solid fa-magnifying-glass-plus", - "settings_device_scanners_info": "Load even more Device Scanners with the LOADED_PLUGINS setting", + "settings_device_scanners_info": "Load more device scanners with the LOADED_PLUGINS setting", "settings_device_scanners_label": "Device scanners", "settings_enabled": "Enabled settings", "settings_enabled_icon": "fa-solid fa-toggle-on", diff --git a/front/php/templates/language/es_es.json b/front/php/templates/language/es_es.json index c6f7ff73..4ce527fb 100755 --- a/front/php/templates/language/es_es.json +++ b/front/php/templates/language/es_es.json @@ -529,6 +529,7 @@ "Network_Cant_Assign_No_Node_Selected": "", "Network_Configuration_Error": "Error en la configuración", "Network_Connected": "Dispositivos conectados", + "Network_Devices": "", "Network_ManageAdd": "Añadir dispositivo", "Network_ManageAdd_Name": "Nombre del dispositivo", "Network_ManageAdd_Name_text": "Nombre sin caracteres especiales", @@ -833,4 +834,4 @@ "settings_system_label": "Sistema", "settings_update_item_warning": "Actualice el valor a continuación. Tenga cuidado de seguir el formato anterior. O la validación no se realiza.", "test_event_tooltip": "Guarda tus cambios antes de probar nuevos ajustes." -} +} \ No newline at end of file diff --git a/front/php/templates/language/fr_fr.json b/front/php/templates/language/fr_fr.json index f73809cf..c503d138 100755 --- a/front/php/templates/language/fr_fr.json +++ b/front/php/templates/language/fr_fr.json @@ -494,6 +494,7 @@ "Network_Cant_Assign_No_Node_Selected": "Impossible d'assigner, aucun noeud parent sélectionné.", "Network_Configuration_Error": "Erreur de configuration", "Network_Connected": "Appareils connectés", + "Network_Devices": "", "Network_ManageAdd": "Ajouter un appareil", "Network_ManageAdd_Name": "Nom de l'appareil", "Network_ManageAdd_Name_text": "Nom sans caractère spécial", @@ -754,4 +755,4 @@ "settings_system_label": "Système", "settings_update_item_warning": "Mettre à jour la valeur ci-dessous. Veillez à bien suivre le même format qu'auparavant. Il n'y a pas de pas de contrôle.", "test_event_tooltip": "Enregistrer d'abord vos modifications avant de tester vôtre paramétrage." -} +} \ No newline at end of file diff --git a/front/php/templates/language/it_it.json b/front/php/templates/language/it_it.json index 44eaec9d..abe344d5 100755 --- a/front/php/templates/language/it_it.json +++ b/front/php/templates/language/it_it.json @@ -494,6 +494,7 @@ "Network_Cant_Assign_No_Node_Selected": "Impossibile assegnare, nessun nodo padre selezionato.", "Network_Configuration_Error": "Errore di configurazione", "Network_Connected": "Dispositivi connessi", + "Network_Devices": "", "Network_ManageAdd": "Aggiungi dispositivo", "Network_ManageAdd_Name": "Nome dispositivo", "Network_ManageAdd_Name_text": "Nome senza caratteri speciali", @@ -754,4 +755,4 @@ "settings_system_label": "Sistema", "settings_update_item_warning": "Aggiorna il valore qui sotto. Fai attenzione a seguire il formato precedente. La convalida non viene eseguita.", "test_event_tooltip": "Salva le modifiche prima di provare le nuove impostazioni." -} +} \ No newline at end of file diff --git a/front/php/templates/language/nb_no.json b/front/php/templates/language/nb_no.json index b60cbded..a1e1b8eb 100755 --- a/front/php/templates/language/nb_no.json +++ b/front/php/templates/language/nb_no.json @@ -494,6 +494,7 @@ "Network_Cant_Assign_No_Node_Selected": "", "Network_Configuration_Error": "Konfigurasjonsfeil", "Network_Connected": "Tilkoblede enheter", + "Network_Devices": "", "Network_ManageAdd": "Legg til enhet", "Network_ManageAdd_Name": "Enhetsnavn", "Network_ManageAdd_Name_text": "Navn uten spesialtegn", @@ -754,4 +755,4 @@ "settings_system_label": "System", "settings_update_item_warning": "Oppdater verdien nedenfor. Pass på å følge forrige format. Validering etterpå utføres ikke.", "test_event_tooltip": "Lagre endringene først, før du tester innstillingene dine." -} +} \ No newline at end of file diff --git a/front/php/templates/language/pl_pl.json b/front/php/templates/language/pl_pl.json index 064e7d4c..616d0a85 100755 --- a/front/php/templates/language/pl_pl.json +++ b/front/php/templates/language/pl_pl.json @@ -494,6 +494,7 @@ "Network_Cant_Assign_No_Node_Selected": "", "Network_Configuration_Error": "Błąd konfiguracji", "Network_Connected": "Połączone urządzenia", + "Network_Devices": "", "Network_ManageAdd": "Dodaj urządzenie", "Network_ManageAdd_Name": "Nazwa urządzenia", "Network_ManageAdd_Name_text": "Nazwa bez znaków specjalnych", @@ -754,4 +755,4 @@ "settings_system_label": "System", "settings_update_item_warning": "Zaktualizuj wartość poniżej. Uważaj, aby zachować poprzedni format. Walidacja nie jest wykonywana.", "test_event_tooltip": "Najpierw zapisz swoje zmiany, zanim przetestujesz ustawienia." -} +} \ No newline at end of file diff --git a/front/php/templates/language/pt_br.json b/front/php/templates/language/pt_br.json index c1ee8b74..28b2ade6 100755 --- a/front/php/templates/language/pt_br.json +++ b/front/php/templates/language/pt_br.json @@ -494,6 +494,7 @@ "Network_Cant_Assign_No_Node_Selected": "", "Network_Configuration_Error": "", "Network_Connected": "", + "Network_Devices": "", "Network_ManageAdd": "", "Network_ManageAdd_Name": "", "Network_ManageAdd_Name_text": "", @@ -754,4 +755,4 @@ "settings_system_label": "", "settings_update_item_warning": "", "test_event_tooltip": "Guarde as alterações antes de testar as definições." -} +} \ No newline at end of file diff --git a/front/php/templates/language/ru_ru.json b/front/php/templates/language/ru_ru.json index 736f8edd..863d308d 100755 --- a/front/php/templates/language/ru_ru.json +++ b/front/php/templates/language/ru_ru.json @@ -494,6 +494,7 @@ "Network_Cant_Assign_No_Node_Selected": "", "Network_Configuration_Error": "Ошибка конфигурации", "Network_Connected": "Подключенные устройства", + "Network_Devices": "", "Network_ManageAdd": "Добавить устройство", "Network_ManageAdd_Name": "Имя устройства", "Network_ManageAdd_Name_text": "Имя без специальных символов", @@ -754,4 +755,4 @@ "settings_system_label": "Система", "settings_update_item_warning": "Обновить значение ниже. Будьте осторожны, следуя предыдущему формату. Проверка не выполняется.", "test_event_tooltip": "Сначала сохраните изменения, прежде чем проверять настройки." -} +} \ No newline at end of file diff --git a/front/php/templates/language/tr_tr.json b/front/php/templates/language/tr_tr.json index 038b84a5..8c281b1e 100755 --- a/front/php/templates/language/tr_tr.json +++ b/front/php/templates/language/tr_tr.json @@ -494,6 +494,7 @@ "Network_Cant_Assign_No_Node_Selected": "", "Network_Configuration_Error": "Kurulum Hatası", "Network_Connected": "Bağlanmış cihazlar", + "Network_Devices": "", "Network_ManageAdd": "Cihaz Ekle", "Network_ManageAdd_Name": "Cihaz İsmi", "Network_ManageAdd_Name_text": "Özel karakterler olmadan isim veriniz", @@ -754,4 +755,4 @@ "settings_system_label": "Sistem", "settings_update_item_warning": "", "test_event_tooltip": "" -} +} \ No newline at end of file diff --git a/front/php/templates/language/uk_ua.json b/front/php/templates/language/uk_ua.json index b689695e..a6dab0ee 100755 --- a/front/php/templates/language/uk_ua.json +++ b/front/php/templates/language/uk_ua.json @@ -494,6 +494,7 @@ "Network_Cant_Assign_No_Node_Selected": "Неможливо призначити, не вибрано батьківський вузол.", "Network_Configuration_Error": "Помилка конфігурації", "Network_Connected": "Підключені пристрої", + "Network_Devices": "", "Network_ManageAdd": "Додати пристрій", "Network_ManageAdd_Name": "Назва пристрою", "Network_ManageAdd_Name_text": "Назва без спеціальних символів", @@ -754,4 +755,4 @@ "settings_system_label": "Система", "settings_update_item_warning": "Оновіть значення нижче. Слідкуйте за попереднім форматом. Перевірка не виконана.", "test_event_tooltip": "Перш ніж перевіряти налаштування, збережіть зміни." -} +} \ No newline at end of file diff --git a/front/php/templates/language/zh_cn.json b/front/php/templates/language/zh_cn.json index 87264938..7b269802 100755 --- a/front/php/templates/language/zh_cn.json +++ b/front/php/templates/language/zh_cn.json @@ -494,6 +494,7 @@ "Network_Cant_Assign_No_Node_Selected": "无法分配，未选择父节点。", "Network_Configuration_Error": "配置错误", "Network_Connected": "联网设备", + "Network_Devices": "", "Network_ManageAdd": "添加设备", "Network_ManageAdd_Name": "设备名称", "Network_ManageAdd_Name_text": "名称不包含特殊字符", @@ -754,4 +755,4 @@ "settings_system_label": "系统", "settings_update_item_warning": "更新下面的值。请注意遵循先前的格式。未执行验证。", "test_event_tooltip": "在测试设置之前，请先保存更改。" -} +} \ No newline at end of file diff --git a/server/graphql_server/graphql_schema.py b/server/graphql_server/graphql_schema.py index e17c2f98..57d73617 100755 --- a/server/graphql_server/graphql_schema.py +++ b/server/graphql_server/graphql_schema.py @@ -174,7 +174,9 @@ class Query(ObjectType): devices_data = [device for device in devices_data if device["devIsArchived"] == 1] elif status == "offline": devices_data = [device for device in devices_data if device["devPresentLastScan"] == 0] - elif status == "all_nodes": + elif status == "network_devices": + devices_data = [device for device in devices_data if device["devType"] in get_setting_value("NETWORK_DEVICE_TYPES")] + elif status == "all_devices": devices_data = devices_data # keep all # additional filters