Chg: update image tag in helm values to v2.10.0-RC1

.gitignore

@@ -18,4 +18,3 @@
 .env.production.local
 
 npm-debug.log*
-.vscode/settings.json

helm/templates/ingress.yaml

@@ -17,9 +17,7 @@ metadata:
   {{- end }}
 
 spec:
-{{- if $ingressValue.className }}
+
-  ingressClassName: {{ $ingressValue.className }}
-{{- end }}
 {{- if $ingressValue.tls }}
   tls:
   {{- range $ingressValue.tls }}

helm/values.yaml

@@ -8,7 +8,7 @@ fullnameOverride: ""
 images:
   owgwui:
     repository: tip-tip-wlan-cloud-ucentral.jfrog.io/owgw-ui
-    tag: v3.2.0
+    tag: v2.10.0-RC1
     pullPolicy: Always
 
 services:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ucentral-client",
-  "version": "3.2.0",
+  "version": "2.10.0(48)",
   "description": "",
   "private": true,
   "main": "index.tsx",
@@ -15,10 +15,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@chakra-ui/anatomy": "^2.1.1",
     "@chakra-ui/icons": "^2.0.18",
     "@chakra-ui/react": "^2.3.6",
-    "@chakra-ui/styled-system": "^2.9.0",
     "@chakra-ui/theme-tools": "^2.0.12",
     "@chakra-ui/utils": "^2.0.14",
     "@emotion/react": "^11.10.6",
@@ -60,7 +58,7 @@
     "react-virtualized-auto-sizer": "^1.0.15",
     "react-window": "^1.8.9",
     "source-map-explorer": "^2.5.3",
-    "typescript": "^5.0.4",
+    "typescript": "^4.8.4",
     "uuid": "^9.0.0",
     "vite": "^4.2.1",
     "yup": "^0.32.11",
@@ -94,7 +92,6 @@
     "lint-staged": "^13.2.1",
     "prettier": "^2.8.7",
     "vite-plugin-pwa": "^0.14.7",
-    "vite-plugin-svgr": "^4.2.0",
     "vite-tsconfig-paths": "^4.2.0"
   },
   "browserslist": {

public/locales/de/translation.json

@@ -223,7 +223,6 @@
 		"day": "Tag",
 		"days": "Tage",
 		"default": "Standard",
-		"defaults": "Standardeinstellungen",
 		"description": "Beschreibung",
 		"details": "Einzelheiten",
 		"device_details": "Gerätedetails",
@@ -269,7 +268,6 @@
 		"map": "Karte",
 		"max": "Max",
 		"min": "MINDEST",
-		"miscellaneous": "Verschiedenes",
 		"mode": "Modus",
 		"model": "Modell",
 		"modified": "Geändert",
@@ -704,32 +702,11 @@
 		"venues_under_root": "Veranstaltungsorte können nicht direkt unter der Root-Entität erstellt werden"
 	},
 	"firmware": {
-		"confirm_default_data": "Bitte bestätigen Sie die untenstehenden Informationen und klicken Sie auf „Bestätigen“, sobald Sie bereit sind, den Vorgang zu starten",
-		"create_success": "Neue Standard-Firmware-Einstellungen erstellt!",
 		"db_update_warning": "Dieser Vorgang wird täglich automatisch durchgeführt, ohne dass dieses manuelle Update verwendet werden muss. Die Aktualisierung dieser Datenbank kann bis zu 25 Minuten dauern",
-		"default_created_error_one": "{{count}} Fehler beim Versuch, eine neue Einstellung zu erstellen",
-		"default_created_error_other": "{{count}} Fehler beim Versuch, eine neue Einstellung zu erstellen",
-		"default_created_one": "{{count}} Standard-Firmware-Einstellung erstellt",
-		"default_created_other": "{{count}} Standard-Firmware-Einstellungen erstellt",
-		"default_found_one": "Für den Gerätetyp {{count}} wurde eine gültige Revision gefunden",
-		"default_found_other": "Gültige Revisionen für {{count}} Gerätetypen gefunden",
-		"default_mass_delete_success_one": " {{count}} Standard-Firmware-Einstellung gelöscht!",
-		"default_mass_delete_success_other": " {{count}} Standard-Firmware-Einstellungen gelöscht!",
-		"default_not_found_one": "Keine gültigen Firmware-Versionen für den Gerätetyp {{count}} ",
-		"default_not_found_other": "Keine gültigen Firmware-Versionen für {{count}} Gerätetypen",
-		"default_title": "",
-		"default_update_success": "Standard-Firmware für {{deviceType}}aktualisiert!",
-		"delete_success": "Standard-Firmware-Einstellung gelöscht!",
-		"edit_default_title": "Dies ist die aktuelle Firmware, die als Mindestversion für neue APs vom Typ {{deviceType}}verwendet wird. Wenn ein neuer {{deviceType}} AP eine Verbindung zum Gateway herstellt, wird er automatisch auf diese Version aktualisiert.",
-		"fetching_defaults": "Alle verfügbaren Firmware für ausgewählte Gerätetypen werden abgerufen...",
 		"last_db_update_modal": "Firmware-Datenbank",
 		"last_db_update_title": "Datenbank",
-		"one": "Firmware",
-		"select_default_device_types": "Bitte wählen Sie alle Gerätetypen aus, auf die Sie diese neue Standard-Firmware-Regel anwenden möchten. Wenn Sie den gewünschten Gerätetyp nicht finden können, bedeutet dies, dass bereits eine Regel angewendet wurde.",
-		"select_default_revision": "Sie können jetzt die Mindestversion auswählen, auf die Ihre Gerätetypen abzielen sollen",
 		"start_db_update": "Datenbankaktualisierung starten",
-		"started_db_update": "Datenbankaktualisierung gestartet, dieser Vorgang sollte bis zu 25 Minuten dauern",
+		"started_db_update": "Datenbankaktualisierung gestartet, dieser Vorgang sollte bis zu 25 Minuten dauern"
-		"update_success": "Standard-Firmware-Informationen gespeichert!"
 	},
 	"footer": {
 		"powered_by": "Unterstützt von",
@@ -738,7 +715,6 @@
 	"form": {
 		"captive_web_root_explanation": "Bitte verwenden Sie nur .tar-Dateien (keine komprimierten Dateien wie z. B. .targz)",
 		"certificate_file_explanation": "Bitte verwenden Sie eine .pem-Datei, die mit „-----BEGIN CERTIFICATE-----“ beginnt und mit „-----END CERTIFICATE-----“ endet.",
-		"invalid_alphanumeric_with_dash": "Akzeptierte Zeichen. sind nur alphanumerisch (Buchstaben & Zahlen)",
 		"invalid_cidr": "Ungültige CIDR-IPv4-Adresse. Beispiel: 192.168.0.1/12",
 		"invalid_email": "Ungültige E-Mail",
 		"invalid_file_content": "Ungültiger Dateiinhalt, bitte bestätigen Sie, dass es sich um ein gültiges Format handelt",
@@ -765,11 +741,7 @@
 		"invalid_static_ipv4_e": "Ungültige Adresse, dieser Bereich ist für Experimente reserviert (Klasse E). Das erste Oktett sollte 223 oder niedriger sein",
 		"invalid_third_party": "Ungültige Drittanbieter-JSON-Zeichenfolge. Bitte bestätigen Sie, dass Ihr Wert ein gültiges JSON ist",
 		"key_file_explanation": "Bitte verwenden Sie eine .pem-Datei, die mit „-----BEGIN PRIVATE KEY-----“ beginnt und mit „-----END PRIVATE KEY-----“ endet.",
-		"max_length": "Maximale Länge von {{max}} Zeichen.",
-		"max_value": "Maximalwert von {{max}}",
-		"min_length": "Mindestlänge von {{min}} Zeichen.",
 		"min_max_string": "Der Wert muss eine Länge zwischen {{min}} (einschließlich) und {{max}} (einschließlich) haben.",
-		"min_value": "Mindestwert von {{min}}",
 		"missing_interface_upstream": "Sie müssen mindestens eine Upstream-Schnittstelle haben. Im Moment sind alle Ihre Schnittstellen nachgelagert",
 		"new_email_to_notify": "Neue E-Mail zur Benachrichtigung",
 		"new_phone_to_notify": "Neues Telefon zu benachrichtigen",
@@ -911,11 +883,6 @@
 		"one": "Benachrichtigung",
 		"other": "Benachrichtigungen"
 	},
-	"openroaming": {
-		"pool_strategy": "Pool-Strategie",
-		"radius_endpoint_one": "Radiusendpunkt",
-		"radius_endpoint_other": "Radiusendpunkte"
-	},
 	"operator": {
 		"delete_explanation": "Möchten Sie diesen Operator wirklich löschen? Dieser Vorgang ist nicht umkehrbar",
 		"delete_operator": "Betreiber löschen",
@@ -981,27 +948,6 @@
 		"title": "Beschränkungen",
 		"tty": "TTY-Zugriff"
 	},
-	"roaming": {
-		"account_created": "Neues Konto erstellt!",
-		"account_deleted": "Konto gelöscht!",
-		"account_one": "Konto",
-		"account_other": "Konten",
-		"certificate_deleted": "Zertifikat gelöscht!",
-		"certificate_one": "Zertifikat",
-		"certificate_other": "Zertifikate",
-		"city": "Stadt",
-		"common_name": "Gemeinsamen Namen",
-		"country": "Land",
-		"global_reach": "Globale Reichweite",
-		"global_reach_account_id": "Konto-ID",
-		"invalid_certificate": "Ungültiges Zertifikat",
-		"invalid_key": "Ungültiger privater Schlüssel",
-		"location_details_title": "Ort",
-		"organization": "Organisation",
-		"private_key": "Privat Schlüssel",
-		"province": "Provinz",
-		"state": "Zustand"
-	},
 	"rrm": {
 		"algorithm": "Algorithmus",
 		"algorithm_other": "Algorithmen",
@@ -1062,9 +1008,6 @@
 		"current_live_devices": "Aktuelle Live-Geräte",
 		"currently_running_one": "Derzeit wird {{count}} Simulation ausgeführt",
 		"currently_running_other": "Derzeit laufen {{count}} Simulationen",
-		"delete_devices_confirm": "Sind Sie sicher, dass Sie alle Geräte und deren Statistiken vom Gateway entfernen möchten? Diese Aktion ist nicht rückgängig zu machen",
-		"delete_devices_loading": "Dieser Vorgang kann bis zu 5 Minuten dauern",
-		"delete_simulation_devices": "Geräte löschen",
 		"delete_success": "Gelöschte Simulation!",
 		"duration": "Dauer",
 		"error_devices": "Fehler Geräte",
@@ -1123,7 +1066,6 @@
 		"title": "Abonnenten"
 	},
 	"system": {
-		"advanced": "Erweitert",
 		"backend_logs": "Back-End-Protokolle",
 		"configuration": "Aufbau",
 		"could_not_retrieve": "Fehler: {{name}} Systeminformationen konnten nicht abgerufen werden",

public/locales/en/translation.json

@@ -223,7 +223,6 @@
 		"day": "Day",
 		"days": "Days",
 		"default": "Default",
-		"defaults": "Defaults",
 		"description": "Description",
 		"details": "Details",
 		"device_details": "Device Details",
@@ -269,7 +268,6 @@
 		"map": "Map",
 		"max": "Max",
 		"min": "Min",
-		"miscellaneous": "Miscellaneous",
 		"mode": "Mode",
 		"model": "Model",
 		"modified": "Modified",
@@ -704,32 +702,11 @@
 		"venues_under_root": "Venues cannot be created directly under the root entity"
 	},
 	"firmware": {
-		"confirm_default_data": "Please confirm the information below and click 'Confirm' once you are ready to start the process",
-		"create_success": "Created new default firmware settings!",
 		"db_update_warning": "This operation is done daily automatically without need to use this manual update. Updating this database can take up to 25 minutes",
-		"default_created_error_one": "{{count}} error while trying to create new setting",
-		"default_created_error_other": "{{count}} errors while trying to create new setting",
-		"default_created_one": "{{count}} default firmware setting created",
-		"default_created_other": "{{count}} default firmware settings created",
-		"default_found_one": "Found valid revision for {{count}} device type",
-		"default_found_other": "Found valid revisions for {{count}} device types",
-		"default_mass_delete_success_one": "Deleted {{count}} default firmware setting!",
-		"default_mass_delete_success_other": "Deleted {{count}} default firmware settings!",
-		"default_not_found_one": "No valid firmware versions for {{count}} device type",
-		"default_not_found_other": "No valid firmware versions for {{count}} device types",
-		"default_title": "Default Firmware",
-		"default_update_success": "Updated default firmware for {{deviceType}}!",
-		"delete_success": "Deleted default firmware setting!",
-		"edit_default_title": "This is the current firmware that is used as the minimum version for new APs of type {{deviceType}}. If a new {{deviceType}} AP connects to the gateway, it will be automatically upgraded to this version.",
-		"fetching_defaults": "Fetching all available firmware for selected device types...",
 		"last_db_update_modal": "Firmware Database",
 		"last_db_update_title": "Database",
-		"one": "Firmware",
-		"select_default_device_types": "Please select all device types that you want to target with this new default firmware rule. If you cannot find your desired device type, it means they already have an applied rule.",
-		"select_default_revision": "You can now select the minimum revision you want your device types to target",
 		"start_db_update": "Start Database Update",
-		"started_db_update": "Started database update, this operation should take up to 25 minutes to complete",
+		"started_db_update": "Started database update, this operation should take up to 25 minutes to complete"
-		"update_success": "Saved default firmware information!"
 	},
 	"footer": {
 		"powered_by": "Powered By",
@@ -738,7 +715,6 @@
 	"form": {
 		"captive_web_root_explanation": "Please use .tar files only (no compressed files like .targz, for example)",
 		"certificate_file_explanation": "Please use a .pem file that starts with \"-----BEGIN CERTIFICATE-----\" and ends with \"-----END CERTIFICATE-----\"",
-		"invalid_alphanumeric_with_dash": "Accepted chars. are only alphanumeric (letters & numbers)",
 		"invalid_cidr": "Invalid CIDR IPv4 address. Example: 192.168.0.1/12",
 		"invalid_email": "Invalid Email",
 		"invalid_file_content": "Invalid file content, please confirm that it is of the valid format",
@@ -765,11 +741,7 @@
 		"invalid_static_ipv4_e": "Invalid address, this range reserved for experiments (class E). The first octet should be 223 or lower",
 		"invalid_third_party": "Invalid Third Party JSON string. Please confirm that your value is a valid JSON",
 		"key_file_explanation": "Please use a .pem file that starts with \"-----BEGIN PRIVATE KEY-----\" and ends with \"-----END PRIVATE KEY-----\"",
-		"max_length": "Maximum length of {{max}} chars.",
-		"max_value": "Maximum value of {{max}}",
-		"min_length": "Minimum length of {{min}} chars.",
 		"min_max_string": "Value needs to be of a length between {{min}} (inclusive) and {{max}} (inclusive)",
-		"min_value": "Minimum value of {{min}}",
 		"missing_interface_upstream": "You need to have at least one upstream interface. At the moment, all your interfaces are downstream",
 		"new_email_to_notify": "New email to notify",
 		"new_phone_to_notify": "New phone to notify",
@@ -911,11 +883,6 @@
 		"one": "Notification",
 		"other": "Notifications"
 	},
-	"openroaming": {
-		"pool_strategy": "Pool Strategy",
-		"radius_endpoint_one": "Radius Endpoint",
-		"radius_endpoint_other": "Radius Endpoints"
-	},
 	"operator": {
 		"delete_explanation": "Are you sure you want to delete this operator? This operation is not reversible",
 		"delete_operator": "Delete Operator",
@@ -981,27 +948,6 @@
 		"title": "Restrictions",
 		"tty": "TTY Access"
 	},
-	"roaming": {
-		"account_created": "New account created!",
-		"account_deleted": "Deleted account!",
-		"account_one": "Account",
-		"account_other": "Accounts",
-		"certificate_deleted": "Deleted certificate!",
-		"certificate_one": "Certificate",
-		"certificate_other": "Certificates",
-		"city": "City",
-		"common_name": "Common Name",
-		"country": "Country",
-		"global_reach": "GlobalReach",
-		"global_reach_account_id": " Account ID",
-		"invalid_certificate": "Invalid certificate",
-		"invalid_key": "Invalid private key",
-		"location_details_title": "Location",
-		"organization": "Organization",
-		"private_key": "Private Key",
-		"province": "Province",
-		"state": "State"
-	},
 	"rrm": {
 		"algorithm": "Algorithm",
 		"algorithm_other": "Algorithms",
@@ -1062,9 +1008,6 @@
 		"current_live_devices": "Current Live Devices",
 		"currently_running_one": "There is currently {{count}} simulation running",
 		"currently_running_other": "There are currently {{count}} simulations running",
-		"delete_devices_confirm": "Are you sure you want to remove all devices and their statistics from the gateway? This action is not reversible",
-		"delete_devices_loading": "This process may take up to 5 minutes",
-		"delete_simulation_devices": "Delete Devices",
 		"delete_success": "Deleted Simulation!",
 		"duration": "Duration",
 		"error_devices": "Error Devices",
@@ -1123,7 +1066,6 @@
 		"title": "Subscribers"
 	},
 	"system": {
-		"advanced": "Advanced",
 		"backend_logs": "Back-End Logs",
 		"configuration": "Configuration",
 		"could_not_retrieve": "Error: could not retrieve {{name}} system information",

public/locales/es/translation.json

@@ -223,7 +223,6 @@
 		"day": "Día",
 		"days": "días",
 		"default": "Defecto",
-		"defaults": "Valores predeterminados",
 		"description": "Descripción",
 		"details": "Detalles",
 		"device_details": "Detalles del dispositivo",
@@ -269,7 +268,6 @@
 		"map": "Mapa",
 		"max": "Max",
 		"min": "Min",
-		"miscellaneous": "Diverso",
 		"mode": "Modo",
 		"model": "Modelo",
 		"modified": "Modificado",
@@ -704,32 +702,11 @@
 		"venues_under_root": "Los lugares no se pueden crear directamente bajo la entidad raíz"
 	},
 	"firmware": {
-		"confirm_default_data": "Confirme la información a continuación y haga clic en 'Confirmar' una vez que esté listo para comenzar el proceso",
-		"create_success": "¡Se crearon nuevas configuraciones de firmware predeterminadas!",
 		"db_update_warning": "Esta operación se realiza automáticamente todos los días de forma automática sin necesidad de utilizar esta actualización manual. La actualización de esta base de datos puede tardar hasta 25 minutos",
-		"default_created_error_one": "{{count}} error al intentar crear una nueva configuración",
-		"default_created_error_other": "{{count}} errores al intentar crear una nueva configuración",
-		"default_created_one": "{{count}} configuración de firmware predeterminada creada",
-		"default_created_other": "{{count}} ajustes de firmware predeterminados creados",
-		"default_found_one": "Se encontró una revisión válida para el tipo de dispositivo {{count}} ",
-		"default_found_other": "Se encontraron revisiones válidas para {{count}} tipos de dispositivos",
-		"default_mass_delete_success_one": "¡Se eliminó {{count}} configuración de firmware predeterminada!",
-		"default_mass_delete_success_other": "¡Se eliminaron {{count}} configuraciones de firmware predeterminadas!",
-		"default_not_found_one": "No hay versiones de firmware válidas para el tipo de dispositivo {{count}} ",
-		"default_not_found_other": "No hay versiones de firmware válidas para {{count}} tipos de dispositivos",
-		"default_title": "",
-		"default_update_success": "¡Firmware predeterminado actualizado para {{deviceType}}!",
-		"delete_success": "¡Configuración de firmware predeterminada eliminada!",
-		"edit_default_title": "Este es el firmware actual que se utiliza como versión mínima para los nuevos AP de tipo {{deviceType}}. Si un nuevo AP {{deviceType}} se conecta a la puerta de enlace, se actualizará automáticamente a esta versión.",
-		"fetching_defaults": "Obteniendo todo el firmware disponible para los tipos de dispositivos seleccionados...",
 		"last_db_update_modal": "Base de datos de firmware",
 		"last_db_update_title": "Base de datos",
-		"one": "Firmware",
-		"select_default_device_types": "Seleccione todos los tipos de dispositivos a los que desea apuntar con esta nueva regla de firmware predeterminada. Si no puede encontrar el tipo de dispositivo deseado, significa que ya tienen una regla aplicada.",
-		"select_default_revision": "Ahora puede seleccionar la revisión mínima a la que desea que se dirijan sus tipos de dispositivos",
 		"start_db_update": "Iniciar actualización de la base de datos",
-		"started_db_update": "Actualización de la base de datos iniciada, esta operación debería tardar hasta 25 minutos en completarse",
+		"started_db_update": "Actualización de la base de datos iniciada, esta operación debería tardar hasta 25 minutos en completarse"
-		"update_success": "¡Información de firmware predeterminada guardada!"
 	},
 	"footer": {
 		"powered_by": "energizado por",
@@ -738,7 +715,6 @@
 	"form": {
 		"captive_web_root_explanation": "Utilice únicamente archivos .tar (no archivos comprimidos como .targz, por ejemplo)",
 		"certificate_file_explanation": "Utilice un archivo .pem que comience con \"-----BEGIN CERTIFICATE-----\" y termine con \"-----END CERTIFICATE-----\"",
-		"invalid_alphanumeric_with_dash": "Caracteres aceptados. son solo alfanuméricos (letras y números)",
 		"invalid_cidr": "Dirección IPv4 CIDR no válida. Ejemplo: 192.168.0.1/12",
 		"invalid_email": "Email inválido",
 		"invalid_file_content": "Contenido de archivo no válido, confirme que tiene un formato válido",
@@ -765,11 +741,7 @@
 		"invalid_static_ipv4_e": "Dirección no válida, este rango reservado para experimentos (clase E). El primer octeto debe ser 223 o inferior",
 		"invalid_third_party": "Cadena JSON de terceros no válida. Confirme que su valor es un JSON válido",
 		"key_file_explanation": "Utilice un archivo .pem que comience con \"-----BEGIN PRIVATE KEY-----\" y termine con \"-----END PRIVATE KEY-----\"",
-		"max_length": "Longitud máxima de {{max}} caracteres.",
-		"max_value": "Valor máximo de {{max}}",
-		"min_length": "Longitud mínima de {{min}} caracteres.",
 		"min_max_string": "El valor debe tener una longitud entre {{min}} (inclusive) y {{max}} (inclusive)",
-		"min_value": "Valor mínimo de {{min}}",
 		"missing_interface_upstream": "Debe tener al menos una interfaz ascendente. Por el momento, todas sus interfaces están en sentido descendente",
 		"new_email_to_notify": "Nuevo correo electrónico para notificar",
 		"new_phone_to_notify": "Nuevo teléfono para avisar",
@@ -911,11 +883,6 @@
 		"one": "Notificación",
 		"other": "Notificaciones"
 	},
-	"openroaming": {
-		"pool_strategy": "Estrategia de piscina",
-		"radius_endpoint_one": "Punto final del radio",
-		"radius_endpoint_other": "Puntos finales de radio"
-	},
 	"operator": {
 		"delete_explanation": "¿Está seguro de que desea eliminar este operador? Esta operación no es reversible.",
 		"delete_operator": "Eliminar operador",
@@ -981,27 +948,6 @@
 		"title": "Las restricciones",
 		"tty": "Acceso TTY"
 	},
-	"roaming": {
-		"account_created": "¡Nueva cuenta creada!",
-		"account_deleted": "¡Cuenta eliminada!",
-		"account_one": "Cuenta",
-		"account_other": "Cuentas",
-		"certificate_deleted": "Certificado eliminado!",
-		"certificate_one": "Certificado",
-		"certificate_other": "Certificados",
-		"city": "ciudad",
-		"common_name": "Nombre común",
-		"country": "País",
-		"global_reach": "Alcance global",
-		"global_reach_account_id": "ID de cuenta ",
-		"invalid_certificate": "Certificado inválido",
-		"invalid_key": "Clave privada no válida",
-		"location_details_title": "Ubicación",
-		"organization": "Organización",
-		"private_key": "Llave privada",
-		"province": "Provincia",
-		"state": "Estado"
-	},
 	"rrm": {
 		"algorithm": "Algoritmo",
 		"algorithm_other": "Algoritmos",
@@ -1062,9 +1008,6 @@
 		"current_live_devices": "Dispositivos activos actuales",
 		"currently_running_one": "Actualmente hay {{count}} simulación en ejecución",
 		"currently_running_other": "Actualmente hay {{count}} simulaciones ejecutándose",
-		"delete_devices_confirm": "¿Está seguro de que desea eliminar todos los dispositivos y sus estadísticas de la puerta de enlace? Esta acción no es reversible",
-		"delete_devices_loading": "Este proceso puede tardar hasta 5 minutos.",
-		"delete_simulation_devices": "BORRAR DISPOSITIVOS",
 		"delete_success": "¡Simulación eliminada!",
 		"duration": "Duración",
 		"error_devices": "Dispositivos de error",
@@ -1123,7 +1066,6 @@
 		"title": "Suscriptores"
 	},
 	"system": {
-		"advanced": "Avanzado",
 		"backend_logs": "Registros de back-end",
 		"configuration": "Configuración",
 		"could_not_retrieve": "Error: no se pudo recuperar la información del sistema {{name}} ",

public/locales/fr/translation.json

@@ -223,7 +223,6 @@
 		"day": "journée",
 		"days": "Journées",
 		"default": "Défaut",
-		"defaults": "Valeurs par défaut",
 		"description": "La description",
 		"details": "Détails",
 		"device_details": "Détails de l'appareil",
@@ -269,7 +268,6 @@
 		"map": "Carte",
 		"max": "Max",
 		"min": "Min",
-		"miscellaneous": "Divers",
 		"mode": "Mode",
 		"model": "Modèle",
 		"modified": "Modifié",
@@ -704,32 +702,11 @@
 		"venues_under_root": "Les lieux ne peuvent pas être créés directement sous l'entité racine"
 	},
 	"firmware": {
-		"confirm_default_data": "Veuillez confirmer les informations ci-dessous et cliquez sur \"Confirmer\" une fois que vous êtes prêt à démarrer le processus",
-		"create_success": "Création de nouveaux paramètres de firmware par défaut !",
 		"db_update_warning": "Cette opération se fait automatiquement quotidiennement sans avoir besoin d'utiliser cette mise à jour manuelle. La mise à jour de cette base de données peut prendre jusqu'à 25 minutes",
-		"default_created_error_one": "{{count}} erreur lors de la tentative de création d'un nouveau paramètre",
-		"default_created_error_other": "{{count}}  erreurs lors de la tentative de création d'un nouveau paramètre",
-		"default_created_one": "{{count}} paramètre de micrologiciel par défaut créé",
-		"default_created_other": "{{count}}  paramètres de micrologiciel par défaut créés",
-		"default_found_one": "Révision valide trouvée pour le type d'appareil {{count}} ",
-		"default_found_other": "Révisions valides trouvées pour {{count}}  types d'appareils",
-		"default_mass_delete_success_one": "Paramètre de micrologiciel par défaut {{count}} supprimé !",
-		"default_mass_delete_success_other": " {{count}}  paramètres de micrologiciel par défaut supprimés !",
-		"default_not_found_one": "Aucune version de micrologiciel valide pour le type d'appareil {{count}} ",
-		"default_not_found_other": "Aucune version de micrologiciel valide pour {{count}}  types d'appareils",
-		"default_title": "",
-		"default_update_success": "Firmware par défaut mis à jour pour {{deviceType}} !",
-		"delete_success": "Paramètre de micrologiciel par défaut supprimé !",
-		"edit_default_title": "Il s'agit du micrologiciel actuel utilisé comme version minimale pour les nouveaux points d'accès de type {{deviceType}}. Si un nouveau point d'accès {{deviceType}} se connecte à la passerelle, il sera automatiquement mis à niveau vers cette version.",
-		"fetching_defaults": "Récupération de tous les micrologiciels disponibles pour les types d'appareils sélectionnés...",
 		"last_db_update_modal": "Base de données du micrologiciel",
 		"last_db_update_title": "Base de données",
-		"one": "Micrologiciel",
-		"select_default_device_types": "Veuillez sélectionner tous les types d'appareils que vous souhaitez cibler avec cette nouvelle règle de micrologiciel par défaut. Si vous ne trouvez pas le type d'appareil souhaité, cela signifie qu'une règle est déjà appliquée.",
-		"select_default_revision": "Vous pouvez maintenant sélectionner la révision minimale que vous souhaitez que vos types d'appareils ciblent",
 		"start_db_update": "Démarrer la mise à jour de la base de données",
-		"started_db_update": "Mise à jour de la base de données démarrée, cette opération devrait prendre jusqu'à 25 minutes",
+		"started_db_update": "Mise à jour de la base de données démarrée, cette opération devrait prendre jusqu'à 25 minutes"
-		"update_success": "Informations sur le micrologiciel par défaut enregistrées !"
 	},
 	"footer": {
 		"powered_by": "Alimenté par",
@@ -738,7 +715,6 @@
 	"form": {
 		"captive_web_root_explanation": "Veuillez utiliser uniquement des fichiers .tar (pas de fichiers compressés comme .targz, par exemple)",
 		"certificate_file_explanation": "Veuillez utiliser un fichier .pem qui commence par \"-----BEGIN CERTIFICATE-----\" et se termine par \"-----END CERTIFICATE-----\"",
-		"invalid_alphanumeric_with_dash": "Caractères acceptés. sont uniquement alphanumériques (lettres et chiffres)",
 		"invalid_cidr": "Adresse IPv4 CIDR non valide. Exemple : 192.168.0.1/12",
 		"invalid_email": "Email Invalide",
 		"invalid_file_content": "Contenu de fichier non valide, veuillez confirmer qu'il est au format valide",
@@ -765,11 +741,7 @@
 		"invalid_static_ipv4_e": "Adresse invalide, cette plage est réservée aux expérimentations (classe E). Le premier octet doit être 223 ou moins",
 		"invalid_third_party": "Chaîne JSON tierce non valide. Veuillez confirmer que votre valeur est un JSON valide",
 		"key_file_explanation": "Veuillez utiliser un fichier .pem qui commence par \"-----BEGIN PRIVATE KEY-----\" et se termine par \"-----END PRIVATE KEY-----\"",
-		"max_length": "Longueur maximale de {{max}}  caractères.",
-		"max_value": "Valeur maximale de  {{max}}",
-		"min_length": "Longueur minimale de {{min}}  caractères.",
 		"min_max_string": "La valeur doit être d'une longueur comprise entre {{min}} (inclus) et {{max}} (inclus)",
-		"min_value": "Valeur minimale de  {{min}}",
 		"missing_interface_upstream": "Vous devez avoir au moins une interface en amont. Pour le moment, toutes vos interfaces sont en aval",
 		"new_email_to_notify": "Nouvel e-mail à notifier",
 		"new_phone_to_notify": "Nouveau téléphone à notifier",
@@ -911,11 +883,6 @@
 		"one": "Notification",
 		"other": "Les notifications"
 	},
-	"openroaming": {
-		"pool_strategy": "Stratégie de pool",
-		"radius_endpoint_one": "Point final de rayon",
-		"radius_endpoint_other": "Points de terminaison du rayon"
-	},
 	"operator": {
 		"delete_explanation": "Voulez-vous vraiment supprimer cet opérateur ? Cette opération n'est pas réversible",
 		"delete_operator": "Supprimer l'opérateur",
@@ -981,27 +948,6 @@
 		"title": "Restrictions",
 		"tty": "Accès ATS"
 	},
-	"roaming": {
-		"account_created": "Nouveau compte créé !",
-		"account_deleted": "Compte supprimé !",
-		"account_one": "Compte",
-		"account_other": "Comptes",
-		"certificate_deleted": "Certificat supprimé !",
-		"certificate_one": "Certificat",
-		"certificate_other": "Certificats",
-		"city": "Ville",
-		"common_name": "Nom commun",
-		"country": "Pays",
-		"global_reach": "Portée mondiale",
-		"global_reach_account_id": "ID de compte ",
-		"invalid_certificate": "certificat invalide",
-		"invalid_key": "Clé privée invalide",
-		"location_details_title": "Emplacement",
-		"organization": "Organisation",
-		"private_key": "Clé privée",
-		"province": "province",
-		"state": "Etat"
-	},
 	"rrm": {
 		"algorithm": "Algorithme",
 		"algorithm_other": "Algorithmes",
@@ -1062,9 +1008,6 @@
 		"current_live_devices": "Appareils en direct actuels",
 		"currently_running_one": "Il y a actuellement {{count}} simulation en cours",
 		"currently_running_other": "Il y a actuellement {{count}}  simulations en cours d'exécution",
-		"delete_devices_confirm": "Voulez-vous vraiment supprimer tous les appareils et leurs statistiques de la passerelle ? Cette action n'est pas réversible",
-		"delete_devices_loading": "Ce processus peut prendre jusqu'à 5 minutes",
-		"delete_simulation_devices": "Supprimer des appareils",
 		"delete_success": "Simulation supprimée !",
 		"duration": "Durée",
 		"error_devices": "Périphériques d'erreur",
@@ -1123,7 +1066,6 @@
 		"title": "Les abonnés"
 	},
 	"system": {
-		"advanced": "Avancée",
 		"backend_logs": "Journaux principaux",
 		"configuration": "Configuration",
 		"could_not_retrieve": "Erreur : impossible de récupérer les informations système {{name}} ",

public/locales/pt/translation.json

@@ -223,7 +223,6 @@
 		"day": "Dia",
 		"days": "Dias",
 		"default": "Padrão",
-		"defaults": "Predefinições",
 		"description": "Descrição",
 		"details": "Detalhes",
 		"device_details": "Detalhes do dispositivo",
@@ -269,7 +268,6 @@
 		"map": "Mapa",
 		"max": "máximo",
 		"min": "minuto",
-		"miscellaneous": "Diversos",
 		"mode": "Modo",
 		"model": "Modelo",
 		"modified": "Modificado",
@@ -704,32 +702,11 @@
 		"venues_under_root": "Os locais não podem ser criados diretamente na entidade raiz"
 	},
 	"firmware": {
-		"confirm_default_data": "Confirme as informações abaixo e clique em 'Confirmar' quando estiver pronto para iniciar o processo",
-		"create_success": "Criou novas configurações de firmware padrão!",
 		"db_update_warning": "Esta operação é feita automaticamente diariamente sem necessidade de usar esta atualização manual. A atualização deste banco de dados pode levar até 25 minutos",
-		"default_created_error_one": "{{count}} erro ao tentar criar uma nova configuração",
-		"default_created_error_other": "{{count}} erros ao tentar criar uma nova configuração",
-		"default_created_one": "{{count}} configuração de firmware padrão criada",
-		"default_created_other": "{{count}} configurações de firmware padrão criadas",
-		"default_found_one": "Revisão válida encontrada para {{count}} tipo de dispositivo",
-		"default_found_other": "Foram encontradas revisões válidas para {{count}} tipos de dispositivo",
-		"default_mass_delete_success_one": "Configuração de firmware padrão {{count}} excluída!",
-		"default_mass_delete_success_other": "Excluídas {{count}} configurações de firmware padrão!",
-		"default_not_found_one": "Nenhuma versão de firmware válida para {{count}} tipo de dispositivo",
-		"default_not_found_other": "Nenhuma versão de firmware válida para {{count}} tipos de dispositivo",
-		"default_title": "",
-		"default_update_success": "Firmware padrão atualizado para {{deviceType}}!",
-		"delete_success": "Configuração de firmware padrão excluída!",
-		"edit_default_title": "Este é o firmware atual usado como versão mínima para novos APs do tipo {{deviceType}}. Se um novo AP {{deviceType}} se conectar ao gateway, ele será atualizado automaticamente para esta versão.",
-		"fetching_defaults": "Buscando todo o firmware disponível para os tipos de dispositivos selecionados...",
 		"last_db_update_modal": "banco de dados de firmware",
 		"last_db_update_title": "base de dados",
-		"one": "Firmware",
-		"select_default_device_types": "Selecione todos os tipos de dispositivos que deseja segmentar com esta nova regra de firmware padrão. Se você não conseguir encontrar o tipo de dispositivo desejado, significa que eles já têm uma regra aplicada.",
-		"select_default_revision": "Agora você pode selecionar a revisão mínima para a qual deseja que seus tipos de dispositivo sejam direcionados",
 		"start_db_update": "Iniciar atualização do banco de dados",
-		"started_db_update": "Atualização do banco de dados iniciada, esta operação deve levar até 25 minutos para ser concluída",
+		"started_db_update": "Atualização do banco de dados iniciada, esta operação deve levar até 25 minutos para ser concluída"
-		"update_success": "Informações de firmware padrão salvas!"
 	},
 	"footer": {
 		"powered_by": "Distribuído por",
@@ -738,7 +715,6 @@
 	"form": {
 		"captive_web_root_explanation": "Por favor, use apenas arquivos .tar (sem arquivos compactados como .targz, por exemplo)",
 		"certificate_file_explanation": "Use um arquivo .pem que comece com \"-----BEGIN CERTIFICATE-----\" e termine com \"-----END CERTIFICATE-----\"",
-		"invalid_alphanumeric_with_dash": "Caracteres aceitos. são apenas alfanuméricos (letras e números)",
 		"invalid_cidr": "Endereço CIDR IPv4 inválido. Exemplo: 192.168.0.1/12",
 		"invalid_email": "E-mail inválido",
 		"invalid_file_content": "Conteúdo de arquivo inválido. Confirme se está no formato válido",
@@ -765,11 +741,7 @@
 		"invalid_static_ipv4_e": "Endereço inválido, este intervalo é reservado para experimentos (classe E). O primeiro octeto deve ser 223 ou inferior",
 		"invalid_third_party": "String JSON de terceiros inválida. Confirme se seu valor é um JSON válido",
 		"key_file_explanation": "Use um arquivo .pem que comece com \"-----BEGIN PRIVATE KEY-----\" e termine com \"-----END PRIVATE KEY-----\"",
-		"max_length": "Comprimento máximo de {{max}} caracteres.",
-		"max_value": "Valor máximo de {{max}}",
-		"min_length": "Comprimento mínimo de {{min}} caracteres.",
 		"min_max_string": "O valor precisa ter um comprimento entre {{min}} (inclusive) e {{max}} (inclusive)",
-		"min_value": "Valor mínimo de {{min}}",
 		"missing_interface_upstream": "Você precisa ter pelo menos uma interface upstream. No momento, todas as suas interfaces estão downstream",
 		"new_email_to_notify": "Novo e-mail para notificar",
 		"new_phone_to_notify": "Novo telefone para notificar",
@@ -911,11 +883,6 @@
 		"one": "Notificação",
 		"other": "Notificações"
 	},
-	"openroaming": {
-		"pool_strategy": "Estratégia de pool",
-		"radius_endpoint_one": "Ponto final do raio",
-		"radius_endpoint_other": "Pontos finais de raio"
-	},
 	"operator": {
 		"delete_explanation": "Tem certeza de que deseja excluir este operador? Esta operação não é reversível",
 		"delete_operator": "Excluir operador",
@@ -981,27 +948,6 @@
 		"title": "RESTRIÇÕES",
 		"tty": "Acesso TTY"
 	},
-	"roaming": {
-		"account_created": "Nova conta criada!",
-		"account_deleted": "Conta excluída!",
-		"account_one": "Conta",
-		"account_other": "Contas",
-		"certificate_deleted": "Certificado excluído!",
-		"certificate_one": "Certificado",
-		"certificate_other": "Certificados",
-		"city": "Cidade",
-		"common_name": "Nome comum",
-		"country": "País",
-		"global_reach": "Alcance global",
-		"global_reach_account_id": "ID da conta",
-		"invalid_certificate": "Certificado inválido",
-		"invalid_key": "Chave privada inválida",
-		"location_details_title": "Localização",
-		"organization": "Organização",
-		"private_key": "Chave privada",
-		"province": "província",
-		"state": "Estado"
-	},
 	"rrm": {
 		"algorithm": "Algoritmo",
 		"algorithm_other": "Algoritmos",
@@ -1062,9 +1008,6 @@
 		"current_live_devices": "Dispositivos ativos atuais",
 		"currently_running_one": "Atualmente, há {{count}} simulação em execução",
 		"currently_running_other": "Existem atualmente {{count}} simulações em execução",
-		"delete_devices_confirm": "Tem certeza de que deseja remover todos os dispositivos e suas estatísticas do gateway? Esta ação não é reversível",
-		"delete_devices_loading": "Este processo pode levar até 5 minutos",
-		"delete_simulation_devices": "Apagar dispositivos",
 		"delete_success": "Simulação excluída!",
 		"duration": "Duração",
 		"error_devices": "Dispositivos de Erro",
@@ -1123,7 +1066,6 @@
 		"title": "Inscritos"
 	},
 	"system": {
-		"advanced": "Avançado",
 		"backend_logs": "Registros de back-end",
 		"configuration": "Configuração",
 		"could_not_retrieve": "Erro: não foi possível recuperar {{name}} informações do sistema",

src/@tanstack.react-table.d.ts

@@ -4,22 +4,18 @@ import '@tanstack/react-table';
 
 declare module '@tanstack/table-core' {
   interface ColumnMeta<TData extends RowData, TValue> {
-    ref?: React.MutableRefObject<HTMLTableCellElement | null>;
-    customMinWidth?: string;
-    anchored?: boolean;
     stopPropagation?: boolean;
     alwaysShow?: boolean;
+    anchored?: boolean;
     hasPopover?: boolean;
     customMaxWidth?: string;
+    customMinWidth?: string;
     customWidth?: string;
     isMonospace?: boolean;
     isCentered?: boolean;
     columnSelectorOptions?: {
       label?: string;
     };
-    rowContentOptions?: {
-      style?: React.CSSProperties;
-    };
     headerOptions?: {
       tooltip?: string;
     };

src/components/Buttons/DeviceActionDropdown/index.tsx

@@ -54,7 +54,6 @@ const DeviceActionDropdown = ({
 }: Props) => {
   const { t } = useTranslation();
   const toast = useToast();
-  const deviceType = device?.deviceType ?? 'ap';
   const connectColor = useColorModeValue('blackAlpha', 'gray');
   const addEventListeners = useControllerStore((state) => state.addEventListeners);
   const { refetch: getRtty, isFetching: isRtty } = useGetDeviceRtty({
@@ -206,7 +205,7 @@ const DeviceActionDropdown = ({
           isDisabled={isDisabled}
           onClick={handleOpenScan}
           colorScheme="teal"
-          hidden={isCompact || deviceType !== 'ap'}
+          hidden={isCompact}
         />
       </Tooltip>
       <Menu>
@@ -222,7 +221,7 @@ const DeviceActionDropdown = ({
         <Portal>
           <MenuList maxH="315px" overflowY="auto">
             <MenuItem onClick={handleBlinkClick}>{t('commands.blink')}</MenuItem>
-            <MenuItem onClick={handleOpenConfigure} hidden={!isCompact || deviceType !== 'ap'}>
+            <MenuItem onClick={handleOpenConfigure} hidden={!isCompact}>
               {t('controller.configure.title')}
             </MenuItem>
             <MenuItem onClick={handleConnectClick} hidden={!isCompact}>
@@ -240,7 +239,7 @@ const DeviceActionDropdown = ({
             <MenuItem onClick={handleUpdateToLatest} hidden>
               {t('premium.toolbox.upgrade_to_latest')}
             </MenuItem>
-            <MenuItem onClick={handleOpenScan} hidden={!isCompact || deviceType !== 'ap'}>
+            <MenuItem onClick={handleOpenScan} hidden={!isCompact}>
               {t('commands.wifiscan')}
             </MenuItem>
           </MenuList>

src/components/Buttons/ToggleEditButton/index.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Button, IconButton, Tooltip, useBreakpoint, useDisclosure } from '@chakra-ui/react';
-import { Pencil, Stop } from '@phosphor-icons/react';
+import { Pencil, X } from '@phosphor-icons/react';
 import { useTranslation } from 'react-i18next';
 import { ConfirmCloseAlertModal } from '../../Modals/ConfirmCloseAlert';
 
@@ -48,7 +48,7 @@ const _ToggleEditButton: React.FC<ToggleEditButtonProps> = ({
           colorScheme="gray"
           type="button"
           onClick={toggle}
-          rightIcon={isEditing ? <Stop size={20} /> : <Pencil size={20} />}
+          rightIcon={isEditing ? <X size={20} /> : <Pencil size={20} />}
           isLoading={isLoading}
           isDisabled={isDisabled}
           ml={ml}
@@ -68,7 +68,7 @@ const _ToggleEditButton: React.FC<ToggleEditButtonProps> = ({
           colorScheme="gray"
           type="button"
           onClick={toggle}
-          icon={isEditing ? <Stop size={20} /> : <Pencil size={20} />}
+          icon={isEditing ? <X size={20} /> : <Pencil size={20} />}
           isLoading={isLoading}
           isDisabled={isDisabled}
           ml={ml}

src/components/Containers/ResponsiveTag/index.tsx

@@ -26,7 +26,7 @@ export const ResponsiveTag = React.memo(({ label, icon, tooltip, isCompact, ...p
   return (
     <Tooltip label={tooltip ?? label}>
       <Tag size="lg" colorScheme="blue" {...props}>
-        <TagLeftIcon boxSize="18px" as={icon} mt={-0.5} />
+        <TagLeftIcon boxSize="18px" as={icon} />
         <TagLabel>{label}</TagLabel>
       </Tag>
     </Tooltip>

src/components/DataTables/DataGrid/CellRow.tsx

@@ -24,6 +24,7 @@ export const DataGridCellRow = <TValue extends object>({
         backgroundColor: hoveredRowBg,
       }}
       onClick={onClick}
+      borderRight="1px solid gray"
     >
       {row.getVisibleCells().map((cell) => (
         <Td
@@ -54,7 +55,6 @@ export const DataGridCellRow = <TValue extends object>({
               : undefined
           }
           border="0.5px solid gray"
-          style={cell.column.columnDef.meta?.rowContentOptions?.style}
         >
           {flexRender(cell.column.columnDef.cell, cell.getContext())}
         </Td>

src/components/DataTables/DataGrid/HeaderRow.tsx

@@ -8,7 +8,7 @@ export type DataGridHeaderRowProps<TValue extends object> = {
 };
 
 export const DataGridHeaderRow = <TValue extends object>({ headerGroup }: DataGridHeaderRowProps<TValue>) => (
-  <Tr p={0}>
+  <Tr p={0} borderRight="1px solid gray">
     {headerGroup.headers.map((header) => (
       <Th
         color="gray.400"

src/components/DataTables/DataGrid/index.tsx

@@ -40,16 +40,13 @@ export type DataGridOptions<TValue extends object> = {
   onRowClick?: (row: TValue) => (() => void) | undefined;
   refetch?: () => void;
   showAsCard?: boolean;
-  hideTablePreferences?: boolean;
-  hideTableTitleRow?: boolean;
 };
 
 export type DataGridProps<TValue extends object> = {
-  innerTableKey?: string | number;
   controller: UseDataGridReturn;
   columns: DataGridColumn<TValue>[];
   header: {
-    title: string | React.ReactNode;
+    title: string;
     objectListed: string;
     leftContent?: React.ReactNode;
     addButton?: React.ReactNode;
@@ -61,7 +58,6 @@ export type DataGridProps<TValue extends object> = {
 };
 
 export const DataGrid = <TValue extends object>({
-  innerTableKey,
   controller,
   columns,
   header,
@@ -153,21 +149,7 @@ export const DataGrid = <TValue extends object>({
     ...tableOptions,
   });
 
-  // If this is a manual DataTable, with a page index that is higher than 0 and higher than the max possible page, we send to index 0
+  if (isLoading && data.length === 0) {
-  React.useEffect(() => {
-    if (
-      options.isManual &&
-      !isLoading &&
-      data &&
-      pagination.pageIndex > 0 &&
-      options.count !== undefined &&
-      Math.ceil(options.count / pagination.pageSize) - 1 < pagination.pageIndex
-    ) {
-      controller.onPaginationChange({ pageIndex: 0, pageSize: pagination.pageSize });
-    }
-  }, [options.count, isLoading, pagination, data]);
-
-  if (isLoading && !options.showAsCard && data.length === 0) {
     return (
       <Center>
         <Spinner size="xl" />
@@ -178,29 +160,25 @@ export const DataGrid = <TValue extends object>({
   return options.showAsCard ? (
     <Card>
       <CardHeader>
-        {typeof header.title === 'string' ? (
         <Heading size="md" my="auto" mr={2}>
           {header.title}
         </Heading>
-        ) : (
-          header.title
-        )}
         {header.leftContent}
         <Spacer />
         <HStack spacing={2}>
           {header.otherButtons}
           {header.addButton}
-          {options.hideTablePreferences ? null : (
+          {
             // @ts-ignore
             <TableSettingsModal<TValue> controller={controller} columns={columns} />
-          )}
+          }
           {options.refetch ? <RefreshButton onClick={options.refetch} isCompact isFetching={isLoading} /> : null}
         </HStack>
       </CardHeader>
       <CardBody display="flex" flexDirection="column">
         <LoadingOverlay isLoading={isLoading}>
           <TableContainer minH={minimumHeight}>
-            <Table size="small" variant="simple" textColor={textColor} w="100%" fontSize="14px" key={innerTableKey}>
+            <Table size="small" variant="simple" textColor={textColor} w="100%" fontSize="14px">
               <Thead>
                 {table.getHeaderGroups().map((headerGroup) => (
                   <DataGridHeaderRow<TValue> key={headerGroup.id} headerGroup={headerGroup} />
@@ -228,7 +206,7 @@ export const DataGrid = <TValue extends object>({
     </Card>
   ) : (
     <Box w="100%">
-      <Flex mb={2} hidden={options.hideTableTitleRow}>
+      <Flex mb={2}>
         <Heading size="md" my="auto" mr={2}>
           {header.title}
         </Heading>
@@ -237,16 +215,16 @@ export const DataGrid = <TValue extends object>({
         <HStack spacing={2}>
           {header.otherButtons}
           {header.addButton}
-          {options.hideTablePreferences ? null : (
+          {
             // @ts-ignore
             <TableSettingsModal<TValue> controller={controller} columns={columns} />
-          )}
+          }
           {options.refetch ? <RefreshButton onClick={options.refetch} isCompact isFetching={isLoading} /> : null}
         </HStack>
       </Flex>
       <LoadingOverlay isLoading={isLoading}>
         <TableContainer minH={minimumHeight}>
-          <Table size="small" variant="simple" textColor={textColor} w="100%" fontSize="14px" key={innerTableKey}>
+          <Table size="small" variant="simple" textColor={textColor} w="100%" fontSize="14px">
             <Thead>
               {table.getHeaderGroups().map((headerGroup) => (
                 <DataGridHeaderRow<TValue> key={headerGroup.id} headerGroup={headerGroup} />

src/components/DataTables/DataGrid/useDataGrid.ts

@@ -2,8 +2,7 @@ import * as React from 'react';
 import { ColumnDef, PaginationState, SortingColumnDef, SortingState, VisibilityState } from '@tanstack/react-table';
 import { useAuth } from 'contexts/AuthProvider';
 
-const getDefaultSettings = ({ settings, showAllRows }: { settings?: string; showAllRows?: boolean }) => {
+const getDefaultSettings = (settings?: string) => {
-  if (showAllRows) return { pageSize: 1000, pageIndex: 0 };
   let limit = 10;
   let index = 0;
 
@@ -55,10 +54,9 @@ export type UseDataGridProps = {
   tableSettingsId: string;
   defaultOrder: string[];
   defaultSortBy?: SortingState;
-  showAllRows?: boolean;
 };
 
-export const useDataGrid = ({ tableSettingsId, defaultSortBy, defaultOrder, showAllRows }: UseDataGridProps) => {
+export const useDataGrid = ({ tableSettingsId, defaultSortBy, defaultOrder }: UseDataGridProps) => {
   const orderSetting = `${tableSettingsId}.order`;
   const hiddenColumnSetting = `${tableSettingsId}.hiddenColumns`;
   const pageSetting = `${tableSettingsId}.page`;
@@ -68,9 +66,8 @@ export const useDataGrid = ({ tableSettingsId, defaultSortBy, defaultOrder, show
   const [columnOrder, setColumnOrder] = React.useState<string[]>(
     getSavedColumnOrder(defaultOrder ?? [], tableSettingsId),
   );
-  const [pageInfo, setPageInfo] = React.useState<PaginationState>(
+  const [pageInfo, setPageInfo] = React.useState<PaginationState>(getDefaultSettings(tableSettingsId));
-    getDefaultSettings({ settings: tableSettingsId, showAllRows }),
+
-  );
   const setNewColumnOrder = React.useCallback(
     (newOrder: string[]) => {
       setColumnOrder(newOrder);

src/components/Form/MultiSelectField/FastMultiSelectInput.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { FormControl, FormErrorMessage, FormLabel } from '@chakra-ui/react';
-import { CreatableSelect, Select } from 'chakra-react-select';
+import { Select } from 'chakra-react-select';
 import PropTypes from 'prop-types';
 import isEqual from 'react-fast-compare';
 import { useTranslation } from 'react-i18next';
@@ -25,7 +25,6 @@ const propTypes = {
   isHidden: PropTypes.bool,
   isPortal: PropTypes.bool.isRequired,
   definitionKey: PropTypes.string,
-  isCreatable: PropTypes.bool,
 };
 
 const defaultProps = {
@@ -37,7 +36,6 @@ const defaultProps = {
   isDisabled: false,
   isHidden: false,
   definitionKey: null,
-  isCreatable: false,
 };
 
 const FastMultiSelectInput = ({
@@ -52,7 +50,6 @@ const FastMultiSelectInput = ({
   isRequired,
   isDisabled,
   isHidden,
-  isCreatable,
   isPortal,
   definitionKey,
 }) => {
@@ -64,32 +61,6 @@ const FastMultiSelectInput = ({
         {label}
         <ConfigurationFieldExplanation definitionKey={definitionKey} />
       </FormLabel>
-      {isCreatable ? (
-        <CreatableSelect
-          chakraStyles={{
-            control: (provided, { isDisabled: isControlDisabled }) => ({
-              ...provided,
-              borderRadius: '15px',
-              opacity: isControlDisabled ? '0.8 !important' : '1',
-              border: '2px solid',
-            }),
-            dropdownIndicator: (provided) => ({
-              ...provided,
-              backgroundColor: 'unset',
-              border: 'unset',
-            }),
-          }}
-          classNamePrefix={isPortal ? 'chakra-react-select' : ''}
-          menuPortalTarget={isPortal ? document.body : undefined}
-          isMulti
-          closeMenuOnSelect={false}
-          options={options}
-          value={value}
-          onChange={onChange}
-          onBlur={onBlur}
-          isDisabled={isDisabled}
-        />
-      ) : (
       <Select
         chakraStyles={{
           control: (provided, { isDisabled: isControlDisabled }) => ({
@@ -119,7 +90,6 @@ const FastMultiSelectInput = ({
         onBlur={onBlur}
         isDisabled={isDisabled}
       />
-      )}
       <FormErrorMessage>{error}</FormErrorMessage>
     </FormControl>
   );

src/components/Form/MultiSelectField/index.jsx

@@ -20,7 +20,6 @@ const propTypes = {
   canSelectAll: PropTypes.bool,
   isPortal: PropTypes.bool,
   definitionKey: PropTypes.string,
-  isCreatable: PropTypes.bool,
 };
 
 const defaultProps = {
@@ -32,7 +31,6 @@ const defaultProps = {
   canSelectAll: false,
   isPortal: false,
   definitionKey: null,
-  isCreatable: false,
 };
 
 const MultiSelectField = ({
@@ -45,23 +43,12 @@ const MultiSelectField = ({
   emptyIsUndefined,
   canSelectAll,
   hasVirtualAll,
-  isCreatable,
   isPortal,
   definitionKey,
 }) => {
   const [{ value }, { touched, error }, { setValue, setTouched }] = useField(name);
 
-  const onChange = useCallback(
+  const onChange = useCallback((option) => {
-    (option) => {
-      if (isCreatable) {
-        if (typeof option === 'string') {
-          setValue([...value, option]);
-        } else {
-          setValue(option);
-        }
-
-        // setValue([...value, option]);
-      } else {
     const allIndex = option.findIndex((opt) => opt.value === '*');
     if (option.length === 0 && emptyIsUndefined) {
       setValue(undefined);
@@ -74,10 +61,7 @@ const MultiSelectField = ({
     } else if (option.length > 0) setValue(option.map((val) => val.value));
     else setValue([]);
     setTouched(true);
-      }
+  }, []);
-    },
-    [value],
-  );
 
   const onFieldBlur = useCallback(() => {
     setTouched(true);
@@ -98,7 +82,6 @@ const MultiSelectField = ({
       isHidden={isHidden}
       isPortal={isPortal}
       definitionKey={definitionKey}
-      isCreatable={isCreatable}
     />
   );
 };

src/components/GlobalSearchBar/index.tsx

@@ -24,11 +24,6 @@ const chakraStyles: (
   placeholder: (provided) => ({
     ...provided,
     lineHeight: '1',
-    pointerEvents: 'none',
-    userSelect: 'none',
-    MozUserSelect: 'none',
-    WebkitUserSelect: 'none',
-    msUserSelect: 'none',
   }),
   container: (provided) => ({
     ...provided,
@@ -36,10 +31,6 @@ const chakraStyles: (
     backgroundColor: colorMode === 'light' ? 'white' : 'gray.600',
     borderRadius: '15px',
   }),
-  input: (provided) => ({
-    ...provided,
-    gridArea: '1 / 2 / 4 / 4 !important',
-  }),
 });
 
 interface SearchOption extends OptionBase {
@@ -104,43 +95,18 @@ const GlobalSearchBar = () => {
           .then(() => callback([]));
       }
       if (v.match('^[a-fA-F0-9-*]+$')) {
-        let result: { label: string; value: string; type: 'serial' }[] = [];
-        let tryAgain = true;
-
         await store
           .searchSerialNumber(v)
           .then((res) => {
-            result = res.map((r) => ({
+            callback(
+              res.map((r) => ({
                 label: r,
                 value: r,
                 type: 'serial',
-            }));
+              })),
-            tryAgain = false;
+            );
           })
-          .catch(() => {
+          .catch(() => []);
-            result = [];
-          });
-
-        if (tryAgain) {
-          // Wait 1 second and try again
-          await new Promise((resolve) => setTimeout(resolve, 1000));
-
-          await store
-            .searchSerialNumber(v)
-            .then((res) => {
-              result = res.map((r) => ({
-                label: r,
-                value: r,
-                type: 'serial',
-              }));
-              tryAgain = false;
-            })
-            .catch(() => {
-              result = [];
-            });
-        }
-
-        callback(result);
       }
       return callback([]);
     },

src/components/Modals/ConfigureModal/index.tsx

@@ -30,7 +30,7 @@ export type ConfigureModalProps = {
   };
 };
 
-const _ConfigureModal = ({ serialNumber, modalProps }: ConfigureModalProps) => {
+export const ConfigureModal = ({ serialNumber, modalProps }: ConfigureModalProps) => {
   const { t } = useTranslation();
   const toast = useToast();
   const configure = useConfigureDevice({ serialNumber });
@@ -45,7 +45,6 @@ const _ConfigureModal = ({ serialNumber, modalProps }: ConfigureModalProps) => {
   const onImportConfiguration = () => {
     setNewConfig(getDevice.data?.configuration ? JSON.stringify(getDevice.data.configuration, null, 4) : '');
   };
-
   const isValid = React.useMemo(() => {
     try {
       JSON.parse(newConfig);
@@ -59,59 +58,22 @@ const _ConfigureModal = ({ serialNumber, modalProps }: ConfigureModalProps) => {
     try {
       const config = JSON.parse(newConfig);
       configure.mutate(config, {
-        onSuccess: (data) => {
+        onSuccess: () => {
-          if (data.errorCode === 0) {
           toast({
             id: `configure-success-${serialNumber}`,
             title: t('common.success'),
-              description:
+            description: t('controller.configure.success'),
-                data.status === 'pending'
-                  ? 'Command is pending! It will execute once the device connects'
-                  : t('controller.configure.success'),
             status: 'success',
             duration: 5000,
             isClosable: true,
             position: 'top-right',
           });
           modalProps.onClose();
-          } else if (data.errorCode === 1) {
-            toast({
-              id: `configure-warning-${serialNumber}`,
-              title: 'Warning',
-              description: `${data?.errorText ?? 'Unknown Warning'}`,
-              status: 'warning',
-              duration: 5000,
-              isClosable: true,
-              position: 'top-right',
-            });
-            modalProps.onClose();
-          } else {
-            toast({
-              id: `config-error-${serialNumber}`,
-              title: t('common.error'),
-              description: `${data?.errorText ?? 'Unknown Error'} (Code ${data.errorCode})`,
-              status: 'error',
-              duration: 5000,
-              isClosable: true,
-              position: 'top-right',
-            });
-          }
-          modalProps.onClose();
         },
       });
-    } catch (e) {
+    } catch (e) {}
-      // do nothing
-    }
   };
 
-  React.useEffect(() => {
-    if (modalProps.isOpen) {
-      getDevice.refetch();
-    } else {
-      setNewConfig('');
-    }
-  }, [modalProps.isOpen]);
-
   return (
     <Modal
       {...modalProps}
@@ -162,5 +124,3 @@ const _ConfigureModal = ({ serialNumber, modalProps }: ConfigureModalProps) => {
     </Modal>
   );
 };
-
-export const ConfigureModal = React.memo(_ConfigureModal);

src/components/Modals/FirmwareUpgradeModal/FirmwareList.tsx

@@ -14,7 +14,7 @@ interface Props {
 const FirmwareList: React.FC<Props> = ({ firmware, upgrade, isLoading }) => {
   const { t } = useTranslation();
 
-  const sortedFirmware = useMemo(() => firmware.sort((a, b) => b.imageDate - a.imageDate), [firmware]);
+  const sortedFirmware = useMemo(() => firmware.sort((a, b) => b.created - a.created), [firmware]);
 
   return (
     <Box h="600px" w="100%" overflowY="auto" px={0}>
@@ -34,10 +34,10 @@ const FirmwareList: React.FC<Props> = ({ firmware, upgrade, isLoading }) => {
           </Tr>
         </Thead>
         <Tbody>
-          {sortedFirmware.map(({ imageDate, size, revision, uri }) => (
+          {sortedFirmware.map(({ created, size, revision, uri }) => (
             <Tr key={uuid()}>
               <Td px={0} py={1} w="200px">
-                {compactDate(imageDate)}
+                {compactDate(created)}
               </Td>
               <Td px={0} py={1} width="160px">
                 {bytesString(size)}

src/components/Modals/TelemetryModal/index.tsx

@@ -25,7 +25,6 @@ import { useTranslation } from 'react-i18next';
 import { Modal } from '../Modal';
 import { lowercaseFirstLetter } from 'helpers/stringHelper';
 import { useTelemetry } from 'hooks/Network/Telemetry';
-import { secondsDuration } from 'helpers/dateFormatting';
 
 export type TelemetryModalProps = {
   serialNumber: string;
@@ -147,7 +146,8 @@ const _TelemetryModal = ({ serialNumber, modalProps }: TelemetryModalProps) => {
               {t('controller.telemetry.interval')}: {form.interval} {lowercaseFirstLetter(t('common.seconds'))}
             </p>
             <p>
-              {t('controller.telemetry.duration')}: {secondsDuration(form.lifetime, t)}
+              {t('controller.telemetry.duration')}: {form.interval}{' '}
+              {lowercaseFirstLetter(t('controller.telemetry.minutes'))}
             </p>
             <p>
               {t('controller.telemetry.types')}: {form.types.join(', ')}

src/components/Modals/WifiScanModal/ResultCard.tsx

@@ -1,5 +1,18 @@
 import React from 'react';
-import { Box, Button, Center, Heading, IconButton, Spacer, useColorMode } from '@chakra-ui/react';
+import {
+  Box,
+  Button,
+  Heading,
+  IconButton,
+  Spacer,
+  Table,
+  Tbody,
+  Td,
+  Th,
+  Thead,
+  Tr,
+  useColorMode,
+} from '@chakra-ui/react';
 import { JsonViewer } from '@textea/json-viewer';
 import { ArrowLeft } from '@phosphor-icons/react';
 import { useTranslation } from 'react-i18next';
@@ -7,124 +20,21 @@ import { v4 as uuid } from 'uuid';
 import { Card } from 'components/Containers/Card';
 import { CardBody } from 'components/Containers/Card/CardBody';
 import { CardHeader } from 'components/Containers/Card/CardHeader';
-import { DeviceScanResult, ScanChannel } from 'models/Device';
+import { ScanChannel } from 'models/Device';
-import { DataGrid } from 'components/DataTables/DataGrid';
-import { DataGridColumn, useDataGrid } from 'components/DataTables/DataGrid/useDataGrid';
 
 interface Props {
   channelInfo: ScanChannel;
 }
-
+const ResultCard: React.FC<Props> = ({ channelInfo: { channel, devices } }) => {
-const ueCell = (ies: DeviceScanResult['ies'], setIes: (ies: DeviceScanResult['ies']) => void) => (
-  <Button size="sm" colorScheme="blue" onClick={() => setIes(ies)} w="100%">
-    {ies.length}
-  </Button>
-);
-
-const centerIfUndefinedCell = (v?: string | number, suffix?: string) =>
-  v !== undefined ? `${v}${suffix ? `${suffix}` : ''}` : <Center>-</Center>;
-
-const ResultCard = ({ channelInfo: { channel, devices } }: Props) => {
   const { t } = useTranslation();
   const { colorMode } = useColorMode();
   const [ies, setIes] = React.useState<{ content: unknown; name: string; type: number }[] | undefined>();
-  const tableController = useDataGrid({
-    tableSettingsId: 'wifiscan.devices.table',
-    defaultOrder: ['ssid', 'signal', 'actions'],
-    defaultSortBy: [
-      {
-        desc: false,
-        id: 'ssid',
-      },
-    ],
-  });
-
-  const columns: DataGridColumn<DeviceScanResult>[] = React.useMemo(
-    (): DataGridColumn<DeviceScanResult>[] => [
-      {
-        id: 'ssid',
-        header: 'SSID',
-        footer: '',
-        accessorKey: 'ssid',
-        meta: {
-          anchored: true,
-          alwaysShow: true,
-        },
-      },
-      {
-        id: 'signal',
-        header: 'Signal',
-        footer: '',
-        accessorKey: 'signal',
-        cell: (v) => `${v.cell.row.original.signal} db`,
-        meta: {
-          anchored: true,
-          customWidth: '80px',
-          alwaysShow: true,
-          rowContentOptions: {
-            style: {
-              textAlign: 'right',
-            },
-          },
-        },
-      },
-      {
-        id: 'station',
-        header: 'UEs',
-        accessorKey: 'sta_count',
-        cell: (v) => centerIfUndefinedCell(v.cell.row.original.sta_count),
-        meta: {
-          anchored: true,
-          customWidth: '40px',
-          alwaysShow: true,
-          rowContentOptions: {
-            style: {
-              textAlign: 'right',
-            },
-          },
-        },
-      },
-      {
-        id: 'utilization',
-        header: 'Ch. Util.',
-        accessorKey: 'ch_util',
-        cell: (v) => centerIfUndefinedCell(v.cell.row.original.ch_util, '%'),
-        meta: {
-          anchored: true,
-          customWidth: '60px',
-          alwaysShow: true,
-          headerOptions: {
-            tooltip: 'Channel Utilization (%)',
-          },
-          rowContentOptions: {
-            style: {
-              textAlign: 'right',
-            },
-          },
-        },
-      },
-      {
-        id: 'ies',
-        header: 'Ies',
-        footer: '',
-        accessorKey: 'actions',
-        cell: (v) => ueCell(v.cell.row.original.ies ?? [], setIes),
-        meta: {
-          customWidth: '50px',
-          isCentered: true,
-          alwaysShow: true,
-        },
-      },
-    ],
-    [t],
-  );
 
   return (
-    <Card>
+    <Card variant="widget">
       <CardHeader display="flex">
         <Heading size="md" my="auto">
-          {t('commands.channel')} #{channel} ({devices.length}{' '}
+          {t('commands.channel')} #{channel} ({devices.length} {t('devices.title')})
-          {devices.length === 1 ? t('devices.one') : t('devices.title')})
         </Heading>
         <Spacer />
         {ies && (
@@ -139,6 +49,7 @@ const ResultCard = ({ channelInfo: { channel, devices } }: Props) => {
         )}
       </CardHeader>
       <CardBody>
+        <Box h="400px" w="100%" overflowY="auto" overflowX="auto" px={0}>
           {ies ? (
             <Box w="800px">
               {ies.map(({ content, name, type }) => (
@@ -158,24 +69,32 @@ const ResultCard = ({ channelInfo: { channel, devices } }: Props) => {
               ))}
             </Box>
           ) : (
-          <DataGrid<DeviceScanResult>
+            <Table variant="simple" px={0}>
-            controller={tableController}
+              <Thead>
-            header={{
+                <Tr>
-              title: '',
+                  <Th>SSID</Th>
-              objectListed: t('devices.title'),
+                  <Th width="110px" isNumeric>
-            }}
+                    {t('commands.signal')}
-            columns={columns}
+                  </Th>
-            data={devices}
+                  <Th w="10px">IEs</Th>
-            options={{
+                </Tr>
-              count: devices.length,
+              </Thead>
-              onRowClick: (device) => () => setIes(device.ies ?? []),
+              <Tbody>
-              hideTablePreferences: true,
+                {devices.map((dev) => (
-              isHidingControls: true,
+                  <Tr key={uuid()}>
-              minimumHeight: '0px',
+                    <Td>{dev.ssid}</Td>
-              hideTableTitleRow: true,
+                    <Td width="110px">{dev.signal} db</Td>
-            }}
+                    <Td w="10px">
-          />
+                      <Button size="sm" colorScheme="blue" onClick={() => setIes(dev.ies ?? [])}>
+                        {dev.ies?.length ?? 0}
+                      </Button>
+                    </Td>
+                  </Tr>
+                ))}
+              </Tbody>
+            </Table>
           )}
+        </Box>
       </CardBody>
     </Card>
   );

src/components/Modals/WifiScanModal/ResultDisplay.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useMemo } from 'react';
-import { Alert, Heading, VStack } from '@chakra-ui/react';
+import { Alert, Heading, SimpleGrid } from '@chakra-ui/react';
 import { useTranslation } from 'react-i18next';
 import { v4 as uuid } from 'uuid';
 import ResultCard from './ResultCard';
@@ -11,7 +11,7 @@ interface Props {
   setCsvData: (data: DeviceScanResult[]) => void;
 }
 
-const WifiScanResultDisplay = ({ results, setCsvData }: Props) => {
+const WifiScanResultDisplay: React.FC<Props> = ({ results, setCsvData }) => {
   const { t } = useTranslation();
 
   const scanResults = useMemo(() => {
@@ -54,18 +54,18 @@ const WifiScanResultDisplay = ({ results, setCsvData }: Props) => {
   return (
     <>
       {results.errorCode === 1 && (
-        <Heading size="md">
+        <Heading size="sm">
           <Alert colorScheme="red">{t('commands.wifiscan_error_1')}</Alert>
         </Heading>
       )}
-      <Heading size="md" mb={2}>
+      <Heading size="sm">
         {t('commands.execution_time')}: {Math.floor(results.executionTime / 1000)}s
       </Heading>
-      <VStack spacing={4} align="stretch">
+      <SimpleGrid minChildWidth="360px" spacing={2}>
         {scanResults?.scanList.map((channel) => (
           <ResultCard key={uuid()} channelInfo={channel} />
         ))}
-      </VStack>
+      </SimpleGrid>
     </>
   );
 };

src/custom.d.ts

@@ -8,4 +8,3 @@ declare module '*.png' {
   const value: string;
   export = value;
 }
-/// <reference types="vite-plugin-svgr/client" />

src/hooks/Network/Commands.ts

@@ -174,37 +174,12 @@ export const useGetEventQueue = () => {
 };
 
 const configureDevice = (serialNumber: string) => async (configuration: Record<string, unknown>) =>
-  axiosGw
+  axiosGw.post<unknown>(`device/${serialNumber}/configure`, {
-    .post<unknown>(`device/${serialNumber}/configure`, {
     when: 0,
     UUID: 1,
     serialNumber,
     configuration,
-    })
+  });
-    .then(
-      (res) =>
-        res.data as Partial<{
-          UUID: string;
-          attachFile: number;
-          command: string;
-          completed: number;
-          custom: number;
-          deferred: boolean;
-          details: Record<string, unknown>;
-          errorCode: number;
-          errorText: string;
-          executed: number;
-          executionTime: number;
-          lastTry: number;
-          results: Record<string, unknown>;
-          serialNumber: string;
-          status: string;
-          submitted: number;
-          submittedBy: string;
-          waitingForFile: number;
-          when: number;
-        }>,
-    );
 
 export const useConfigureDevice = ({ serialNumber }: { serialNumber: string }) => {
   const queryClient = useQueryClient();
@@ -212,8 +187,6 @@ export const useConfigureDevice = ({ serialNumber }: { serialNumber: string }) =
   return useMutation(configureDevice(serialNumber), {
     onSuccess: () => {
       queryClient.invalidateQueries(['commands', serialNumber]);
-      queryClient.invalidateQueries(['device', serialNumber]);
-      queryClient.invalidateQueries(['devices']);
     },
   });
 };
@@ -275,14 +248,27 @@ const startScript = (data: { serialNumber: string; timeout?: number; [k: string]
     })
     .then((response: { data: DeviceCommandHistory }) => response.data);
 export const useDeviceScript = ({ serialNumber }: { serialNumber: string }) => {
+  const { t } = useTranslation();
+  const toast = useToast();
   const queryClient = useQueryClient();
 
   return useMutation(startScript, {
     onSuccess: () => {
       queryClient.invalidateQueries(['commands', serialNumber]);
     },
-    onError: () => {
+    onError: (e) => {
       queryClient.invalidateQueries(['commands', serialNumber]);
+      if (axios.isAxiosError(e)) {
+        toast({
+          id: 'script-error',
+          title: t('common.error'),
+          description: e?.response?.data?.ErrorDescription,
+          status: 'error',
+          duration: 5000,
+          isClosable: true,
+          position: 'top-right',
+        });
+      }
     },
   });
 };

src/hooks/Network/DefaultConfigurations.ts

@@ -3,12 +3,10 @@ import { axiosGw } from 'constants/axiosInstances';
 import { useEndpointStatus } from 'hooks/useEndpointStatus';
 import { AxiosError } from 'models/Axios';
 import { DeviceConfiguration } from 'models/Device';
-import { DevicePlatform } from './Devices';
 
 export type DefaultConfigurationResponse = {
   configuration: DeviceConfiguration;
   created: number;
-  platform: DevicePlatform;
   description: string;
   lastModified: number;
   modelIds: string[];

src/hooks/Network/DefaultFirmware.ts

@@ -1,103 +0,0 @@
-import { QueryFunctionContext, useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
-import axios from 'axios';
-import { axiosGw } from 'constants/axiosInstances';
-import { AtLeast } from 'models/General';
-
-export type DefaultFirmware = {
-  deviceType: string;
-  description: string;
-  uri: string;
-  revision: string;
-  imageCreationDate: number;
-  created: number;
-  lastModified: number;
-};
-
-export type DefaultFirmwareResponse = {
-  firmwares: DefaultFirmware[];
-};
-
-const getDefaultFirmware = async () =>
-  axiosGw.get('default_firmwares').then((response) => response.data as DefaultFirmwareResponse);
-
-export const useGetDefaultFirmware = () =>
-  useQuery(['default_firmwares', 'all'], getDefaultFirmware, {
-    staleTime: 1000 * 60,
-  });
-
-const getDefaultFirmwareByDeviceType = async (context: QueryFunctionContext<[string, string]>) =>
-  axiosGw.get(`default_firmware/${context.queryKey[1]}`).then((response) => response.data as DefaultFirmware);
-
-export const useGetDefaultFirmwareByDeviceType = (deviceType: string) =>
-  useQuery(['default_firmwares', deviceType], getDefaultFirmwareByDeviceType);
-
-export const createDefaultFirmware = async (defaultFirmware: DefaultFirmware) =>
-  axiosGw
-    .post(`default_firmware/${defaultFirmware.deviceType}`, defaultFirmware)
-    .then((response) => response.data as DefaultFirmware);
-
-export const useCreateDefaultFirmware = () => {
-  const queryClient = useQueryClient();
-
-  return useMutation(createDefaultFirmware, {
-    onSuccess: () => {
-      queryClient.invalidateQueries(['default_firmwares']);
-    },
-  });
-};
-
-const deleteDefaultFirmware = async (deviceType: string) =>
-  axiosGw.delete(`default_firmware/${deviceType}`).then((response) => response.data as DefaultFirmware);
-
-export const useDeleteDefaultFirmware = () => {
-  const queryClient = useQueryClient();
-
-  return useMutation(deleteDefaultFirmware, {
-    onSuccess: () => {
-      queryClient.invalidateQueries(['default_firmwares']);
-    },
-  });
-};
-
-const deleteBatchDefaultFirmware = async (deviceTypes: string[]) => {
-  const promises = deviceTypes.map((deviceType) =>
-    axiosGw
-      .delete(`default_firmware/${deviceType}`)
-      .then(() => ({
-        deviceType,
-        success: true,
-      }))
-      .catch((e) => ({
-        deviceType,
-        error: axios.isAxiosError(e) ? e.response?.data.ErrorDescription : e,
-      })),
-  );
-  const res = await Promise.allSettled(promises);
-
-  return res;
-};
-
-export const useDeleteBatchDefaultFirmware = () => {
-  const queryClient = useQueryClient();
-
-  return useMutation(deleteBatchDefaultFirmware, {
-    onSuccess: () => {
-      queryClient.invalidateQueries(['default_firmwares']);
-    },
-  });
-};
-
-export const updateDefaultFirmware = async (defaultFirmware: AtLeast<DefaultFirmware, 'deviceType'>) =>
-  axiosGw
-    .put(`default_firmware/${defaultFirmware.deviceType}`, defaultFirmware)
-    .then((response) => response.data as DefaultFirmware);
-
-export const useUpdateDefaultFirmware = () => {
-  const queryClient = useQueryClient();
-
-  return useMutation(updateDefaultFirmware, {
-    onSuccess: () => {
-      queryClient.invalidateQueries(['default_firmwares']);
-    },
-  });
-};

src/hooks/Network/Devices.ts

@@ -9,21 +9,15 @@ import { AxiosError } from 'models/Axios';
 import { DeviceRttyApiResponse, GatewayDevice, WifiScanCommand, WifiScanResult } from 'models/Device';
 import { Note } from 'models/Note';
 import { PageInfo } from 'models/Table';
-import { DeviceCommandHistory } from './Commands';
 
-export const DEVICE_PLATFORMS = ['all', 'ap', 'switch'] as const;
+const getDeviceCount = () =>
-export type DevicePlatform = (typeof DEVICE_PLATFORMS)[number];
+  axiosGw.get('devices?countOnly=true').then((response) => response.data) as Promise<{ count: number }>;
 
-const getDeviceCount = (platform: DevicePlatform) =>
+export const useGetDeviceCount = ({ enabled }: { enabled: boolean }) => {
-  axiosGw.get(`devices?countOnly=true&platform=${platform}`).then((response) => response.data) as Promise<{
-    count: number;
-  }>;
-
-export const useGetDeviceCount = ({ enabled, platform = 'all' }: { enabled: boolean; platform?: DevicePlatform }) => {
   const { t } = useTranslation();
   const toast = useToast();
 
-  return useQuery(['devices', 'count', { platform }], () => getDeviceCount(platform), {
+  return useQuery(['devices', 'count'], getDeviceCount, {
     enabled,
     onError: (e: AxiosError) => {
       if (!toast.isActive('inventory-fetching-error'))
@@ -48,14 +42,13 @@ export type DeviceWithStatus = {
   associations_2G: number;
   associations_5G: number;
   associations_6G: number;
-  blackListed?: boolean;
   compatible: string;
   connected: boolean;
   connectReason?: string;
   certificateExpiryDate?: number;
   createdTimestamp: number;
   devicePassword: string;
-  deviceType: 'ap' | 'switch';
+  deviceType: 'AP' | 'SWITCH' | 'IOT' | 'MESH';
   entity: string;
   firmware: string;
   fwUpdatePolicy: string;
@@ -102,27 +95,25 @@ export const getSingleDeviceWithStatus = (serialNumber: string) =>
     })
     .catch(() => undefined);
 
-const getDevices = (limit: number, offset: number, platform: DevicePlatform) =>
+const getDevices = (limit: number, offset: number) =>
   axiosGw
-    .get(`devices?deviceWithStatus=true&limit=${limit}&offset=${offset}&platform=${platform}`)
+    .get(`devices?deviceWithStatus=true&limit=${limit}&offset=${offset}`)
     .then((response) => response.data) as Promise<{ devicesWithStatus: DeviceWithStatus[] }>;
 
 export const useGetDevices = ({
   pageInfo,
   enabled,
   onError,
-  platform = 'all',
 }: {
   pageInfo?: PageInfo;
   enabled: boolean;
   onError?: (e: AxiosError) => void;
-  platform?: DevicePlatform;
 }) => {
   const offset = pageInfo?.limit !== undefined ? pageInfo.limit * pageInfo.index : 0;
 
   return useQuery(
-    ['devices', 'all', { limit: pageInfo?.limit, offset, platform }],
+    ['devices', 'all', { limit: pageInfo?.limit, offset }],
-    () => getDevices(pageInfo?.limit || 0, offset, platform),
+    () => getDevices(pageInfo?.limit || 0, offset),
     {
       keepPreviousData: true,
       enabled: enabled && pageInfo !== undefined,
@@ -132,28 +123,22 @@ export const useGetDevices = ({
   );
 };
 
-const getAllDevices = async (platform: DevicePlatform) => {
+const getAllDevices = async () => {
   let offset = 0;
   let devices: DeviceWithStatus[] = [];
   let devicesResponse: { devicesWithStatus: DeviceWithStatus[] };
   do {
     // eslint-disable-next-line no-await-in-loop
-    devicesResponse = await getDevices(500, offset, platform);
+    devicesResponse = await getDevices(500, offset);
     devices = devices.concat(devicesResponse.devicesWithStatus);
     offset += 500;
   } while (devicesResponse.devicesWithStatus.length === 500);
   return devices;
 };
 
-export const useGetAllDevicesWithStatus = ({
+export const useGetAllDevicesWithStatus = ({ onError }: { onError?: (e: AxiosError) => void }) => {
-  onError,
-  platform = 'all',
-}: {
-  onError?: (e: AxiosError) => void;
-  platform?: DevicePlatform;
-}) => {
   const { isReady } = useEndpointStatus('owgw');
-  return useQuery(['devices', 'all', 'full', { platform }], () => getAllDevices(platform), {
+  return useQuery(['devices', 'all', 'full'], getAllDevices, {
     enabled: isReady && false,
     onError,
   });
@@ -446,45 +431,3 @@ export const useUpdateDevice = ({ serialNumber }: { serialNumber: string }) => {
     },
   });
 };
-
-const deleteDeviceBatch = async (pattern: string) => {
-  if (pattern.length < 6) throw new Error('Pattern must be at least 6 characters long');
-
-  axiosGw.delete(`devices?macPattern=${pattern}`);
-};
-
-export const useDeleteDeviceBatch = () => {
-  const queryClient = useQueryClient();
-
-  return useMutation(deleteDeviceBatch, {
-    onSuccess: () => {
-      queryClient.invalidateQueries(['devices']);
-    },
-  });
-};
-
-export type PowerCyclePort = {
-  /** Ex.: Ethernet0 */
-  name: string;
-  /** Cycle length in MS. Default is 10 000 */
-  cycle?: number;
-};
-
-export type PowerCycleRequest = {
-  serial: string;
-  when: number;
-  ports: PowerCyclePort[];
-};
-
-export const usePowerCycle = () => {
-  const queryClient = useQueryClient();
-  return useMutation(
-    (request: PowerCycleRequest) =>
-      axiosGw.post(`device/${request.serial}/powercycle`, request).then((res) => res.data as DeviceCommandHistory),
-    {
-      onSettled: () => {
-        queryClient.invalidateQueries(['commands']);
-      },
-    },
-  );
-};

src/hooks/Network/Firmware.ts

@@ -12,7 +12,7 @@ const getAvailableFirmwareBatch = async (deviceType: string, limit: number, offs
     .get(`firmwares?deviceType=${deviceType}&limit=${limit}&offset=${offset}`)
     .then(({ data }: { data: { firmwares: Firmware[] } }) => data);
 
-export const getAllAvailableFirmware = async (deviceType: string) => {
+const getAllAvailableFirmware = async (deviceType: string) => {
   const limit = 500;
   let offset = 0;
   let data: { firmwares: Firmware[] } = { firmwares: [] };
@@ -70,34 +70,15 @@ export const useUpdateDeviceFirmware = ({ serialNumber, onClose }: { serialNumbe
 
   return useMutation(
     ({ keepRedirector, uri, signature }: { keepRedirector: boolean; uri: string; signature?: string }) =>
-      axiosGw
+      axiosGw.post(`device/${serialNumber}/upgrade${signature ? `?FWsignature=${signature}` : ''}`, {
-        .post(`device/${serialNumber}/upgrade${signature ? `?FWsignature=${signature}` : ''}`, {
         serialNumber,
         when: 0,
         keepRedirector,
         uri,
         signature,
-        })
+      }),
-        .then(
-          (response) =>
-            response as {
-              data: {
-                errorCode: number;
-                errorText: string;
-                status: string;
-                results?: {
-                  status?: {
-                    error?: number;
-                    resultCode?: number;
-                    text?: string;
-                  };
-                };
-              };
-            },
-        ),
     {
-      onSuccess: ({ data }) => {
+      onSuccess: () => {
-        if (data.errorCode === 0) {
         toast({
           id: `device-upgrade-success-${uuid()}`,
           title: t('common.success'),
@@ -108,28 +89,6 @@ export const useUpdateDeviceFirmware = ({ serialNumber, onClose }: { serialNumbe
           position: 'top-right',
         });
         onClose();
-        } else if (data.errorCode === 1) {
-          toast({
-            id: `device-upgrade-warning-${uuid()}`,
-            title: 'Warning',
-            description: `${data?.errorText ?? 'Unknown Warning'}`,
-            status: 'warning',
-            duration: 5000,
-            isClosable: true,
-            position: 'top-right',
-          });
-          onClose();
-        } else {
-          toast({
-            id: `device-upgrade-error-${uuid()}`,
-            title: t('common.error'),
-            description: `${data?.errorText ?? 'Unknown Error'} (Code ${data.errorCode})`,
-            status: 'error',
-            duration: 5000,
-            isClosable: true,
-            position: 'top-right',
-          });
-        }
       },
       onError: (e: AxiosError) => {
         toast({

src/hooks/Network/Simulations.ts

@@ -1,173 +0,0 @@
-import { QueryFunctionContext, useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
-import { axiosGw, axiosOwls } from 'constants/axiosInstances';
-import { AtLeast } from 'models/General';
-
-export type Simulation = {
-  clientInterval: number;
-  concurrentDeviceS: number;
-  deviceType: string;
-  devices: number;
-  gateway: string;
-  healthCheckInterval: number;
-  id: string;
-  keepAlive: number;
-  key: string;
-  macPrefix: string;
-  minAssociations: number;
-  maxAssociations: number;
-  minClients: number;
-  maxClients: number;
-  name: string;
-  reconnectionInterval: number;
-  simulationLength: number;
-  stateInterval: number;
-  threads: number;
-};
-
-const getSimulations = () => async () =>
-  axiosOwls.get(`simulation/*`).then((response) => response.data as { list: Simulation[] });
-
-export const useGetSimulations = () =>
-  useQuery(['simulations'], getSimulations(), {
-    keepPreviousData: true,
-    staleTime: 30000,
-  });
-
-const getSimulation = (id?: string) => async () =>
-  axiosOwls.get(`simulation/${id}`).then((response) => response.data as { list: Simulation[] });
-export const useGetSimulation = ({ id }: { id?: string }) =>
-  useQuery(['simulation', id], getSimulation(id), {
-    keepPreviousData: true,
-    enabled: id !== undefined,
-    staleTime: 30000,
-  });
-
-const createSimulation = async (newSimulation: Partial<Simulation>) => axiosOwls.post(`simulation/0`, newSimulation);
-export const useCreateSimulation = () => {
-  const queryClient = useQueryClient();
-
-  return useMutation(createSimulation, {
-    onSuccess: () => {
-      queryClient.invalidateQueries(['simulations']);
-    },
-  });
-};
-
-const updateSimulation = async (newSimulation: AtLeast<Simulation, 'id'>) =>
-  axiosOwls.put(`simulation/${newSimulation.id}`, newSimulation).then((response) => response.data as Simulation);
-export const useUpdateSimulation = () => {
-  const queryClient = useQueryClient();
-
-  return useMutation(updateSimulation, {
-    onSuccess: (newSimulation) => {
-      queryClient.setQueryData(['simulation'], newSimulation);
-      queryClient.invalidateQueries(['simulations']);
-    },
-  });
-};
-
-const deleteSimulation = async ({ id }: { id: string }) => axiosOwls.delete(`simulation/${id}`);
-export const useDeleteSimulation = () => {
-  const queryClient = useQueryClient();
-
-  return useMutation(deleteSimulation, {
-    onSuccess: () => {
-      queryClient.invalidateQueries(['simulations']);
-    },
-  });
-};
-
-const startSimulation = async ({ id }: { id: string }) => axiosOwls.post(`operation/${id}?operation=start`);
-export const useStartSimulation = () => {
-  const queryClient = useQueryClient();
-
-  return useMutation(startSimulation, {
-    onSuccess: () => {
-      queryClient.invalidateQueries(['simulations', 'status']);
-    },
-  });
-};
-const stopSimulation = async ({ runId, simulationId }: { simulationId: string; runId: string }) =>
-  axiosOwls.post(`operation/${simulationId}?runningId=${runId}&operation=stop`);
-export const useStopSimulation = () => {
-  const queryClient = useQueryClient();
-
-  return useMutation(stopSimulation, {
-    onSuccess: () => {
-      queryClient.invalidateQueries(['simulations', 'status']);
-    },
-  });
-};
-const cancelSimulation = async ({ runId, simulationId }: { simulationId: string; runId: string }) =>
-  axiosOwls.post(`operation/${simulationId}?runningId=${runId}&operation=cancel`);
-export const useCancelSimulation = () => {
-  const queryClient = useQueryClient();
-
-  return useMutation(cancelSimulation, {
-    onSuccess: () => {
-      queryClient.invalidateQueries(['simulations', 'status']);
-    },
-  });
-};
-
-export type SimulationStatus = {
-  endTime: number;
-  errorDevices: number;
-  id: string;
-  liveDevices: number;
-  msgsRx: number;
-  msgsTx: number;
-  owner: string;
-  rx: number;
-  simulationId: string;
-  startTime: number;
-  state: 'running' | 'completed' | 'cancelled' | 'none';
-  timeToFullDevices: number;
-  tx: number;
-};
-const getSimulationsStatus = async () =>
-  axiosOwls.get(`status/*`).then((response) => response.data as SimulationStatus[]);
-export const useGetSimulationsStatus = () =>
-  useQuery(['simulations', 'status'], getSimulationsStatus, {
-    keepPreviousData: true,
-    staleTime: Infinity,
-  });
-
-const getSimulationStatus = async (context: QueryFunctionContext<[string, string, string]>) =>
-  axiosOwls.get(`status/${context.queryKey[2]}`).then((response) => response.data as SimulationStatus);
-export const useGetSimulationStatus = ({ id }: { id: string }) =>
-  useQuery(['simulations', 'status', id], getSimulationStatus, {
-    keepPreviousData: true,
-    staleTime: Infinity,
-  });
-
-const getSimulationHistory = async (context: QueryFunctionContext<[string, string, string]>) =>
-  axiosOwls.get(`results/${context.queryKey[2]}`).then((response) => response.data.list as SimulationStatus[]);
-export const useGetSimulationHistory = ({ id }: { id: string }) =>
-  useQuery(['simulations', 'history', id], getSimulationHistory, {
-    keepPreviousData: true,
-    enabled: !!id,
-  });
-
-const deleteSimulationResult = async ({ id }: { id: string }) => axiosOwls.delete(`results/${id}`);
-export const useDeleteSimulationResult = () => {
-  const queryClient = useQueryClient();
-
-  return useMutation(deleteSimulationResult, {
-    onSuccess: () => {
-      queryClient.invalidateQueries(['simulations', 'history']);
-    },
-  });
-};
-
-const deleteSimulatedDevices = async () => axiosGw.delete('devices?simulatedDevices=true');
-
-export const useDeleteSimulatedDevices = () => {
-  const queryClient = useQueryClient();
-
-  return useMutation(deleteSimulatedDevices, {
-    onSuccess: () => {
-      queryClient.invalidateQueries(['devices']);
-    },
-  });
-};

src/hooks/Network/Statistics.ts

@@ -2,24 +2,7 @@ import { useQuery } from '@tanstack/react-query';
 import { axiosGw } from 'constants/axiosInstances';
 import { AxiosError } from 'models/Axios';
 
-export type DeviceLinkState = {
+type DeviceInterfaceStatistics = {
-  carrier?: number;
-  counters?: {
-    collisions: number;
-    multicast: number;
-    rx_bytes: number;
-    rx_dropped: number;
-    rx_errors: number;
-    rx_packets: number;
-    tx_bytes: number;
-    tx_dropped: number;
-    tx_errors: number;
-    tx_packets: number;
-  };
-  duplex?: string;
-  speed?: number;
-};
-export type DeviceInterfaceStatistics = {
   clients: {
     ipv4_addresses?: string[];
     ipv6_addresses?: string[];
@@ -59,7 +42,6 @@ export type DeviceInterfaceStatistics = {
       dynamic_vlan?: number;
       inactive: number;
       ipaddr_v4: string;
-      fingerprint?: object;
       rssi: number;
       rx_bytes: number;
       rx_duration: number;
@@ -130,21 +112,11 @@ export type DeviceStatistics = {
     channel: number;
     band?: string[];
     channel_width: string;
-    noise?: number;
+    noise: number;
     phy: string;
     receive_ms: number;
     transmit_ms: number;
-    temperature?: number;
     tx_power: number;
-    frequency?: number[];
-    survey?: {
-      busy: number;
-      frequency: number;
-      noise: number;
-      time: number;
-      time_rx: number;
-      time_tx: number;
-    }[];
   }[];
   dynamic_vlans?: {
     vid: number;
@@ -166,10 +138,18 @@ export type DeviceStatistics = {
   };
   'link-state'?: {
     downstream: {
-      [key: string]: DeviceLinkState;
+      eth1?: {
+        carrier?: number;
+        duplex?: string;
+        speed?: number;
+      };
     };
     upstream: {
-      [key: string]: DeviceLinkState;
+      eth0?: {
+        carrier?: number;
+        duplex?: string;
+        speed?: number;
+      };
     };
   };
   'lldp-peers'?: {
@@ -210,7 +190,6 @@ export const useGetDeviceLastStats = ({
   useQuery(['device', serialNumber, 'last-statistics'], () => getLastStats(serialNumber), {
     enabled: serialNumber !== undefined && serialNumber !== '',
     staleTime: 1000 * 60,
-    refetchInterval: 1000 * 60,
     onError,
   });
 

src/hooks/Network/System.ts

@@ -199,36 +199,3 @@ export const useUpdateSystemLogLevels = ({ endpoint, token }: { endpoint: string
     },
   });
 };
-
-export type SystemResources = {
-  currRealMem: number;
-  currVirtMem: number;
-  numberOfFileDescriptors: number;
-  peakRealMem: number;
-  peakVirtMem: number;
-};
-
-export const useGetSystemResources = ({
-  endpoint,
-  token,
-  onSuccess,
-}: {
-  endpoint: string;
-  token: string;
-  onSuccess?: (data: SystemResources) => void;
-}) =>
-  useQuery(
-    ['systemResources', endpoint],
-    () =>
-      axiosInstance
-        .get(`${endpoint}/api/v1/system?command=resources`, {
-          headers: {
-            Authorization: `Bearer ${token}`,
-          },
-        })
-        .then(({ data }: { data: SystemResources }) => data),
-    {
-      refetchInterval: 5 * 1000,
-      onSuccess,
-    },
-  );

src/hooks/useNotification.ts

@@ -1,80 +0,0 @@
-import * as React from 'react';
-import { useToast } from '@chakra-ui/react';
-import { useTranslation } from 'react-i18next';
-import { v4 as uuid } from 'uuid';
-import { isApiError } from 'models/Axios';
-
-export type SuccessNotificationProps = {
-  description: string;
-  id?: string;
-};
-
-export type ApiErrorNotificationProps = {
-  e: unknown;
-  fallbackMessage?: string;
-  id?: string;
-};
-
-export const useNotification = () => {
-  const { t } = useTranslation();
-  const toast = useToast();
-
-  const successToast = ({ description, id }: SuccessNotificationProps) => {
-    toast({
-      id: id ?? uuid(),
-      title: t('common.success'),
-      description,
-      status: 'success',
-      duration: 3000,
-      isClosable: true,
-      position: 'top-right',
-    });
-  };
-
-  const apiErrorToast = ({ e, id, fallbackMessage }: ApiErrorNotificationProps) => {
-    if (isApiError(e)) {
-      toast({
-        id: id ?? uuid(),
-        title: t('common.error'),
-        description: e.response?.data.ErrorDescription,
-        status: 'error',
-        duration: 5000,
-        isClosable: true,
-        position: 'top-right',
-      });
-    } else {
-      toast({
-        id: id ?? uuid(),
-        title: t('common.error'),
-        description: fallbackMessage,
-        status: 'error',
-        duration: 5000,
-        isClosable: true,
-        position: 'top-right',
-      });
-    }
-  };
-
-  const errorToast = ({ description, id }: SuccessNotificationProps) => {
-    toast({
-      id: id ?? uuid(),
-      title: t('common.error'),
-      description,
-      status: 'error',
-      duration: 5000,
-      isClosable: true,
-      position: 'top-right',
-    });
-  };
-
-  return React.useMemo(
-    () => ({
-      successToast,
-      errorToast,
-      apiErrorToast,
-    }),
-    [t],
-  );
-};
-
-export type UseNotificationReturn = ReturnType<typeof useNotification>;

src/layout/Devices.tsx

@@ -1,6 +1,16 @@
 import * as React from 'react';
-import { Flex, Heading, Icon, Text, Tooltip, VStack } from '@chakra-ui/react';
+import {
-import { ArrowSquareDown, ArrowSquareUp } from '@phosphor-icons/react';
+  Box,
+  CircularProgress,
+  CircularProgressLabel,
+  Flex,
+  Heading,
+  Icon,
+  Text,
+  Tooltip,
+  VStack,
+} from '@chakra-ui/react';
+import { ArrowSquareDown, ArrowSquareUp, Clock } from '@phosphor-icons/react';
 import { useTranslation } from 'react-i18next';
 import { Card } from 'components/Containers/Card';
 import { compactSecondsToDetailed, minimalSecondsToDetailed } from 'helpers/dateFormatting';
@@ -10,26 +20,74 @@ import { useGetDevicesStats } from 'hooks/Network/Devices';
 const SidebarDevices = () => {
   const { t } = useTranslation();
   const getStats = useGetDevicesStats({});
+  const [lastTime, setLastTime] = React.useState<Date | undefined>();
+  const [lastUpdate, setLastUpdate] = React.useState<Date | undefined>();
+
+  const time = React.useMemo(() => {
+    if (lastTime === undefined || lastUpdate === undefined) return null;
+
+    const seconds = lastTime.getTime() - lastUpdate.getTime();
+
+    return Math.max(0, Math.floor(seconds / 1000));
+  }, [lastTime, lastUpdate]);
+
+  const circleColor = () => {
+    if (time === null) return 'gray.300';
+    if (time < 10) return 'green.300';
+    if (time < 30) return 'yellow.300';
+    return 'red.300';
+  };
+
+  React.useEffect(() => {
+    setLastUpdate(new Date());
+  }, [getStats.data]);
+
+  React.useEffect(() => {
+    const interval = setInterval(() => {
+      setLastTime(new Date());
+    }, 1000);
+    return () => {
+      clearInterval(interval);
+    };
+  }, []);
 
   if (!getStats.data) return null;
 
   return (
     <Card p={4}>
+      <Tooltip hasArrow label={t('controller.stats.seconds_ago', { s: time })}>
+        <CircularProgress
+          isIndeterminate
+          color={circleColor()}
+          position="absolute"
+          right="6px"
+          top="6px"
+          w="unset"
+          size={6}
+          thickness="14px"
+        >
+          <CircularProgressLabel fontSize="1.9em">{time}s</CircularProgressLabel>
+        </CircularProgress>
+      </Tooltip>
+      <Tooltip hasArrow label={t('controller.stats.seconds_ago', { s: time })}>
+        <Box position="absolute" right="8px" top="8px" w="unset" hidden>
+          <Clock size={16} />
+        </Box>
+      </Tooltip>
       <VStack mb={-1}>
         <Flex flexDir="column" textAlign="center">
+          <Heading size="md">{getStats.data.connectedDevices}</Heading>
           <Heading size="xs" display="flex" justifyContent="center">
             <Text>
               {t('common.connected')} {t('devices.title')}{' '}
             </Text>{' '}
           </Heading>
-          <Heading size="md">{getStats.data.connectedDevices}</Heading>
-          <Heading size="xs">{t('controller.devices.average_uptime')}</Heading>
           <Tooltip hasArrow label={compactSecondsToDetailed(getStats.data.averageConnectionTime, t)}>
             <Heading size="md" textAlign="center" mt={1}>
               {minimalSecondsToDetailed(getStats.data.averageConnectionTime, t)}
             </Heading>
           </Tooltip>
-
+          <Heading size="xs">{t('controller.devices.average_uptime')}</Heading>
           <Flex fontSize="sm" fontWeight="bold" alignItems="center" justifyContent="center" mt={1}>
             <Tooltip hasArrow label="Rx">
               <Flex alignItems="center" mr={1}>

src/layout/Navbar/index.tsx

@@ -17,7 +17,6 @@ import {
   Tooltip,
   useBreakpoint,
   Portal,
-  useDisclosure,
 } from '@chakra-ui/react';
 import { ArrowCircleLeft } from '@phosphor-icons/react';
 import { useTranslation } from 'react-i18next';
@@ -28,20 +27,11 @@ export type NavbarProps = {
   toggleSidebar: () => void;
   activeRoute?: string;
   languageSwitcher?: React.ReactNode;
-  favoritesButton?: React.ReactNode;
-  rightElements?: React.ReactNode;
 };
 
-export const Navbar = ({
+export const Navbar = ({ toggleSidebar, activeRoute, languageSwitcher }: NavbarProps) => {
-  toggleSidebar,
-  activeRoute,
-  languageSwitcher,
-  favoritesButton,
-  rightElements = null,
-}: NavbarProps) => {
   const { t } = useTranslation();
   const navigate = useNavigate();
-  const menuProps = useDisclosure();
   const [scrolled, setScrolled] = useState(false);
   const breakpoint = useBreakpoint();
   const { colorMode, toggleColorMode } = useColorMode();
@@ -86,20 +76,6 @@ export const Navbar = ({
 
   window.addEventListener('scroll', changeNavbar);
 
-  let timeout: NodeJS.Timeout;
-  const onMouseEnter = () => {
-    if (timeout) {
-      clearTimeout(timeout);
-    }
-    menuProps.onOpen();
-  };
-  const onMouseLeave = () => {
-    if (timeout) {
-      clearTimeout(timeout);
-    }
-    timeout = setTimeout(() => menuProps.onClose(), 100);
-  };
-
   return (
     <Portal>
       <Flex
@@ -123,7 +99,6 @@ export const Navbar = ({
         top="15px"
         border={scrolled ? '0.5px solid' : undefined}
         w={isCompact ? '100%' : 'calc(100% - 254px)'}
-        zIndex={10}
       >
         <Flex
           w="100%"
@@ -134,14 +109,11 @@ export const Navbar = ({
           justifyContent="center"
         >
           {isCompact && <HamburgerIcon w="24px" h="24px" onClick={toggleSidebar} mr={10} mt={1} />}
-          {activeRoute && activeRoute.length > 0 ? (
+          <Heading size="lg">{activeRoute}</Heading>
-            <Heading size="lg" mr={4}>
-              {activeRoute}
-            </Heading>
-          ) : null}
           <Tooltip label={t('common.go_back')}>
             <IconButton
               mt={1}
+              ml={4}
               colorScheme="blue"
               aria-label={t('common.go_back')}
               onClick={goBack}
@@ -151,8 +123,6 @@ export const Navbar = ({
           </Tooltip>
           <Box ms="auto" w={{ base: 'unset' }}>
             <Flex alignItems="center" flexDirection="row">
-              {rightElements}
-              {favoritesButton}
               <Tooltip hasArrow label={t('common.theme')}>
                 <IconButton
                   aria-label={t('common.theme')}
@@ -162,33 +132,27 @@ export const Navbar = ({
                 />
               </Tooltip>
               {languageSwitcher}
-              <Box ml={1} mr={4}>
+              <HStack spacing={{ base: '0', md: '6' }} ml={1} mr={4}>
-                <Menu {...menuProps} gutter={0}>
+                <Menu>
-                  <MenuButton
+                  <MenuButton py={2} transition="all 0.3s" _focus={{ boxShadow: 'none' }}>
-                    py={2}
-                    transition="all 0.3s"
-                    _focus={{ boxShadow: 'none' }}
-                    onMouseEnter={onMouseEnter}
-                    onMouseLeave={onMouseLeave}
-                  >
                     <HStack>
                       {!isCompact && <Text fontWeight="bold">{user?.name}</Text>}
                       <Avatar h="40px" w="40px" fontSize="0.8rem" lineHeight="2rem" src={avatar} name={user?.name} />
                     </HStack>
                   </MenuButton>
+                  <Portal>
                     <MenuList
                       bg={useColorModeValue('white', 'gray.900')}
                       borderColor={useColorModeValue('gray.200', 'gray.700')}
-                    onMouseEnter={onMouseEnter}
-                    onMouseLeave={onMouseLeave}
                     >
                       <MenuItem onClick={goToProfile} w="100%">
                         {t('account.title')}
                       </MenuItem>
                       <MenuItem onClick={logout}>{t('common.logout')}</MenuItem>
                     </MenuList>
+                  </Portal>
                 </Menu>
-              </Box>
+              </HStack>
             </Flex>
           </Box>
         </Flex>

src/layout/Sidebar/index.tsx

@@ -89,7 +89,7 @@ export const Sidebar = ({ routes, isOpen, toggle, logo, version, topNav, childre
         </Box>
       </>
     ),
-    [user?.userRole, location, topNav],
+    [user?.userRole, location],
   );
 
   return (

src/models/Axios.ts

@@ -1,6 +1,3 @@
-import { AxiosError as Err, isAxiosError } from 'axios';
+import { AxiosError as Err } from 'axios';
 
 export type AxiosError = Err<{ ErrorDescription: string; ErrorCode: number }>;
-
-export const isApiError = (e: unknown): e is AxiosError =>
-  isAxiosError(e) && (e as AxiosError).response?.data?.ErrorDescription !== undefined;

src/models/Device.ts

@@ -3,8 +3,6 @@ import { Note } from './Note';
 
 export interface GatewayDevice {
   UUID: number;
-  blackListed?: boolean;
-  certificateExpiryDate: number;
   compatible: string;
   configuration: unknown;
   createdTimestamp: number;
@@ -18,7 +16,6 @@ export interface GatewayDevice {
   lastConfigurationChange: number;
   lastConfigurationDownload: number;
   lastFWUpdate: number;
-  lastRecordedContact: number;
   locale: string;
   location: string;
   macAddress: string;
@@ -115,16 +112,12 @@ interface BssidResult {
   bssid: string;
   capability: number;
   channel: number;
-  /** Channel Utilization percentage (ex.: 28 -> 28% channel utilization) */
-  ch_util?: number;
   frequency: number;
   ht_oper: string;
   ies: { content: unknown; name: string; type: number }[];
   last_seen: number;
   ssid: string;
   signal: number;
-  /** Station count */
-  sta_count?: number;
   tsf: number;
   meshid?: string;
   vht_oper: string;
@@ -149,8 +142,20 @@ export interface WifiScanResult {
   };
 }
 
-export type DeviceScanResult = BssidResult;
+export interface DeviceScanResult {
-
+  bssid: string;
+  capability: number;
+  channel: number;
+  frequency: number;
+  ht_oper: string;
+  ies: { content: unknown; name: string; type: number }[];
+  last_seen: number;
+  ssid: string;
+  signal: number | string;
+  tsf: number;
+  meshid?: string;
+  vht_oper: string;
+}
 export interface ScanChannel {
   channel: number;
   devices: DeviceScanResult[];

src/pages/AdvancedSystemPage/index.tsx

@@ -1,93 +0,0 @@
-import * as React from 'react';
-import {
-  Box,
-  Button,
-  Center,
-  Heading,
-  Popover,
-  PopoverArrow,
-  PopoverBody,
-  PopoverCloseButton,
-  PopoverContent,
-  PopoverHeader,
-  PopoverTrigger,
-  Text,
-} from '@chakra-ui/react';
-import { Trash } from '@phosphor-icons/react';
-import { Card } from 'components/Containers/Card';
-import { CardHeader } from 'components/Containers/Card/CardHeader';
-import { CardBody } from 'components/Containers/Card/CardBody';
-import { DeleteButton } from 'components/Buttons/DeleteButton';
-import { useNotification } from 'hooks/useNotification';
-import { useDeleteSimulatedDevices } from 'hooks/Network/Simulations';
-
-const AdvancedSystemPage = () => {
-  const { successToast, apiErrorToast } = useNotification();
-  const deleteSimulatedDevices = useDeleteSimulatedDevices();
-
-  const handleDeleteSimulatedDevices = async () =>
-    deleteSimulatedDevices.mutateAsync(undefined, {
-      onSuccess: () => {
-        successToast({
-          id: 'delete-simulated-devices',
-          description: 'Simulated devices deleted!',
-        });
-      },
-      onError: (e) => {
-        apiErrorToast({
-          id: 'delete-simulated-devices',
-          e,
-          fallbackMessage: 'Error deleting simulated devices',
-        });
-      },
-    });
-
-  return (
-    <Card>
-      <CardHeader>
-        <Heading size="md">Operations</Heading>
-      </CardHeader>
-      <CardBody>
-        <Box>
-          <Heading size="sm">Delete Simulated Devices</Heading>
-          <Text fontStyle="italic">Delete all simulated devices from the database. This action cannot be undone.</Text>
-          <Popover>
-            {({ onClose }) => (
-              <>
-                <PopoverTrigger>
-                  <Button colorScheme="red" rightIcon={<Trash size={20} />}>
-                    Delete
-                  </Button>
-                </PopoverTrigger>
-                <PopoverContent>
-                  <PopoverArrow />
-                  <PopoverCloseButton />
-                  <PopoverHeader>Confirm</PopoverHeader>
-                  <PopoverBody>
-                    <Text>Are you sure you want to delete all simulated devices?</Text>
-                    <Center mt={4}>
-                      <Button onClick={onClose} mr={1}>
-                        Cancel
-                      </Button>
-                      <DeleteButton
-                        ml={1}
-                        isLoading={deleteSimulatedDevices.isLoading}
-                        onClick={async () => {
-                          await handleDeleteSimulatedDevices();
-                          onClose();
-                        }}
-                        isCompact={false}
-                      />
-                    </Center>
-                  </PopoverBody>
-                </PopoverContent>
-              </>
-            )}
-          </Popover>
-        </Box>
-      </CardBody>
-    </Card>
-  );
-};
-
-export default AdvancedSystemPage;

src/pages/DefaultConfigurations/List/CreateModal.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Box, Flex, useBoolean, useDisclosure, useToast } from '@chakra-ui/react';
+import { Box, SimpleGrid, useBoolean, useDisclosure, useToast } from '@chakra-ui/react';
 import { Formik, FormikProps } from 'formik';
 import { useTranslation } from 'react-i18next';
 import { v4 as uuid } from 'uuid';
@@ -16,7 +16,6 @@ import { useGetDeviceTypes } from 'hooks/Network/Firmware';
 import { useFormModal } from 'hooks/useFormModal';
 import { useFormRef } from 'hooks/useFormRef';
 import { AxiosError } from 'models/Axios';
-import { SelectField } from 'components/Form/Fields/SelectField';
 
 const CreateDefaultConfigurationModal = () => {
   const { t } = useTranslation();
@@ -69,9 +68,7 @@ const CreateDefaultConfigurationModal = () => {
             key={formKey}
             validationSchema={DefaultConfigurationSchema(t)}
             onSubmit={(data, { setSubmitting, resetForm }) => {
-              createConfig.mutateAsync(
+              createConfig.mutateAsync(data, {
-                { ...data, modelIds: data.modelIds.map((v) => v.value) },
-                {
                 onSuccess: () => {
                   toast({
                     id: `config-create-success`,
@@ -99,33 +96,14 @@ const CreateDefaultConfigurationModal = () => {
                   });
                   setSubmitting(false);
                 },
-                },
+              });
-              );
             }}
           >
             <Box>
-              <Flex mb={4}>
+              <SimpleGrid spacing={4} minChildWidth="200px">
-                <StringField
+                <StringField name="name" label={t('common.name')} isRequired isDisabled={isDisabled} />
-                  name="name"
+                <StringField name="description" label={t('common.description')} isDisabled={isDisabled} />
-                  label={t('common.name')}
+              </SimpleGrid>
-                  isRequired
-                  isDisabled={isDisabled}
-                  maxW="340px"
-                  mr={4}
-                />
-                <SelectField
-                  name="platform"
-                  label="Platform"
-                  options={[
-                    { label: 'AP', value: 'ap' },
-                    { label: 'Switch', value: 'switch' },
-                  ]}
-                  isRequired
-                  isDisabled={isDisabled}
-                  w="max-content"
-                />
-              </Flex>
-              <StringField name="description" label={t('common.description')} isDisabled={isDisabled} mb={4} />
               <MultiSelectField
                 name="modelIds"
                 label={t('controller.dashboard.device_types')}
@@ -136,10 +114,9 @@ const CreateDefaultConfigurationModal = () => {
                     value: devType,
                   })) ?? []
                 }
-                isCreatable
                 isRequired
               />
-              <StringField name="configuration" label={t('configurations.one')} isArea isDisabled={isDisabled} mt={4} />
+              <StringField name="configuration" label={t('configurations.one')} isArea isDisabled={isDisabled} />
             </Box>
           </Formik>
         </Box>

src/pages/DefaultConfigurations/List/EditModal.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Box, Flex, useBoolean, UseDisclosureReturn, useToast } from '@chakra-ui/react';
+import { Box, SimpleGrid, useBoolean, UseDisclosureReturn, useToast } from '@chakra-ui/react';
 import { Formik, FormikProps } from 'formik';
 import { useTranslation } from 'react-i18next';
 import { v4 as uuid } from 'uuid';
@@ -15,7 +15,6 @@ import { useGetDeviceTypes } from 'hooks/Network/Firmware';
 import { useFormModal } from 'hooks/useFormModal';
 import { useFormRef } from 'hooks/useFormRef';
 import { AxiosError } from 'models/Axios';
-import { SelectField } from 'components/Form/Fields/SelectField';
 
 type Props = {
   modalProps: UseDisclosureReturn;
@@ -70,15 +69,12 @@ const EditDefaultConfiguration = ({ modalProps, config }: Props) => {
               innerRef={formRef as React.Ref<FormikProps<DefaultConfigurationResponse>>}
               initialValues={{
                 ...config,
-                modelIds: config.modelIds.map((v) => ({ label: v, value: v })),
                 configuration: JSON.stringify(config.configuration, null, 2),
               }}
               key={formKey}
               validationSchema={DefaultConfigurationSchema(t)}
               onSubmit={(data, { setSubmitting, resetForm }) => {
-                updateConfig.mutateAsync(
+                updateConfig.mutateAsync(data, {
-                  { ...data, modelIds: data.modelIds.map((v) => v.value) },
-                  {
                   onSuccess: () => {
                     toast({
                       id: `config-edit-success`,
@@ -106,33 +102,14 @@ const EditDefaultConfiguration = ({ modalProps, config }: Props) => {
                     });
                     setSubmitting(false);
                   },
-                  },
+                });
-                );
               }}
             >
               <Box>
-                <Flex mb={4}>
+                <SimpleGrid spacing={4} minChildWidth="200px">
-                  <StringField
+                  <StringField name="name" label={t('common.name')} isRequired isDisabled={isDisabled} />
-                    name="name"
+                  <StringField name="description" label={t('common.description')} isDisabled={isDisabled} />
-                    label={t('common.name')}
+                </SimpleGrid>
-                    isRequired
-                    isDisabled={isDisabled}
-                    maxW="340px"
-                    mr={4}
-                  />
-                  <SelectField
-                    name="platform"
-                    label="Platform"
-                    options={[
-                      { label: 'AP', value: 'ap' },
-                      { label: 'Switch', value: 'switch' },
-                    ]}
-                    isRequired
-                    isDisabled
-                    w="max-content"
-                  />
-                </Flex>
-                <StringField name="description" label={t('common.description')} isDisabled={isDisabled} mb={4} />
                 <MultiSelectField
                   name="modelIds"
                   label={t('controller.dashboard.device_types')}
@@ -143,16 +120,9 @@ const EditDefaultConfiguration = ({ modalProps, config }: Props) => {
                       value: devType,
                     })) ?? []
                   }
-                  isCreatable
                   isRequired
                 />
-                <StringField
+                <StringField name="configuration" label={t('configurations.one')} isArea isDisabled={isDisabled} />
-                  name="configuration"
-                  label={t('configurations.one')}
-                  isArea
-                  isDisabled={isDisabled}
-                  mt={4}
-                />
               </Box>
             </Formik>
           )}

src/pages/DefaultConfigurations/List/index.tsx

@@ -58,14 +58,6 @@ const DefaultConfigurationsList = () => {
         Cell: ({ cell }) => dateCell(cell.row.original.lastModified),
         customWidth: '50px',
       },
-      {
-        id: 'platform',
-        Header: 'Platform',
-        Footer: '',
-        accessor: 'platform',
-        Cell: ({ cell }) => cell.row.original.platform.toUpperCase(),
-        customWidth: '50px',
-      },
       {
         id: 'modelIds',
         Header: t('controller.dashboard.device_types'),

src/pages/DefaultConfigurations/utils.ts

@@ -6,8 +6,7 @@ export const DefaultConfigurationSchema = (t: (str: string) => string) =>
     .shape({
       name: Yup.string().required(t('form.required')),
       description: Yup.string(),
-      modelIds: Yup.array().of(Yup.object()).required(t('form.required')).min(1, t('form.required')),
+      modelIds: Yup.array().of(Yup.string()).required(t('form.required')).min(1, t('form.required')),
-      platform: Yup.string().oneOf(['ap', 'switch']).required(t('form.required')),
       configuration: Yup.string()
         .required(t('form.required'))
         .test('configuration', t('form.invalid_json'), (v) => testJson(v ?? '')),
@@ -16,6 +15,5 @@ export const DefaultConfigurationSchema = (t: (str: string) => string) =>
       name: '',
       description: '',
       modelIds: [],
-      platform: 'ap',
       configuration: '',
     });

src/pages/DefaultFirmware/CreateModal/ConfirmDefaultFirmwareCreation.tsx

@@ -1,188 +0,0 @@
-/* eslint-disable prefer-promise-reject-errors */
-import * as React from 'react';
-import { CheckCircleIcon, WarningIcon } from '@chakra-ui/icons';
-import {
-  Accordion,
-  AccordionButton,
-  AccordionIcon,
-  AccordionItem,
-  AccordionPanel,
-  Box,
-  Center,
-  Flex,
-  Heading,
-  Spinner,
-  Text,
-} from '@chakra-ui/react';
-import { useQuery } from '@tanstack/react-query';
-import { useTranslation } from 'react-i18next';
-import { compactDate } from 'helpers/dateFormatting';
-import { getRevision } from 'helpers/stringHelper';
-import { DefaultFirmware } from 'hooks/Network/DefaultFirmware';
-import { getAllAvailableFirmware } from 'hooks/Network/Firmware';
-
-const getDefaultFirmware = async (deviceType: string, revision: string) =>
-  getAllAvailableFirmware(deviceType)
-    .then((res) => {
-      const found = res.firmwares.find((firmware) => firmware.revision === revision);
-      if (!found) {
-        return { error: { deviceType, error: 'Could not find available firmware for this revision' } };
-      }
-      return {
-        success: {
-          deviceType,
-          description: '',
-          revision,
-          imageCreationDate: found.imageDate,
-          uri: found.uri,
-          created: 0,
-          lastModified: 0,
-        },
-      };
-    })
-    .catch(() => ({ error: { deviceType, error: 'Could not fetch firmware available for this device type' } }));
-
-const getComputedData = async (deviceTypes: string[], revision: string) => {
-  const defaultFirmwares: DefaultFirmware[] = [];
-  const errors: { deviceType: string; error: string }[] = [];
-
-  const promises = deviceTypes.map((deviceType) => getDefaultFirmware(deviceType, revision));
-  const results = await Promise.allSettled(promises);
-
-  results.forEach((result) => {
-    if (result.status === 'fulfilled') {
-      if (result.value.error) {
-        errors.push(result.value.error);
-      } else if (result.value.success) {
-        defaultFirmwares.push(result.value.success);
-      }
-    }
-  });
-
-  return { defaultFirmwares, errors };
-};
-
-type Props = {
-  deviceTypes: string[];
-  revision: string;
-  goNext: (defaultFirmwares: DefaultFirmware[]) => Promise<void>;
-  setNextCallback: React.Dispatch<React.SetStateAction<(() => (Promise<void> | void) | undefined) | undefined>>;
-};
-
-const ConfirmDefaultFirmwareCreation = ({ deviceTypes, revision, goNext, setNextCallback }: Props) => {
-  const { t } = useTranslation();
-  const getCompleteData = useQuery(
-    ['default_firmware', 'computed_data'],
-    () => getComputedData(deviceTypes, revision),
-    {
-      refetchOnMount: true,
-    },
-  );
-
-  const onNext = async () => {
-    if (getCompleteData.data) {
-      await goNext(getCompleteData.data.defaultFirmwares);
-    }
-  };
-
-  React.useEffect(() => {
-    if (getCompleteData.data) {
-      setNextCallback(() => onNext);
-    } else {
-      setNextCallback(undefined);
-    }
-  }, [getCompleteData.data, setNextCallback]);
-
-  return (
-    <>
-      <Heading mb={4} size="sm">
-        {t('firmware.confirm_default_data')}
-      </Heading>
-      {getCompleteData.isFetching ? (
-        <Center my={4} display="flex" flexDirection="column">
-          <Spinner size="xl" />
-          <Heading size="sm" mt={2}>
-            {t('firmware.fetching_defaults')}
-          </Heading>
-        </Center>
-      ) : null}
-      {getCompleteData.data && !getCompleteData.isFetching ? (
-        <>
-          <Heading size="sm" mb={2}>
-            {t('firmware.one')}: {getRevision(revision)}
-          </Heading>
-          <Accordion allowToggle allowMultiple>
-            <AccordionItem>
-              <h2>
-                <AccordionButton>
-                  <Box as="span" flex="1" textAlign="left">
-                    <CheckCircleIcon color="green.500" mr={2} mt={-0.5} />
-                    {t('firmware.default_found', { count: getCompleteData.data?.defaultFirmwares.length })}
-                  </Box>
-                  <AccordionIcon />
-                </AccordionButton>
-              </h2>
-              <AccordionPanel pb={4}>
-                <Accordion allowToggle allowMultiple>
-                  {getCompleteData.data?.defaultFirmwares.map((data) => (
-                    <AccordionItem key={data.deviceType}>
-                      <h2>
-                        <AccordionButton>
-                          <Box as="span" flex="1" textAlign="left">
-                            {data.deviceType}
-                          </Box>
-                          <AccordionIcon />
-                        </AccordionButton>
-                      </h2>
-                      <AccordionPanel pb={4}>
-                        <Flex>
-                          <Text>Image Date: </Text>
-                          <Text ml={2}>{compactDate(data.imageCreationDate)}</Text>
-                        </Flex>
-                        <Flex>
-                          <Text>URI: </Text>
-                          <Text ml={2}>{data.uri}</Text>
-                        </Flex>
-                      </AccordionPanel>
-                    </AccordionItem>
-                  ))}
-                </Accordion>
-              </AccordionPanel>
-            </AccordionItem>
-            <AccordionItem>
-              <h2>
-                <AccordionButton>
-                  <Box as="span" flex="1" textAlign="left">
-                    <WarningIcon color="red.500" mr={2} mt={-0.5} />
-                    {t('firmware.default_not_found', { count: getCompleteData.data?.errors.length })} (cannot create
-                    valid default firmware)
-                  </Box>
-                  <AccordionIcon />
-                </AccordionButton>
-              </h2>
-              <AccordionPanel pb={4}>
-                <Accordion allowToggle allowMultiple>
-                  {getCompleteData.data?.errors.map((error) => (
-                    <AccordionItem key={error.deviceType}>
-                      <h2>
-                        <AccordionButton>
-                          <Box as="span" flex="1" textAlign="left">
-                            {error.deviceType}
-                          </Box>
-                          <AccordionIcon />
-                        </AccordionButton>
-                      </h2>
-                      <AccordionPanel pb={4}>{error.error}</AccordionPanel>
-                    </AccordionItem>
-                  ))}
-                </Accordion>
-              </AccordionPanel>
-            </AccordionItem>
-          </Accordion>
-        </>
-      ) : null}
-    </>
-  );
-};
-
-export default ConfirmDefaultFirmwareCreation;

src/pages/DefaultFirmware/CreateModal/CreateDefaultFirmwareResults.tsx

@@ -1,81 +0,0 @@
-import * as React from 'react';
-import { CheckCircleIcon, WarningIcon } from '@chakra-ui/icons';
-import {
-  Accordion,
-  AccordionButton,
-  AccordionIcon,
-  AccordionItem,
-  AccordionPanel,
-  Box,
-  Flex,
-  Heading,
-  List,
-  ListItem,
-  Text,
-} from '@chakra-ui/react';
-import { useTranslation } from 'react-i18next';
-import { CreateDefaultFirmwareResult } from './utils';
-
-type Props = {
-  results: CreateDefaultFirmwareResult[];
-};
-
-const CreateDefaultFirmwareResults = ({ results }: Props) => {
-  const { t } = useTranslation();
-
-  const successes = results.filter((result) => !result.error);
-  const errors = results.filter((result) => result.error);
-
-  return (
-    <>
-      <Heading size="sm">{t('controller.devices.results')}: </Heading>
-      <Accordion allowToggle allowMultiple>
-        <AccordionItem>
-          <h2>
-            <AccordionButton>
-              <Box as="span" flex="1" textAlign="left">
-                <CheckCircleIcon color="green.500" mr={2} mt={-0.5} />
-                {t('firmware.default_created', { count: successes.length })}
-              </Box>
-              <AccordionIcon />
-            </AccordionButton>
-          </h2>
-          <AccordionPanel pb={4}>
-            <List>
-              {successes.map((success) => (
-                <ListItem key={success.deviceType}>
-                  <Text>{success.deviceType}</Text>
-                </ListItem>
-              ))}
-            </List>
-          </AccordionPanel>
-        </AccordionItem>
-        <AccordionItem>
-          <h2>
-            <AccordionButton>
-              <Box as="span" flex="1" textAlign="left">
-                <WarningIcon color="red.500" mr={2} mt={-0.5} />
-                {t('firmware.default_created_error_other', { count: errors.length })}
-              </Box>
-              <AccordionIcon />
-            </AccordionButton>
-          </h2>
-          <AccordionPanel pb={4}>
-            <List>
-              {errors.map((error) => (
-                <ListItem key={error.deviceType}>
-                  <Flex>
-                    <Text>{error.deviceType} -</Text>
-                    <Text ml={2}>{error.error}</Text>
-                  </Flex>
-                </ListItem>
-              ))}
-            </List>
-          </AccordionPanel>
-        </AccordionItem>
-      </Accordion>
-    </>
-  );
-};
-
-export default CreateDefaultFirmwareResults;

src/pages/DefaultFirmware/CreateModal/DeviceTypeSelection.tsx

@@ -1,98 +0,0 @@
-import * as React from 'react';
-import { Heading } from '@chakra-ui/react';
-import { GroupBase, MultiValue, OptionBase, Select } from 'chakra-react-select';
-import { useTranslation } from 'react-i18next';
-import { useGetDefaultFirmware } from 'hooks/Network/DefaultFirmware';
-import { useGetDeviceTypes } from 'hooks/Network/Firmware';
-
-interface Option extends OptionBase {
-  label: string;
-  value: string;
-}
-
-type Props = {
-  goNext: (deviceTypes: string[]) => void;
-  setNextCallback: React.Dispatch<React.SetStateAction<(() => (Promise<void> | void) | undefined) | undefined>>;
-};
-
-const DeviceTypeSelection = ({ goNext, setNextCallback }: Props) => {
-  const { t } = useTranslation();
-  const getFirmware = useGetDefaultFirmware();
-  const getDeviceTypes = useGetDeviceTypes();
-  const [selectedDeviceTypes, setSelectedDeviceTypes] = React.useState<string[]>([]);
-  const availableDevicesTypes = React.useMemo(() => {
-    const alreadyCreatedDeviceTypes = getFirmware.data?.firmwares.map((firmware) => firmware.deviceType);
-    const deviceTypes = getDeviceTypes.data?.deviceTypes;
-    return deviceTypes?.filter((deviceType) => !alreadyCreatedDeviceTypes?.includes(deviceType));
-  }, [getDeviceTypes.data, getFirmware.data]);
-
-  const handleChange = (newValue: MultiValue<Option>) => {
-    const deviceTypes = newValue.map(({ value }) => value);
-    const allIndex = deviceTypes.indexOf('*');
-    if (allIndex === 0) {
-      setSelectedDeviceTypes(availableDevicesTypes ?? []);
-    } else if (allIndex > 0) {
-      setSelectedDeviceTypes(availableDevicesTypes ?? []);
-    } else {
-      setSelectedDeviceTypes(deviceTypes);
-    }
-  };
-
-  const options = React.useMemo(() => {
-    if (availableDevicesTypes?.length === selectedDeviceTypes.length)
-      return availableDevicesTypes?.map((deviceType) => ({ value: deviceType, label: deviceType })) ?? [];
-
-    return [
-      { value: '*', label: t('common.all') },
-      ...(availableDevicesTypes?.map((deviceType) => ({ value: deviceType, label: deviceType })) ?? []),
-    ];
-  }, [availableDevicesTypes, selectedDeviceTypes.length]);
-
-  const onNext = () => {
-    goNext(selectedDeviceTypes.sort((a, b) => a.localeCompare(b)));
-  };
-
-  React.useEffect(() => {
-    if (selectedDeviceTypes.length === 0) {
-      setNextCallback(undefined);
-    } else {
-      setNextCallback(() => onNext);
-    }
-  }, [selectedDeviceTypes, onNext]);
-
-  return (
-    <>
-      <Heading mb={4} size="sm">
-        {t('firmware.select_default_device_types')}
-      </Heading>
-      <Select<Option, true, GroupBase<Option>>
-        chakraStyles={{
-          control: (provided) => ({
-            ...provided,
-            borderRadius: '15px',
-            border: '2px solid',
-          }),
-          dropdownIndicator: (provided) => ({
-            ...provided,
-            backgroundColor: 'unset',
-            border: 'unset',
-          }),
-        }}
-        isMulti
-        closeMenuOnSelect={false}
-        options={options}
-        value={
-          selectedDeviceTypes.map((value) => ({
-            value,
-            label: value,
-          })) as MultiValue<Option>
-        }
-        isClearable={selectedDeviceTypes.length > 1}
-        onChange={handleChange}
-        isDisabled={!availableDevicesTypes}
-      />
-    </>
-  );
-};
-
-export default DeviceTypeSelection;

src/pages/DefaultFirmware/CreateModal/SelectRevision.tsx

@@ -1,72 +0,0 @@
-import * as React from 'react';
-import { Box, Flex, Heading, Select, Switch, Text, useBoolean } from '@chakra-ui/react';
-import { useTranslation } from 'react-i18next';
-import { compactDate } from 'helpers/dateFormatting';
-import { getRevision } from 'helpers/stringHelper';
-import { useGetFirmwareDeviceType } from 'hooks/Network/Firmware';
-
-type Props = {
-  deviceTypes: string[];
-  goNext: (revision: string) => void;
-  setNextCallback: React.Dispatch<React.SetStateAction<(() => (Promise<void> | void) | undefined) | undefined>>;
-};
-
-const DefaultFirmwareRevisionSelection = ({ deviceTypes, goNext, setNextCallback }: Props) => {
-  const { t } = useTranslation();
-  const [isShowingDev, setIsShowingDev] = useBoolean();
-  const [revision, setRevision] = React.useState<string>('');
-  const getFirmware = useGetFirmwareDeviceType({
-    deviceType: deviceTypes[0] ?? 'eap_101',
-  });
-
-  const handleChange = (event: React.ChangeEvent<HTMLSelectElement>) => {
-    setRevision(event.target.value);
-  };
-
-  const onNext = () => {
-    goNext(revision);
-  };
-
-  const firmwareOptions = React.useMemo(() => {
-    if (isShowingDev) return getFirmware.data?.sort((a, b) => (a.imageDate > b.imageDate ? -1 : 1));
-    return getFirmware.data
-      ?.filter((fms) => !fms.revision.includes('dev'))
-      ?.sort((a, b) => (a.imageDate > b.imageDate ? -1 : 1));
-  }, [getFirmware.data, isShowingDev]);
-
-  React.useEffect(() => {
-    if (revision.length === 0) {
-      setNextCallback(undefined);
-    } else {
-      setNextCallback(() => onNext);
-    }
-  }, [revision, onNext]);
-
-  return (
-    <>
-      <Heading mb={4} size="sm">
-        {t('firmware.select_default_revision')}
-      </Heading>
-      <Flex mb={2}>
-        <Text>{t('controller.firmware.show_dev_releases')}</Text>
-        <Switch ml={2} isChecked={isShowingDev} onChange={setIsShowingDev.toggle} size="lg" />
-      </Flex>
-      <Box w="unset">
-        <Select w="unset" value={revision} onChange={handleChange}>
-          {revision.length === 0 && (
-            <option key="default" value="" disabled>
-              {' '}
-            </option>
-          )}
-          {firmwareOptions?.map((firmware) => (
-            <option key={firmware.revision} value={firmware.revision}>
-              {compactDate(firmware.imageDate)} - {getRevision(firmware.revision)}
-            </option>
-          ))}
-        </Select>
-      </Box>
-    </>
-  );
-};
-
-export default DefaultFirmwareRevisionSelection;

src/pages/DefaultFirmware/CreateModal/index.tsx

@@ -1,121 +0,0 @@
-import React from 'react';
-import { Box, Button, useDisclosure } from '@chakra-ui/react';
-import { ArrowRight } from '@phosphor-icons/react';
-import { useQueryClient } from '@tanstack/react-query';
-import { useTranslation } from 'react-i18next';
-import ConfirmDefaultFirmwareCreation from './ConfirmDefaultFirmwareCreation';
-import CreateDefaultFirmwareResults from './CreateDefaultFirmwareResults';
-import DeviceTypeSelection from './DeviceTypeSelection';
-import DefaultFirmwareRevisionSelection from './SelectRevision';
-import { CreateDefaultFirmwareResult, createDefaultFirmwareBatch } from './utils';
-import { CreateButton } from 'components/Buttons/CreateButton';
-import { ConfirmCloseAlertModal } from 'components/Modals/ConfirmCloseAlert';
-import { Modal } from 'components/Modals/Modal';
-import { DefaultFirmware } from 'hooks/Network/DefaultFirmware';
-
-const CreateDefaultFirmwareModal = () => {
-  const { t } = useTranslation();
-  const queryClient = useQueryClient();
-  const [currentStep, setCurrentStep] = React.useState<'device_type' | 'revision' | 'confirm' | 'result'>(
-    'device_type',
-  );
-  const modalProps = useDisclosure();
-  const closeConfirmModal = useDisclosure();
-  const [deviceTypes, setDeviceTypes] = React.useState<string[]>([]);
-  const [revision, setRevision] = React.useState<string>('');
-  const [results, setResults] = React.useState<CreateDefaultFirmwareResult[]>([]);
-  const [nextCallback, setNextCallback] = React.useState<() => (Promise<void> | void) | undefined>();
-  const [isLoading, setIsLoading] = React.useState(false);
-
-  const closeCancelAndForm = () => {
-    modalProps.onClose();
-    closeConfirmModal.onClose();
-    setCurrentStep('device_type');
-    setDeviceTypes([]);
-    setRevision('');
-    setResults([]);
-  };
-
-  const onClose = () => {
-    if (currentStep === 'device_type' || currentStep === 'result') {
-      closeCancelAndForm();
-    } else {
-      closeConfirmModal.onOpen();
-    }
-  };
-
-  const finishDeviceType = (newDeviceTypes: string[]) => {
-    setDeviceTypes(newDeviceTypes);
-    setCurrentStep('revision');
-    setNextCallback(undefined);
-  };
-
-  const finishRevision = (newRevision: string) => {
-    setRevision(newRevision);
-    setCurrentStep('confirm');
-    setNextCallback(undefined);
-  };
-
-  const startCreation = async (defaults: DefaultFirmware[]) => {
-    setIsLoading(true);
-    const newResults = await createDefaultFirmwareBatch(defaults);
-    setIsLoading(false);
-    queryClient.invalidateQueries(['default_firmwares']);
-    setResults(newResults);
-    setCurrentStep('result');
-    setNextCallback(undefined);
-  };
-
-  return (
-    <>
-      <CreateButton onClick={modalProps.onOpen} mr={2} />
-      <Modal
-        {...modalProps}
-        onClose={onClose}
-        title={`${t('common.create')} ${t('common.default')} ${t('firmware.one')}`}
-        topRightButtons={
-          currentStep === 'result' ? null : (
-            <Button
-              onClick={nextCallback}
-              isDisabled={nextCallback === undefined}
-              rightIcon={<ArrowRight />}
-              colorScheme="blue"
-              isLoading={isLoading}
-            >
-              {currentStep === 'confirm' ? t('common.start') : t('common.next')}
-            </Button>
-          )
-        }
-      >
-        <Box pb={8}>
-          {currentStep === 'device_type' ? (
-            <DeviceTypeSelection goNext={finishDeviceType} setNextCallback={setNextCallback} />
-          ) : null}
-          {currentStep === 'revision' ? (
-            <DefaultFirmwareRevisionSelection
-              deviceTypes={deviceTypes}
-              goNext={finishRevision}
-              setNextCallback={setNextCallback}
-            />
-          ) : null}
-          {currentStep === 'confirm' ? (
-            <ConfirmDefaultFirmwareCreation
-              deviceTypes={deviceTypes}
-              revision={revision}
-              goNext={startCreation}
-              setNextCallback={setNextCallback}
-            />
-          ) : null}
-          {currentStep === 'result' ? <CreateDefaultFirmwareResults results={results} /> : null}
-        </Box>
-      </Modal>
-      <ConfirmCloseAlertModal
-        isOpen={closeConfirmModal.isOpen}
-        confirm={closeCancelAndForm}
-        cancel={closeConfirmModal.onClose}
-      />
-    </>
-  );
-};
-
-export default CreateDefaultFirmwareModal;

src/pages/DefaultFirmware/CreateModal/utils.ts

@@ -1,30 +0,0 @@
-import { isAxiosError } from 'axios';
-import { DefaultFirmware, createDefaultFirmware } from 'hooks/Network/DefaultFirmware';
-
-export type CreateDefaultFirmwareResult =
-  | {
-      deviceType: string;
-      error?: undefined;
-    }
-  | {
-      deviceType: string;
-      error: string;
-    };
-
-export const createFms = async (defaultFirmware: DefaultFirmware): Promise<CreateDefaultFirmwareResult> =>
-  createDefaultFirmware(defaultFirmware)
-    .then(() => ({
-      deviceType: defaultFirmware.deviceType,
-    }))
-    .catch((e) => ({
-      deviceType: defaultFirmware.deviceType,
-      error: isAxiosError(e) ? e.response?.data?.ErrorDescription : 'Unknown error',
-    }));
-
-export const createDefaultFirmwareBatch = async (
-  defaultFirmware: DefaultFirmware[],
-): Promise<CreateDefaultFirmwareResult[]> => {
-  const promises = defaultFirmware.map((fms) => createFms(fms));
-  const responses = await Promise.all(promises);
-  return responses;
-};

src/pages/DefaultFirmware/DeleteButton.tsx

@@ -1,80 +0,0 @@
-import * as React from 'react';
-import {
-  useDisclosure,
-  Box,
-  Button,
-  Center,
-  IconButton,
-  Popover,
-  PopoverArrow,
-  PopoverBody,
-  PopoverCloseButton,
-  PopoverContent,
-  PopoverFooter,
-  PopoverHeader,
-  PopoverTrigger,
-  Tooltip,
-  useToast,
-} from '@chakra-ui/react';
-import { Trash } from '@phosphor-icons/react';
-import { useTranslation } from 'react-i18next';
-import { useDeleteBatchDefaultFirmware, useGetDefaultFirmware } from 'hooks/Network/DefaultFirmware';
-
-const DeleteDefaultFirmwaresButton = () => {
-  const { t } = useTranslation();
-  const toast = useToast();
-  const popoverProps = useDisclosure();
-  const getFirmware = useGetDefaultFirmware();
-  const deleteFirmware = useDeleteBatchDefaultFirmware();
-
-  const handleDelete = () => {
-    deleteFirmware.mutate(getFirmware.data?.firmwares.map((firmware) => firmware.deviceType) ?? [], {
-      onSuccess: () => {
-        toast({
-          id: `firmware-delete-success`,
-          title: t('common.success'),
-          description: t('firmware.default_mass_delete_success', { count: getFirmware.data?.firmwares.length }),
-          status: 'success',
-          duration: 5000,
-          isClosable: true,
-          position: 'top-right',
-        });
-        popoverProps.onClose();
-      },
-    });
-  };
-
-  return (
-    <Popover isOpen={popoverProps.isOpen} onOpen={popoverProps.onOpen} onClose={popoverProps.onClose}>
-      <Tooltip hasArrow label={t('crud.delete')} placement="top" isDisabled={popoverProps.isOpen}>
-        <Box>
-          <PopoverTrigger>
-            <IconButton aria-label={t('crud.delete')} colorScheme="red" icon={<Trash size={20} />} />
-          </PopoverTrigger>
-        </Box>
-      </Tooltip>
-      <PopoverContent>
-        <PopoverArrow />
-        <PopoverCloseButton />
-        <PopoverHeader>
-          {t('crud.delete')} <b>{getFirmware.data?.firmwares.length} Settings</b>
-        </PopoverHeader>
-        <PopoverBody>
-          Are you sure you want to delete these {getFirmware.data?.firmwares.length} default firmware settings?
-        </PopoverBody>
-        <PopoverFooter>
-          <Center>
-            <Button colorScheme="gray" mr="1" onClick={popoverProps.onClose}>
-              {t('common.cancel')}
-            </Button>
-            <Button colorScheme="red" ml="1" onClick={handleDelete} isLoading={deleteFirmware.isLoading}>
-              {t('common.yes')}
-            </Button>
-          </Center>
-        </PopoverFooter>
-      </PopoverContent>
-    </Popover>
-  );
-};
-
-export default DeleteDefaultFirmwaresButton;

src/pages/DefaultFirmware/List/Actions.tsx

@@ -1,111 +0,0 @@
-import React from 'react';
-import {
-  Box,
-  Button,
-  Center,
-  Flex,
-  IconButton,
-  Popover,
-  PopoverArrow,
-  PopoverBody,
-  PopoverCloseButton,
-  PopoverContent,
-  PopoverFooter,
-  PopoverHeader,
-  PopoverTrigger,
-  Tooltip,
-  useDisclosure,
-  useToast,
-} from '@chakra-ui/react';
-import { MagnifyingGlass, Trash } from '@phosphor-icons/react';
-import { useQueryClient } from '@tanstack/react-query';
-import { useTranslation } from 'react-i18next';
-import { DefaultFirmware, useDeleteDefaultFirmware } from 'hooks/Network/DefaultFirmware';
-import { AxiosError } from 'models/Axios';
-
-type Props = {
-  firmware: DefaultFirmware;
-  handleViewDetails: (firmware: DefaultFirmware) => void;
-};
-
-const Actions = ({ firmware, handleViewDetails }: Props) => {
-  const { t } = useTranslation();
-  const queryClient = useQueryClient();
-  const toast = useToast();
-  const { isOpen, onOpen, onClose } = useDisclosure();
-  const deleteFirmware = useDeleteDefaultFirmware();
-
-  const handleDeleteClick = () =>
-    deleteFirmware.mutate(firmware.deviceType, {
-      onSuccess: () => {
-        toast({
-          id: `firmware-delete-success`,
-          title: t('common.success'),
-          description: t('firmware.delete_success'),
-          status: 'success',
-          duration: 5000,
-          isClosable: true,
-          position: 'top-right',
-        });
-        onClose();
-        queryClient.invalidateQueries(['defaultFirmwares']);
-      },
-      onError: (error) => {
-        const e = error as AxiosError;
-        toast({
-          id: `firmware-delete-error`,
-          title: t('common.error'),
-          description: e?.response?.data?.ErrorDescription,
-          status: 'error',
-          duration: 5000,
-          isClosable: true,
-          position: 'top-right',
-        });
-      },
-    });
-  const handleDetailsClick = () => handleViewDetails(firmware);
-
-  return (
-    <Flex>
-      <Popover isOpen={isOpen} onOpen={onOpen} onClose={onClose}>
-        <Tooltip hasArrow label={t('crud.delete')} placement="top" isDisabled={isOpen}>
-          <Box>
-            <PopoverTrigger>
-              <IconButton aria-label={t('crud.delete')} colorScheme="red" icon={<Trash size={20} />} size="sm" />
-            </PopoverTrigger>
-          </Box>
-        </Tooltip>
-        <PopoverContent>
-          <PopoverArrow />
-          <PopoverCloseButton />
-          <PopoverHeader>
-            {t('crud.delete')} <b>{firmware.deviceType}</b>
-          </PopoverHeader>
-          <PopoverBody>{t('crud.delete_confirm', { obj: 'setting' })}</PopoverBody>
-          <PopoverFooter>
-            <Center>
-              <Button colorScheme="gray" mr="1" onClick={onClose}>
-                {t('common.cancel')}
-              </Button>
-              <Button colorScheme="red" ml="1" onClick={handleDeleteClick} isLoading={deleteFirmware.isLoading}>
-                {t('common.yes')}
-              </Button>
-            </Center>
-          </PopoverFooter>
-        </PopoverContent>
-      </Popover>
-      <Tooltip hasArrow label={t('common.view_details')} placement="top">
-        <IconButton
-          aria-label={t('common.view_details')}
-          ml={2}
-          colorScheme="blue"
-          icon={<MagnifyingGlass size={20} />}
-          size="sm"
-          onClick={handleDetailsClick}
-        />
-      </Tooltip>
-    </Flex>
-  );
-};
-
-export default Actions;

src/pages/DefaultFirmware/List/EditModal.tsx

@@ -1,319 +0,0 @@
-import * as React from 'react';
-import { CopyIcon } from '@chakra-ui/icons';
-import {
-  Alert,
-  AlertDescription,
-  AlertIcon,
-  Box,
-  Flex,
-  Grid,
-  GridItem,
-  Heading,
-  IconButton,
-  Select,
-  Switch,
-  Text,
-  Textarea,
-  Tooltip,
-  UseDisclosureReturn,
-  useBoolean,
-  useClipboard,
-  useDisclosure,
-  useToast,
-} from '@chakra-ui/react';
-import { useTranslation } from 'react-i18next';
-import { DefaultFirmware, useUpdateDefaultFirmware } from 'hooks/Network/DefaultFirmware';
-import { useGetFirmwareDeviceType } from 'hooks/Network/Firmware';
-import { AtLeast } from 'models/General';
-import { AxiosError } from 'models/Axios';
-import { getRevision } from 'helpers/stringHelper';
-import { compactDate } from 'helpers/dateFormatting';
-import { Firmware } from 'models/Firmware';
-import { Modal } from 'components/Modals/Modal';
-import { SaveButton } from 'components/Buttons/SaveButton';
-import { ToggleEditButton } from 'components/Buttons/ToggleEditButton';
-import FormattedDate from 'components/InformationDisplays/FormattedDate';
-import { ConfirmCloseAlertModal } from 'components/Modals/ConfirmCloseAlert';
-
-type Props = {
-  modalProps: UseDisclosureReturn;
-  defaultFirmware: DefaultFirmware;
-};
-const EditDefaultFirmwareModal = ({ modalProps, defaultFirmware }: Props) => {
-  const { t } = useTranslation();
-  const toast = useToast();
-  const copy = useClipboard(defaultFirmware.uri);
-  const warningModalProps = useDisclosure();
-  const [isEditing, setIsEditing] = useBoolean();
-  const updateFirmware = useUpdateDefaultFirmware();
-  const [showDev, setShowDev] = useBoolean(false);
-  const getFirmware = useGetFirmwareDeviceType({ deviceType: defaultFirmware.deviceType });
-  const [formValues, setFormValues] = React.useState<{
-    revision: string;
-    imageDate: number;
-    uri: string;
-    description: string;
-  }>({
-    revision: defaultFirmware.revision,
-    uri: defaultFirmware.uri,
-    imageDate: defaultFirmware.imageCreationDate,
-    description: defaultFirmware.description,
-  });
-
-  const currentFirmware = {
-    revision: defaultFirmware.revision,
-    uri: defaultFirmware.uri,
-    imageDate: defaultFirmware.imageCreationDate,
-  };
-
-  const availableFirmware = React.useMemo(() => {
-    let allAvailable: (
-      | Firmware
-      | {
-          revision: string;
-          uri: string;
-          imageDate: number;
-        }
-    )[] = getFirmware.data ?? [];
-
-    if (!allAvailable.find(({ revision }) => revision === currentFirmware.revision)) {
-      allAvailable = [currentFirmware, ...allAvailable];
-    }
-
-    allAvailable.sort((a, b) => b.imageDate - a.imageDate);
-
-    return allAvailable;
-  }, [getFirmware.data, currentFirmware]);
-
-  const options = availableFirmware
-    ?.filter(({ revision }) => (showDev ? true : !revision.includes('dev')))
-    .map((firmware) => ({
-      value: firmware.revision,
-      label:
-        firmware.revision === currentFirmware.revision
-          ? `${compactDate(firmware.imageDate)} - ${getRevision(firmware.revision)} (Current Value)`
-          : `${compactDate(firmware.imageDate)} - ${getRevision(firmware.revision)}`,
-    }));
-
-  const onSelectChange = (e: React.ChangeEvent<HTMLSelectElement>) => {
-    if (e.target.value === currentFirmware.revision) {
-      setFormValues({
-        ...formValues,
-        revision: currentFirmware.revision,
-        uri: currentFirmware.uri,
-        imageDate: currentFirmware.imageDate,
-      });
-    } else {
-      const found = availableFirmware.find(({ revision }) => revision === e.target.value);
-      if (found) {
-        setFormValues({
-          ...formValues,
-          revision: found.revision,
-          uri: found.uri,
-          imageDate: found.imageDate,
-        });
-      }
-    }
-  };
-
-  const onClose = () => {
-    if (isEditing) {
-      warningModalProps.onOpen();
-    } else {
-      modalProps.onClose();
-    }
-  };
-
-  const onSave = () => {
-    const newValues: AtLeast<DefaultFirmware, 'deviceType'> = {
-      deviceType: defaultFirmware.deviceType,
-      description: formValues.description,
-    };
-
-    if (formValues.revision !== currentFirmware.revision) {
-      newValues.revision = formValues.revision;
-      newValues.uri = formValues.uri;
-      newValues.imageCreationDate = formValues.imageDate;
-    }
-
-    updateFirmware.mutate(newValues, {
-      onSuccess: () => {
-        toast({
-          id: `config-edit-success`,
-          title: t('common.success'),
-          description: t('firmware.default_update_success', { deviceType: defaultFirmware.deviceType }),
-          status: 'success',
-          duration: 5000,
-          isClosable: true,
-          position: 'top-right',
-        });
-        setIsEditing.off();
-        modalProps.onClose();
-      },
-      onError: (error) => {
-        const e = error as AxiosError;
-        toast({
-          id: `config-edit-error`,
-          title: t('common.error'),
-          description: e?.response?.data?.ErrorDescription,
-          status: 'error',
-          duration: 5000,
-          isClosable: true,
-          position: 'top-right',
-        });
-      },
-    });
-  };
-
-  const onCloseAfterWarning = () => {
-    setIsEditing.off();
-    warningModalProps.onClose();
-    modalProps.onClose();
-  };
-
-  React.useEffect(() => {
-    copy.setValue(defaultFirmware.uri);
-    setFormValues({
-      revision: defaultFirmware.revision,
-      description: defaultFirmware.description,
-      uri: defaultFirmware.uri,
-      imageDate: defaultFirmware.imageCreationDate,
-    });
-  }, [defaultFirmware.uri, defaultFirmware.description, defaultFirmware.revision, isEditing]);
-
-  // TODO -> Only thing editable is the firmware and description. Make sure I can deal with a revision not existing anymore
-
-  return (
-    <>
-      <Modal
-        {...modalProps}
-        onClose={onClose}
-        title={defaultFirmware.deviceType}
-        topRightButtons={
-          <>
-            <SaveButton hidden={!isEditing} onClick={onSave} isLoading={updateFirmware.isLoading} />
-            <ToggleEditButton toggleEdit={setIsEditing.toggle} isEditing={isEditing} />
-          </>
-        }
-      >
-        <Box>
-          <Alert status="info">
-            <AlertIcon />
-            <AlertDescription>
-              {t('firmware.edit_default_title', { deviceType: defaultFirmware.deviceType })}
-            </AlertDescription>
-          </Alert>
-          {isEditing ? (
-            <Box mb={4}>
-              <Heading size="md" mb={2}>
-                New Values
-              </Heading>
-              <Heading size="sm">{t('commands.revision')}</Heading>
-              <Flex mb={2}>
-                <Text>{t('controller.firmware.show_dev_releases')}</Text>
-                <Switch ml={2} isChecked={showDev} onChange={setShowDev.toggle} size="md" mt={0.5} />
-              </Flex>
-              <Box display="inline-flex">
-                <Select value={formValues.revision} onChange={onSelectChange}>
-                  {options?.map(({ value, label }) => (
-                    <option key={value} value={value}>
-                      {label}
-                    </option>
-                  ))}
-                </Select>
-              </Box>
-              <Grid>
-                <GridItem colSpan={1} alignContent="center" alignItems="center" display="flex">
-                  <Heading size="sm">URI</Heading>
-                </GridItem>
-                <GridItem colSpan={1} alignContent="center" alignItems="center">
-                  {formValues.uri}
-                </GridItem>
-                <GridItem colSpan={1} alignContent="center" alignItems="center">
-                  <Heading size="sm">{t('commands.image_date')}</Heading>
-                </GridItem>
-                <GridItem colSpan={1} alignContent="center" alignItems="center">
-                  <FormattedDate date={formValues.imageDate} />
-                </GridItem>
-              </Grid>
-              <Heading size="sm">{t('common.description')}</Heading>
-              <Textarea
-                value={formValues.description}
-                onChange={(e) =>
-                  setFormValues({
-                    ...formValues,
-                    description: e.target.value,
-                  })
-                }
-              />
-            </Box>
-          ) : null}
-          <Grid templateColumns="repeat(1, 1fr)" gap={1} mt={4} w="100%">
-            <GridItem colSpan={1} alignContent="center" alignItems="center" hidden={!isEditing}>
-              <Heading size="md">Current Values</Heading>
-            </GridItem>
-            <GridItem colSpan={1} alignContent="center" alignItems="center">
-              <Heading size="sm">{t('commands.revision')}</Heading>
-            </GridItem>
-            <GridItem colSpan={1} alignContent="center" alignItems="center">
-              {getRevision(defaultFirmware.revision)}
-            </GridItem>
-            <GridItem colSpan={1} alignContent="center" alignItems="center" display="flex">
-              <Heading size="sm">URI</Heading>
-              <Tooltip
-                label={copy.hasCopied ? `${t('common.copied')}!` : t('common.copy')}
-                hasArrow
-                closeOnClick={false}
-                shouldWrapChildren
-              >
-                <IconButton
-                  aria-label={t('common.copy')}
-                  icon={<CopyIcon h={4} w={4} />}
-                  onClick={(e) => {
-                    copy.onCopy();
-                    e.stopPropagation();
-                  }}
-                  size="xs"
-                  colorScheme="teal"
-                  mx={0.5}
-                />
-              </Tooltip>
-            </GridItem>
-            <GridItem colSpan={1} alignContent="center" alignItems="center">
-              {defaultFirmware.uri}
-            </GridItem>
-            <GridItem colSpan={1} alignContent="center" alignItems="center">
-              <Heading size="sm">{t('commands.image_date')}</Heading>
-            </GridItem>
-            <GridItem colSpan={1} alignContent="center" alignItems="center">
-              <FormattedDate date={defaultFirmware.imageCreationDate} />
-            </GridItem>
-            <GridItem colSpan={1} alignContent="center" alignItems="center">
-              <Heading size="sm">{t('common.modified')}</Heading>
-            </GridItem>
-            <GridItem colSpan={1} alignContent="center" alignItems="center">
-              <FormattedDate date={defaultFirmware.lastModified} />
-            </GridItem>
-            <GridItem colSpan={1} alignContent="center" alignItems="center">
-              <Heading size="sm">{t('common.description')}</Heading>
-            </GridItem>
-            <GridItem colSpan={1} alignContent="center" alignItems="center">
-              {defaultFirmware.description.length === 0 ? (
-                <Text fontStyle="italic">{t('common.none')}</Text>
-              ) : (
-                <Text>{defaultFirmware.description}</Text>
-              )}
-            </GridItem>
-          </Grid>
-        </Box>
-      </Modal>
-      <ConfirmCloseAlertModal
-        isOpen={warningModalProps.isOpen}
-        confirm={onCloseAfterWarning}
-        cancel={warningModalProps.onClose}
-      />
-    </>
-  );
-};
-
-export default EditDefaultFirmwareModal;

src/pages/DefaultFirmware/List/index.tsx

@@ -1,119 +0,0 @@
-import * as React from 'react';
-import { Box, useDisclosure } from '@chakra-ui/react';
-import { useTranslation } from 'react-i18next';
-import CreateDefaultFirmwareModal from '../CreateModal';
-import DeleteDefaultFirmwaresButton from '../DeleteButton';
-import Actions from './Actions';
-import EditDefaultFirmware from './EditModal';
-import { DataGridColumn, useDataGrid } from 'components/DataTables/DataGrid/useDataGrid';
-import { DefaultFirmware, useGetDefaultFirmware } from 'hooks/Network/DefaultFirmware';
-import FormattedDate from 'components/InformationDisplays/FormattedDate';
-import { getRevision } from 'helpers/stringHelper';
-import { DataGrid } from 'components/DataTables/DataGrid';
-
-const DefaultFirmwareList = () => {
-  const { t } = useTranslation();
-  const tableController = useDataGrid({
-    tableSettingsId: 'controller.default_firmware.table',
-    defaultOrder: ['deviceType', 'revision', 'modified', 'description', 'actions'],
-    defaultSortBy: [{ id: 'deviceType', desc: true }],
-  });
-  const getFirmware = useGetDefaultFirmware();
-  const modalProps = useDisclosure();
-  const [selectedFirmware, setSelectedFirmware] = React.useState<DefaultFirmware | undefined>();
-
-  const onViewDetails = (config: DefaultFirmware) => {
-    setSelectedFirmware(config);
-    modalProps.onOpen();
-  };
-  const onRowClick = React.useCallback((row: DefaultFirmware) => () => onViewDetails(row), []);
-
-  const dateCell = React.useCallback((v: number) => <FormattedDate date={v} />, []);
-  const actionCell = React.useCallback(
-    (firmware: DefaultFirmware) => <Actions firmware={firmware} handleViewDetails={onViewDetails} />,
-    [],
-  );
-  const revisionCell = React.useCallback((v: string) => getRevision(v), []);
-
-  const columns: DataGridColumn<DefaultFirmware>[] = React.useMemo(
-    () =>
-      [
-        {
-          id: 'deviceType',
-          header: t('common.type'),
-          accessorKey: 'deviceType',
-          meta: {
-            customWidth: '150px',
-            alwaysShow: true,
-            anchored: true,
-          },
-        },
-        {
-          id: 'revision',
-          header: t('commands.revision'),
-          accessorKey: 'revision',
-          cell: ({ cell }) => revisionCell(cell.row.original.revision),
-          meta: {
-            customWidth: '150px',
-            alwaysShow: true,
-          },
-        },
-        {
-          id: 'modified',
-          header: t('common.modified'),
-          accessorKey: 'modified',
-          cell: ({ cell }) => dateCell(cell.row.original.lastModified),
-          meta: {
-            customWidth: '50px',
-          },
-        },
-        {
-          id: 'description',
-          header: t('common.description'),
-          accessorKey: 'description',
-        },
-        {
-          id: 'actions',
-          header: t('common.actions'),
-          accessorKey: 'actions',
-          cell: (v) => actionCell(v.cell.row.original),
-          enableSorting: false,
-          meta: {
-            customWidth: '50px',
-            alwaysShow: true,
-          },
-        },
-      ] satisfies DataGridColumn<DefaultFirmware>[],
-    [dateCell],
-  );
-
-  return (
-    <Box overflowX="auto" w="100%">
-      <DataGrid<DefaultFirmware>
-        controller={tableController}
-        header={{
-          title: `${t('common.default')} ${t('firmware.one')} ${
-            getFirmware.data ? `(${getFirmware.data.firmwares.length})` : ''
-          }`,
-          objectListed: t('analytics.firmware'),
-          otherButtons: <DeleteDefaultFirmwaresButton />,
-          addButton: <CreateDefaultFirmwareModal />,
-        }}
-        columns={columns}
-        data={getFirmware.data?.firmwares}
-        isLoading={getFirmware.isFetching}
-        options={{
-          onRowClick: (firmw) => onRowClick(firmw),
-          refetch: getFirmware.refetch,
-          minimumHeight: '200px',
-          showAsCard: true,
-          isHidingControls: true,
-          isManual: true,
-        }}
-      />
-      {selectedFirmware ? <EditDefaultFirmware modalProps={modalProps} defaultFirmware={selectedFirmware} /> : null}
-    </Box>
-  );
-};
-
-export default DefaultFirmwareList;