Merge pull request #48 from stephb9959/dev

Version 2.2

config/webpack.common.js

@@ -4,6 +4,7 @@ const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const webpack = require('webpack');
 const path = require('path');
 const paths = require('./paths');
 
@@ -19,6 +20,9 @@ module.exports = {
     preferRelative: true,
   },
   plugins: [
+    new webpack.DefinePlugin({
+      'process.env.VERSION': JSON.stringify(process.env.npm_package_version),
+    }),
     new MiniCssExtractPlugin({
       filename: 'styles/[name].[contenthash].css',
       chunkFilename: '[id].[contenthash].css',

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "ucentral-client",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ucentral-client",
-      "version": "2.1.0",
+      "version": "2.2.0",
       "dependencies": {
         "@coreui/coreui": "^3.4.0",
         "@coreui/icons": "^2.0.1",
@@ -32,7 +32,7 @@
         "react-tooltip": "^4.2.21",
         "react-widgets": "^5.1.1",
         "sass": "^1.35.1",
-        "ucentral-libs": "^0.8.82",
+        "ucentral-libs": "^0.9.39",
         "uuid": "^8.3.2"
       },
       "devDependencies": {
@@ -14812,29 +14812,30 @@
       }
     },
     "node_modules/ucentral-libs": {
-      "version": "0.8.82",
-      "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.8.82.tgz",
-      "integrity": "sha512-b6NUyK3vLm49tKs9HZXodBLMhn+SRZ6OragtF1j9GZ8UZpIJL3gB+Tfo576CUmgKW6U14GOplTPWQHGWZFEGjg==",
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
+      "version": "0.9.39",
+      "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.39.tgz",
+      "integrity": "sha512-BGsT0tdOyJUNNIjD6y1gWATcyShhR/2Qik77FqF9m9efiLEbz7MiH+8IOxnup8X6gFt6nyTNqPZIzbXYuw48og==",
+      "dependencies": {
         "@coreui/coreui": "^3.4.0",
         "@coreui/icons": "^2.0.1",
         "@coreui/icons-react": "^1.1.0",
         "@coreui/react": "^3.4.6",
         "@coreui/react-chartjs": "^1.1.0",
         "lodash": "^4.17.21",
-        "prop-types": "^15.7.2",
-        "react": "^17.0.2",
-        "react-dom": "^17.0.2",
         "react-flow-renderer": "^9.6.6",
         "react-paginate": "^7.1.3",
         "react-router-dom": "^5.2.0",
         "react-select": "^4.3.1",
         "react-tooltip": "^4.2.21",
-        "sass": "^1.35.1",
         "uuid": "^8.3.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "prop-types": "^15.7.2",
+        "react": "^17.0.2",
+        "react-dom": "^17.0.2"
       }
     },
     "node_modules/unbox-primitive": {
@@ -27652,10 +27653,23 @@
       }
     },
     "ucentral-libs": {
-      "version": "0.8.82",
-      "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.8.82.tgz",
-      "integrity": "sha512-b6NUyK3vLm49tKs9HZXodBLMhn+SRZ6OragtF1j9GZ8UZpIJL3gB+Tfo576CUmgKW6U14GOplTPWQHGWZFEGjg==",
-      "requires": {}
+      "version": "0.9.39",
+      "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.39.tgz",
+      "integrity": "sha512-BGsT0tdOyJUNNIjD6y1gWATcyShhR/2Qik77FqF9m9efiLEbz7MiH+8IOxnup8X6gFt6nyTNqPZIzbXYuw48og==",
+      "requires": {
+        "@coreui/coreui": "^3.4.0",
+        "@coreui/icons": "^2.0.1",
+        "@coreui/icons-react": "^1.1.0",
+        "@coreui/react": "^3.4.6",
+        "@coreui/react-chartjs": "^1.1.0",
+        "lodash": "^4.17.21",
+        "react-flow-renderer": "^9.6.6",
+        "react-paginate": "^7.1.3",
+        "react-router-dom": "^5.2.0",
+        "react-select": "^4.3.1",
+        "react-tooltip": "^4.2.21",
+        "uuid": "^8.3.2"
+      }
     },
     "unbox-primitive": {
       "version": "1.0.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ucentral-client",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "dependencies": {
     "@coreui/coreui": "^3.4.0",
     "@coreui/icons": "^2.0.1",
@@ -26,7 +26,7 @@
     "react-tooltip": "^4.2.21",
     "react-widgets": "^5.1.1",
     "sass": "^1.35.1",
-    "ucentral-libs": "^0.8.82",
+    "ucentral-libs": "^0.9.39",
     "uuid": "^8.3.2"
   },
   "main": "index.js",

public/locales/de/translation.json

@@ -8,6 +8,7 @@
 		"factory_reset": "Auf Werkseinstellungen zurückgesetzt",
 		"firmware_upgrade": "Firmware Aktualisierung",
 		"reboot": "Gerät neustarten",
+		"telemetry": "Telemetrie",
 		"title": "Geräte Administrations",
 		"trace": "Tcpdump starten",
 		"wifi_scan": "Wi-Fi Scan"
@@ -22,10 +23,11 @@
 	},
 	"commands": {
 		"error": "Fehler beim Senden des Befehls!",
+		"error_delete_log": "Fehler beim Versuch zu löschen: {{error}}",
 		"event_queue": "Ereigniswarteschlange",
 		"success": "Befehl wurde erfolgreich übermittelt",
 		"title": "Gerätebefehle",
-		"unable_queue": "Anfrage für Ereigniswarteschlange kann nicht abgeschlossen werden"
+		"unable_queue": "Anfrage für Ereigniswarteschlange kann nicht abgeschlossen werden: {{error}}"
 	},
 	"common": {
 		"access_policy": "Zugangsrichtlinien",
@@ -33,6 +35,8 @@
 		"adding_ellipsis": "Hinzufügen ...",
 		"are_you_sure": "Bist du sicher?",
 		"back_to_login": "Zurück zur Anmeldung",
+		"back_to_start": "Zurück zum Start",
+		"by": "Durch",
 		"cancel": "Abbrechen",
 		"certificate": "Zertifikat",
 		"certificates": "Zertifikate",
@@ -81,6 +85,7 @@
 		"endpoint": "Endpunkt",
 		"endpoints": "Endpunkte",
 		"error": "Fehler",
+		"error_adding_note": "Fehler beim Hinzufügen einer Notiz",
 		"execute_now": "Möchten Sie diesen Befehl jetzt ausführen?",
 		"executed": "Ausgeführt",
 		"exit": "Ausgang",
@@ -96,6 +101,7 @@
 		"hours": "std",
 		"id": "ID",
 		"ip_address": "IP Adresse",
+		"items_per_page": "Objekte pro Seite:",
 		"last_dashboard_refresh": "Letzte Dashboard-Aktualisierung",
 		"later_tonight": "Später am Abend",
 		"latest": "Neueste",
@@ -108,11 +114,13 @@
 		"memory_used": "Verwendeter Speicher",
 		"minute": "Minute",
 		"minutes": "protokoll",
+		"modified": "Geändert",
 		"na": "(unbekannt)",
 		"need_date": "Du brauchst ein Datum...",
 		"no": "Nein",
 		"no_devices_found": "Keine Geräte gefunden",
 		"no_items": "Keine Gegenstände",
+		"none": "Keiner",
 		"not_connected": "Nicht verbunden",
 		"of_connected": "% der Geräte",
 		"off": "Aus",
@@ -120,6 +128,7 @@
 		"optional": "Wahlweise",
 		"overall_health": "Allgemeine Gesundheit",
 		"password_policy": "Kennwortrichtlinie",
+		"preview": "Vorschau",
 		"recorded": "Verzeichnet",
 		"refresh": "Aktualisierung",
 		"refresh_device": "Gerät aktualisieren",
@@ -135,7 +144,9 @@
 		"seconds_elapsed": "Sekunden verstrichen",
 		"serial_number": "Seriennummer",
 		"show_all": "Zeige alles",
+		"socket_connection_closed": "Verbindung geschlossen!",
 		"start": "Start",
+		"stop_editing": "Stoppen Sie die Bearbeitung",
 		"submit": "Absenden",
 		"submitted": "Eingereicht",
 		"success": "Erfolg",
@@ -144,6 +155,8 @@
 		"timestamp": "Zeit",
 		"to": "zu",
 		"type": "Art",
+		"type_for_options": "Geben Sie den Wert ein, den Sie erstellen müssen...",
+		"type_for_options_format": "Geben Sie einen Wert im gültigen Format ein ({{format}})...",
 		"unable_to_connect": "Keine Verbindung zum Gerät möglich",
 		"unable_to_delete": "Löschen nicht möglich",
 		"unknown": "unbekannte",
@@ -155,18 +168,51 @@
 		"yes": "Ja"
 	},
 	"configuration": {
+		"add_configuration": "Konfiguration hinzufügen",
+		"add_new_block": "Neuen Konfigurationsblock hinzufügen",
+		"cannot_delete": "Diese Konfiguration kann nicht gelöscht werden, da sie von mindestens einer Entität, einem Veranstaltungsort oder einem Gerät verwendet wird",
+		"choose_section": "Welchen Abschnitt soll dieser Block enthalten?",
+		"configuration_browser": "Konfigurationsbrowser",
+		"configurations": "Konfigurationen",
+		"create": "Konfiguration erstellen",
+		"create_config": "Neue Konfiguration erstellen",
+		"create_new_configuration": "Neues Konfigurationselement erstellen",
 		"created": "Erstellt",
+		"creation_success": "Konfiguration erfolgreich erstellt!",
+		"currently_associated": "Aktuell zugeordnete Konfiguration: {{config}}",
+		"currently_selected_config": "Derzeit ausgewählte Konfiguration: {{config}}",
+		"delete_config": "Konfiguration löschen",
 		"details": "Gerätedetails",
 		"device_password": "Passwort",
-		"last_configuration_change": "Letzte Konfigurationsänderung",
+		"device_type": "Gerätetyp",
+		"device_types": "Gerätetypen",
+		"edit_configuration": "Konfiguration bearbeiten",
+		"error_delete": "Fehler beim Versuch zu löschen: {{error}}",
+		"error_fetching_config": "Fehler beim Abrufen der Konfiguration",
+		"error_trying_delete": "Fehler beim Versuch zu löschen: {{error}}",
+		"error_update": "Fehler: {{error}}",
+		"explanation": "Erläuterung",
+		"last_configuration_change": "Konfigurationsänderung",
 		"last_configuration_download": "Letzter Konfigurations-Download",
 		"location": "Ort",
+		"need_device_type": "Jede Konfiguration muss mindestens einen Gerätetyp unterstützen",
+		"no_associated_config": "Keine zugehörige Konfiguration",
+		"no_associated_configuration": "Keine zugeordneten Konfigurationen",
 		"note": "Hinweis",
 		"notes": "Anmerkungen",
 		"owner": "Inhaber",
+		"select_configuration": "Wählen Sie diese Konfiguration",
+		"success_block_delete": "Konfigurationsblock erfolgreich gelöscht",
+		"success_update": "Konfiguration erfolgreich aktualisiert!",
+		"successful_delete": "Konfiguration gelöscht!",
+		"support_all": "Alle unterstützen",
+		"supported_device_types": "Unterstützte Gerätetypen",
 		"title": "Gerätekonfiguration",
 		"type": "Gerätetyp",
+		"used_by": "Benutzt von",
+		"used_by_details": "{{entities}} Entitäten, {{venues}} Veranstaltungsorte und {{devices}} Geräte",
 		"uuid": "Konfigurations-ID",
+		"view_in_use": "In Verwendung anzeigen",
 		"view_json": "Rohe Konfiguration anzeigen"
 	},
 	"configure": {
@@ -176,6 +222,9 @@
 		"title": "Gerät konfigurieren",
 		"valid_json": "Sie müssen ein gültiges JSON eingeben"
 	},
+	"connect": {
+		"error_trying_to_connect": "Fehler beim Versuch, eine Verbindung zum Gerät herzustellen: {{error}}"
+	},
 	"delete_command": {
 		"explanation": "Möchten Sie diesen Befehl wirklich löschen? Diese Aktion ist nicht umkehrbar.",
 		"title": "Befehl löschen"
@@ -186,6 +235,10 @@
 		"explanation": "Dadurch werden alle {{object}} vor dem von Ihnen gewählten Datum gelöscht. Seien Sie vorsichtig, diese Aktion ist nicht umkehrbar.",
 		"healthchecks_title": "Healthchecks löschen"
 	},
+	"device": {
+		"error_fetching_device": "Fehler beim Abrufen der Geräteinformationen: {{error}}",
+		"error_fetching_devices": "Fehler beim Abrufen von Geräten: {{error}}"
+	},
 	"device_logs": {
 		"log": "Protokoll",
 		"severity": "Wichtigkeit",
@@ -196,14 +249,22 @@
 		"add_failure": "Fehler, der Server hat zurückgegeben: {{error}}",
 		"add_root": "Root-Entität hinzufügen",
 		"add_success": "Entität erfolgreich erstellt!",
+		"assigned_inventory": "Zugewiesenes Inventar",
 		"cannot_delete": "Entitäten mit untergeordneten Elementen können nicht gelöscht werden. Löschen Sie die untergeordneten Elemente dieser Entität, um sie löschen zu können.",
+		"currently_selected_entity": "Derzeit ausgewähltes Unternehmen: {{config}}",
+		"currently_selected_venue": "Aktuell ausgewählter Veranstaltungsort: {{config}}",
 		"delete_success": "Entität erfolgreich gelöscht",
 		"delete_warning": "Achtung: Dieser Vorgang kann nicht rückgängig gemacht werden",
 		"edit_failure": "Aktualisierung fehlgeschlagen : {{error}}",
 		"entities": "Entitäten",
 		"entity": "Entität",
+		"error_fetch_entity": "Fehler beim Abrufen von Entitätsinformationen",
+		"error_fetching": "Fehler beim Abrufen von Entitäten",
+		"error_saving": "Fehler beim Speichern der Entität",
+		"not_assigned": "Nicht zugeordnet",
 		"only_unassigned": "Nur nicht zugewiesen",
-		"valid_serial": "Muss eine gültige Seriennummer sein (12 HEX-Zeichen)"
+		"valid_serial": "Muss eine gültige Seriennummer sein (12 HEX-Zeichen)",
+		"venues": "Veranstaltungsorte"
 	},
 	"factory_reset": {
 		"redirector": "Gatewaykonfiguration beibehalten:",
@@ -251,24 +312,87 @@
 		"title": "Gesundheitzustand"
 	},
 	"inventory": {
+		"add_child": "Untergeordneten Veranstaltungsort hinzufügen",
 		"add_child_venue": "Untergeordneten Veranstaltungsort zu {{entityName}}hinzufügen",
-		"add_tag": "Tag hinzufügen",
-		"add_tag_to": "Inventar-Tag zu {{name}}hinzufügen",
+		"add_tag": "Tag erstellen",
+		"add_tag_to": "Neues Gerät zu {{name}}hinzufügen",
+		"add_venue": "Veranstaltungsort hinzufügen",
+		"assign_entity_instructions": "Sie können die Entität, der dieses Tag zugewiesen werden soll, entweder über das Menü unten finden oder die UUID der Entität manuell in das Feld oben einfügen.",
 		"assign_error": "Fehler beim Versuch, Tag zuzuweisen",
 		"assign_to_entity": "Zu Entität zuweisen",
+		"bulk_delete_assigned": "Möchten Sie zugewiesene Geräte in Ihrer Datei massenweise löschen?",
+		"bulk_delete_assigned_warning": "Achtung: Diese Aktion ist nicht umkehrbar",
+		"bulk_delete_devices": "Massenlöschgeräte",
+		"bulk_delete_devices_not_found": "{{number}} Geräte nicht gefunden",
+		"bulk_delete_explanation": "Verwenden Sie zum Massenlöschen von Geräten eine CSV-Datei mit einer Spalte namens SerialNumber",
+		"bulk_delete_test": "Datei validieren",
+		"close_entity_menu": "Menü \"Entität bearbeiten\" schließen",
+		"delete_devices": "Geräte löschen",
+		"delete_errors": "{{number}} Gerätefehler löschen",
+		"delete_tag": "Tag löschen",
+		"delete_venue": "Veranstaltungsort endgültig löschen",
+		"deleted_devices": "{{number}} Gelöschte Geräte",
+		"deleting": "Löschen ...",
+		"deletion_failure": "Löschfehler",
+		"devices_assigned": "{{number}} vorhandene Geräte zugewiesen und aktualisiert",
+		"devices_created": "{{number}} Geräte erstellt",
+		"devices_deleted": "Geräte gelöscht",
+		"devices_errors_while_creating": "{{number}} Geräteerstellung fehlgeschlagen",
+		"devices_errors_while_updating": "{{number}} Geräteupdates fehlgeschlagen",
+		"devices_found_assigned": "{{number}} Geräte gefunden und bereits einer Entität oder einem Veranstaltungsort zugewiesen",
+		"devices_found_unassigned": "{{number}} Geräte gefunden, aber nicht zugewiesen",
+		"devices_imported": " Importierte Geräte",
+		"devices_not_found": "{{number}} Geräte ohne Konflikt",
+		"devices_tested": "Getestete Geräte",
+		"duplicate_serial": "Seriennummer bereits in Datei verwendet (Duplikat)",
+		"error_create_venue": "Fehler beim Erstellen des Veranstaltungsortes",
+		"error_delete_tag": "Fehler beim Löschen des Inventar-Tags",
+		"error_get_venue": "Fehler beim Abrufen von Veranstaltungsorten",
 		"error_retrieving": "Beim Abrufen von Inventar-Tags ist ein Fehler aufgetreten",
 		"error_unassign": "Fehler beim Aufheben der Zuweisung",
+		"error_update_venue": "Fehler beim Aktualisieren des Veranstaltungsorts",
+		"error_venue_delete": "Fehler beim Löschen des Veranstaltungsortes",
+		"error_within_file": "{{number}} Geräte mit falschen Informationen in der Datei (werden ignoriert)",
+		"file_error": "Es scheint ein Fehler in Ihrer Datei zu sein. Bitte stellen Sie sicher, dass die Datei im CSV-Format vorliegt und die oben genannten 5 Spalten in der ersten Zeile der Datei enthält",
+		"final_delete_results": "Endgültige Löschergebnisse",
+		"final_import_results": "Endgültige Importergebnisse",
+		"import_assigned_devices": "Möchten Sie sie mit diesem Import neu zuweisen?",
+		"import_assigned_devices_explanation": "Einige Geräte haben Konflikte mit bereits zugewiesenen Geräten. Sie sollten diese Probleme vor dem Importieren beheben.",
+		"import_devices": "Geräte importieren",
+		"import_devices_explanation": "Für den Massenimport von Geräten müssen Sie eine CSV-Datei mit den folgenden Spalten verwenden: SerialNumber,Name,Description,DeviceType,NoteText",
+		"import_devices_to": "Geräte nach {{name}}importieren",
+		"import_existing_devices": "Aktualisieren und zuweisen?",
+		"import_existing_devices_explanation": "Einige Geräte sind bereits im Inventar vorhanden und nicht zugewiesen.",
+		"importing": "Importieren ...",
+		"last_modification": "Letzte Änderung",
+		"no_devices_to_delete": "Keine Geräte zum Löschen",
+		"no_devices_to_import": "Keine gültigen Geräte zum Erstellen oder Aktualisieren!",
+		"note_text": "Text notieren",
+		"passed_tests": "Alle Tests wurden bestanden, Ihre Geräte sind bereit für den Import!",
+		"serial_number_required": "Fehler: Seriennummer fehlt",
+		"showing_top_10": "Hier ist eine Vorschau der Informationen, die wir aus Ihrer Datei abgerufen haben:",
+		"sub_venues": "Unterräume",
 		"subscriber": "Teilnehmer",
 		"successful_assign": "Tag erfolgreich zugewiesen",
+		"successful_tag_delete": "Inventar-Tag erfolgreich gelöscht",
 		"successful_tag_update": "Tag erfolgreich aktualisiert",
 		"successful_unassign": "Vorgang zum Aufheben der Zuweisung war erfolgreich",
+		"successful_venue_create": "Erfolgreich erstellter Veranstaltungsort",
+		"successful_venue_delete": "Veranstaltungsort erfolgreich gelöscht",
+		"successful_venue_update": "Erfolgreich aktualisierter Veranstaltungsort",
 		"tag_created": "Inventar-Tag erfolgreich erstellt",
 		"tag_creation_error": "Fehler beim Versuch, Inventar-Tag zu erstellen",
 		"tag_update_error": "Fehler beim Aktualisieren des Tags",
 		"tags_assigned_to": "Inventar-Tags {{name}}zugewiesen",
+		"test_import": "Importdaten validieren",
+		"test_results": "Testergebnisse",
+		"title": "Inventar",
+		"type_invalid": "Fehler: Ungültiger Gerätetyp",
 		"unassign": "Zuordnung aufheben",
 		"unassign_tag": "Tag von Entität zuweisen",
+		"unassigned_deleted_devices": "{{number}} Geräte gelöscht und nicht zugewiesen",
 		"unassigned_tags": "Nicht zugewiesene Tags",
+		"validating_import_file": "Importdatei und -daten werden validiert...",
 		"venue": "Tagungsort"
 	},
 	"login": {
@@ -324,10 +448,10 @@
 		"title": "Statistiken"
 	},
 	"status": {
-		"connection_status": "Verbindungsstatus",
+		"connection_status": "Status",
 		"error": "Statusdaten sind nicht verfügbar",
 		"last_contact": "Letzter Kontakt",
-		"load_averages": "Belastung (Durchschnitt 1 / 5 / 15 Minuten)",
+		"load_averages": "Belastung (1/5/15 m.)",
 		"localtime": "Ortszeit",
 		"memory": "Verwendeter Speicher",
 		"percentage_free": "{{percentage}}% von {{total}} kostenlos",
@@ -337,7 +461,21 @@
 		"used_total_memory": "{{used}} verwendet / {{total}} insgesamt"
 	},
 	"system": {
-		"error_fetching": "Fehler beim Abrufen von Systeminformationen"
+		"error_fetching": "Fehler beim Abrufen von Systeminformationen",
+		"error_reloading": "Fehler beim Neuladen: {{error}}",
+		"hostname": "Hostname",
+		"os": "Betriebssystem",
+		"processors": "Prozessoren",
+		"reload": "Neu laden",
+		"reload_subsystems": "Subsysteme neu laden",
+		"subsystems": "Subsysteme",
+		"success_reload": "Reload-Befehl erfolgreich gesendet!"
+	},
+	"telemetry": {
+		"connection_failed": "Verbindung konnte nicht hergestellt werden. Fehler: {{error}}",
+		"interval": "Intervall",
+		"last_update": "Letztes Update",
+		"types": "Typen"
 	},
 	"trace": {
 		"choose_network": "Netzwerk auswählen",
@@ -375,7 +513,7 @@
 		"create_success": "Benutzer erfolgreich erstellt",
 		"creating": "Benutzer erstellen ...",
 		"delete_avatar": "Avatar löschen",
-		"delete_failure": "Fehler beim Versuch, den Benutzer zu löschen",
+		"delete_failure": "Fehler beim Versuch, den Benutzer zu löschen: {{error}}",
 		"delete_success": "Benutzer erfolgreich gelöscht!",
 		"delete_title": "Benutzer löschen",
 		"delete_warning": "Warnung: Sobald Sie einen Benutzer gelöscht haben, können Sie ihn nicht wiederherstellen",
@@ -383,6 +521,7 @@
 		"description": "Beschreibung",
 		"edit": "Benutzer bearbeiten",
 		"email_address": "E-Mail-Addresse",
+		"error_fetching_users": "Fehler beim Abrufen der Nutzer: {{error}}",
 		"force_password_change": "Passwortänderung bei der Anmeldung erzwingen",
 		"id": "Benutzeridentifikation.",
 		"last_login": "Letzte Anmeldung",
@@ -398,7 +537,7 @@
 		"provide_password": "Bitte geben Sie ein gültiges Passwort ein",
 		"save_avatar": "Avatar speichern",
 		"show_hide_password": "Passwort anzeigen/verbergen",
-		"update_failure": "Stellen Sie sicher, dass alle Ihre Daten gültig sind. Wenn Sie das Kennwort ändern, stellen Sie sicher, dass es sich nicht um ein altes handelt.",
+		"update_failure": "Fehler beim Aktualisieren: {{error}}",
 		"update_failure_title": "Update fehlgeschlagen",
 		"update_success": "Benutzer erfolgreich aktualisiert",
 		"update_success_title": "Erfolg",

public/locales/en/translation.json

@@ -8,6 +8,7 @@
 		"factory_reset": "Factory Reset",
 		"firmware_upgrade": "Firmware Upgrade",
 		"reboot": "Reboot",
+		"telemetry": "Telemetry",
 		"title": "Commands",
 		"trace": "Trace",
 		"wifi_scan": "Wi-Fi Scan"
@@ -22,10 +23,11 @@
 	},
 	"commands": {
 		"error": "Error while submitting command!",
+		"error_delete_log": "Error while trying to delete: {{error}}",
 		"event_queue": "Event Queue",
 		"success": "Command submitted successfully, you can look at the Commands log for the result",
 		"title": "Command History",
-		"unable_queue": "Unable to complete event queue request"
+		"unable_queue": "Unable to complete event queue request: {{error}}"
 	},
 	"common": {
 		"access_policy": "Access Policy",
@@ -33,6 +35,8 @@
 		"adding_ellipsis": "Adding...",
 		"are_you_sure": "Are you sure?",
 		"back_to_login": "Back to Login",
+		"back_to_start": "Back to start",
+		"by": "By",
 		"cancel": "Cancel",
 		"certificate": "Certificate",
 		"certificates": "Certificates",
@@ -81,6 +85,7 @@
 		"endpoint": "Endpoint",
 		"endpoints": "Endpoints",
 		"error": "Error",
+		"error_adding_note": "Error while adding note",
 		"execute_now": "Would you like to execute this command now?",
 		"executed": "Executed",
 		"exit": "Exit",
@@ -96,6 +101,7 @@
 		"hours": "hours",
 		"id": "Id",
 		"ip_address": "IP Address",
+		"items_per_page": "Items per page: ",
 		"last_dashboard_refresh": "Last Dashboard Refresh",
 		"later_tonight": "Later tonight",
 		"latest": "Latest",
@@ -108,11 +114,13 @@
 		"memory_used": "Memory Used",
 		"minute": "minute",
 		"minutes": "minutes",
+		"modified": "Modified",
 		"na": "N/A",
 		"need_date": "You need a date...",
 		"no": "No",
 		"no_devices_found": "No Devices Found",
 		"no_items": "No Items",
+		"none": "None",
 		"not_connected": "Not Connected",
 		"of_connected": "% of devices",
 		"off": "Off",
@@ -120,6 +128,7 @@
 		"optional": "Optional",
 		"overall_health": "Overall Health",
 		"password_policy": "Password Policy",
+		"preview": "Preview",
 		"recorded": "Recorded",
 		"refresh": "Refresh",
 		"refresh_device": "Refresh Device",
@@ -135,7 +144,9 @@
 		"seconds_elapsed": "Seconds elapsed",
 		"serial_number": "Serial Number",
 		"show_all": "Show All",
+		"socket_connection_closed": "Connection closed!",
 		"start": "Start",
+		"stop_editing": "Stop Editing",
 		"submit": "Submit",
 		"submitted": "Submitted",
 		"success": "Success",
@@ -144,6 +155,8 @@
 		"timestamp": "Time",
 		"to": "To",
 		"type": "Type",
+		"type_for_options": "Type the value you need to create...",
+		"type_for_options_format": "Type a value of the valid format ({{format}})...",
 		"unable_to_connect": "Unable to Connect to Device",
 		"unable_to_delete": "Unable to Delete",
 		"unknown": "Unknown",
@@ -155,18 +168,51 @@
 		"yes": "Yes"
 	},
 	"configuration": {
+		"add_configuration": "Add Configuration",
+		"add_new_block": "Add new Configuration Block",
+		"cannot_delete": "This configuration cannot be deleted because it is being used by at least one entity, venue or device",
+		"choose_section": "Which section you would like this block to contain?",
+		"configuration_browser": "Configuration Browser",
+		"configurations": "Configurations",
+		"create": "Create Configuration",
+		"create_config": "Create New Configuration",
+		"create_new_configuration": "Create New Configuration Element",
 		"created": "Created",
+		"creation_success": "Configuration successfully created!",
+		"currently_associated": "Currently Associated Configuration: {{config}}",
+		"currently_selected_config": "Currently Selected Configuration: {{config}}",
+		"delete_config": "Delete Config",
 		"details": "Details",
 		"device_password": "Password",
-		"last_configuration_change": "Last Configuration Change",
+		"device_type": "Device Type",
+		"device_types": "Device Types",
+		"edit_configuration": "Edit Configuration",
+		"error_delete": "Error while trying to delete: {{error}}",
+		"error_fetching_config": "Error while fetching configuration",
+		"error_trying_delete": "Error while trying to delete: {{error}}",
+		"error_update": "Error: {{error}}",
+		"explanation": "Explanation",
+		"last_configuration_change": "Config Change",
 		"last_configuration_download": "Last Configuration Download",
 		"location": "Location",
+		"need_device_type": "Every configuration needs to support at least one device type",
+		"no_associated_config": "No Associated Configuration",
+		"no_associated_configuration": "No Associated Configurations",
 		"note": "Note",
 		"notes": "Notes",
 		"owner": "Owner",
+		"select_configuration": "Select this Configuration",
+		"success_block_delete": "Successfully deleted configuration block",
+		"success_update": "Configuration Successfully Updated!",
+		"successful_delete": "Deleted Configuration!",
+		"support_all": "Support All",
+		"supported_device_types": "Supported Device Types",
 		"title": "Configuration",
 		"type": "Device Type",
+		"used_by": "Used By",
+		"used_by_details": "{{entities}} Entities, {{venues}} Venues and {{devices}} Devices",
 		"uuid": "Config ID",
+		"view_in_use": "View In Use",
 		"view_json": "View raw JSON"
 	},
 	"configure": {
@@ -176,6 +222,9 @@
 		"title": "Configure",
 		"valid_json": "You need to enter valid JSON"
 	},
+	"connect": {
+		"error_trying_to_connect": "Error while trying to connect to device: {{error}}"
+	},
 	"delete_command": {
 		"explanation": "Are you sure you want to delete this command? This action is not reversible.",
 		"title": "Delete Command"
@@ -186,6 +235,10 @@
 		"explanation": "This will delete all of the {{object}} before the date you choose. Be careful, this action is not reversible.",
 		"healthchecks_title": "Delete Healthchecks"
 	},
+	"device": {
+		"error_fetching_device": "Error fetching device information: {{error}}",
+		"error_fetching_devices": "Error while fetching devices: {{error}}"
+	},
 	"device_logs": {
 		"log": "Log",
 		"severity": "Severity",
@@ -196,14 +249,22 @@
 		"add_failure": "Error, the server returned : {{error}}",
 		"add_root": "Add Root Entity",
 		"add_success": "Entity Successfully Created!",
+		"assigned_inventory": "Assigned Inventory",
 		"cannot_delete": "You cannot delete entities which have children. Delete this entity's children to be able to delete it.",
+		"currently_selected_entity": "Currently Selected Entity: {{config}}",
+		"currently_selected_venue": "Currently Selected Venue: {{config}}",
 		"delete_success": "Entity Successfully Deleted",
 		"delete_warning": "Warning: this operation cannot be reverted",
 		"edit_failure": "Update unsuccessful : {{error}}",
 		"entities": "Entities",
 		"entity": "Entity",
+		"error_fetch_entity": "Error while fetching entity information",
+		"error_fetching": "Error while fetching entities",
+		"error_saving": "Error while saving entity",
+		"not_assigned": "Not Assigned",
 		"only_unassigned": "Only Unassigned",
-		"valid_serial": "Needs to be a valid serial number (12 HEX characters)"
+		"valid_serial": "Needs to be a valid serial number (12 HEX characters)",
+		"venues": "Venues"
 	},
 	"factory_reset": {
 		"redirector": "Keep redirector: ",
@@ -251,24 +312,87 @@
 		"title": "Health"
 	},
 	"inventory": {
+		"add_child": "Add Child Venue",
 		"add_child_venue": "Add Child Venue to {{entityName}}",
-		"add_tag": "Add Tag",
-		"add_tag_to": "Add Inventory Tag to {{name}}",
+		"add_tag": "Create Tag",
+		"add_tag_to": "Add New Device to {{name}}",
+		"add_venue": "Add Venue",
+		"assign_entity_instructions": "You can either find the entity you want this tag to be assigned to by using the menu below, or you can manually paste the entity's UUID in the field above.",
 		"assign_error": "Error while trying to assign tag",
 		"assign_to_entity": "Assign to Entity",
+		"bulk_delete_assigned": "Would you like to bulk delete assigned devices within your file?",
+		"bulk_delete_assigned_warning": "Warning: this action is not reversible",
+		"bulk_delete_devices": "Bulk Delete Devices",
+		"bulk_delete_devices_not_found": "{{number}} devices not found",
+		"bulk_delete_explanation": "To bulk delete devices, use a CSV file with one column called SerialNumber",
+		"bulk_delete_test": "Validate File",
+		"close_entity_menu": "Close Edit Entity Menu",
+		"delete_devices": "Delete Devices",
+		"delete_errors": "{{number}} Delete Device Errors",
+		"delete_tag": "Delete Tag",
+		"delete_venue": "Permanently Delete Venue",
+		"deleted_devices": "{{number}} Deleted Devices",
+		"deleting": "Deleting... ",
+		"deletion_failure": "Deletion error",
+		"devices_assigned": "{{number}} existing devices assigned and updated",
+		"devices_created": "{{number}} devices created",
+		"devices_deleted": "Devices Deleted",
+		"devices_errors_while_creating": "{{number}} device creations failed",
+		"devices_errors_while_updating": "{{number}} device updates failed",
+		"devices_found_assigned": "{{number}} devices found and already assigned to an entity or venue",
+		"devices_found_unassigned": "{{number}} devices found, but not assigned",
+		"devices_imported": " Devices Imported",
+		"devices_not_found": "{{number}} devices with no conflict",
+		"devices_tested": "Devices Tested",
+		"duplicate_serial": "Serial Number already used in file (duplicate)",
+		"error_create_venue": "Error while creating venue",
+		"error_delete_tag": "Error while deleting inventory tag",
+		"error_get_venue": "Error while retrieving venues",
 		"error_retrieving": "Error occurred while retrieving inventory tags",
 		"error_unassign": "Error during unassign operation",
+		"error_update_venue": "Error while updating venue",
+		"error_venue_delete": "Error while deleting venue",
+		"error_within_file": "{{number}} devices with wrong information in file (will be ignored)",
+		"file_error": "There seems to be a mistake in your file. Please make sure the file is in CSV format and contains the 5 columns mentioned above in the first line of the file",
+		"final_delete_results": "Final Delete Results",
+		"final_import_results": "Final Import Results",
+		"import_assigned_devices": "Do you want to reassign them with this import?",
+		"import_assigned_devices_explanation": "Some devices conflict with already assigned devices. You should resolve those problems before importing. ",
+		"import_devices": "Import Devices",
+		"import_devices_explanation": "To bulk import devices, you need to use a CSV file with the following columns: SerialNumber,Name,Description,DeviceType,NoteText",
+		"import_devices_to": "Import Devices to {{name}}",
+		"import_existing_devices": "Update and assign them?",
+		"import_existing_devices_explanation": "Some devices already exist in the inventory and are unassigned.",
+		"importing": "Importing...",
+		"last_modification": "Last Modification",
+		"no_devices_to_delete": "No Devices to Delete",
+		"no_devices_to_import": "No valid devices to create or update!",
+		"note_text": "Note Text",
+		"passed_tests": "All tests were passed, your devices are ready to import!",
+		"serial_number_required": "Error: Missing Serial Number",
+		"showing_top_10": "Here is a preview of the information we have retrieved from your file:",
+		"sub_venues": "Subvenues",
 		"subscriber": "Subscriber",
 		"successful_assign": "Tag successfully assigned",
+		"successful_tag_delete": "Inventory Tag Successfully Deleted",
 		"successful_tag_update": "Successfully updated tag",
 		"successful_unassign": "Unassign operation was successful",
+		"successful_venue_create": "Successfully Created Venue",
+		"successful_venue_delete": "Venue successfully deleted",
+		"successful_venue_update": "Successfully Updated Venue",
 		"tag_created": "Inventory tag successfully created",
 		"tag_creation_error": "Error while trying to create inventory tag",
 		"tag_update_error": "Error while updating tag",
 		"tags_assigned_to": "Inventory tags assigned to {{name}}",
+		"test_import": "Validate Import Data",
+		"test_results": "Test Results",
+		"title": "Inventory",
+		"type_invalid": "Error: Invalid Device Type",
 		"unassign": "Unassign",
 		"unassign_tag": "Unassign Tag from Entity",
+		"unassigned_deleted_devices": "{{number}} Devices Deleted and Unassigned",
 		"unassigned_tags": "Unassigned tags",
+		"validating_import_file": "Validating import file and data...",
 		"venue": "Venue"
 	},
 	"login": {
@@ -324,10 +448,10 @@
 		"title": "Statistics"
 	},
 	"status": {
-		"connection_status": "Connection Status",
+		"connection_status": "Status",
 		"error": "Status data is unavailable",
 		"last_contact": "Last Contact",
-		"load_averages": "Load ( 1 / 5 / 15 minute average)",
+		"load_averages": "Load (1/5/15 m.)",
 		"localtime": "Localtime",
 		"memory": "Memory Used",
 		"percentage_free": "{{percentage}}% of {{total}} free",
@@ -337,7 +461,21 @@
 		"used_total_memory": "{{used}} used / {{total}} total "
 	},
 	"system": {
-		"error_fetching": "Error while fetching system information"
+		"error_fetching": "Error while fetching system information",
+		"error_reloading": "Error while reloading: {{error}}",
+		"hostname": "Host Name",
+		"os": "Operation System",
+		"processors": "Processors",
+		"reload": "Reload",
+		"reload_subsystems": "Reload Subsystems",
+		"subsystems": "Subsystems",
+		"success_reload": "Reload command successfully submitted!"
+	},
+	"telemetry": {
+		"connection_failed": "Failed to create connection. Error: {{error}}",
+		"interval": "Interval",
+		"last_update": "Last Update",
+		"types": "Types"
 	},
 	"trace": {
 		"choose_network": "Choose network",
@@ -375,7 +513,7 @@
 		"create_success": "User Created Successfully",
 		"creating": "Creating User...",
 		"delete_avatar": "Delete Avatar",
-		"delete_failure": "Error while trying to delete user",
+		"delete_failure": "Error while trying to delete user: {{error}}",
 		"delete_success": "User successfully deleted!",
 		"delete_title": "Delete User",
 		"delete_warning": "Warning: Once you delete a user you cannot revert",
@@ -383,6 +521,7 @@
 		"description": "Description",
 		"edit": "Edit User",
 		"email_address": "Email Address",
+		"error_fetching_users": "Error fetching users: {{error}}",
 		"force_password_change": "Force Password Change on Login",
 		"id": "User Id.",
 		"last_login": "Last Login",
@@ -398,7 +537,7 @@
 		"provide_password": "Please provide a valid password",
 		"save_avatar": "Save Avatar",
 		"show_hide_password": "Show/Hide Password",
-		"update_failure": "Make sure all of your data is valid. If you are modifying the password, make sure it is not an old one.",
+		"update_failure": "Error while trying to update: {{error}}",
 		"update_failure_title": "Update Failed",
 		"update_success": "User Updated Successfully",
 		"update_success_title": "Success",

public/locales/es/translation.json

@@ -8,6 +8,7 @@
 		"factory_reset": "Restablecimiento De Fábrica",
 		"firmware_upgrade": "Actualización de firmware",
 		"reboot": "Reiniciar",
+		"telemetry": "Telemetria",
 		"title": "Comandos",
 		"trace": "Rastro",
 		"wifi_scan": "Escaneo Wi-Fi "
@@ -22,10 +23,11 @@
 	},
 	"commands": {
 		"error": "¡Error al enviar el comando!",
+		"error_delete_log": "Error al intentar eliminar: {{error}}",
 		"event_queue": "Cola de eventos",
 		"success": "Comando enviado con éxito, puede consultar el registro de Comandos para ver el resultado",
 		"title": "Historial de Comandos",
-		"unable_queue": "No se pudo completar la solicitud de cola de eventos"
+		"unable_queue": "No se pudo completar la solicitud de cola de eventos: {{error}}"
 	},
 	"common": {
 		"access_policy": "Política de acceso",
@@ -33,6 +35,8 @@
 		"adding_ellipsis": "Añadiendo ...",
 		"are_you_sure": "¿Estás seguro?",
 		"back_to_login": "Atrás para iniciar sesión",
+		"back_to_start": "volver a empezar",
+		"by": "Por",
 		"cancel": "Cancelar",
 		"certificate": "Certificado",
 		"certificates": "Certificados",
@@ -81,6 +85,7 @@
 		"endpoint": "punto final",
 		"endpoints": "Puntos finales",
 		"error": "Error",
+		"error_adding_note": "Error al agregar una nota",
 		"execute_now": "¿Le gustaría ejecutar este comando ahora?",
 		"executed": "ejecutado",
 		"exit": "salida",
@@ -96,6 +101,7 @@
 		"hours": "horas",
 		"id": "Carné de identidad",
 		"ip_address": "Dirección IP",
+		"items_per_page": "Artículos por página:",
 		"last_dashboard_refresh": "Última actualización del panel",
 		"later_tonight": "Más tarde esta noche",
 		"latest": "último",
@@ -108,11 +114,13 @@
 		"memory_used": "Memoria usada",
 		"minute": "minuto",
 		"minutes": "minutos",
+		"modified": "Modificado",
 		"na": "N / A",
 		"need_date": "Necesitas una cita ...",
 		"no": "No",
 		"no_devices_found": "No se encontraron dispositivos",
 		"no_items": "No hay articulos",
+		"none": "Ninguna",
 		"not_connected": "No conectado",
 		"of_connected": "% de dispositivos",
 		"off": "Apagado",
@@ -120,6 +128,7 @@
 		"optional": "Opcional",
 		"overall_health": "Salud en general",
 		"password_policy": "Política de contraseñas",
+		"preview": "Avance",
 		"recorded": "Grabado",
 		"refresh": "Refrescar",
 		"refresh_device": "Actualizar dispositivo",
@@ -135,7 +144,9 @@
 		"seconds_elapsed": "Segundos transcurridos",
 		"serial_number": "Número de serie",
 		"show_all": "Mostrar todo",
+		"socket_connection_closed": "¡Conexión cerrada!",
 		"start": "comienzo",
+		"stop_editing": "Dejar de editar",
 		"submit": "Enviar",
 		"submitted": "Presentado",
 		"success": "Éxito",
@@ -144,6 +155,8 @@
 		"timestamp": "hora",
 		"to": "a",
 		"type": "Tipo",
+		"type_for_options": "Escriba el valor que necesita crear ...",
+		"type_for_options_format": "Escriba un valor del formato válido ({{format}}) ...",
 		"unable_to_connect": "No se puede conectar al dispositivo",
 		"unable_to_delete": "No se puede eliminar",
 		"unknown": "Desconocido",
@@ -155,18 +168,51 @@
 		"yes": "Sí"
 	},
 	"configuration": {
+		"add_configuration": "Agregar configuración",
+		"add_new_block": "Agregar nuevo bloque de configuración",
+		"cannot_delete": "Esta configuración no se puede eliminar porque está siendo utilizada por al menos una entidad, lugar o dispositivo",
+		"choose_section": "Qué sección le gustaría que contenga este bloque?",
+		"configuration_browser": "Navegador de configuración",
+		"configurations": "Configuraciones",
+		"create": "Crear Configuración",
+		"create_config": "Crear nueva configuración",
+		"create_new_configuration": "Crear nuevo elemento de configuración",
 		"created": "creado",
+		"creation_success": "¡Configuración creada con éxito!",
+		"currently_associated": "Configuración asociada actual: {{config}}",
+		"currently_selected_config": "Configuración seleccionada actualmente: {{config}}",
+		"delete_config": "Eliminar Configuración",
 		"details": "Detalles",
 		"device_password": "Contraseña",
-		"last_configuration_change": "Último cambio de configuración",
+		"device_type": "Tipo de dispositivo",
+		"device_types": "Tipos de dispositivos",
+		"edit_configuration": "Editar configuración",
+		"error_delete": "Error al intentar eliminar: {{error}}",
+		"error_fetching_config": "Error al obtener la configuración",
+		"error_trying_delete": "Error al intentar eliminar: {{error}}",
+		"error_update": "Error: {{error}}",
+		"explanation": "Explicación",
+		"last_configuration_change": "CAMBIO DE CONFIGURACIÓN",
 		"last_configuration_download": "Descarga de la última configuración",
 		"location": "Ubicación",
+		"need_device_type": "Cada configuración debe admitir al menos un tipo de dispositivo",
+		"no_associated_config": "Sin configuración asociada",
+		"no_associated_configuration": "Sin configuraciones asociadas",
 		"note": "Nota",
 		"notes": "Notas",
 		"owner": "Propietario",
+		"select_configuration": "Seleccione esta configuración",
+		"success_block_delete": "Bloque de configuración eliminado con éxito",
+		"success_update": "¡Configuración actualizada con éxito!",
+		"successful_delete": "Configuración eliminada!",
+		"support_all": "Apoyar a todos",
+		"supported_device_types": "Tipos de dispositivos compatibles",
 		"title": "Configuración",
 		"type": "Tipo de dispositivo",
+		"used_by": "Usado por",
+		"used_by_details": "{{entities}} Entidades, {{venues}} lugares y {{devices}} dispositivos",
 		"uuid": "ID de configuración",
+		"view_in_use": "Ver en uso",
 		"view_json": "Ver JSON sin procesar"
 	},
 	"configure": {
@@ -176,6 +222,9 @@
 		"title": "Configurar",
 		"valid_json": "Debes ingresar un JSON válido"
 	},
+	"connect": {
+		"error_trying_to_connect": "Error al intentar conectarse al dispositivo: {{error}}"
+	},
 	"delete_command": {
 		"explanation": "¿Está seguro de que desea eliminar este comando? Esta acción no es reversible.",
 		"title": "Eliminar comando"
@@ -186,6 +235,10 @@
 		"explanation": "Esto eliminará todos los {{object}} antes de la fecha que elija. Tenga cuidado, esta acción no es reversible.",
 		"healthchecks_title": "Eliminar comprobaciones de estado"
 	},
+	"device": {
+		"error_fetching_device": "Error al obtener la información del dispositivo: {{error}}",
+		"error_fetching_devices": "Error al recuperar dispositivos: {{error}}"
+	},
 	"device_logs": {
 		"log": "Iniciar sesión",
 		"severity": "Gravedad",
@@ -196,14 +249,22 @@
 		"add_failure": "Error, el servidor devolvió: {{error}}",
 		"add_root": "Agregar entidad raíz",
 		"add_success": "¡Entidad creada con éxito!",
+		"assigned_inventory": "Inventario asignado",
 		"cannot_delete": "No puede eliminar entidades que tienen hijos. Elimina los hijos de esta entidad para poder eliminarla.",
+		"currently_selected_entity": "Entidad seleccionada actualmente: {{config}}",
+		"currently_selected_venue": "Lugar seleccionado actualmente: {{config}}",
 		"delete_success": "Entidad eliminada correctamente",
 		"delete_warning": "Advertencia: esta operación no se puede revertir",
 		"edit_failure": "Actualización fallida: {{error}}",
 		"entities": "entidades",
 		"entity": "Entidad",
+		"error_fetch_entity": "Error al obtener la información de la entidad",
+		"error_fetching": "Error al recuperar entidades",
+		"error_saving": "Error al guardar la entidad",
+		"not_assigned": "No asignado",
 		"only_unassigned": "Solo sin asignar",
-		"valid_serial": "Debe ser un número de serie válido (12 caracteres HEX)"
+		"valid_serial": "Debe ser un número de serie válido (12 caracteres HEX)",
+		"venues": "Sedes"
 	},
 	"factory_reset": {
 		"redirector": "Mantener el redirector:",
@@ -251,24 +312,87 @@
 		"title": "Salud"
 	},
 	"inventory": {
+		"add_child": "Agregar lugar secundario",
 		"add_child_venue": "Agregar lugar infantil a {{entityName}}",
-		"add_tag": "Añadir etiqueta",
-		"add_tag_to": "Agregar etiqueta de inventario a {{name}}",
+		"add_tag": "Crear etiqueta",
+		"add_tag_to": "Agregar nuevo dispositivo a {{name}}",
+		"add_venue": "Agregar lugar",
+		"assign_entity_instructions": "Puede encontrar la entidad a la que desea que se asigne esta etiqueta utilizando el menú a continuación, o puede pegar manualmente el UUID de la entidad en el campo de arriba.",
 		"assign_error": "Error al intentar asignar la etiqueta",
 		"assign_to_entity": "Asignar a entidad",
+		"bulk_delete_assigned": "¿Le gustaría eliminar de forma masiva los dispositivos asignados dentro de su archivo?",
+		"bulk_delete_assigned_warning": "Advertencia: esta acción no es reversible",
+		"bulk_delete_devices": "Dispositivos de eliminación masiva",
+		"bulk_delete_devices_not_found": "{{number}} dispositivos no encontrados",
+		"bulk_delete_explanation": "Para eliminar dispositivos de forma masiva, use un archivo CSV con una columna llamada SerialNumber",
+		"bulk_delete_test": "Validar archivo",
+		"close_entity_menu": "Cerrar el menú Editar entidad",
+		"delete_devices": "BORRAR DISPOSITIVOS",
+		"delete_errors": "{{number}} Eliminar errores del dispositivo",
+		"delete_tag": "Eliminar etiqueta",
+		"delete_venue": "Eliminar el lugar de forma permanente",
+		"deleted_devices": "{{number}} Dispositivos eliminados",
+		"deleting": "Eliminando ...",
+		"deletion_failure": "Error de borrado",
+		"devices_assigned": "{{number}} dispositivos existentes asignados y actualizados",
+		"devices_created": "{{number}} dispositivos creados",
+		"devices_deleted": "Dispositivos eliminados",
+		"devices_errors_while_creating": "{{number}} fallaron las creaciones del dispositivo",
+		"devices_errors_while_updating": "{{number}} fallaron las actualizaciones del dispositivo",
+		"devices_found_assigned": "{{number}} dispositivos encontrados y ya asignados a una entidad o lugar",
+		"devices_found_unassigned": "{{number}} dispositivos encontrados, pero no asignados",
+		"devices_imported": " Dispositivos importados",
+		"devices_not_found": "{{number}} dispositivos sin conflicto",
+		"devices_tested": "Dispositivos probados",
+		"duplicate_serial": "Número de serie ya utilizado en el archivo (duplicado)",
+		"error_create_venue": "Error al crear el lugar",
+		"error_delete_tag": "Error al eliminar la etiqueta de inventario",
+		"error_get_venue": "Error al recuperar lugares",
 		"error_retrieving": "Se produjo un error al recuperar las etiquetas de inventario",
 		"error_unassign": "Error durante la operación de anulación de asignación",
+		"error_update_venue": "Error al actualizar el lugar",
+		"error_venue_delete": "Error al eliminar el lugar",
+		"error_within_file": "{{number}} dispositivos con información incorrecta en el archivo (se ignorarán)",
+		"file_error": "Parece haber un error en su archivo. Asegúrese de que el archivo esté en formato CSV y contenga las 5 columnas mencionadas anteriormente en la primera línea del archivo",
+		"final_delete_results": "Resultados de eliminación final",
+		"final_import_results": "Resultados finales de importación",
+		"import_assigned_devices": "¿Quieres reasignarlos con esta importación?",
+		"import_assigned_devices_explanation": "Algunos dispositivos entran en conflicto con los dispositivos ya asignados. Debe resolver esos problemas antes de importar.",
+		"import_devices": "Importar dispositivos",
+		"import_devices_explanation": "Para importar dispositivos de forma masiva, debe utilizar un archivo CSV con las siguientes columnas: Número de serie, Nombre, Descripción, Tipo de dispositivo, Texto de nota",
+		"import_devices_to": "Importar dispositivos a {{name}}",
+		"import_existing_devices": "¿Actualizarlos y asignarlos?",
+		"import_existing_devices_explanation": "Algunos dispositivos ya existen en el inventario y no están asignados.",
+		"importing": "Importador...",
+		"last_modification": "Última modificación",
+		"no_devices_to_delete": "No hay dispositivos para eliminar",
+		"no_devices_to_import": "¡No hay dispositivos válidos para crear o actualizar!",
+		"note_text": "Texto de la nota",
+		"passed_tests": "Se aprobaron todas las pruebas, ¡sus dispositivos están listos para importar!",
+		"serial_number_required": "Error: falta el número de serie",
+		"showing_top_10": "Aquí hay una vista previa de la información que hemos recuperado de su archivo:",
+		"sub_venues": "Subvenues",
 		"subscriber": "Abonado",
 		"successful_assign": "Etiqueta asignada correctamente",
+		"successful_tag_delete": "Etiqueta de inventario eliminada correctamente",
 		"successful_tag_update": "Etiqueta actualizada correctamente",
 		"successful_unassign": "La operación de anulación de asignación se realizó correctamente",
+		"successful_venue_create": "Lugar creado con éxito",
+		"successful_venue_delete": "Lugar eliminado correctamente",
+		"successful_venue_update": "Lugar actualizado con éxito",
 		"tag_created": "Etiqueta de inventario creada correctamente",
 		"tag_creation_error": "Error al intentar crear una etiqueta de inventario",
 		"tag_update_error": "Error al actualizar la etiqueta",
 		"tags_assigned_to": "Etiquetas de inventario asignadas a {{name}}",
+		"test_import": "Validar datos de importación",
+		"test_results": "Resultados de la prueba",
+		"title": "Inventario",
+		"type_invalid": "Error: tipo de dispositivo no válido",
 		"unassign": "Anular asignación",
 		"unassign_tag": "Anular asignación de etiqueta de entidad",
+		"unassigned_deleted_devices": "{{number}} Dispositivos eliminados y sin asignar",
 		"unassigned_tags": "Etiquetas sin asignar",
+		"validating_import_file": "Validando archivo y datos de importación ...",
 		"venue": "Lugar de encuentro"
 	},
 	"login": {
@@ -324,10 +448,10 @@
 		"title": "estadística"
 	},
 	"status": {
-		"connection_status": "Estado de conexión",
+		"connection_status": "Estado",
 		"error": "Los datos de estado no están disponibles",
 		"last_contact": "Último contacto",
-		"load_averages": "Carga (promedio de 1/5/15 minutos)",
+		"load_averages": "Carga (1/5/15 m.)",
 		"localtime": "Hora local",
 		"memory": "Memoria usada",
 		"percentage_free": "{{percentage}}% de {{total}} gratis",
@@ -337,7 +461,21 @@
 		"used_total_memory": "{{used}} usado / {{total}} total"
 	},
 	"system": {
-		"error_fetching": "Error al obtener información del sistema"
+		"error_fetching": "Error al obtener información del sistema",
+		"error_reloading": "Error al recargar: {{error}}",
+		"hostname": "Nombre de host",
+		"os": "sistema operativo",
+		"processors": "Procesadores",
+		"reload": "Recargar",
+		"reload_subsystems": "Recargar subsistemas",
+		"subsystems": "Subsistemas",
+		"success_reload": "¡El comando de recarga se envió correctamente!"
+	},
+	"telemetry": {
+		"connection_failed": "No se pudo crear la conexión. Error: {{error}}",
+		"interval": "intervalo",
+		"last_update": "Última actualización",
+		"types": "Los tipos"
 	},
 	"trace": {
 		"choose_network": "Elija la red",
@@ -375,7 +513,7 @@
 		"create_success": "Usuario creado con éxito",
 		"creating": "Creando usuario ...",
 		"delete_avatar": "Eliminar avatar",
-		"delete_failure": "Error al intentar eliminar al usuario",
+		"delete_failure": "Error al intentar eliminar al usuario: {{error}}",
 		"delete_success": "¡Usuario eliminado correctamente!",
 		"delete_title": "Borrar usuario",
 		"delete_warning": "Advertencia: una vez que elimina un usuario, no puede revertir",
@@ -383,6 +521,7 @@
 		"description": "Descripción",
 		"edit": "editar usuario",
 		"email_address": "Dirección de correo electrónico",
+		"error_fetching_users": "Error al obtener usuarios: {{error}}",
 		"force_password_change": "Forzar cambio de contraseña al iniciar sesión",
 		"id": "Id. De usuario",
 		"last_login": "Último acceso",
@@ -398,7 +537,7 @@
 		"provide_password": "Proporcione una contraseña válida",
 		"save_avatar": "Guardar avatar",
 		"show_hide_password": "Mostrar / Ocultar contraseña",
-		"update_failure": "Asegúrese de que todos sus datos sean válidos. Si está modificando la contraseña, asegúrese de que no sea antigua.",
+		"update_failure": "Error al intentar actualizar: {{error}}",
 		"update_failure_title": "Actualización fallida",
 		"update_success": "Usuario actualizado con éxito",
 		"update_success_title": "Éxito",

public/locales/fr/translation.json

@@ -8,6 +8,7 @@
 		"factory_reset": "Retour aux paramètres d'usine",
 		"firmware_upgrade": "Mise à jour du firmware",
 		"reboot": "Redémarrer",
+		"telemetry": "Télémétrie",
 		"title": "Les commandes",
 		"trace": "Trace",
 		"wifi_scan": "Balayage Wi-Fi"
@@ -22,10 +23,11 @@
 	},
 	"commands": {
 		"error": "Erreur lors de la soumission de la commande !",
+		"error_delete_log": "Erreur lors de la tentative de suppression : {{error}}",
 		"event_queue": "File d'attente d'événements",
 		"success": "Commande soumise avec succès, vous pouvez consulter le journal des commandes pour le résultat",
 		"title": "Historique des commandes",
-		"unable_queue": "Impossible de terminer la demande de file d'attente d'événements"
+		"unable_queue": "Impossible de terminer la demande de file d'attente d'événements: {{error}}"
 	},
 	"common": {
 		"access_policy": "Politique d'accès",
@@ -33,6 +35,8 @@
 		"adding_ellipsis": "Ajouter...",
 		"are_you_sure": "Êtes-vous sûr?",
 		"back_to_login": "Retour connexion",
+		"back_to_start": "Retour au début",
+		"by": "Par",
 		"cancel": "annuler",
 		"certificate": "Certificat",
 		"certificates": "Certificats",
@@ -81,6 +85,7 @@
 		"endpoint": "Point final",
 		"endpoints": "Points de terminaison",
 		"error": "Erreur",
+		"error_adding_note": "Erreur lors de l'ajout de la note",
 		"execute_now": "Souhaitez-vous exécuter cette commande maintenant ?",
 		"executed": "réalisé",
 		"exit": "Sortie",
@@ -96,6 +101,7 @@
 		"hours": "heures",
 		"id": "Id",
 		"ip_address": "Adresse IP",
+		"items_per_page": "Objets par page:",
 		"last_dashboard_refresh": "Dernière actualisation du tableau de bord",
 		"later_tonight": "Plus tard ce soir",
 		"latest": "Dernier",
@@ -108,11 +114,13 @@
 		"memory_used": "Mémoire utilisée",
 		"minute": "minute",
 		"minutes": "minutes",
+		"modified": "Modifié",
 		"na": "N / A",
 		"need_date": "Vous avez besoin d'un rendez-vous...",
 		"no": "Non",
 		"no_devices_found": "Aucun périphérique trouvé",
 		"no_items": "Pas d'objet",
+		"none": "Aucun",
 		"not_connected": "Pas connecté",
 		"of_connected": "% d'appareils",
 		"off": "De",
@@ -120,6 +128,7 @@
 		"optional": "Optionnel",
 		"overall_health": "Santé globale",
 		"password_policy": "Politique de mot de passe",
+		"preview": "Aperçu",
 		"recorded": "Enregistré",
 		"refresh": "Rafraîchir",
 		"refresh_device": "Actualiser l'appareil",
@@ -135,7 +144,9 @@
 		"seconds_elapsed": "Secondes écoulées",
 		"serial_number": "Numéro de série",
 		"show_all": "Montre tout",
+		"socket_connection_closed": "Connexion fermée !",
 		"start": "Début",
+		"stop_editing": "Arrêter la modification",
 		"submit": "Soumettre",
 		"submitted": "Soumis",
 		"success": "Succès",
@@ -144,6 +155,8 @@
 		"timestamp": "Temps",
 		"to": "à",
 		"type": "Type",
+		"type_for_options": "Tapez la valeur que vous devez créer...",
+		"type_for_options_format": "Saisissez une valeur au format valide ({{format}})...",
 		"unable_to_connect": "Impossible de se connecter à l'appareil",
 		"unable_to_delete": "Impossible de supprimer",
 		"unknown": "Inconnu",
@@ -155,18 +168,51 @@
 		"yes": "Oui"
 	},
 	"configuration": {
+		"add_configuration": "Ajouter une configuration",
+		"add_new_block": "Ajouter un nouveau bloc de configuration",
+		"cannot_delete": "Cette configuration ne peut pas être supprimée car elle est utilisée par au moins une entité, un lieu ou un appareil",
+		"choose_section": "Quelle section souhaitez-vous que ce bloc contienne?",
+		"configuration_browser": "Navigateur de configuration",
+		"configurations": "Les configurations",
+		"create": "Créer une configuration",
+		"create_config": "Créer une nouvelle configuration",
+		"create_new_configuration": "Créer un nouvel élément de configuration",
 		"created": "Créé",
+		"creation_success": "Configuration créée avec succès !",
+		"currently_associated": "Configuration associée actuelle : {{config}}",
+		"currently_selected_config": "Configuration actuellement sélectionnée : {{config}}",
+		"delete_config": "Supprimer la configuration",
 		"details": "Détails",
 		"device_password": "Mot de passe",
-		"last_configuration_change": "Dernière modification de configuration",
+		"device_type": "Type d'appareil",
+		"device_types": "Types d'appareils",
+		"edit_configuration": "Modifier la configuration",
+		"error_delete": "Erreur lors de la tentative de suppression : {{error}}",
+		"error_fetching_config": "Erreur lors de la récupération de la configuration",
+		"error_trying_delete": "Erreur lors de la tentative de suppression : {{error}}",
+		"error_update": "Erreur: {{error}}",
+		"explanation": "Explication",
+		"last_configuration_change": "Changement de configuration",
 		"last_configuration_download": "Téléchargement de la dernière configuration",
 		"location": "Emplacement",
+		"need_device_type": "Chaque configuration doit prendre en charge au moins un type d'appareil",
+		"no_associated_config": "Aucune configuration associée",
+		"no_associated_configuration": "Aucune configuration associée",
 		"note": "Remarque",
 		"notes": "Remarques",
 		"owner": "Propriétaire",
+		"select_configuration": "Sélectionnez cette configuration",
+		"success_block_delete": "Bloc de configuration supprimé avec succès",
+		"success_update": "Configuration mise à jour avec succès !",
+		"successful_delete": "Configuration supprimée !",
+		"support_all": "Soutenir tous",
+		"supported_device_types": "Types d'appareils pris en charge",
 		"title": "Configuration",
 		"type": "Type d'appareil",
+		"used_by": "Utilisé par",
+		"used_by_details": "{{entities}} Entités, {{venues}} Lieux et {{devices}} Appareils",
 		"uuid": "Identifiant de configuration",
+		"view_in_use": "Afficher en cours d'utilisation",
 		"view_json": "Afficher le JSON brut"
 	},
 	"configure": {
@@ -176,6 +222,9 @@
 		"title": "Configurer",
 		"valid_json": "Vous devez entrer un JSON valide"
 	},
+	"connect": {
+		"error_trying_to_connect": "Erreur lors de la tentative de connexion à l'appareil : {{error}}"
+	},
 	"delete_command": {
 		"explanation": "Êtes-vous sûr de vouloir supprimer cette commande ? Cette action n'est pas réversible.",
 		"title": "Supprimer la commande"
@@ -186,6 +235,10 @@
 		"explanation": "Cela supprimera tous les {{object}} avant la date que vous choisissez. Attention, cette action n'est pas réversible.",
 		"healthchecks_title": "Supprimer les vérifications d'état"
 	},
+	"device": {
+		"error_fetching_device": "Erreur lors de la récupération des informations sur l'appareil : {{error}}",
+		"error_fetching_devices": "Erreur lors de la récupération des appareils : {{error}}"
+	},
 	"device_logs": {
 		"log": "Bûche",
 		"severity": "Gravité",
@@ -196,14 +249,22 @@
 		"add_failure": "Erreur, le serveur a renvoyé : {{error}}",
 		"add_root": "Ajouter une entité racine",
 		"add_success": "Entité créée avec succès !",
+		"assigned_inventory": "Inventaire assigné",
 		"cannot_delete": "Vous ne pouvez pas supprimer des entités qui ont des enfants. Supprimez les enfants de cette entité pour pouvoir la supprimer.",
+		"currently_selected_entity": "Entité actuellement sélectionnée : {{config}}",
+		"currently_selected_venue": "Lieu actuellement sélectionné : {{config}}",
 		"delete_success": "Entité supprimée avec succès",
 		"delete_warning": "Attention : cette opération ne peut pas être annulée",
 		"edit_failure": "Échec de la mise à jour : {{error}}",
 		"entities": "Entités",
 		"entity": "Entité",
+		"error_fetch_entity": "Erreur lors de la récupération des informations sur l'entité",
+		"error_fetching": "Erreur lors de la récupération des entités",
+		"error_saving": "Erreur lors de l'enregistrement de l'entité",
+		"not_assigned": "Non attribué",
 		"only_unassigned": "Uniquement non attribué",
-		"valid_serial": "Doit être un numéro de série valide (12 caractères HEX)"
+		"valid_serial": "Doit être un numéro de série valide (12 caractères HEX)",
+		"venues": "Les lieux"
 	},
 	"factory_reset": {
 		"redirector": "Conserver le redirecteur :",
@@ -251,24 +312,87 @@
 		"title": "Santé"
 	},
 	"inventory": {
+		"add_child": "Ajouter un lieu enfant",
 		"add_child_venue": "Ajouter un lieu enfant à {{entityName}}",
-		"add_tag": "Ajouter une étiquette",
-		"add_tag_to": "Ajouter une balise d'inventaire à {{name}}",
+		"add_tag": "Créer un tag",
+		"add_tag_to": "Ajouter un nouvel appareil à {{name}}",
+		"add_venue": "Ajouter un lieu",
+		"assign_entity_instructions": "Vous pouvez soit trouver l'entité à laquelle vous souhaitez que cette balise soit attribuée en utilisant le menu ci-dessous, soit coller manuellement l'UUID de l'entité dans le champ ci-dessus.",
 		"assign_error": "Erreur lors de la tentative d'attribution de balise",
 		"assign_to_entity": "Affecter à l'entité",
+		"bulk_delete_assigned": "Souhaitez-vous supprimer en bloc les appareils attribués dans votre fichier ?",
+		"bulk_delete_assigned_warning": "Attention : cette action n'est pas réversible",
+		"bulk_delete_devices": "Supprimer en bloc des appareils",
+		"bulk_delete_devices_not_found": "{{number}} appareils introuvables",
+		"bulk_delete_explanation": "Pour supprimer en bloc des appareils, utilisez un fichier CSV avec une colonne appelée SerialNumber",
+		"bulk_delete_test": "Valider le fichier",
+		"close_entity_menu": "Fermer le menu Modifier l'entité",
+		"delete_devices": "Supprimer des appareils",
+		"delete_errors": "{{number}} Supprimer les erreurs de périphérique",
+		"delete_tag": "Supprimer la balise",
+		"delete_venue": "Supprimer définitivement le lieu",
+		"deleted_devices": "{{number}} appareils supprimés",
+		"deleting": "Suppression ...",
+		"deletion_failure": "Erreur de suppression",
+		"devices_assigned": "{{number}} appareils existants attribués et mis à jour",
+		"devices_created": "{{number}} appareils créés",
+		"devices_deleted": "Appareils supprimés",
+		"devices_errors_while_creating": "{{number}} créations d'appareils ont échoué",
+		"devices_errors_while_updating": "{{number}} mises à jour de l'appareil ont échoué",
+		"devices_found_assigned": "{{number}} appareils trouvés et déjà attribués à une entité ou à un lieu",
+		"devices_found_unassigned": "{{number}} appareils trouvés, mais non attribués",
+		"devices_imported": " Périphériques importés",
+		"devices_not_found": "{{number}} appareils sans conflit",
+		"devices_tested": "Appareils testés",
+		"duplicate_serial": "Numéro de série déjà utilisé dans le fichier (duplicata)",
+		"error_create_venue": "Erreur lors de la création du lieu",
+		"error_delete_tag": "Erreur lors de la suppression de la balise d'inventaire",
+		"error_get_venue": "Erreur lors de la récupération des lieux",
 		"error_retrieving": "Une erreur s'est produite lors de la récupération des balises d'inventaire",
 		"error_unassign": "Erreur lors de l'opération de désaffectation",
+		"error_update_venue": "Erreur lors de la mise à jour du lieu",
+		"error_venue_delete": "Erreur lors de la suppression du lieu",
+		"error_within_file": "{{number}} appareils avec des informations erronées dans le fichier (sera ignoré)",
+		"file_error": "Il semble y avoir une erreur dans votre fichier. Veuillez vous assurer que le fichier est au format CSV et contient les 5 colonnes mentionnées ci-dessus dans la première ligne du fichier",
+		"final_delete_results": "Résultats de la suppression finale",
+		"final_import_results": "Résultats d'importation finaux",
+		"import_assigned_devices": "Voulez-vous les réaffecter avec cette importation ?",
+		"import_assigned_devices_explanation": "Certains appareils sont en conflit avec des appareils déjà attribués. Vous devez résoudre ces problèmes avant d'importer.",
+		"import_devices": "Importer des appareils",
+		"import_devices_explanation": "Pour importer des appareils en bloc, vous devez utiliser un fichier CSV avec les colonnes suivantes : SerialNumber,Name,Description,DeviceType,NoteText",
+		"import_devices_to": "Importer des appareils dans {{name}}",
+		"import_existing_devices": "Mettre à jour et les attribuer ?",
+		"import_existing_devices_explanation": "Certains appareils existent déjà dans l'inventaire et ne sont pas affectés.",
+		"importing": "Importation ...",
+		"last_modification": "dernière modification",
+		"no_devices_to_delete": "Aucun appareil à supprimer",
+		"no_devices_to_import": "Aucun appareil valide à créer ou à mettre à jour !",
+		"note_text": "Texte de note",
+		"passed_tests": "Tous les tests ont été passés, vos appareils sont prêts à être importés !",
+		"serial_number_required": "Erreur : Numéro de série manquant",
+		"showing_top_10": "Voici un aperçu des informations que nous avons récupérées dans votre dossier :",
+		"sub_venues": "Sous-sites",
 		"subscriber": "Abonné",
 		"successful_assign": "Tag attribué avec succès",
+		"successful_tag_delete": "Balise d'inventaire supprimée avec succès",
 		"successful_tag_update": "Balise mise à jour avec succès",
 		"successful_unassign": "L'opération de désaffectation a réussi",
+		"successful_venue_create": "Lieu créé avec succès",
+		"successful_venue_delete": "Lieu supprimé avec succès",
+		"successful_venue_update": "Lieu mis à jour avec succès",
 		"tag_created": "Tag d'inventaire créé avec succès",
 		"tag_creation_error": "Erreur lors de la tentative de création d'une balise d'inventaire",
 		"tag_update_error": "Erreur lors de la mise à jour de la balise",
 		"tags_assigned_to": "Balises d'inventaire attribuées à {{name}}",
+		"test_import": "Valider les données d'importation",
+		"test_results": "Résultats de test",
+		"title": "Inventaire",
+		"type_invalid": "Erreur : Type de périphérique non valide",
 		"unassign": "Annuler l'attribution",
 		"unassign_tag": "Désaffecter la balise de l'entité",
+		"unassigned_deleted_devices": "{{number}} appareils supprimés et non attribués",
 		"unassigned_tags": "Balises non attribuées",
+		"validating_import_file": "Validation du fichier d'importation et des données...",
 		"venue": "Lieu"
 	},
 	"login": {
@@ -324,10 +448,10 @@
 		"title": "statistiques"
 	},
 	"status": {
-		"connection_status": "Statut de connexion",
+		"connection_status": "Statut",
 		"error": "Les données d'état ne sont pas disponibles",
 		"last_contact": "Dernier contact",
-		"load_averages": "Charge (moyenne 1 / 5 / 15 minutes)",
+		"load_averages": "Charge (1/5/15 m.)",
 		"localtime": "heure locale",
 		"memory": "Mémoire utilisée",
 		"percentage_free": "{{percentage}}% de {{total}} gratuit",
@@ -337,7 +461,21 @@
 		"used_total_memory": "{{used}} utilisé / {{total}} total"
 	},
 	"system": {
-		"error_fetching": "Erreur lors de la récupération des informations système"
+		"error_fetching": "Erreur lors de la récupération des informations système",
+		"error_reloading": "Erreur lors du rechargement : {{error}}",
+		"hostname": "nom d'hôte",
+		"os": "le système d'exploitation",
+		"processors": "Processeurs",
+		"reload": "Recharger",
+		"reload_subsystems": "Recharger les sous-systèmes",
+		"subsystems": "Sous-systèmes",
+		"success_reload": "Recharger la commande soumise avec succès !"
+	},
+	"telemetry": {
+		"connection_failed": "Échec de la création de la connexion. Erreur : {{error}}",
+		"interval": "Intervalle",
+		"last_update": "Dernière mise à jour",
+		"types": "Les types"
 	},
 	"trace": {
 		"choose_network": "Choisir le réseau",
@@ -375,7 +513,7 @@
 		"create_success": "L'utilisateur a été créé avec succès",
 		"creating": "Création de l'utilisateur...",
 		"delete_avatar": "Supprimer l'avatar",
-		"delete_failure": "Erreur lors de la tentative de suppression de l'utilisateur",
+		"delete_failure": "Erreur lors de la tentative de suppression de l'utilisateur: {{error}}",
 		"delete_success": "Utilisateur supprimé avec succès !",
 		"delete_title": "Supprimer l'utilisateur",
 		"delete_warning": "Avertissement : Une fois que vous avez supprimé un utilisateur, vous ne pouvez plus revenir en arrière",
@@ -383,6 +521,7 @@
 		"description": "La description",
 		"edit": "Modifier l'utilisateur",
 		"email_address": "Adresse électronique",
+		"error_fetching_users": "Erreur lors de la récupération des utilisateurs : {{error}}",
 		"force_password_change": "Forcer le changement de mot de passe lors de la connexion",
 		"id": "Identifiant d'utilisateur.",
 		"last_login": "Dernière connexion",
@@ -398,7 +537,7 @@
 		"provide_password": "Veuillez fournir un mot de passe valide",
 		"save_avatar": "Enregistrer l'avatar",
 		"show_hide_password": "Afficher/Masquer le mot de passe",
-		"update_failure": "Assurez-vous que toutes vos données sont valides. Si vous modifiez le mot de passe, assurez-vous qu'il ne s'agit pas d'un ancien.",
+		"update_failure": "Erreur lors de la tentative de mise à jour : {{error}}",
 		"update_failure_title": "mise à jour a échoué",
 		"update_success": "L'utilisateur a bien été mis à jour",
 		"update_success_title": "Succès",

public/locales/pt/translation.json

@@ -8,6 +8,7 @@
 		"factory_reset": "Restauração de fábrica",
 		"firmware_upgrade": "Atualização de firmware",
 		"reboot": "Reiniciar",
+		"telemetry": "Telemetria",
 		"title": "Comandos",
 		"trace": "Vestígio",
 		"wifi_scan": "Wi-Fi Scan"
@@ -22,10 +23,11 @@
 	},
 	"commands": {
 		"error": "Erro ao enviar comando!",
+		"error_delete_log": "Erro ao tentar excluir: {{error}}",
 		"event_queue": "Fila de Eventos",
 		"success": "Comando enviado com sucesso, você pode consultar o log de Comandos para ver o resultado",
 		"title": "Histórico de Comandos",
-		"unable_queue": "Incapaz de completar o pedido de fila de eventos"
+		"unable_queue": "Incapaz de completar o pedido de fila de eventos: {{error}}"
 	},
 	"common": {
 		"access_policy": "Política de Acesso",
@@ -33,6 +35,8 @@
 		"adding_ellipsis": "Adicionando ...",
 		"are_you_sure": "Você tem certeza?",
 		"back_to_login": "Volte ao login",
+		"back_to_start": "Voltar ao Início",
+		"by": "Por",
 		"cancel": "Cancelar",
 		"certificate": "Certificado",
 		"certificates": "Certificados",
@@ -81,6 +85,7 @@
 		"endpoint": "Ponto final",
 		"endpoints": "Pontos finais",
 		"error": "Erro",
+		"error_adding_note": "Erro ao adicionar nota",
 		"execute_now": "Você gostaria de executar este comando agora?",
 		"executed": "Executado",
 		"exit": "Saída",
@@ -96,6 +101,7 @@
 		"hours": "horas",
 		"id": "identidade",
 		"ip_address": "Endereço de IP",
+		"items_per_page": "Itens por página:",
 		"last_dashboard_refresh": "Última atualização do painel",
 		"later_tonight": "Logo à noite",
 		"latest": "Mais recentes",
@@ -108,11 +114,13 @@
 		"memory_used": "Memória Usada",
 		"minute": "minuto",
 		"minutes": "minutos",
+		"modified": "Modificado",
 		"na": "N / D",
 		"need_date": "Você precisa de um encontro ...",
 		"no": "Não",
 		"no_devices_found": "Nenhum dispositivo encontrado",
 		"no_items": "Nenhum item",
+		"none": "Nenhum",
 		"not_connected": "Não conectado",
 		"of_connected": "% de dispositivos",
 		"off": "Fora",
@@ -120,6 +128,7 @@
 		"optional": "Opcional",
 		"overall_health": "Saúde geral",
 		"password_policy": "Política de Senha",
+		"preview": "Visualizar",
 		"recorded": "Gravado",
 		"refresh": "REFRESH",
 		"refresh_device": "Atualizar dispositivo",
@@ -135,7 +144,9 @@
 		"seconds_elapsed": "Segundos decorridos",
 		"serial_number": "Número de série",
 		"show_all": "mostre tudo",
+		"socket_connection_closed": "Conexão fechada!",
 		"start": "Começar",
+		"stop_editing": "Pare de editar",
 		"submit": "Enviar",
 		"submitted": "Submetido",
 		"success": "Sucesso",
@@ -144,6 +155,8 @@
 		"timestamp": "tempo",
 		"to": "Para",
 		"type": "Tipo",
+		"type_for_options": "Digite o valor que você precisa criar ...",
+		"type_for_options_format": "Digite um valor no formato válido ({{format}}) ...",
 		"unable_to_connect": "Incapaz de conectar ao dispositivo",
 		"unable_to_delete": "Incapaz de deletar",
 		"unknown": "Desconhecido",
@@ -155,18 +168,51 @@
 		"yes": "sim"
 	},
 	"configuration": {
+		"add_configuration": "Adicionar configuração",
+		"add_new_block": "Adicionar novo bloco de configuração",
+		"cannot_delete": "Esta configuração não pode ser excluída porque está sendo usada por pelo menos uma entidade, local ou dispositivo",
+		"choose_section": "Qual seção você gostaria que este bloco contivesse?",
+		"configuration_browser": "Navegador de configuração",
+		"configurations": "configurações",
+		"create": "Criar configuração",
+		"create_config": "Criar Nova Configuração",
+		"create_new_configuration": "Criar Novo Elemento de Configuração",
 		"created": "Criado",
+		"creation_success": "Configuração criada com sucesso!",
+		"currently_associated": "Configuração atual associada: {{config}}",
+		"currently_selected_config": "Configuração atualmente selecionada: {{config}}",
+		"delete_config": "Excluir configuração",
 		"details": "Detalhes",
 		"device_password": "Senha",
-		"last_configuration_change": "Última Mudança de Configuração",
+		"device_type": "Tipo de dispositivo",
+		"device_types": "Tipos de dispositivos",
+		"edit_configuration": "Editar configuração",
+		"error_delete": "Erro ao tentar excluir: {{error}}",
+		"error_fetching_config": "Erro ao buscar configuração",
+		"error_trying_delete": "Erro ao tentar excluir: {{error}}",
+		"error_update": "Erro: {{error}}",
+		"explanation": "Explicação",
+		"last_configuration_change": "Mudança de configuração",
 		"last_configuration_download": "Último download da configuração",
 		"location": "Localização",
+		"need_device_type": "Cada configuração deve suportar pelo menos um tipo de dispositivo",
+		"no_associated_config": "Sem configuração associada",
+		"no_associated_configuration": "Sem configurações associadas",
 		"note": "Nota",
 		"notes": "notas",
 		"owner": "Proprietário",
+		"select_configuration": "Selecione esta configuração",
+		"success_block_delete": "Bloco de configuração excluído com sucesso",
+		"success_update": "Configuração atualizada com sucesso!",
+		"successful_delete": "Configuração excluída!",
+		"support_all": "Apoie todos",
+		"supported_device_types": "Tipos de dispositivos suportados",
 		"title": "Configuração",
 		"type": "Tipo de dispositivo",
+		"used_by": "Usado por",
+		"used_by_details": "{{entities}} Entidades, {{venues}} Locais e {{devices}} Dispositivos",
 		"uuid": "ID de configuração",
+		"view_in_use": "Visualização em uso",
 		"view_json": "Exibir JSON bruto"
 	},
 	"configure": {
@@ -176,6 +222,9 @@
 		"title": "Configurar",
 		"valid_json": "Você precisa inserir um JSON válido"
 	},
+	"connect": {
+		"error_trying_to_connect": "Erro ao tentar conectar ao dispositivo: {{error}}"
+	},
 	"delete_command": {
 		"explanation": "Tem certeza de que deseja excluir este comando? esta ação não é reversível.",
 		"title": "Apagar Comando"
@@ -186,6 +235,10 @@
 		"explanation": "Isso excluirá todos os {{object}} antes da data que você escolheu. Cuidado, esta ação não é reversível.",
 		"healthchecks_title": "Excluir verificações de saúde"
 	},
+	"device": {
+		"error_fetching_device": "Erro ao buscar informações do dispositivo: {{error}}",
+		"error_fetching_devices": "Erro ao buscar dispositivos: {{error}}"
+	},
 	"device_logs": {
 		"log": "Registro",
 		"severity": "Gravidade",
@@ -196,14 +249,22 @@
 		"add_failure": "Erro, o servidor retornou: {{error}}",
 		"add_root": "Adicionar Entidade Raiz",
 		"add_success": "Entidade criada com sucesso!",
+		"assigned_inventory": "Estoque Atribuído",
 		"cannot_delete": "Você não pode excluir entidades que têm filhos. Exclua os filhos desta entidade para poder excluí-la.",
+		"currently_selected_entity": "Entidade atualmente selecionada: {{config}}",
+		"currently_selected_venue": "Local selecionado atualmente: {{config}}",
 		"delete_success": "Entidade excluída com sucesso",
 		"delete_warning": "Aviso: esta operação não pode ser revertida",
 		"edit_failure": "Atualização malsucedida: {{error}}",
 		"entities": "Entidades",
 		"entity": "Entidade",
+		"error_fetch_entity": "Erro ao buscar informações da entidade",
+		"error_fetching": "Erro ao buscar entidades",
+		"error_saving": "Erro ao salvar entidade",
+		"not_assigned": "Não atribuído",
 		"only_unassigned": "Apenas não atribuídos",
-		"valid_serial": "Precisa ser um número de série válido (12 caracteres HEX)"
+		"valid_serial": "Precisa ser um número de série válido (12 caracteres HEX)",
+		"venues": "Locais"
 	},
 	"factory_reset": {
 		"redirector": "Manter redirecionador:",
@@ -251,24 +312,87 @@
 		"title": "Saúde"
 	},
 	"inventory": {
+		"add_child": "Adicionar local infantil",
 		"add_child_venue": "Adicionar Local Infantil a {{entityName}}",
-		"add_tag": "Adicionar etiqueta",
-		"add_tag_to": "Adicionar tag de estoque a {{name}}",
+		"add_tag": "Criar tag",
+		"add_tag_to": "Adicionar novo dispositivo a {{name}}",
+		"add_venue": "Adicionar Local",
+		"assign_entity_instructions": "Você pode encontrar a entidade à qual deseja que esta tag seja atribuída usando o menu abaixo ou pode colar manualmente o UUID da entidade no campo acima.",
 		"assign_error": "Erro ao tentar atribuir tag",
 		"assign_to_entity": "Atribuir à Entidade",
+		"bulk_delete_assigned": "Gostaria de excluir em massa os dispositivos atribuídos em seu arquivo?",
+		"bulk_delete_assigned_warning": "Aviso: esta ação não é reversível",
+		"bulk_delete_devices": "Dispositivos de exclusão em massa",
+		"bulk_delete_devices_not_found": "{{number}} dispositivos não encontrados",
+		"bulk_delete_explanation": "Para excluir dispositivos em massa, use um arquivo CSV com uma coluna chamada SerialNumber",
+		"bulk_delete_test": "Validar Arquivo",
+		"close_entity_menu": "Fechar Menu Editar Entidade",
+		"delete_devices": "Apagar dispositivos",
+		"delete_errors": "{{number}} Excluir erros do dispositivo",
+		"delete_tag": "Excluir tag",
+		"delete_venue": "Excluir local permanentemente",
+		"deleted_devices": "{{number}} Dispositivos Excluídos",
+		"deleting": "Excluindo ...",
+		"deletion_failure": "Erro de exclusão",
+		"devices_assigned": "{{number}} dispositivos existentes atribuídos e atualizados",
+		"devices_created": "{{number}} dispositivos criados",
+		"devices_deleted": "Dispositivos Excluídos",
+		"devices_errors_while_creating": "{{number}} criações de dispositivos falharam",
+		"devices_errors_while_updating": "{{number}} atualizações do dispositivo falharam",
+		"devices_found_assigned": "{{number}} dispositivos encontrados e já atribuídos a uma entidade ou local",
+		"devices_found_unassigned": "{{number}} dispositivos encontrados, mas não atribuídos",
+		"devices_imported": " Dispositivos importados",
+		"devices_not_found": "{{number}} dispositivos sem conflito",
+		"devices_tested": "Dispositivos Testados",
+		"duplicate_serial": "Número de série já usado no arquivo (duplicado)",
+		"error_create_venue": "Erro ao criar local",
+		"error_delete_tag": "Erro ao excluir tag de inventário",
+		"error_get_venue": "Erro ao recuperar locais",
 		"error_retrieving": "Ocorreu um erro ao recuperar as tags de inventário",
 		"error_unassign": "Erro durante operação de cancelamento de atribuição",
+		"error_update_venue": "Erro ao atualizar o local",
+		"error_venue_delete": "Erro ao excluir local",
+		"error_within_file": "{{number}} dispositivos com informações erradas no arquivo (serão ignorados)",
+		"file_error": "Parece haver um erro em seu arquivo. Certifique-se de que o arquivo esteja no formato CSV e contenha as 5 colunas mencionadas acima na primeira linha do arquivo",
+		"final_delete_results": "Resultados de exclusão final",
+		"final_import_results": "Resultados finais de importação",
+		"import_assigned_devices": "Quer reatribuí-los com esta importação?",
+		"import_assigned_devices_explanation": "Alguns dispositivos entram em conflito com dispositivos já atribuídos. Você deve resolver esses problemas antes de importar.",
+		"import_devices": "Dispositivos de importação",
+		"import_devices_explanation": "Para importar dispositivos em massa, você precisa usar um arquivo CSV com as seguintes colunas: SerialNumber, Name, Description, DeviceType, NoteText",
+		"import_devices_to": "Importar dispositivos para {{name}}",
+		"import_existing_devices": "Atualizar e atribuí-los?",
+		"import_existing_devices_explanation": "Alguns dispositivos já existem no inventário e não foram atribuídos.",
+		"importing": "A importar ...",
+		"last_modification": "Última modificação",
+		"no_devices_to_delete": "Nenhum dispositivo para excluir",
+		"no_devices_to_import": "Nenhum dispositivo válido para criar ou atualizar!",
+		"note_text": "Texto da Nota",
+		"passed_tests": "Todos os testes foram aprovados, seus dispositivos estão prontos para importar!",
+		"serial_number_required": "Erro: Número de série ausente",
+		"showing_top_10": "Aqui está uma prévia das informações que recuperamos de seu arquivo:",
+		"sub_venues": "Subvenues",
 		"subscriber": "Assinante",
 		"successful_assign": "Tag atribuída com sucesso",
+		"successful_tag_delete": "Tag de inventário excluída com sucesso",
 		"successful_tag_update": "Tag atualizada com sucesso",
 		"successful_unassign": "A operação de cancelamento da atribuição foi bem-sucedida",
+		"successful_venue_create": "Local criado com sucesso",
+		"successful_venue_delete": "Local excluído com sucesso",
+		"successful_venue_update": "Local atualizado com sucesso",
 		"tag_created": "Tag de inventário criada com sucesso",
 		"tag_creation_error": "Erro ao tentar criar etiqueta de inventário",
 		"tag_update_error": "Erro ao atualizar tag",
 		"tags_assigned_to": "Tags de inventário atribuídas a {{name}}",
+		"test_import": "Validar dados de importação",
+		"test_results": "Resultado dos testes",
+		"title": "Inventário",
+		"type_invalid": "Erro: Tipo de dispositivo inválido",
 		"unassign": "Cancelar atribuição",
 		"unassign_tag": "Cancelar a atribuição de tag da entidade",
+		"unassigned_deleted_devices": "{{number}} Dispositivos excluídos e não atribuídos",
 		"unassigned_tags": "Tags não atribuídas",
+		"validating_import_file": "Validando arquivo de importação e dados ...",
 		"venue": "Local"
 	},
 	"login": {
@@ -324,10 +448,10 @@
 		"title": "Estatisticas"
 	},
 	"status": {
-		"connection_status": "Status da conexão",
+		"connection_status": "Status",
 		"error": "Dados de status indisponíveis",
 		"last_contact": "Último contato",
-		"load_averages": "Carga (1/5/15 minutos em média)",
+		"load_averages": "Carga (1/5/15 m.)",
 		"localtime": "Horário local",
 		"memory": "Memória Usada",
 		"percentage_free": "{{percentage}}% de {{total}} grátis",
@@ -337,7 +461,21 @@
 		"used_total_memory": "{{used}} usado / {{total}} total"
 	},
 	"system": {
-		"error_fetching": "Erro ao buscar informações do sistema"
+		"error_fetching": "Erro ao buscar informações do sistema",
+		"error_reloading": "Erro ao recarregar: {{error}}",
+		"hostname": "Nome de anfitrião",
+		"os": "Sistema Operacional",
+		"processors": "Processadores",
+		"reload": "Recarregar",
+		"reload_subsystems": "Recarregar subsistemas",
+		"subsystems": "Subsistemas",
+		"success_reload": "Comando de recarregamento enviado com sucesso!"
+	},
+	"telemetry": {
+		"connection_failed": "Falha ao criar conexão. Erro: {{error}}",
+		"interval": "intervalo",
+		"last_update": "Última atualização",
+		"types": "Tipos"
 	},
 	"trace": {
 		"choose_network": "Escolha a rede",
@@ -375,7 +513,7 @@
 		"create_success": "Usuário criado com sucesso",
 		"creating": "Criando usuário ...",
 		"delete_avatar": "Apagar Avatar",
-		"delete_failure": "Erro ao tentar excluir usuário",
+		"delete_failure": "Erro ao tentar excluir usuário: {{error}}",
 		"delete_success": "Usuário excluído com sucesso!",
 		"delete_title": "Deletar usuário",
 		"delete_warning": "Aviso: depois de excluir um usuário, você não pode reverter",
@@ -383,6 +521,7 @@
 		"description": "Descrição",
 		"edit": "Editar usuário",
 		"email_address": "Endereço de e-mail",
+		"error_fetching_users": "Erro ao buscar usuários: {{error}}",
 		"force_password_change": "Forçar mudança de senha no login",
 		"id": "ID do usuário.",
 		"last_login": "Último login",
@@ -398,7 +537,7 @@
 		"provide_password": "Forneça uma senha válida",
 		"save_avatar": "Salvar Avatar",
 		"show_hide_password": "Mostrar / ocultar senha",
-		"update_failure": "Certifique-se de que todos os seus dados são válidos. Se você estiver modificando a senha, certifique-se de que não seja uma senha antiga.",
+		"update_failure": "Erro ao tentar atualizar: {{error}}",
 		"update_failure_title": "Atualização falhou",
 		"update_success": "Usuário atualizado com sucesso",
 		"update_success_title": "Sucesso",

src/components/BlinkModal/index.js

@@ -11,7 +11,10 @@ import {
   CFormGroup,
   CInputRadio,
   CLabel,
+  CPopover,
 } from '@coreui/react';
+import CIcon from '@coreui/icons-react';
+import { cilX } from '@coreui/icons';
 import React, { useState, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import DatePicker from 'react-widgets/DatePicker';
@@ -70,7 +73,7 @@ const BlinkModal = ({ show, toggleModal }) => {
 
     axiosInstance
       .post(
-        `${endpoints.ucentralgw}/api/v1/device/${encodeURIComponent(deviceSerialNumber)}/leds`,
+        `${endpoints.owgw}/api/v1/device/${encodeURIComponent(deviceSerialNumber)}/leds`,
         parameters,
         { headers },
       )
@@ -88,8 +91,15 @@ const BlinkModal = ({ show, toggleModal }) => {
 
   return (
     <CModal show={show} onClose={toggleModal}>
-      <CModalHeader closeButton>
-        <CModalTitle>{t('blink.device_leds')}</CModalTitle>
+      <CModalHeader className="p-1">
+        <CModalTitle className="pl-1 pt-1">{t('blink.device_leds')}</CModalTitle>
+        <div className="text-right">
+          <CPopover content={t('common.close')}>
+            <CButton color="primary" variant="outline" className="ml-2" onClick={toggleModal}>
+              <CIcon content={cilX} />
+            </CButton>
+          </CPopover>
+        </div>
       </CModalHeader>
       {result === 'success' ? (
         <SuccessfulActionModalBody toggleModal={toggleModal} />

src/components/CommandHistory/DetailsModal.js

@@ -1,27 +1,24 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import {
-  CButton,
-  CModal,
-  CModalHeader,
-  CModalBody,
-  CModalTitle,
-  CModalFooter,
-} from '@coreui/react';
+import { CButton, CModal, CModalHeader, CModalBody, CModalTitle, CPopover } from '@coreui/react';
+import CIcon from '@coreui/icons-react';
+import { cilX } from '@coreui/icons';
 
 const DetailsModal = ({ t, show, toggle, details, commandUuid }) => (
   <CModal size="lg" show={show} onClose={toggle}>
-    <CModalHeader closeButton>
+    <CModalHeader className="p-1">
       <CModalTitle className="text-dark">{commandUuid}</CModalTitle>
+      <div className="text-right">
+        <CPopover content={t('common.close')}>
+          <CButton color="primary" variant="outline" className="ml-2" onClick={toggle}>
+            <CIcon content={cilX} />
+          </CButton>
+        </CPopover>
+      </div>
     </CModalHeader>
     <CModalBody>
       <pre className="ignore">{JSON.stringify(details, null, 4)}</pre>
     </CModalBody>
-    <CModalFooter>
-      <CButton color="secondary" onClick={toggle}>
-        {t('common.close')}
-      </CButton>
-    </CModalFooter>
   </CModal>
 );
 

src/components/CommandHistory/index.js

@@ -5,11 +5,11 @@ import {
   CWidgetDropdown,
   CRow,
   CCol,
-  CCollapse,
   CButton,
   CDataTable,
   CCard,
   CPopover,
+  CButtonToolbar,
 } from '@coreui/react';
 import CIcon from '@coreui/icons-react';
 import DatePicker from 'react-widgets/DatePicker';
@@ -21,7 +21,6 @@ import ConfirmModal from 'components/ConfirmModal';
 import { LoadingButton, useAuth, useDevice } from 'ucentral-libs';
 import WifiScanResultModalWidget from 'components/WifiScanResultModal';
 import DetailsModal from './DetailsModal';
-import styles from './index.module.scss';
 
 const DeviceCommands = () => {
   const { t } = useTranslation();
@@ -38,8 +37,6 @@ const DeviceCommands = () => {
   const [showDetailsModal, setShowDetailsModal] = useState(false);
   const [detailsUuid, setDetailsUuid] = useState('');
   const [modalDetails, setModalDetails] = useState({});
-  // Main collapsible
-  const [collapse, setCollapse] = useState(false);
   // General states
   const [commands, setCommands] = useState([]);
   const [loading, setLoading] = useState(false);
@@ -50,11 +47,6 @@ const DeviceCommands = () => {
   const [loadingMore, setLoadingMore] = useState(false);
   const [showLoadingMore, setShowLoadingMore] = useState(true);
 
-  const toggle = (e) => {
-    setCollapse(!collapse);
-    e.preventDefault();
-  };
-
   const toggleScanModal = () => {
     setShowScanModal(!showScanModal);
   };
@@ -113,7 +105,7 @@ const DeviceCommands = () => {
 
     axiosInstance
       .get(
-        `${endpoints.ucentralgw}/api/v1/commands?serialNumber=${encodeURIComponent(
+        `${endpoints.owgw}/api/v1/commands?serialNumber=${encodeURIComponent(
           deviceSerialNumber,
         )}${extraParams}`,
         options,
@@ -138,10 +130,7 @@ const DeviceCommands = () => {
     };
 
     axiosInstance
-      .get(
-        `${endpoints.ucentralgw}/api/v1/file/${uuid}?serialNumber=${deviceSerialNumber}`,
-        options,
-      )
+      .get(`${endpoints.owgw}/api/v1/file/${uuid}?serialNumber=${deviceSerialNumber}`, options)
       .then((response) => {
         const blob = new Blob([response.data], { type: 'application/octet-stream' });
         const link = document.createElement('a');
@@ -162,7 +151,7 @@ const DeviceCommands = () => {
       },
     };
     return axiosInstance
-      .delete(`${endpoints.ucentralgw}/api/v1/command/${uuidDelete}`, options)
+      .delete(`${endpoints.owgw}/api/v1/command/${uuidDelete}`, options)
       .then(() => {
         deleteCommandFromList(uuidDelete);
         setUuidDelete('');
@@ -199,17 +188,15 @@ const DeviceCommands = () => {
   };
 
   const columns = [
-    { key: 'UUID', label: t('common.id'), _style: { width: '28%' } },
-    { key: 'command', label: t('common.command'), _style: { width: '10%' } },
-    { key: 'completed', label: t('common.completed'), filter: false, _style: { width: '16%' } },
-    { key: 'submitted', label: t('common.submitted'), filter: false, _style: { width: '16%' } },
-    { key: 'executed', label: t('common.executed'), filter: false, _style: { width: '16%' } },
+    { key: 'command', label: t('common.command'), _style: { width: '15%' } },
+    { key: 'completed', label: t('common.completed'), filter: false, _style: { width: '20%' } },
+    { key: 'submitted', label: t('common.submitted'), filter: false, _style: { width: '20%' } },
     {
       key: 'show_buttons',
       label: '',
       sorter: false,
       filter: false,
-      _style: { width: '14%' },
+      _style: { width: '1%' },
     },
   ];
 
@@ -255,23 +242,13 @@ const DeviceCommands = () => {
   }, [commands]);
 
   return (
-    <CWidgetDropdown
-      inverse="true"
-      color="gradient-primary"
-      header={t('commands.title')}
-      footerSlot={
-        <div className={styles.footer}>
-          <CCollapse show={collapse}>
-            <CRow>
-              <CCol />
-              <CCol className="text-right">
-                <div>
-                  <CButton onClick={refreshCommands} size="sm">
-                    <CIcon name="cil-sync" content={cilSync} className="text-white" size="2xl" />
-                  </CButton>
-                </div>
-              </CCol>
-            </CRow>
+    <div>
+      <CWidgetDropdown
+        inverse="true"
+        color="gradient-primary"
+        header={t('commands.title')}
+        footerSlot={
+          <div className="pb-1 px-3">
             <CRow className="mb-2">
               <CCol>
                 From:
@@ -283,8 +260,9 @@ const DeviceCommands = () => {
               </CCol>
             </CRow>
             <CCard>
-              <div className={['overflow-auto', styles.scrollableBox].join(' ')}>
+              <div className="overflow-auto" style={{ height: '200px' }}>
                 <CDataTable
+                  border
                   loading={loading}
                   items={commands ?? []}
                   fields={columns}
@@ -305,98 +283,100 @@ const DeviceCommands = () => {
                           : 'Pending'}
                       </td>
                     ),
-                    executed: (item) => (
-                      <td>
-                        {item.executed && item.executed !== ''
-                          ? prettyDate(item.executed)
-                          : 'Pending'}
-                      </td>
-                    ),
                     show_buttons: (item, index) => (
                       <td>
-                        <CRow>
-                          <CCol>
-                            <CPopover
-                              content={
-                                item.command === 'trace' ? t('common.download') : t('common.result')
-                              }
+                        <CButtonToolbar
+                          role="group"
+                          className="justify-content-flex-end"
+                          style={{ width: '170px' }}
+                        >
+                          <CPopover
+                            content={
+                              item.command === 'trace' ? t('common.download') : t('common.result')
+                            }
+                          >
+                            <CButton
+                              color="primary"
+                              variant="outline"
+                              shape="square"
+                              size="sm"
+                              className="mx-2"
+                              onClick={() => {
+                                toggleDetails(item);
+                              }}
                             >
-                              <CButton
-                                color="primary"
-                                variant="outline"
-                                shape="square"
-                                size="sm"
-                                onClick={() => {
-                                  toggleDetails(item);
-                                }}
-                              >
-                                {item.command === 'trace' ? (
-                                  <CIcon content={cilCloudDownload} size="lg" />
-                                ) : (
-                                  <CIcon content={cilCalendarCheck} size="lg" />
-                                )}
-                              </CButton>
-                            </CPopover>
-                          </CCol>
-                          <CCol>
-                            <CPopover content={t('common.details')}>
-                              <CButton
-                                color="primary"
-                                variant="outline"
-                                shape="square"
-                                size="sm"
-                                onClick={() => {
-                                  toggleResponse(item);
-                                }}
-                              >
-                                <CIcon name="cilList" size="lg" />
-                              </CButton>
-                            </CPopover>
-                          </CCol>
-                          <CCol>
-                            <CPopover content={t('common.delete')}>
-                              <CButton
-                                color="primary"
-                                variant="outline"
-                                shape="square"
-                                size="sm"
-                                onClick={() => {
-                                  toggleConfirmModal(item.UUID, index);
-                                }}
-                              >
-                                <CIcon name="cilTrash" size="lg" />
-                              </CButton>
-                            </CPopover>
-                          </CCol>
-                        </CRow>
+                              {item.command === 'trace' ? (
+                                <CIcon
+                                  name="cil-cloud-download"
+                                  content={cilCloudDownload}
+                                  size="lg"
+                                />
+                              ) : (
+                                <CIcon
+                                  name="cil-calendar-check"
+                                  content={cilCalendarCheck}
+                                  size="lg"
+                                />
+                              )}
+                            </CButton>
+                          </CPopover>
+                          <CPopover content={t('common.details')}>
+                            <CButton
+                              color="primary"
+                              variant="outline"
+                              shape="square"
+                              size="sm"
+                              className="mx-2"
+                              onClick={() => {
+                                toggleResponse(item);
+                              }}
+                            >
+                              <CIcon name="cilList" size="lg" />
+                            </CButton>
+                          </CPopover>
+                          <CPopover content={t('common.delete')}>
+                            <CButton
+                              color="primary"
+                              variant="outline"
+                              shape="square"
+                              size="sm"
+                              className="mx-2"
+                              onClick={() => {
+                                toggleConfirmModal(item.UUID, index);
+                              }}
+                            >
+                              <CIcon name="cilTrash" size="lg" />
+                            </CButton>
+                          </CPopover>
+                        </CButtonToolbar>
                       </td>
                     ),
                   }}
                 />
-                <CRow className={styles.loadMoreSpacing}>
-                  {showLoadingMore && (
+
+                {showLoadingMore && (
+                  <div className="mb-3">
                     <LoadingButton
-                      label="View More"
-                      isLoadingLabel="Loading More..."
+                      label={t('common.view_more')}
+                      isLoadingLabel={t('common.loading_more_ellipsis')}
                       isLoading={loadingMore}
                       action={showMoreCommands}
                       variant="outline"
                     />
-                  )}
-                </CRow>
+                  </div>
+                )}
               </div>
             </CCard>
-          </CCollapse>
-          <CButton show={collapse ? 'true' : 'false'} color="transparent" onClick={toggle} block>
-            <CIcon
-              name={collapse ? 'cilChevronTop' : 'cilChevronBottom'}
-              className="text-white"
-              size="lg"
-            />
+          </div>
+        }
+      >
+        <div className="text-right float-right">
+          <CButton onClick={refreshCommands} size="sm">
+            <CIcon name="cil-sync" content={cilSync} className="text-white" size="2xl" />
           </CButton>
         </div>
-      }
-    >
+      </CWidgetDropdown>
+
       <WifiScanResultModalWidget
         show={showScanModal}
         toggle={toggleScanModal}
@@ -411,7 +391,7 @@ const DeviceCommands = () => {
         details={modalDetails}
         commandUuid={detailsUuid}
       />
-    </CWidgetDropdown>
+    </div>
   );
 };
 

src/components/CommandHistory/index.module.scss

@@ -1,15 +0,0 @@
-.footer {
-  padding: 20px;
-}
-
-.scrollableBox {
-  height: 200px;
-}
-
-.customIconHeight {
-  height: 19px;
-}
-
-.loadMoreSpacing {
-  margin-bottom: 1%;
-}

src/components/ConfigureModal/index.js

@@ -12,7 +12,10 @@ import {
   CTextarea,
   CInvalidFeedback,
   CInputFile,
+  CPopover,
 } from '@coreui/react';
+import CIcon from '@coreui/icons-react';
+import { cilX } from '@coreui/icons';
 import React, { useState, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import PropTypes from 'prop-types';
@@ -83,7 +86,7 @@ const ConfigureModal = ({ show, toggleModal }) => {
 
     axiosInstance
       .post(
-        `${endpoints.ucentralgw}/api/v1/device/${encodeURIComponent(deviceSerialNumber)}/configure`,
+        `${endpoints.owgw}/api/v1/device/${encodeURIComponent(deviceSerialNumber)}/configure`,
         parameters,
         { headers },
       )
@@ -125,8 +128,15 @@ const ConfigureModal = ({ show, toggleModal }) => {
 
   return (
     <CModal show={show} onClose={toggleModal} size="lg">
-      <CModalHeader closeButton>
-        <CModalTitle>{t('configure.title')}</CModalTitle>
+      <CModalHeader className="p-1">
+        <CModalTitle className="pl-1 pt-1">{t('configure.title')}</CModalTitle>
+        <div className="text-right">
+          <CPopover content={t('common.close')}>
+            <CButton color="primary" variant="outline" className="ml-2" onClick={toggleModal}>
+              <CIcon content={cilX} />
+            </CButton>
+          </CPopover>
+        </div>
       </CModalHeader>
       {hadSuccess ? (
         <SuccessfulActionModalBody toggleModal={toggleModal} />

src/components/ConfirmModal/index.js

@@ -9,7 +9,10 @@ import {
   CModalFooter,
   CSpinner,
   CBadge,
+  CPopover,
 } from '@coreui/react';
+import CIcon from '@coreui/icons-react';
+import { cilX } from '@coreui/icons';
 import PropTypes from 'prop-types';
 
 const ConfirmModal = ({ show, toggle, action }) => {
@@ -63,8 +66,15 @@ const ConfirmModal = ({ show, toggle, action }) => {
 
   return (
     <CModal className="text-dark" show={show} onClose={toggle}>
-      <CModalHeader closeButton>
-        <CModalTitle>{t('delete_command.title')}</CModalTitle>
+      <CModalHeader className="p-1">
+        <CModalTitle className="pl-1 pt-1">{t('delete_command.title')}</CModalTitle>
+        <div className="text-right">
+          <CPopover content={t('common.close')}>
+            <CButton color="primary" variant="outline" className="ml-2" onClick={toggle}>
+              <CIcon content={cilX} />
+            </CButton>
+          </CPopover>
+        </div>
       </CModalHeader>
       <CModalBody>
         <h6>{t('delete_command.explanation')}</h6>
@@ -73,9 +83,6 @@ const ConfirmModal = ({ show, toggle, action }) => {
         <CButton disabled={loading} color="primary" onClick={() => doAction()}>
           {getButtonContent()}
         </CButton>
-        <CButton color="secondary" onClick={toggle}>
-          {t('common.cancel')}
-        </CButton>
       </CModalFooter>
     </CModal>
   );

src/components/CreateUserModal/index.js

@@ -1,7 +1,9 @@
 import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { useTranslation } from 'react-i18next';
-import { CModal, CModalHeader, CModalBody } from '@coreui/react';
+import { CModal, CModalHeader, CModalBody, CModalTitle, CPopover, CButton } from '@coreui/react';
+import CIcon from '@coreui/icons-react';
+import { cilSave, cilX } from '@coreui/icons';
 import { CreateUserForm, useFormFields, useAuth, useToast } from 'ucentral-libs';
 import axiosInstance from 'utils/axiosInstance';
 import { testRegex, validateEmail } from 'utils/helper';
@@ -91,7 +93,7 @@ const CreateUserModal = ({ show, toggle, getUsers }) => {
       };
 
       axiosInstance
-        .post(`${endpoints.ucentralsec}/api/v1/user/0`, parameters, {
+        .post(`${endpoints.owsec}/api/v1/user/0`, parameters, {
           headers,
         })
         .then(() => {
@@ -123,11 +125,11 @@ const CreateUserModal = ({ show, toggle, getUsers }) => {
 
   const getPasswordPolicy = () => {
     axiosInstance
-      .post(`${endpoints.ucentralsec}/api/v1/oauth2?requirements=true`, {})
+      .post(`${endpoints.owsec}/api/v1/oauth2?requirements=true`, {})
       .then((response) => {
         const newPolicies = response.data;
-        newPolicies.accessPolicy = `${endpoints.ucentralsec}${newPolicies.accessPolicy}`;
-        newPolicies.passwordPolicy = `${endpoints.ucentralsec}${newPolicies.passwordPolicy}`;
+        newPolicies.accessPolicy = `${endpoints.owsec}${newPolicies.accessPolicy}`;
+        newPolicies.passwordPolicy = `${endpoints.owsec}${newPolicies.passwordPolicy}`;
         setPolicies(response.data);
       })
       .catch(() => {});
@@ -143,14 +145,26 @@ const CreateUserModal = ({ show, toggle, getUsers }) => {
 
   return (
     <CModal show={show} onClose={toggle} size="xl">
-      <CModalHeader>{t('user.create')}</CModalHeader>
+      <CModalHeader className="p-1">
+        <CModalTitle className="pl-1 pt-1">{t('user.create')}</CModalTitle>
+        <div className="text-right">
+          <CPopover content={t('user.create')}>
+            <CButton color="primary" variant="outline" onClick={createUser} disabled={loading}>
+              <CIcon content={cilSave} />
+            </CButton>
+          </CPopover>
+          <CPopover content={t('common.close')}>
+            <CButton color="primary" variant="outline" className="ml-2" onClick={toggle}>
+              <CIcon content={cilX} />
+            </CButton>
+          </CPopover>
+        </div>
+      </CModalHeader>
       <CModalBody>
         <CreateUserForm
           t={t}
           fields={formFields}
           updateField={updateFieldWithId}
-          createUser={createUser}
-          loading={loading}
           policies={policies}
           toggleChange={toggleChange}
         />

src/components/DeleteLogModal/index.js

@@ -1,9 +1,20 @@
 import React, { useState, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
-import { CModal, CModalHeader, CModalTitle, CModalBody, CCol, CRow } from '@coreui/react';
+import {
+  CModal,
+  CModalHeader,
+  CModalTitle,
+  CModalBody,
+  CCol,
+  CRow,
+  CPopover,
+  CButton,
+} from '@coreui/react';
+import CIcon from '@coreui/icons-react';
+import { cilX } from '@coreui/icons';
 import DatePicker from 'react-widgets/DatePicker';
 import PropTypes from 'prop-types';
-import { ConfirmFooter, useAuth, useDevice } from 'ucentral-libs';
+import { ConfirmFooter, useAuth, useDevice, useToast } from 'ucentral-libs';
 import { dateToUnix } from 'utils/helper';
 import axiosInstance from 'utils/axiosInstance';
 import eventBus from 'utils/eventBus';
@@ -11,6 +22,7 @@ import eventBus from 'utils/eventBus';
 const DeleteLogModal = ({ show, toggle, object }) => {
   const { t } = useTranslation();
   const { currentToken, endpoints } = useAuth();
+  const { addToast } = useToast();
   const { deviceSerialNumber } = useDevice();
   const [loading, setLoading] = useState(false);
   const [maxDate, setMaxDate] = useState(new Date().toString());
@@ -34,9 +46,16 @@ const DeleteLogModal = ({ show, toggle, object }) => {
       },
     };
     return axiosInstance
-      .delete(`${endpoints.ucentralgw}/api/v1/device/${deviceSerialNumber}/${object}`, options)
+      .delete(`${endpoints.owgw}/api/v1/device/${deviceSerialNumber}/${object}`, options)
       .then(() => {})
-      .catch(() => {})
+      .catch((e) => {
+        addToast({
+          title: t('common.error'),
+          body: t('commands.error_delete_log', { error: e.response?.data?.ErrorDescription }),
+          color: 'danger',
+          autohide: true,
+        });
+      })
       .finally(() => {
         if (object === 'healthchecks')
           eventBus.dispatch('deletedHealth', { message: 'Healthcheck was deleted' });
@@ -54,12 +73,19 @@ const DeleteLogModal = ({ show, toggle, object }) => {
 
   return (
     <CModal className="text-dark" show={show} onClose={toggle}>
-      <CModalHeader closeButton>
-        <CModalTitle>
+      <CModalHeader className="p-1">
+        <CModalTitle className="pl-1 pt-1">
           {object === 'healthchecks'
             ? t('delete_logs.healthchecks_title')
             : t('delete_logs.device_logs_title')}
         </CModalTitle>
+        <div className="text-right">
+          <CPopover content={t('common.close')}>
+            <CButton color="primary" variant="outline" className="ml-2" onClick={toggle}>
+              <CIcon content={cilX} />
+            </CButton>
+          </CPopover>
+        </div>
       </CModalHeader>
       <CModalBody>
         <h6>{t('delete_logs.explanation', { object })}</h6>

src/components/DeviceActionCard/index.js

@@ -11,6 +11,7 @@ import WifiScanModal from 'components/WifiScanModal';
 import BlinkModal from 'components/BlinkModal';
 import FactoryResetModal from 'components/FactoryResetModal';
 import EventQueueModal from 'components/EventQueueModal';
+import TelemetryModal from 'components/TelemetryModal';
 
 const DeviceActions = () => {
   const { t } = useTranslation();
@@ -30,38 +31,25 @@ const DeviceActions = () => {
   const [showConfigModal, setConfigModal] = useState(false);
   const [showFactoryModal, setShowFactoryModal] = useState(false);
   const [showQueueModal, setShowQueueModal] = useState(false);
+  const [showTelemetryModal, setShowTelemetryModal] = useState(false);
 
-  const toggleRebootModal = () => {
-    setShowRebootModal(!showRebootModal);
-  };
+  const toggleRebootModal = () => setShowRebootModal(!showRebootModal);
 
-  const toggleBlinkModal = () => {
-    setShowBlinkModal(!showBlinkModal);
-  };
+  const toggleBlinkModal = () => setShowBlinkModal(!showBlinkModal);
 
-  const toggleUpgradeModal = () => {
-    setShowUpgradeModal(!showUpgradeModal);
-  };
+  const toggleUpgradeModal = () => setShowUpgradeModal(!showUpgradeModal);
 
-  const toggleTraceModal = () => {
-    setShowTraceModal(!showTraceModal);
-  };
+  const toggleTraceModal = () => setShowTraceModal(!showTraceModal);
 
-  const toggleScanModal = () => {
-    setShowScanModal(!showScanModal);
-  };
+  const toggleScanModal = () => setShowScanModal(!showScanModal);
 
-  const toggleConfigModal = () => {
-    setConfigModal(!showConfigModal);
-  };
+  const toggleConfigModal = () => setConfigModal(!showConfigModal);
 
-  const toggleFactoryResetModal = () => {
-    setShowFactoryModal(!showFactoryModal);
-  };
+  const toggleFactoryResetModal = () => setShowFactoryModal(!showFactoryModal);
 
-  const toggleQueueModal = () => {
-    setShowQueueModal(!showQueueModal);
-  };
+  const toggleQueueModal = () => setShowQueueModal(!showQueueModal);
+
+  const toggleTelemetryModal = () => setShowTelemetryModal(!showTelemetryModal);
 
   const getRttysInfo = () => {
     setConnectLoading(true);
@@ -74,7 +62,7 @@ const DeviceActions = () => {
 
     axiosInstance
       .get(
-        `${endpoints.ucentralgw}/api/v1/device/${encodeURIComponent(deviceSerialNumber)}/rtty`,
+        `${endpoints.owgw}/api/v1/device/${encodeURIComponent(deviceSerialNumber)}/rtty`,
         options,
       )
       .then((response) => {
@@ -82,7 +70,14 @@ const DeviceActions = () => {
         const newWindow = window.open(url, '_blank', 'noopener,noreferrer');
         if (newWindow) newWindow.opener = null;
       })
-      .catch(() => {})
+      .catch((e) => {
+        addToast({
+          title: t('common.error'),
+          body: t('connect.error_trying_to_connect', { error: e.response?.data?.ErrorDescription }),
+          color: 'danger',
+          autohide: true,
+        });
+      })
       .finally(() => {
         setConnectLoading(false);
       });
@@ -97,7 +92,7 @@ const DeviceActions = () => {
     };
 
     axiosInstance
-      .get(`${endpoints.ucentralgw}/api/v1/device/${deviceSerialNumber}`, options)
+      .get(`${endpoints.owgw}/api/v1/device/${deviceSerialNumber}`, options)
       .then((response) => {
         setDevice(response.data);
       })
@@ -143,7 +138,7 @@ const DeviceActions = () => {
             </CButton>
           </CCol>
         </CRow>
-        <CRow className="mt-3">
+        <CRow className="mt-4">
           <CCol>
             <CButton block color="primary" onClick={toggleUpgradeModal}>
               {t('actions.firmware_upgrade')}
@@ -155,7 +150,7 @@ const DeviceActions = () => {
             </CButton>
           </CCol>
         </CRow>
-        <CRow className="mt-3">
+        <CRow className="mt-4">
           <CCol>
             <CButton block color="primary" onClick={toggleScanModal}>
               {t('actions.wifi_scan')}
@@ -167,7 +162,7 @@ const DeviceActions = () => {
             </CButton>
           </CCol>
         </CRow>
-        <CRow className="mt-3">
+        <CRow className="mt-4">
           <CCol>
             <LoadingButton
               isLoading={connectLoading}
@@ -182,13 +177,17 @@ const DeviceActions = () => {
             </CButton>
           </CCol>
         </CRow>
-        <CRow className="mt-3">
+        <CRow className="mt-4">
           <CCol>
             <CButton block color="primary" onClick={toggleQueueModal}>
               {t('commands.event_queue')}
             </CButton>
           </CCol>
-          <CCol />
+          <CCol>
+            <CButton block color="primary" onClick={toggleTelemetryModal}>
+              {t('actions.telemetry')}
+            </CButton>
+          </CCol>
         </CRow>
       </CCardBody>
       <RebootModal show={showRebootModal} toggleModal={toggleRebootModal} />
@@ -208,6 +207,7 @@ const DeviceActions = () => {
       <ConfigureModal show={showConfigModal} toggleModal={toggleConfigModal} />
       <FactoryResetModal show={showFactoryModal} toggleModal={toggleFactoryResetModal} />
       <EventQueueModal show={showQueueModal} toggle={toggleQueueModal} />
+      <TelemetryModal show={showTelemetryModal} toggle={toggleTelemetryModal} />
     </CCard>
   );
 };

src/components/DeviceConfiguration/index.js

@@ -22,6 +22,7 @@ import {
   NotesTable,
   useAuth,
   useDevice,
+  useToast,
 } from 'ucentral-libs';
 import DeviceConfigurationModal from './DeviceConfigurationModal';
 
@@ -29,6 +30,7 @@ const DeviceConfiguration = () => {
   const { t } = useTranslation();
   const { currentToken, endpoints } = useAuth();
   const { deviceSerialNumber } = useDevice();
+  const { addToast } = useToast();
   const [loading, setLoading] = useState(false);
   const [showPassword, setShowPassword] = useState(false);
   const [collapse, setCollapse] = useState(false);
@@ -57,14 +59,18 @@ const DeviceConfiguration = () => {
     };
 
     axiosInstance
-      .get(
-        `${endpoints.ucentralgw}/api/v1/device/${encodeURIComponent(deviceSerialNumber)}`,
-        options,
-      )
+      .get(`${endpoints.owgw}/api/v1/device/${encodeURIComponent(deviceSerialNumber)}`, options)
       .then((response) => {
         setDevice(response.data);
       })
-      .catch(() => {});
+      .catch((e) => {
+        addToast({
+          title: t('common.error'),
+          body: t('device.error_fetching_device', { error: e.response?.data?.ErrorDescription }),
+          color: 'danger',
+          autohide: true,
+        });
+      });
   };
 
   const saveNote = (currentNote) => {
@@ -82,7 +88,7 @@ const DeviceConfiguration = () => {
 
     axiosInstance
       .put(
-        `${endpoints.ucentralgw}/api/v1/device/${encodeURIComponent(deviceSerialNumber)}`,
+        `${endpoints.owgw}/api/v1/device/${encodeURIComponent(deviceSerialNumber)}`,
         parameters,
         { headers },
       )
@@ -156,46 +162,46 @@ const DeviceConfiguration = () => {
                 {device.firmware}
               </CCol>
             </CRow>
-            <CRow className="mt-2">
-              <CCol md="3">
-                <CLabel>{t('configuration.last_configuration_change')} : </CLabel>
-              </CCol>
-              <CCol xs="12" md="9">
-                {prettyDate(device.lastConfigurationChange)}
-              </CCol>
-            </CRow>
-            <CRow className="mt-2">
-              <CCol md="3">
-                <CLabel>{t('common.mac')} :</CLabel>
-              </CCol>
-              <CCol xs="12" md="9">
-                {device.macAddress}
-              </CCol>
-            </CRow>
-            <CRow className="mt-2 mb-4">
-              <CCol md="3">
-                <CLabel className="align-middle">{t('configuration.device_password')} : </CLabel>
-              </CCol>
-              <CCol xs="12" md="2">
-                {getPassword()}
-              </CCol>
-              <CCol md="7">
-                <HideTextButton t={t} toggle={toggleShowPassword} show={showPassword} />
-                <CopyToClipboardButton
-                  t={t}
-                  size="sm"
-                  content={device?.devicePassword === '' ? 'openwifi' : device.devicePassword}
-                />
-              </CCol>
-            </CRow>
-            <NotesTable
-              t={t}
-              notes={device.notes}
-              loading={loading}
-              addNote={saveNote}
-              descriptionColumn={false}
-            />
             <CCollapse show={collapse}>
+              <CRow className="mt-2">
+                <CCol md="3">
+                  <CLabel>{t('configuration.last_configuration_change')} : </CLabel>
+                </CCol>
+                <CCol xs="12" md="9">
+                  {prettyDate(device.lastConfigurationChange)}
+                </CCol>
+              </CRow>
+              <CRow className="mt-2">
+                <CCol md="3">
+                  <CLabel>{t('common.mac')} :</CLabel>
+                </CCol>
+                <CCol xs="12" md="9">
+                  {device.macAddress}
+                </CCol>
+              </CRow>
+              <CRow className="mt-2 mb-4">
+                <CCol md="3">
+                  <CLabel className="align-middle">{t('configuration.device_password')} : </CLabel>
+                </CCol>
+                <CCol xs="12" md="2">
+                  {getPassword()}
+                </CCol>
+                <CCol md="7">
+                  <HideTextButton t={t} toggle={toggleShowPassword} show={showPassword} />
+                  <CopyToClipboardButton
+                    t={t}
+                    size="sm"
+                    content={device?.devicePassword === '' ? 'openwifi' : device.devicePassword}
+                  />
+                </CCol>
+              </CRow>
+              <NotesTable
+                t={t}
+                notes={device.notes}
+                loading={loading}
+                addNote={saveNote}
+                descriptionColumn={false}
+              />
               <CRow className="mt-2">
                 <CCol md="3">
                   <CLabel>{t('configuration.last_configuration_download')} : </CLabel>

src/components/DeviceFirmwareModal/index.js

@@ -1,6 +1,7 @@
+/* eslint-disable no-await-in-loop */
 import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { DeviceFirmwareModal as Modal, useAuth } from 'ucentral-libs';
+import { DeviceFirmwareModal as Modal, useAuth, useToast } from 'ucentral-libs';
 import axiosInstance from 'utils/axiosInstance';
 import { useTranslation } from 'react-i18next';
 
@@ -12,37 +13,59 @@ const DeviceFirmwareModal = ({
   upgradeStatus,
 }) => {
   const { t } = useTranslation();
+  const { addToast } = useToast();
   const { currentToken, endpoints } = useAuth();
   const [loading, setLoading] = useState(false);
   const [firmwareVersions, setFirmwareVersions] = useState([]);
 
-  const getFirmwareList = () => {
-    setLoading(true);
-
+  const getPartialFirmware = async (offset) => {
     const headers = {
       Accept: 'application/json',
       Authorization: `Bearer ${currentToken}`,
     };
 
-    axiosInstance
-      .get(`${endpoints.ucentralfms}/api/v1/firmwares?deviceType=${device.compatible}`, {
-        headers,
-      })
-      .then((response) => {
-        const sortedFirmware = response.data.firmwares.sort((a, b) => {
-          const firstDate = a.imageDate;
-          const secondDate = b.imageDate;
-          if (firstDate < secondDate) return 1;
-          return firstDate > secondDate ? -1 : 0;
-        });
-        setFirmwareVersions(sortedFirmware);
-        setLoading(false);
-      })
+    return axiosInstance
+      .get(
+        `${endpoints.owfms}/api/v1/firmwares?deviceType=${device.compatible}&limit=500&offset=${offset}`,
+        {
+          headers,
+        },
+      )
+      .then((response) => response.data.firmwares)
       .catch(() => {
-        setLoading(false);
+        addToast({
+          title: t('common.error'),
+          body: t('common.general_error'),
+          color: 'danger',
+          autohide: true,
+        });
+        return [];
       });
   };
 
+  const getFirmwareList = async () => {
+    setLoading(true);
+
+    const allFirmwares = [];
+    let continueFirmware = true;
+    let i = 1;
+    while (continueFirmware) {
+      const newFirmwares = await getPartialFirmware(i);
+      if (newFirmwares === null || newFirmwares.length === 0) continueFirmware = false;
+      allFirmwares.push(...newFirmwares);
+      i += 500;
+    }
+    const sortedFirmware = allFirmwares.sort((a, b) => {
+      const firstDate = a.imageDate;
+      const secondDate = b.imageDate;
+      if (firstDate < secondDate) return 1;
+      return firstDate > secondDate ? -1 : 0;
+    });
+    setFirmwareVersions(sortedFirmware);
+
+    setLoading(false);
+  };
+
   const upgradeToVersion = (uri) => {
     setUpgradeStatus({
       loading: true,
@@ -60,7 +83,7 @@ const DeviceFirmwareModal = ({
     };
 
     axiosInstance
-      .post(`${endpoints.ucentralgw}/api/v1/device/${device.serialNumber}/upgrade`, parameters, {
+      .post(`${endpoints.owgw}/api/v1/device/${device.serialNumber}/upgrade`, parameters, {
         headers,
       })
       .then((response) => {

src/components/DeviceHealth/index.js

@@ -13,6 +13,7 @@ import {
   CPopover,
 } from '@coreui/react';
 import CIcon from '@coreui/icons-react';
+import { cilTrash } from '@coreui/icons';
 import { useTranslation } from 'react-i18next';
 import DatePicker from 'react-widgets/DatePicker';
 import { prettyDate, dateToUnix } from 'utils/helper';
@@ -25,7 +26,6 @@ const DeviceHealth = () => {
   const { t } = useTranslation();
   const { currentToken, endpoints } = useAuth();
   const { deviceSerialNumber } = useDevice();
-  const [collapse, setCollapse] = useState(false);
   const [details, setDetails] = useState([]);
   const [loading, setLoading] = useState(false);
   const [healthChecks, setHealthChecks] = useState([]);
@@ -42,11 +42,6 @@ const DeviceHealth = () => {
     setShowDeleteModal(!showDeleteModal);
   };
 
-  const toggle = (e) => {
-    setCollapse(!collapse);
-    e.preventDefault();
-  };
-
   const modifyStart = (value) => {
     setStart(value);
   };
@@ -85,7 +80,7 @@ const DeviceHealth = () => {
 
     axiosInstance
       .get(
-        `${endpoints.ucentralgw}/api/v1/device/${encodeURIComponent(
+        `${endpoints.owgw}/api/v1/device/${encodeURIComponent(
           deviceSerialNumber,
         )}/healthchecks${extraParams}`,
         options,
@@ -195,96 +190,71 @@ const DeviceHealth = () => {
       color={barColor}
       inverse="true"
       footerSlot={
-        <div className="p-4">
+        <div className="pb-1 px-3">
           <CProgress className="mb-3" color="white" value={sanityLevel ?? 0} />
-          <CCollapse show={collapse}>
-            <div className="text-right">
-              <CPopover content={t('common.delete')}>
-                <CButton
-                  color="light"
-                  shape="square"
-                  size="sm"
-                  onClick={() => {
-                    toggleDeleteModal();
-                  }}
-                >
-                  <CIcon name="cilTrash" size="lg" />
-                </CButton>
-              </CPopover>
+          <CRow className="mb-3">
+            <CCol>
+              {t('common.from')}
+              :
+              <DatePicker includeTime onChange={(date) => modifyStart(date)} />
+            </CCol>
+            <CCol>
+              {t('common.to')}
+              :
+              <DatePicker includeTime onChange={(date) => modifyEnd(date)} />
+            </CCol>
+          </CRow>
+          <CCard className="p-0">
+            <div className="overflow-auto" style={{ height: '200px' }}>
+              <CDataTable
+                border
+                items={healthChecks ?? []}
+                fields={columns}
+                className="text-white"
+                loading={loading}
+                sorterValue={{ column: 'recorded', desc: 'true' }}
+                scopedSlots={{
+                  UUID: (item) => <td className="align-middle">{item.UUID}</td>,
+                  recorded: (item) => <td className="align-middle">{prettyDate(item.recorded)}</td>,
+                  sanity: (item) => <td className="align-middle">{`${item.sanity}%`}</td>,
+                  show_details: (item, index) => (
+                    <td className="align-middle">
+                      <CButton
+                        color="primary"
+                        variant={details.includes(index) ? '' : 'outline'}
+                        shape="square"
+                        size="sm"
+                        onClick={() => {
+                          toggleDetails(index);
+                        }}
+                      >
+                        <CIcon name="cilList" size="lg" />
+                      </CButton>
+                    </td>
+                  ),
+                  details: (item, index) => (
+                    <CCollapse show={details.includes(index)}>
+                      <CCardBody>
+                        <h5>{t('common.details')}</h5>
+                        <div>{getDetails(index, item.values)}</div>
+                      </CCardBody>
+                    </CCollapse>
+                  ),
+                }}
+              />
+              {showLoadingMore && (
+                <div className="mb-3">
+                  <LoadingButton
+                    label={t('common.view_more')}
+                    isLoadingLabel={t('common.loading_more_ellipsis')}
+                    isLoading={loadingMore}
+                    action={showMoreLogs}
+                    variant="outline"
+                  />
+                </div>
+              )}
             </div>
-            <CRow className="mb-3">
-              <CCol>
-                {t('common.from')}
-                :
-                <DatePicker includeTime onChange={(date) => modifyStart(date)} />
-              </CCol>
-              <CCol>
-                {t('common.to')}
-                :
-                <DatePicker includeTime onChange={(date) => modifyEnd(date)} />
-              </CCol>
-            </CRow>
-            <CCard className="p-0">
-              <div className="overflow-auto" style={{ height: '250px' }}>
-                <CDataTable
-                  border
-                  items={healthChecks ?? []}
-                  fields={columns}
-                  className="text-white"
-                  loading={loading}
-                  sorterValue={{ column: 'recorded', desc: 'true' }}
-                  scopedSlots={{
-                    UUID: (item) => <td className="align-middle">{item.UUID}</td>,
-                    recorded: (item) => (
-                      <td className="align-middle">{prettyDate(item.recorded)}</td>
-                    ),
-                    sanity: (item) => <td className="align-middle">{`${item.sanity}%`}</td>,
-                    show_details: (item, index) => (
-                      <td className="align-middle">
-                        <CButton
-                          color="primary"
-                          variant={details.includes(index) ? '' : 'outline'}
-                          shape="square"
-                          size="sm"
-                          onClick={() => {
-                            toggleDetails(index);
-                          }}
-                        >
-                          <CIcon name="cilList" size="lg" />
-                        </CButton>
-                      </td>
-                    ),
-                    details: (item, index) => (
-                      <CCollapse show={details.includes(index)}>
-                        <CCardBody>
-                          <h5>{t('common.details')}</h5>
-                          <div>{getDetails(index, item.values)}</div>
-                        </CCardBody>
-                      </CCollapse>
-                    ),
-                  }}
-                />
-                {showLoadingMore && (
-                  <div className="mb-3">
-                    <LoadingButton
-                      label={t('common.view_more')}
-                      isLoadingLabel={t('common.loading_more_ellipsis')}
-                      isLoading={loadingMore}
-                      action={showMoreLogs}
-                      variant="outline"
-                    />
-                  </div>
-                )}
-              </div>
-            </CCard>
-          </CCollapse>
-          <CButton show={collapse ? 'true' : 'false'} color="transparent" onClick={toggle} block>
-            <CIcon
-              name={collapse ? 'cilChevronTop' : 'cilChevronBottom'}
-              className="text-white"
-              size="lg"
-            />
-          </CButton>
+          </CCard>
           <DeleteLogModal
             serialNumber={deviceSerialNumber}
             object="healthchecks"
@@ -293,7 +263,15 @@ const DeviceHealth = () => {
           />
         </div>
       }
-    />
+    >
+      <div className="text-right float-right">
+        <CPopover content={t('common.delete')}>
+          <CButton onClick={toggleDeleteModal} size="sm">
+            <CIcon name="cil-trash" content={cilTrash} className="text-white" size="2xl" />
+          </CButton>
+        </CPopover>
+      </div>
+    </CWidgetDropdown>
   );
 };
 

src/components/DeviceListTable/index.js

@@ -68,9 +68,7 @@ const DeviceList = () => {
 
     axiosInstance
       .get(
-        `${
-          endpoints.ucentralgw
-        }/api/v1/devices?deviceWithStatus=true&limit=${devicePerPage}&offset=${
+        `${endpoints.owgw}/api/v1/devices?deviceWithStatus=true&limit=${devicePerPage}&offset=${
           devicePerPage * selectedPage + 1
         }`,
         options,
@@ -80,7 +78,7 @@ const DeviceList = () => {
         const serialsToGet = fullDevices.map((device) => device.serialNumber);
 
         return axiosInstance.get(
-          `${endpoints.ucentralfms}/api/v1/firmwareAge?select=${serialsToGet}`,
+          `${endpoints.owfms}/api/v1/firmwareAge?select=${serialsToGet}`,
           options,
         );
       })
@@ -101,7 +99,13 @@ const DeviceList = () => {
         setDevices(fullDevices);
         setLoading(false);
       })
-      .catch(() => {
+      .catch((e) => {
+        addToast({
+          title: t('common.error'),
+          body: t('device.error_fetching_devices', { error: e.response?.data?.ErrorDescription }),
+          color: 'danger',
+          autohide: true,
+        });
         setLoading(false);
       });
   };
@@ -115,7 +119,7 @@ const DeviceList = () => {
     };
 
     axiosInstance
-      .get(`${endpoints.ucentralgw}/api/v1/devices?countOnly=true`, {
+      .get(`${endpoints.owgw}/api/v1/devices?countOnly=true`, {
         headers,
       })
       .then((response) => {
@@ -132,7 +136,13 @@ const DeviceList = () => {
         }
         getDeviceInformation(selectedPage);
       })
-      .catch(() => {
+      .catch((e) => {
+        addToast({
+          title: t('common.error'),
+          body: t('device.error_fetching_devices', { error: e.response?.data?.ErrorDescription }),
+          color: 'danger',
+          autohide: true,
+        });
         setLoading(false);
       });
   };
@@ -147,22 +157,47 @@ const DeviceList = () => {
       },
     };
 
+    let newDevice;
+
     axiosInstance
       .get(
-        `${endpoints.ucentralgw}/api/v1/devices?deviceWithStatus=true&select=${encodeURIComponent(
+        `${endpoints.owgw}/api/v1/devices?deviceWithStatus=true&select=${encodeURIComponent(
           serialNumber,
         )}`,
         options,
       )
+      .then(
+        ({
+          data: {
+            devicesWithStatus: [device],
+          },
+        }) => {
+          newDevice = device;
+
+          return axiosInstance.get(
+            `${endpoints.owfms}/api/v1/firmwareAge?select=${serialNumber}`,
+            options,
+          );
+        },
+      )
       .then((response) => {
-        const device = response.data.devicesWithStatus[0];
+        newDevice.firmwareInfo = {
+          age: response.data.ages[0].age,
+          latest: response.data.ages[0].latest,
+        };
         const foundIndex = devices.findIndex((obj) => obj.serialNumber === serialNumber);
         const newList = devices;
-        newList[foundIndex] = device;
+        newList[foundIndex] = newDevice;
         setDevices(newList);
         setLoading(false);
       })
-      .catch(() => {
+      .catch((e) => {
+        addToast({
+          title: t('common.error'),
+          body: t('device.error_fetching_devices', { error: e.response?.data?.ErrorDescription }),
+          color: 'danger',
+          autohide: true,
+        });
         setLoading(false);
       });
   };
@@ -203,7 +238,7 @@ const DeviceList = () => {
 
     axiosInstance
       .get(
-        `${endpoints.ucentralfms}/api/v1/firmwares?deviceType=${device.compatible}&latestOnly=true`,
+        `${endpoints.owfms}/api/v1/firmwares?deviceType=${device.compatible}&latestOnly=true`,
         options,
       )
       .then((response) => {
@@ -214,7 +249,7 @@ const DeviceList = () => {
             uri: response.data.uri,
           };
           return axiosInstance.post(
-            `${endpoints.ucentralgw}/api/v1/device/${device.serialNumber}/upgrade`,
+            `${endpoints.owgw}/api/v1/device/${device.serialNumber}/upgrade`,
             parameters,
             options,
           );
@@ -259,19 +294,16 @@ const DeviceList = () => {
     };
 
     axiosInstance
-      .get(
-        `${endpoints.ucentralgw}/api/v1/device/${encodeURIComponent(serialNumber)}/rtty`,
-        options,
-      )
+      .get(`${endpoints.owgw}/api/v1/device/${encodeURIComponent(serialNumber)}/rtty`, options)
       .then((response) => {
         const url = `https://${response.data.server}:${response.data.viewport}/connect/${response.data.connectionId}`;
         const newWindow = window.open(url, '_blank', 'noopener,noreferrer');
         if (newWindow) newWindow.opener = null;
       })
-      .catch(() => {
+      .catch((e) => {
         addToast({
           title: t('common.error'),
-          body: t('common.unable_to_connect'),
+          body: t('connect.error_trying_to_connect', { error: e.response?.data?.ErrorDescription }),
           color: 'danger',
           autohide: true,
         });
@@ -291,7 +323,7 @@ const DeviceList = () => {
     };
 
     axiosInstance
-      .delete(`${endpoints.ucentralgw}/api/v1/device/${encodeURIComponent(serialNumber)}`, options)
+      .delete(`${endpoints.owgw}/api/v1/device/${encodeURIComponent(serialNumber)}`, options)
       .then(() => {
         addToast({
           title: t('common.success'),

src/components/DeviceLogs/index.js

@@ -12,6 +12,7 @@ import {
   CPopover,
 } from '@coreui/react';
 import CIcon from '@coreui/icons-react';
+import { cilTrash } from '@coreui/icons';
 import { useTranslation } from 'react-i18next';
 import DatePicker from 'react-widgets/DatePicker';
 import { prettyDate, dateToUnix } from 'utils/helper';
@@ -24,7 +25,6 @@ const DeviceLogs = () => {
   const { t } = useTranslation();
   const { currentToken, endpoints } = useAuth();
   const { deviceSerialNumber } = useDevice();
-  const [collapse, setCollapse] = useState(false);
   const [details, setDetails] = useState([]);
   const [loading, setLoading] = useState(false);
   const [logs, setLogs] = useState([]);
@@ -39,11 +39,6 @@ const DeviceLogs = () => {
     setShowDeleteModal(!showDeleteModal);
   };
 
-  const toggle = (e) => {
-    setCollapse(!collapse);
-    e.preventDefault();
-  };
-
   const modifyStart = (value) => {
     setStart(value);
   };
@@ -82,7 +77,7 @@ const DeviceLogs = () => {
 
     axiosInstance
       .get(
-        `${endpoints.ucentralgw}/api/v1/device/${encodeURIComponent(
+        `${endpoints.owgw}/api/v1/device/${encodeURIComponent(
           deviceSerialNumber,
         )}/logs${extraParams}`,
         options,
@@ -176,91 +171,76 @@ const DeviceLogs = () => {
         color="gradient-info"
         header={t('device_logs.title')}
         footerSlot={
-          <div className="p-4">
-            <CCollapse show={collapse}>
-              <div className="text-right">
-                <CPopover content={t('common.delete')}>
-                  <CButton
-                    color="light"
-                    shape="square"
-                    size="sm"
-                    onClick={() => {
-                      toggleDeleteModal();
-                    }}
-                  >
-                    <CIcon name="cilTrash" size="lg" />
-                  </CButton>
-                </CPopover>
+          <div className="pb-1 px-3">
+            <CRow className="mb-3">
+              <CCol>
+                {t('common.from')}
+                <DatePicker includeTime onChange={(date) => modifyStart(date)} />
+              </CCol>
+              <CCol>
+                {t('common.to')}
+                <DatePicker includeTime onChange={(date) => modifyEnd(date)} />
+              </CCol>
+            </CRow>
+            <CCard>
+              <div className="overflow-auto" style={{ height: '250px' }}>
+                <CDataTable
+                  items={logs ?? []}
+                  fields={columns}
+                  loading={loading}
+                  className="text-white"
+                  sorterValue={{ column: 'recorded', desc: 'true' }}
+                  scopedSlots={{
+                    recorded: (item) => <td>{prettyDate(item.recorded)}</td>,
+                    show_details: (item, index) => (
+                      <td className="py-2">
+                        <CButton
+                          color="primary"
+                          variant={details.includes(index) ? '' : 'outline'}
+                          shape="square"
+                          size="sm"
+                          onClick={() => {
+                            toggleDetails(index);
+                          }}
+                        >
+                          <CIcon name="cilList" size="lg" />
+                        </CButton>
+                      </td>
+                    ),
+                    details: (item, index) => (
+                      <CCollapse show={details.includes(index)}>
+                        <CCardBody>
+                          <h5>{t('common.details')}</h5>
+                          <div>{getDetails(index, item)}</div>
+                        </CCardBody>
+                      </CCollapse>
+                    ),
+                  }}
+                />
+                {showLoadingMore && (
+                  <div className="mb-3">
+                    <LoadingButton
+                      label={t('common.view_more')}
+                      isLoadingLabel={t('common.loading_more_ellipsis')}
+                      isLoading={loadingMore}
+                      action={showMoreLogs}
+                      variant="outline"
+                    />
+                  </div>
+                )}
               </div>
-              <CRow className="mb-3">
-                <CCol>
-                  {t('common.from')}
-                  <DatePicker includeTime onChange={(date) => modifyStart(date)} />
-                </CCol>
-                <CCol>
-                  {t('common.to')}
-                  <DatePicker includeTime onChange={(date) => modifyEnd(date)} />
-                </CCol>
-              </CRow>
-              <CCard>
-                <div className="overflow-auto" style={{ height: '250px' }}>
-                  <CDataTable
-                    items={logs ?? []}
-                    fields={columns}
-                    loading={loading}
-                    className="text-white"
-                    sorterValue={{ column: 'recorded', desc: 'true' }}
-                    scopedSlots={{
-                      recorded: (item) => <td>{prettyDate(item.recorded)}</td>,
-                      show_details: (item, index) => (
-                        <td className="py-2">
-                          <CButton
-                            color="primary"
-                            variant={details.includes(index) ? '' : 'outline'}
-                            shape="square"
-                            size="sm"
-                            onClick={() => {
-                              toggleDetails(index);
-                            }}
-                          >
-                            <CIcon name="cilList" size="lg" />
-                          </CButton>
-                        </td>
-                      ),
-                      details: (item, index) => (
-                        <CCollapse show={details.includes(index)}>
-                          <CCardBody>
-                            <h5>{t('common.details')}</h5>
-                            <div>{getDetails(index, item)}</div>
-                          </CCardBody>
-                        </CCollapse>
-                      ),
-                    }}
-                  />
-                  {showLoadingMore && (
-                    <div className="mb-3">
-                      <LoadingButton
-                        label={t('common.view_more')}
-                        isLoadingLabel={t('common.loading_more_ellipsis')}
-                        isLoading={loadingMore}
-                        action={showMoreLogs}
-                        variant="outline"
-                      />
-                    </div>
-                  )}
-                </div>
-              </CCard>
-            </CCollapse>
-            <CButton show={collapse ? 'true' : 'false'} color="transparent" onClick={toggle} block>
-              <CIcon
-                name={collapse ? 'cilChevronTop' : 'cilChevronBottom'}
-                className="text-white"
-                size="lg"
-              />
-            </CButton>
+            </CCard>
           </div>
         }
-      />
+      >
+        <div className="text-right float-right">
+          <CPopover content={t('common.delete')}>
+            <CButton onClick={toggleDeleteModal} size="sm">
+              <CIcon name="cil-trash" content={cilTrash} className="text-white" size="2xl" />
+            </CButton>
+          </CPopover>
+        </div>
+      </CWidgetDropdown>
       <DeleteLogModal
         serialNumber={deviceSerialNumber}
         object="logs"

src/components/DeviceSearchBar/index.js

@@ -24,7 +24,7 @@ const DeviceSearchBar = () => {
       }
     } else if (socket.readyState !== WebSocket.CONNECTING) {
       setWaitingSearch(value);
-      setSocket(new WebSocket(`${endpoints.ucentralgw.replace('https', 'wss')}/api/v1/ws`));
+      setSocket(new WebSocket(`${endpoints.owgw.replace('https', 'wss')}/api/v1/ws`));
     } else {
       setWaitingSearch(value);
     }
@@ -60,8 +60,8 @@ const DeviceSearchBar = () => {
   }, [socket]);
 
   useEffect(() => {
-    if (socket === null) {
-      setSocket(new WebSocket(`${endpoints.ucentralgw.replace('https', 'wss')}/api/v1/ws`));
+    if (socket === null && endpoints?.owgw) {
+      setSocket(new WebSocket(`${endpoints.owgw.replace('https', 'wss')}/api/v1/ws`));
     }
   }, []);
 

src/components/DeviceStatusCard/index.js

@@ -1,17 +1,42 @@
 import React, { useState, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import axiosInstance from 'utils/axiosInstance';
-import { DeviceStatusCard as Card, useDevice, useAuth } from 'ucentral-libs';
+import { DeviceStatusCard as Card, useDevice, useAuth, useToast } from 'ucentral-libs';
 
 const DeviceStatusCard = () => {
   const { t } = useTranslation();
   const { currentToken, endpoints } = useAuth();
   const { deviceSerialNumber } = useDevice();
+  const { addToast } = useToast();
   const [lastStats, setLastStats] = useState(null);
   const [status, setStatus] = useState(null);
+  const [deviceConfig, setDeviceConfig] = useState(null);
   const [error, setError] = useState(false);
   const [loading, setLoading] = useState(false);
 
+  const getDevice = () => {
+    const options = {
+      headers: {
+        Accept: 'application/json',
+        Authorization: `Bearer ${currentToken}`,
+      },
+    };
+
+    axiosInstance
+      .get(`${endpoints.owgw}/api/v1/device/${encodeURIComponent(deviceSerialNumber)}`, options)
+      .then((response) => {
+        setDeviceConfig(response.data);
+      })
+      .catch((e) => {
+        addToast({
+          title: t('common.error'),
+          body: t('device.error_fetching_device', { error: e.response?.data?.ErrorDescription }),
+          color: 'danger',
+          autohide: true,
+        });
+      });
+  };
+
   const getData = () => {
     setLoading(true);
     const options = {
@@ -22,13 +47,13 @@ const DeviceStatusCard = () => {
     };
 
     const lastStatsRequest = axiosInstance.get(
-      `${endpoints.ucentralgw}/api/v1/device/${encodeURIComponent(
+      `${endpoints.owgw}/api/v1/device/${encodeURIComponent(
         deviceSerialNumber,
       )}/statistics?lastOnly=true`,
       options,
     );
     const statusRequest = axiosInstance.get(
-      `${endpoints.ucentralgw}/api/v1/device/${encodeURIComponent(deviceSerialNumber)}/status`,
+      `${endpoints.owgw}/api/v1/device/${encodeURIComponent(deviceSerialNumber)}/status`,
       options,
     );
 
@@ -45,9 +70,17 @@ const DeviceStatusCard = () => {
       });
   };
 
+  const refresh = () => {
+    getData();
+    getDevice();
+  };
+
   useEffect(() => {
     setError(false);
-    if (deviceSerialNumber) getData();
+    if (deviceSerialNumber) {
+      getDevice();
+      getData();
+    }
   }, [deviceSerialNumber]);
 
   return (
@@ -56,7 +89,8 @@ const DeviceStatusCard = () => {
       loading={loading}
       error={error}
       deviceSerialNumber={deviceSerialNumber}
-      getData={getData}
+      getData={refresh}
+      deviceConfig={deviceConfig}
       status={status}
       lastStats={lastStats}
     />

src/components/EditUserModal/index.js

@@ -61,11 +61,11 @@ const EditUserModal = ({ show, toggle, userId, getUsers }) => {
 
   const getPasswordPolicy = () => {
     axiosInstance
-      .post(`${endpoints.ucentralsec}/api/v1/oauth2?requirements=true`, {})
+      .post(`${endpoints.owsec}/api/v1/oauth2?requirements=true`, {})
       .then((response) => {
         const newPolicies = response.data;
-        newPolicies.accessPolicy = `${endpoints.ucentralsec}${newPolicies.accessPolicy}`;
-        newPolicies.passwordPolicy = `${endpoints.ucentralsec}${newPolicies.passwordPolicy}`;
+        newPolicies.accessPolicy = `${endpoints.owsec}${newPolicies.accessPolicy}`;
+        newPolicies.passwordPolicy = `${endpoints.owsec}${newPolicies.passwordPolicy}`;
         setPolicies(response.data);
       })
       .catch(() => {});
@@ -80,7 +80,7 @@ const EditUserModal = ({ show, toggle, userId, getUsers }) => {
     };
 
     axiosInstance
-      .get(`${endpoints.ucentralsec}/api/v1/user/${userId}`, options)
+      .get(`${endpoints.owsec}/api/v1/user/${userId}`, options)
       .then((response) => {
         const newUser = {};
 
@@ -134,7 +134,7 @@ const EditUserModal = ({ show, toggle, userId, getUsers }) => {
       };
 
       axiosInstance
-        .put(`${endpoints.ucentralsec}/api/v1/user/${userId}`, parameters, options)
+        .put(`${endpoints.owsec}/api/v1/user/${userId}`, parameters, options)
         .then(() => {
           addToast({
             title: t('user.update_success_title'),
@@ -145,10 +145,10 @@ const EditUserModal = ({ show, toggle, userId, getUsers }) => {
           getUsers();
           toggle();
         })
-        .catch(() => {
+        .catch((e) => {
           addToast({
             title: t('user.update_failure_title'),
-            body: t('user.update_failure'),
+            body: t('user.update_failure', { error: e.response?.data?.ErrorDescription }),
             color: 'danger',
             autohide: true,
           });
@@ -186,7 +186,7 @@ const EditUserModal = ({ show, toggle, userId, getUsers }) => {
     };
 
     axiosInstance
-      .put(`${endpoints.ucentralsec}/api/v1/user/${userId}`, parameters, options)
+      .put(`${endpoints.owsec}/api/v1/user/${userId}`, parameters, options)
       .then(() => {
         getUser();
       })

src/components/EventQueueModal/index.js

@@ -28,18 +28,14 @@ const EventQueueModal = ({ show, toggle }) => {
     };
 
     axiosInstance
-      .post(
-        `${endpoints.ucentralgw}/api/v1/device/${deviceSerialNumber}/eventqueue`,
-        parameters,
-        options,
-      )
+      .post(`${endpoints.owgw}/api/v1/device/${deviceSerialNumber}/eventqueue`, parameters, options)
       .then((response) => {
         setResult(response.data);
       })
-      .catch(() => {
+      .catch((e) => {
         addToast({
           title: t('common.error'),
-          body: t('commands.unable_queue'),
+          body: t('commands.unable_queue', { error: e.response?.data?.ErrorDescription }),
           color: 'danger',
           autohide: true,
         });

src/components/FactoryResetModal/index.js

@@ -10,7 +10,10 @@ import {
   CForm,
   CSwitch,
   CAlert,
+  CPopover,
 } from '@coreui/react';
+import CIcon from '@coreui/icons-react';
+import { cilX } from '@coreui/icons';
 import React, { useState, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import PropTypes from 'prop-types';
@@ -64,7 +67,7 @@ const ConfigureModal = ({ show, toggleModal }) => {
 
     axiosInstance
       .post(
-        `${endpoints.ucentralgw}/api/v1/device/${encodeURIComponent(deviceSerialNumber)}/factory`,
+        `${endpoints.owgw}/api/v1/device/${encodeURIComponent(deviceSerialNumber)}/factory`,
         parameters,
         { headers },
       )
@@ -84,8 +87,15 @@ const ConfigureModal = ({ show, toggleModal }) => {
 
   return (
     <CModal show={show} onClose={toggleModal}>
-      <CModalHeader closeButton>
-        <CModalTitle>{t('factory_reset.title')}</CModalTitle>
+      <CModalHeader className="p-1">
+        <CModalTitle className="pl-1 pt-1">{t('factory_reset.title')}</CModalTitle>
+        <div className="text-right">
+          <CPopover content={t('common.close')}>
+            <CButton color="primary" variant="outline" className="ml-2" onClick={toggleModal}>
+              <CIcon content={cilX} />
+            </CButton>
+          </CPopover>
+        </div>
       </CModalHeader>
       {hadSuccess ? (
         <SuccessfulActionModalBody toggleModal={toggleModal} />

src/components/FirmwareHistoryModal/index.js

@@ -29,7 +29,7 @@ const FirmwareHistoryModal = ({ serialNumber, show, toggle }) => {
     };
 
     axiosInstance
-      .get(`${endpoints.ucentralfms}/api/v1/revisionHistory/${serialNumber}`, options)
+      .get(`${endpoints.owfms}/api/v1/revisionHistory/${serialNumber}`, options)
       .then((response) => setData(response.data.history ?? []))
       .catch(() => {})
       .finally(() => setLoading(false));
@@ -46,7 +46,7 @@ const FirmwareHistoryModal = ({ serialNumber, show, toggle }) => {
   return (
     <CModal size="xl" show={show} onClose={toggle} scrollable>
       <CModalHeader closeButton>
-        <CModalTitle>
+        <CModalTitle className="pl-1 pt-1">
           #{serialNumber} {t('firmware.history_title')}
         </CModalTitle>
       </CModalHeader>

src/components/FirmwareUpgradeModal/UpgradeFooter.js

@@ -1,74 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
-import PropTypes from 'prop-types';
-import { CButton, CSpinner, CModalFooter } from '@coreui/react';
-
-const UpgradeFooter = ({
-  isNow,
-  isShown,
-  isLoading,
-  action,
-  color,
-  variant,
-  block,
-  toggleParent,
-}) => {
-  const { t } = useTranslation();
-  const [askingIfSure, setAskingIfSure] = useState(false);
-
-  const confirmingIfSure = () => {
-    setAskingIfSure(true);
-  };
-
-  useEffect(() => {
-    setAskingIfSure(false);
-  }, [isShown]);
-
-  return (
-    <CModalFooter>
-      <div hidden={!askingIfSure}>{t('common.are_you_sure')}</div>
-      <CButton
-        disabled={isLoading}
-        hidden={askingIfSure}
-        color={color}
-        variant={variant}
-        onClick={() => confirmingIfSure()}
-        block={block}
-      >
-        {isNow ? t('upgrade.upgrade') : t('common.schedule')}
-      </CButton>
-      <CButton
-        disabled={isLoading}
-        hidden={!askingIfSure}
-        color={color}
-        onClick={() => action()}
-        block={block}
-      >
-        {isLoading ? t('common.loading_ellipsis') : t('common.yes')}
-        <CSpinner color="light" hidden={!isLoading} component="span" size="sm" />
-      </CButton>
-      <CButton color="secondary" onClick={toggleParent}>
-        {t('common.cancel')}
-      </CButton>
-    </CModalFooter>
-  );
-};
-
-UpgradeFooter.propTypes = {
-  isNow: PropTypes.bool.isRequired,
-  isLoading: PropTypes.bool.isRequired,
-  block: PropTypes.bool,
-  action: PropTypes.func.isRequired,
-  color: PropTypes.string,
-  variant: PropTypes.string,
-  toggleParent: PropTypes.func.isRequired,
-  isShown: PropTypes.bool.isRequired,
-};
-
-UpgradeFooter.defaultProps = {
-  color: 'primary',
-  variant: '',
-  block: false,
-};
-
-export default UpgradeFooter;

src/components/FirmwareUpgradeModal/UpgradeWaitingBody.js

@@ -1,102 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
-import PropTypes from 'prop-types';
-import { CModalBody } from '@coreui/react';
-import { v4 as createUuid } from 'uuid';
-import { useAuth } from 'ucentral-libs';
-import axiosInstance from 'utils/axiosInstance';
-
-const UpgradeWaitingBody = ({ serialNumber }) => {
-  const { t } = useTranslation();
-  const { currentToken, endpoints } = useAuth();
-  const [currentStep, setCurrentStep] = useState(0);
-  const [secondsElapsed, setSecondsElapsed] = useState(0);
-  const [labelsToShow, setLabelsToShow] = useState(['upgrade.command_submitted']);
-
-  const getDeviceConnection = () => {
-    const options = {
-      headers: {
-        Accept: 'application/json',
-        Authorization: `Bearer ${currentToken}`,
-      },
-    };
-
-    axiosInstance
-      .get(
-        `${endpoints.ucentralgw}/api/v1/device/${encodeURIComponent(serialNumber)}/status`,
-        options,
-      )
-      .then((response) => response.data.connected)
-      .catch(() => {});
-  };
-
-  const getFirmwareVersion = () => {
-    const options = {
-      headers: {
-        Accept: 'application/json',
-        Authorization: `Bearer ${currentToken}`,
-      },
-    };
-
-    axiosInstance
-      .get(`${endpoints.ucentralgw}/api/v1/device/${encodeURIComponent(serialNumber)}`, options)
-      .then((response) => response.data.firmware)
-      .catch(() => {});
-  };
-
-  const refreshStep = () => {
-    if (currentStep === 0 && !getDeviceConnection) {
-      const labelsToAdd = [
-        t('upgrade.device_disconnected'),
-        t('upgrade.device_upgrading_firmware'),
-        t('upgrade.waiting_for_device'),
-      ];
-      setLabelsToShow([...labelsToShow, ...labelsToAdd]);
-      setCurrentStep(1);
-    } else if (currentStep === 1 && getDeviceConnection()) {
-      const newFirmware = `: ${getFirmwareVersion()}`;
-      const labelsToAdd = [
-        t('upgrade.device_reconnected'),
-        `${t('upgrade.new_version')}: ${newFirmware}`,
-      ];
-      setLabelsToShow([...labelsToShow, ...labelsToAdd]);
-      setCurrentStep(2);
-    }
-  };
-
-  useEffect(() => {
-    const refreshIntervalId = setInterval(() => {
-      refreshStep();
-    }, 5000);
-
-    const timerIntervalId = setInterval(() => {
-      setSecondsElapsed(secondsElapsed + 1);
-    }, 1000);
-
-    return () => {
-      clearInterval(refreshIntervalId);
-      clearInterval(timerIntervalId);
-    };
-  }, []);
-
-  return (
-    <CModalBody>
-      <div className="consoleBox">
-        {labelsToShow.map((label) => (
-          <p key={createUuid()}>
-            {new Date().toString()}:{label}
-          </p>
-        ))}
-        <p>
-          {t('common.seconds_elapsed')}:{secondsElapsed}
-        </p>
-      </div>
-    </CModalBody>
-  );
-};
-
-UpgradeWaitingBody.propTypes = {
-  serialNumber: PropTypes.string.isRequired,
-};
-
-export default UpgradeWaitingBody;

src/components/FirmwareUpgradeModal/index.js

@@ -1,241 +0,0 @@
-import {
-  CButton,
-  CModal,
-  CModalHeader,
-  CModalTitle,
-  CModalBody,
-  CSwitch,
-  CCol,
-  CRow,
-  CInput,
-  CInvalidFeedback,
-  CModalFooter,
-} from '@coreui/react';
-import React, { useState, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
-import DatePicker from 'react-widgets/DatePicker';
-import PropTypes from 'prop-types';
-import { dateToUnix } from 'utils/helper';
-import 'react-widgets/styles.css';
-import { useDevice, useAuth } from 'ucentral-libs';
-import axiosInstance from 'utils/axiosInstance';
-import eventBus from 'utils/eventBus';
-import ButtonFooter from './UpgradeFooter';
-import UpgradeWaitingBody from './UpgradeWaitingBody';
-
-const FirmwareUpgradeModal = ({ show, toggleModal }) => {
-  const { t } = useTranslation();
-  const { currentToken, endpoints } = useAuth();
-  const { deviceSerialNumber, getDeviceConnection } = useDevice();
-  const [isNow, setIsNow] = useState(true);
-  const [waitForUpgrade, setWaitForUpgrade] = useState(false);
-  const [date, setDate] = useState(new Date().toString());
-  const [firmware, setFirmware] = useState('');
-  const [validFirmware, setValidFirmware] = useState(true);
-  const [validDate, setValidDate] = useState(true);
-  const [blockFields, setBlockFields] = useState(false);
-  const [disabledWaiting, setDisableWaiting] = useState(false);
-  const [waitingForUpgrade, setWaitingForUpgrade] = useState(false);
-  const [showWaitingConsole, setShowWaitingConsole] = useState(false);
-  const [deviceConnected, setDeviceConnected] = useState(true);
-
-  const toggleNow = () => {
-    if (isNow) {
-      setWaitForUpgrade(false);
-      setDisableWaiting(true);
-    } else {
-      setDisableWaiting(false);
-    }
-
-    setIsNow(!isNow);
-  };
-
-  const toggleWaitForUpgrade = () => {
-    setWaitForUpgrade(waitForUpgrade);
-  };
-
-  const formValidation = () => {
-    let valid = true;
-    if (firmware.trim() === '') {
-      setValidFirmware(false);
-      valid = false;
-    }
-
-    if (!isNow && date.trim() === '') {
-      setValidDate(false);
-      valid = false;
-    }
-    return valid;
-  };
-
-  useEffect(() => {
-    setBlockFields(false);
-    setShowWaitingConsole(false);
-  }, [show]);
-
-  useEffect(() => {
-    setValidFirmware(true);
-    setValidDate(true);
-  }, [firmware, date]);
-
-  useEffect(() => {
-    if (deviceSerialNumber !== null && show) {
-      const asyncGet = async () => {
-        const isConnected = await getDeviceConnection(
-          deviceSerialNumber,
-          currentToken,
-          endpoints.ucentralgw,
-        );
-        setDisableWaiting(!isConnected);
-        setDeviceConnected(isConnected);
-      };
-      asyncGet();
-    }
-  }, [show]);
-
-  const postUpgrade = () => {
-    if (formValidation()) {
-      setWaitingForUpgrade(true);
-      setBlockFields(true);
-      const headers = {
-        Accept: 'application/json',
-        Authorization: `Bearer ${currentToken}`,
-        serialNumber: deviceSerialNumber,
-      };
-
-      const parameters = {
-        serialNumber: deviceSerialNumber,
-        when: isNow ? 0 : dateToUnix(date),
-        uri: firmware,
-      };
-      axiosInstance
-        .post(
-          `${endpoints.ucentralgw}/api/v1/device/${encodeURIComponent(deviceSerialNumber)}/upgrade`,
-          parameters,
-          { headers },
-        )
-        .then(() => {
-          if (waitForUpgrade) {
-            setShowWaitingConsole(true);
-          }
-        })
-        .catch(() => {})
-        .finally(() => {
-          setBlockFields(false);
-          setWaitingForUpgrade(false);
-          eventBus.dispatch('actionCompleted', { message: 'An action has been completed' });
-        });
-    }
-  };
-
-  if (showWaitingConsole) {
-    return (
-      <CModal show={show} onClose={toggleModal}>
-        <CModalHeader closeButton>
-          <CModalTitle>{t('upgrade.title')}</CModalTitle>
-        </CModalHeader>
-        <CModalBody>
-          <UpgradeWaitingBody serialNumber={deviceSerialNumber} />
-        </CModalBody>
-        <CModalFooter>
-          <CButton color="secondary" onClick={toggleModal}>
-            {t('common.close')}
-          </CButton>
-        </CModalFooter>
-      </CModal>
-    );
-  }
-
-  return (
-    <CModal show={show} onClose={toggleModal}>
-      <CModalHeader closeButton>
-        <CModalTitle>{t('upgrade.title')}</CModalTitle>
-      </CModalHeader>
-      <CModalBody>
-        <h6>{t('upgrade.directions')}</h6>
-        <CRow className="mt-3">
-          <CCol md="4" className="mt-2">
-            <p>{t('upgrade.firmware_uri')}</p>
-          </CCol>
-          <CCol md="8">
-            <CInput
-              disabled={blockFields}
-              className={('form-control', { 'is-invalid': !validFirmware })}
-              type="text"
-              id="uri"
-              name="uri-input"
-              autoComplete="firmware-uri"
-              onChange={(event) => setFirmware(event.target.value)}
-              value={firmware}
-            />
-            <CInvalidFeedback>{t('upgrade.need_uri')}</CInvalidFeedback>
-          </CCol>
-        </CRow>
-        <CRow className="mt-3">
-          <CCol md="8">
-            <p>{t('common.execute_now')}</p>
-          </CCol>
-          <CCol>
-            <CSwitch
-              disabled={blockFields}
-              color="primary"
-              defaultChecked={isNow}
-              onClick={toggleNow}
-              labelOn={t('common.yes')}
-              labelOff={t('common.no')}
-            />
-          </CCol>
-        </CRow>
-        <CRow className="mt-3" hidden={isNow}>
-          <CCol md="4" className="mt-2">
-            <p>{t('upgrade.time')}</p>
-          </CCol>
-          <CCol xs="12" md="8">
-            <DatePicker
-              selected={new Date(date)}
-              value={new Date(date)}
-              className={('form-control', { 'is-invalid': !validDate })}
-              includeTime
-              disabled={blockFields}
-              onChange={(newDate) => setDate(newDate.toString())}
-            />
-            <CInvalidFeedback>{t('common.need_date')}</CInvalidFeedback>
-          </CCol>
-        </CRow>
-        <CRow className="mt-3" hidden={true || !isNow || disabledWaiting || !deviceConnected}>
-          <CCol md="8">
-            <p>
-              {t('upgrade.wait_for_upgrade')}
-              <b hidden={!disabledWaiting}> {t('upgrade.offline_device')}</b>
-            </p>
-          </CCol>
-          <CCol>
-            <CSwitch
-              disabled={blockFields || disabledWaiting}
-              color="primary"
-              defaultChecked={waitForUpgrade}
-              onClick={toggleWaitForUpgrade}
-              labelOn={t('common.yes')}
-              labelOff={t('common.no')}
-            />
-          </CCol>
-        </CRow>
-      </CModalBody>
-      <ButtonFooter
-        isNow={isNow}
-        isShown={show}
-        isLoading={waitingForUpgrade}
-        action={postUpgrade}
-        color="primary"
-        toggleParent={toggleModal}
-      />
-    </CModal>
-  );
-};
-
-FirmwareUpgradeModal.propTypes = {
-  show: PropTypes.bool.isRequired,
-  toggleModal: PropTypes.func.isRequired,
-};
-
-export default FirmwareUpgradeModal;

src/components/InterfaceStatistics/LatestStatisticsModal.js

@@ -1,12 +1,7 @@
 import React, { useState, useEffect } from 'react';
-import {
-  CButton,
-  CModal,
-  CModalHeader,
-  CModalBody,
-  CModalTitle,
-  CModalFooter,
-} from '@coreui/react';
+import { CButton, CModal, CModalHeader, CModalBody, CModalTitle, CPopover } from '@coreui/react';
+import CIcon from '@coreui/icons-react';
+import { cilX } from '@coreui/icons';
 import PropTypes from 'prop-types';
 import { useTranslation } from 'react-i18next';
 import axiosInstance from 'utils/axiosInstance';
@@ -28,7 +23,7 @@ const LatestStatisticsModal = ({ show, toggle }) => {
 
     axiosInstance
       .get(
-        `${endpoints.ucentralgw}/api/v1/device/${deviceSerialNumber}/statistics?lastOnly=true`,
+        `${endpoints.owgw}/api/v1/device/${deviceSerialNumber}/statistics?lastOnly=true`,
         options,
       )
       .then((response) => {
@@ -45,17 +40,19 @@ const LatestStatisticsModal = ({ show, toggle }) => {
 
   return (
     <CModal size="lg" show={show} onClose={toggle}>
-      <CModalHeader closeButton>
+      <CModalHeader className="p-1">
         <CModalTitle className="text-dark">{t('statistics.latest_statistics')}</CModalTitle>
+        <div className="text-right">
+          <CPopover content={t('common.close')}>
+            <CButton color="primary" variant="outline" className="ml-2" onClick={toggle}>
+              <CIcon content={cilX} />
+            </CButton>
+          </CPopover>
+        </div>
       </CModalHeader>
       <CModalBody>
         <pre className="ignore">{JSON.stringify(latestStats, null, 4)}</pre>
       </CModalBody>
-      <CModalFooter>
-        <CButton color="secondary" onClick={toggle}>
-          {t('common.close')}
-        </CButton>
-      </CModalFooter>
     </CModal>
   );
 };

src/components/InterfaceStatistics/StatisticsChartList.js

@@ -128,7 +128,7 @@ const StatisticsChartList = () => {
 
     axiosInstance
       .get(
-        `${endpoints.ucentralgw}/api/v1/device/${deviceSerialNumber}/statistics?newest=true&limit=50`,
+        `${endpoints.owgw}/api/v1/device/${deviceSerialNumber}/statistics?newest=true&limit=50`,
         options,
       )
       .then((response) => {

src/components/InterfaceStatistics/index.js

@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useHistory, useParams } from 'react-router-dom';
-import { CCard, CCardHeader, CCardBody, CRow, CCol, CPopover, CButton } from '@coreui/react';
+import { CCard, CCardHeader, CCardBody, CPopover, CButton } from '@coreui/react';
 import { cilSync } from '@coreui/icons';
 import CIcon from '@coreui/icons-react';
 import eventBus from 'utils/eventBus';
@@ -36,38 +36,31 @@ const DeviceStatisticsCard = () => {
     <div>
       <CCard>
         <CCardHeader>
-          <CRow>
-            <CCol>
-              <div className="text-value-xxl pt-2">{t('statistics.title')}</div>
-            </CCol>
-            <CCol sm="6" xxl="6">
-              <CRow>
-                <CCol sm="1" xxl="5" />
-                <CCol sm="4" xxl="2" className="text-right">
-                  <CButton color="secondary" onClick={goToAnalysis}>
-                    {t('wifi_analysis.title')}
-                  </CButton>
-                </CCol>
-                <CCol sm="3" xxl="2" className="text-right">
-                  <CButton color="secondary" onClick={toggleLatestModal}>
-                    {t('statistics.show_latest')}
-                  </CButton>
-                </CCol>
-                <CCol sm="3" xxl="2" className="text-right">
-                  <CButton color="secondary" onClick={toggleLifetimeModal}>
-                    Lifetime Statistics
-                  </CButton>
-                </CCol>
-                <CCol sm="1" xxl="1" className="text-center">
-                  <CPopover content={t('common.refresh')}>
-                    <CButton color="secondary" onClick={refresh} size="sm">
-                      <CIcon content={cilSync} />
-                    </CButton>
-                  </CPopover>
-                </CCol>
-              </CRow>
-            </CCol>
-          </CRow>
+          <div className="d-flex flex-row-reverse align-items-center">
+            <div className="pl-2">
+              <CPopover content={t('common.refresh')}>
+                <CButton color="primary" variant="outline" onClick={refresh}>
+                  <CIcon content={cilSync} />
+                </CButton>
+              </CPopover>
+            </div>
+            <div className="pl-2">
+              <CButton color="primary" variant="outline" onClick={toggleLifetimeModal}>
+                Lifetime Statistics
+              </CButton>
+            </div>
+            <div className="pl-2">
+              <CButton color="primary" variant="outline" onClick={toggleLatestModal}>
+                {t('statistics.show_latest')}
+              </CButton>
+            </div>
+            <div>
+              <CButton color="primary" variant="outline" onClick={goToAnalysis}>
+                {t('wifi_analysis.title')}
+              </CButton>
+            </div>
+            <div className="text-value-lg mr-auto">{t('statistics.title')}</div>
+          </div>
         </CCardHeader>
         <CCardBody className="p-5">
           <StatisticsChartList />

src/components/LifetimeStatsModal/index.js

@@ -23,7 +23,7 @@ const LifetimeStatsModal = ({ show, toggle }) => {
 
     axiosInstance
       .get(
-        `${endpoints.ucentralgw}/api/v1/device/${deviceSerialNumber}/statistics?lifetime=true`,
+        `${endpoints.owgw}/api/v1/device/${deviceSerialNumber}/statistics?lifetime=true`,
         options,
       )
       .then((response) => {

src/components/RebootModal/index.js

@@ -8,7 +8,10 @@ import {
   CSwitch,
   CCol,
   CRow,
+  CPopover,
 } from '@coreui/react';
+import CIcon from '@coreui/icons-react';
+import { cilX } from '@coreui/icons';
 import React, { useState, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import DatePicker from 'react-widgets/DatePicker';
@@ -64,7 +67,7 @@ const ActionModal = ({ show, toggleModal }) => {
 
     axiosInstance
       .post(
-        `${endpoints.ucentralgw}/api/v1/device/${encodeURIComponent(deviceSerialNumber)}/reboot`,
+        `${endpoints.owgw}/api/v1/device/${encodeURIComponent(deviceSerialNumber)}/reboot`,
         parameters,
         { headers },
       )
@@ -82,8 +85,15 @@ const ActionModal = ({ show, toggleModal }) => {
 
   return (
     <CModal show={show} onClose={toggleModal}>
-      <CModalHeader closeButton>
-        <CModalTitle>{t('reboot.title')}</CModalTitle>
+      <CModalHeader className="p-1">
+        <CModalTitle className="pl-1 pt-1">{t('reboot.title')}</CModalTitle>
+        <div className="text-right">
+          <CPopover content={t('common.close')}>
+            <CButton color="primary" variant="outline" className="ml-2" onClick={toggleModal}>
+              <CIcon content={cilX} />
+            </CButton>
+          </CPopover>
+        </div>
       </CModalHeader>
       {result === 'success' ? (
         <SuccessfulActionModalBody toggleModal={toggleModal} />

src/components/TelemetryModal/index.js

@@ -0,0 +1,222 @@
+import React, { useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import PropTypes from 'prop-types';
+import Select from 'react-select';
+import {
+  CModal,
+  CModalHeader,
+  CModalTitle,
+  CModalBody,
+  CButton,
+  CPopover,
+  CRow,
+  CCol,
+  CInput,
+  CSpinner,
+  CAlert,
+} from '@coreui/react';
+import CIcon from '@coreui/icons-react';
+import { cilX } from '@coreui/icons';
+import { useDevice, useAuth, useToast } from 'ucentral-libs';
+import axiosInstance from 'utils/axiosInstance';
+import { checkIfJson } from 'utils/helper';
+
+const typeOptions = [
+  { value: 'wifi-frames', label: 'wifi-frames' },
+  { value: 'dhcp-snooping', label: 'dhcp-snooping' },
+];
+
+const TelemetryModal = ({ show, toggle }) => {
+  const { t } = useTranslation();
+  const { currentToken, endpoints } = useAuth();
+  const { deviceSerialNumber } = useDevice();
+  const { addToast } = useToast();
+  const [socket, setSocket] = useState(null);
+  const [lastMessage, setLastMessage] = useState({});
+  const [receivedMessages, setReceivedMessages] = useState(0);
+  const [types, setTypes] = useState([]);
+  const [interval, setInterval] = useState(3);
+  const [loading, setLoading] = useState(false);
+  const [lastUpdate, setLastUpdate] = useState('');
+
+  const onIntervalChange = (e) => setInterval(e.target.value);
+
+  const closeSocket = () => {
+    if (socket !== null) {
+      socket.close();
+      setSocket(null);
+    }
+  };
+
+  const getUrl = () => {
+    setLastUpdate('');
+    setLastMessage({});
+    setLoading(true);
+
+    const parameters = {
+      serialNumber: deviceSerialNumber,
+      interval: parseInt(interval, 10),
+      types: types.map((type) => type.value),
+    };
+
+    const headers = {
+      Accept: 'application/json',
+      Authorization: `Bearer ${currentToken}`,
+    };
+
+    axiosInstance
+      .post(
+        `${endpoints.owgw}/api/v1/device/${encodeURIComponent(deviceSerialNumber)}/telemetry`,
+        parameters,
+        { headers },
+      )
+      .then((response) => {
+        if (response.data.uri && response.data.uri !== '') {
+          setReceivedMessages(0);
+          setSocket(new WebSocket(response.data.uri));
+        }
+      })
+      .catch((e) => {
+        addToast({
+          title: t('common.error'),
+          body: t('telemetry.connection_failed', { error: e.response?.data?.ErrorDescription }),
+          color: 'danger',
+          autohide: true,
+        });
+      })
+      .finally(() => setLoading(false));
+  };
+
+  useEffect(() => {
+    if (socket !== null) {
+      socket.onopen = () => {
+        socket.send(`token:${currentToken}`);
+      };
+
+      socket.onmessage = (event) => {
+        if (checkIfJson(event.data)) {
+          const result = JSON.parse(event.data);
+          setLastMessage(result);
+          setLastUpdate(new Date().toLocaleString());
+        }
+      };
+    }
+
+    return () => closeSocket();
+  }, [socket]);
+
+  useEffect(() => {
+    if (!show && socket !== null) {
+      closeSocket();
+    }
+  }, [show, socket]);
+
+  useEffect(() => {
+    if (lastMessage !== {}) setReceivedMessages(receivedMessages + 1);
+  }, [lastMessage]);
+
+  return (
+    <CModal className="text-dark" size="lg" show={show} onClose={toggle}>
+      <CModalHeader className="p-1">
+        <CModalTitle className="pl-1 pt-1">{t('actions.telemetry')}</CModalTitle>
+        <div className="text-right">
+          <CPopover content={t('common.close')}>
+            <CButton color="primary" variant="outline" className="ml-2" onClick={toggle}>
+              <CIcon content={cilX} />
+            </CButton>
+          </CPopover>
+        </div>
+      </CModalHeader>
+      <CModalBody className="px-5">
+        {socket === null ? (
+          <div>
+            <CRow>
+              <CCol>{`${t('telemetry.interval')}: ${interval} ${t('common.seconds')}`}</CCol>
+            </CRow>
+            <CRow>
+              <CCol>
+                <CInput
+                  type="range"
+                  min="1"
+                  max="120"
+                  step="1"
+                  onChange={onIntervalChange}
+                  value={interval}
+                />
+              </CCol>
+            </CRow>
+            <CRow>
+              <CCol sm="2" className="pt-2">
+                {t('telemetry.types')}:
+              </CCol>
+              <CCol sm="6">
+                <Select
+                  isMulti
+                  closeMenuOnSelect={false}
+                  name="Device Types"
+                  options={typeOptions}
+                  onChange={setTypes}
+                  value={types}
+                  className="basic-multi-select"
+                  classNamePrefix="select"
+                />
+              </CCol>
+            </CRow>
+            <CRow>
+              <CCol className="text-center p-4">
+                <CButton color="primary" onClick={getUrl} disabled={loading || types.length === 0}>
+                  Start Telemetry!
+                </CButton>
+              </CCol>
+            </CRow>
+          </div>
+        ) : (
+          <div>
+            <CRow>
+              <CCol>
+                {t('telemetry.interval')}: {interval} {t('common.seconds')}
+              </CCol>
+            </CRow>
+            <CRow>
+              <CCol>
+                {t('telemetry.types')}: {types.map((type) => type.label).join(', ')}
+              </CCol>
+            </CRow>
+            <CRow>
+              <CCol>
+                {t('telemetry.last_update')}: {lastUpdate}
+              </CCol>
+            </CRow>
+            <CRow>
+              <CCol className="font-weight-bold">Received Messages: {receivedMessages}</CCol>
+            </CRow>
+            <CRow>
+              <CCol>
+                <pre>{JSON.stringify(lastMessage, null, '\t')}</pre>
+              </CCol>
+            </CRow>
+            <CRow>
+              {socket.readyState === WebSocket.OPEN ||
+              socket.readyState === WebSocket.CONNECTING ? (
+                <CCol className="d-flex justify-content-center align-items-center">
+                  <CSpinner />
+                </CCol>
+              ) : (
+                <CCol>
+                  <CAlert color="danger">{t('common.socket_connection_closed')}</CAlert>
+                </CCol>
+              )}
+            </CRow>
+          </div>
+        )}
+      </CModalBody>
+    </CModal>
+  );
+};
+
+TelemetryModal.propTypes = {
+  show: PropTypes.bool.isRequired,
+  toggle: PropTypes.func.isRequired,
+};
+
+export default TelemetryModal;

src/components/TraceModal/WaitingForTraceBody.js

@@ -21,7 +21,7 @@ const WaitingForTraceBody = ({ serialNumber, commandUuid, toggle }) => {
     };
 
     axiosInstance
-      .get(`${endpoints.ucentralgw}/api/v1/command/${encodeURIComponent(commandUuid)}`, options)
+      .get(`${endpoints.owgw}/api/v1/command/${encodeURIComponent(commandUuid)}`, options)
       .then((response) => {
         if (response.data.waitingForFile === 0) {
           setWaitingForFile(false);
@@ -44,10 +44,7 @@ const WaitingForTraceBody = ({ serialNumber, commandUuid, toggle }) => {
     };
 
     axiosInstance
-      .get(
-        `${endpoints.ucentralgw}/api/v1/file/${commandUuid}?serialNumber=${serialNumber}`,
-        options,
-      )
+      .get(`${endpoints.owgw}/api/v1/file/${commandUuid}?serialNumber=${serialNumber}`, options)
       .then((response) => {
         const blob = new Blob([response.data], { type: 'application/octet-stream' });
         const link = document.createElement('a');

src/components/TraceModal/index.js

@@ -13,7 +13,10 @@ import {
   CInputRadio,
   CFormGroup,
   CLabel,
+  CPopover,
 } from '@coreui/react';
+import CIcon from '@coreui/icons-react';
+import { cilX } from '@coreui/icons';
 import React, { useState, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import PropTypes from 'prop-types';
@@ -80,7 +83,7 @@ const TraceModal = ({ show, toggleModal }) => {
 
     axiosInstance
       .post(
-        `${endpoints.ucentralgw}/api/v1/device/${encodeURIComponent(deviceSerialNumber)}/trace`,
+        `${endpoints.owgw}/api/v1/device/${encodeURIComponent(deviceSerialNumber)}/trace`,
         parameters,
         { headers },
       )
@@ -108,7 +111,7 @@ const TraceModal = ({ show, toggleModal }) => {
         const isConnected = await getDeviceConnection(
           deviceSerialNumber,
           currentToken,
-          endpoints.ucentralgw,
+          endpoints.owgw,
         );
         setIsDeviceConnected(isConnected);
       };
@@ -256,8 +259,15 @@ const TraceModal = ({ show, toggleModal }) => {
 
   return (
     <CModal show={show} onClose={toggleModal}>
-      <CModalHeader closeButton>
-        <CModalTitle>{t('trace.title')}</CModalTitle>
+      <CModalHeader className="p-1">
+        <CModalTitle className="pl-1 pt-1">{t('trace.title')}</CModalTitle>
+        <div className="text-right">
+          <CPopover content={t('common.close')}>
+            <CButton color="primary" variant="outline" className="ml-2" onClick={toggleModal}>
+              <CIcon content={cilX} />
+            </CButton>
+          </CPopover>
+        </div>
       </CModalHeader>
       {getBody()}
     </CModal>

src/components/WifiScanModal/index.js

@@ -10,7 +10,10 @@ import {
   CSwitch,
   CCol,
   CSpinner,
+  CPopover,
 } from '@coreui/react';
+import CIcon from '@coreui/icons-react';
+import { cilX } from '@coreui/icons';
 import React, { useState, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import PropTypes from 'prop-types';
@@ -98,7 +101,7 @@ const WifiScanModal = ({ show, toggleModal }) => {
 
     axiosInstance
       .post(
-        `${endpoints.ucentralgw}/api/v1/device/${encodeURIComponent(deviceSerialNumber)}/wifiscan`,
+        `${endpoints.owgw}/api/v1/device/${encodeURIComponent(deviceSerialNumber)}/wifiscan`,
         parameters,
         { headers },
       )
@@ -124,8 +127,15 @@ const WifiScanModal = ({ show, toggleModal }) => {
 
   return (
     <CModal size="lg" show={show} onClose={toggleModal}>
-      <CModalHeader closeButton>
-        <CModalTitle>{t('actions.wifi_scan')}</CModalTitle>
+      <CModalHeader className="p-1">
+        <CModalTitle className="pl-1 pt-1">{t('actions.wifi_scan')}</CModalTitle>
+        <div className="text-right">
+          <CPopover content={t('common.close')}>
+            <CButton color="primary" variant="outline" className="ml-2" onClick={toggleModal}>
+              <CIcon content={cilX} />
+            </CButton>
+          </CPopover>
+        </div>
       </CModalHeader>
       <CModalBody>
         <div hidden={hideOptions || waiting}>

src/components/WifiScanResultModal/index.js

@@ -1,14 +1,9 @@
 /* eslint-disable-rule prefer-destructuring */
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import {
-  CButton,
-  CModal,
-  CModalHeader,
-  CModalBody,
-  CModalTitle,
-  CModalFooter,
-} from '@coreui/react';
+import { CButton, CModal, CModalHeader, CModalBody, CModalTitle, CPopover } from '@coreui/react';
+import CIcon from '@coreui/icons-react';
+import { cilX } from '@coreui/icons';
 import PropTypes from 'prop-types';
 import { prettyDate } from 'utils/helper';
 import WifiChannelTable from './WifiChannelTable';
@@ -48,21 +43,23 @@ const WifiScanResultModal = ({ show, toggle, scanResults, date }) => {
   };
   return (
     <CModal size="lg" show={show} onClose={toggle}>
-      <CModalHeader closeButton>
+      <CModalHeader>
         <CModalTitle className="text-dark">
           {date !== '' ? prettyDate(date) : ''} {t('scan.results')}
         </CModalTitle>
+        <div className="text-right">
+          <CPopover content={t('common.close')}>
+            <CButton color="primary" variant="outline" className="ml-2" onClick={toggle}>
+              <CIcon content={cilX} />
+            </CButton>
+          </CPopover>
+        </div>
       </CModalHeader>
       <CModalBody>
         {scanResults === null ? null : (
           <WifiChannelTable channels={parseThroughList(scanResults)} />
         )}
       </CModalBody>
-      <CModalFooter>
-        <CButton color="secondary" onClick={toggle}>
-          {t('common.close')}
-        </CButton>
-      </CModalFooter>
     </CModal>
   );
 };

src/layout/index.js

@@ -89,7 +89,7 @@ const TheLayout = () => {
             <PageContainer t={t} routes={routes} redirectTo="/devices" />
           </ToastProvider>
         </div>
-        <Footer t={t} version="2.1.0" />
+        <Footer t={t} version={process.env.VERSION} />
       </div>
     </div>
   );

src/pages/DeviceDashboard/index.js

@@ -338,7 +338,7 @@ const DeviceDashboard = () => {
       Authorization: `Bearer ${currentToken}`,
     };
     axiosInstance
-      .get(`${endpoints.ucentralgw}/api/v1/deviceDashboard`, {
+      .get(`${endpoints.owgw}/api/v1/deviceDashboard`, {
         headers,
       })
       .then((response) => {

src/pages/DevicePage/index.js

@@ -2,7 +2,6 @@ import React from 'react';
 import { useParams } from 'react-router-dom';
 import { CRow, CCol } from '@coreui/react';
 import DeviceHealth from 'components/DeviceHealth';
-import DeviceConfiguration from 'components/DeviceConfiguration';
 import DeviceStatusCard from 'components/DeviceStatusCard';
 import CommandHistory from 'components/CommandHistory';
 import DeviceLogs from 'components/DeviceLogs';
@@ -18,20 +17,25 @@ const DevicePage = () => {
     <div className="App">
       <DeviceProvider axiosInstance={axiosInstance} serialNumber={deviceId}>
         <CRow>
-          <CCol xs="12" lg="6">
+          <CCol>
             <DeviceStatusCard />
-            <DeviceConfiguration />
           </CCol>
-          <CCol xs="12" lg="6">
-            <DeviceLogs />
-            <DeviceHealth />
+        </CRow>
+        <CRow>
+          <CCol lg="12" xl="6">
+            <CommandHistory />
+          </CCol>
+          <CCol lg="12" xl="6">
             <DeviceActionCard />
           </CCol>
         </CRow>
         <CRow>
-          <CCol>
+          <CCol lg="12" xl="6">
             <DeviceStatisticsCard />
-            <CommandHistory />
+          </CCol>
+          <CCol lg="12" xl="6">
+            <DeviceHealth />
+            <DeviceLogs />
           </CCol>
         </CRow>
       </DeviceProvider>

src/pages/FirmwareDashboard/index.js

@@ -43,7 +43,7 @@ const FirmwareDashboard = () => {
     };
 
     return axiosInstance
-      .get(`${endpoints.ucentralgw}/api/v1/ouis?macList=${oui.join(',')}`, {
+      .get(`${endpoints.owgw}/api/v1/ouis?macList=${oui.join(',')}`, {
         headers,
       })
       .then((response) => {
@@ -298,7 +298,7 @@ const FirmwareDashboard = () => {
       Authorization: `Bearer ${currentToken}`,
     };
     axiosInstance
-      .get(`${endpoints.ucentralfms}/api/v1/deviceReport`, {
+      .get(`${endpoints.owfms}/api/v1/deviceReport`, {
         headers,
       })
       .then((response) => {

src/pages/FirmwareListPage/index.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-await-in-loop */
 import React, { useState, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import axiosInstance from 'utils/axiosInstance';
@@ -48,42 +49,55 @@ const FirmwareListPage = () => {
     filterFirmware(firmware, !displayDev);
   };
 
-  const getFirmware = (deviceType) => {
-    setLoading(true);
-
+  const getPartialFirmware = async (deviceType, offset) => {
     const headers = {
       Accept: 'application/json',
       Authorization: `Bearer ${currentToken}`,
     };
 
-    axiosInstance
+    return axiosInstance
       .get(
-        `${endpoints.ucentralfms}/api/v1/firmwares?deviceType=${deviceType ?? selectedDeviceType}`,
+        `${endpoints.owfms}/api/v1/firmwares?deviceType=${deviceType}&limit=500&offset=${offset}`,
         {
           headers,
         },
       )
-      .then((response) => {
-        const sortedFirmware = response.data.firmwares.sort((a, b) => {
-          const firstDate = a.imageDate;
-          const secondDate = b.imageDate;
-          if (firstDate < secondDate) return 1;
-          return firstDate > secondDate ? -1 : 0;
-        });
-        setFirmware(sortedFirmware);
-        filterFirmware(sortedFirmware, displayDev);
-      })
+      .then((response) => response.data.firmwares)
       .catch(() => {
-        setLoading(false);
         addToast({
           title: t('common.error'),
           body: t('common.general_error'),
           color: 'danger',
           autohide: true,
         });
+        return [];
       });
   };
 
+  const getFirmware = async (deviceType) => {
+    setLoading(true);
+
+    const allFirmwares = [];
+    let continueFirmware = true;
+    let i = 1;
+    while (continueFirmware) {
+      const newFirmwares = await getPartialFirmware(deviceType ?? selectedDeviceType, i);
+      if (newFirmwares === null || newFirmwares.length === 0) continueFirmware = false;
+      allFirmwares.push(...newFirmwares);
+      i += 500;
+    }
+    const sortedFirmware = allFirmwares.sort((a, b) => {
+      const firstDate = a.imageDate;
+      const secondDate = b.imageDate;
+      if (firstDate < secondDate) return 1;
+      return firstDate > secondDate ? -1 : 0;
+    });
+    setFirmware(sortedFirmware);
+    filterFirmware(sortedFirmware, displayDev);
+
+    setLoading(false);
+  };
+
   const getDeviceTypes = () => {
     setLoading(true);
 
@@ -93,7 +107,7 @@ const FirmwareListPage = () => {
     };
 
     axiosInstance
-      .get(`${endpoints.ucentralfms}/api/v1/firmwares?deviceSet=true`, {
+      .get(`${endpoints.owfms}/api/v1/firmwares?deviceSet=true`, {
         headers,
       })
       .then((response) => {
@@ -148,7 +162,7 @@ const FirmwareListPage = () => {
     };
 
     axiosInstance
-      .put(`${endpoints.ucentralfms}/api/v1/firmware/${id}`, parameters, options)
+      .put(`${endpoints.owfms}/api/v1/firmware/${id}`, parameters, options)
       .then(() => {
         getFirmware();
         setAddNoteLoading(false);
@@ -180,7 +194,7 @@ const FirmwareListPage = () => {
     };
 
     axiosInstance
-      .put(`${endpoints.ucentralfms}/api/v1/firmware/${id}`, parameters, options)
+      .put(`${endpoints.owfms}/api/v1/firmware/${id}`, parameters, options)
       .then(() => {
         getFirmware();
         setUpdateDescriptionLoading(false);

src/pages/LoginPage/index.js

@@ -206,7 +206,7 @@ const Login = () => {
         .then((response) => {
           if (response) {
             const endpoints = {
-              ucentralsec: fields.ucentralsecurl.value,
+              owsec: fields.ucentralsecurl.value,
             };
             for (const endpoint of response.data.endpoints) {
               endpoints[endpoint.type] = endpoint.uri;

src/pages/ProfilePage/index.js

@@ -1,6 +1,8 @@
 import React, { useState, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
-import { CCard, CCardBody } from '@coreui/react';
+import { CCard, CCardBody, CCardHeader, CButton, CPopover } from '@coreui/react';
+import CIcon from '@coreui/icons-react';
+import { cilSave } from '@coreui/icons';
 import axiosInstance from 'utils/axiosInstance';
 import { testRegex } from 'utils/helper';
 import { useUser, EditMyProfile, useAuth, useToast } from 'ucentral-libs';
@@ -60,11 +62,11 @@ const ProfilePage = () => {
 
   const getPasswordPolicy = () => {
     axiosInstance
-      .post(`${endpoints.ucentralsec}/api/v1/oauth2?requirements=true`, {})
+      .post(`${endpoints.owsec}/api/v1/oauth2?requirements=true`, {})
       .then((response) => {
         const newPolicies = response.data;
-        newPolicies.accessPolicy = `${endpoints.ucentralsec}${newPolicies.accessPolicy}`;
-        newPolicies.passwordPolicy = `${endpoints.ucentralsec}${newPolicies.passwordPolicy}`;
+        newPolicies.accessPolicy = `${endpoints.owsec}${newPolicies.accessPolicy}`;
+        newPolicies.passwordPolicy = `${endpoints.owsec}${newPolicies.passwordPolicy}`;
         setPolicies(response.data);
       })
       .catch(() => {});
@@ -79,7 +81,7 @@ const ProfilePage = () => {
     };
 
     axiosInstance
-      .get(`${endpoints.ucentralsec}/api/v1/user/${user.Id}`, options)
+      .get(`${endpoints.owsec}/api/v1/user/${user.Id}`, options)
       .then((response) => {
         const newUser = {};
 
@@ -109,7 +111,7 @@ const ProfilePage = () => {
     data.append('file', newAvatarFile);
 
     axiosInstance
-      .post(`${endpoints.ucentralsec}/api/v1/avatar/${user.Id}`, data, options)
+      .post(`${endpoints.owsec}/api/v1/avatar/${user.Id}`, data, options)
       .then(() => {
         addToast({
           title: t('user.update_success_title'),
@@ -122,10 +124,10 @@ const ProfilePage = () => {
         setNewAvatarFile(null);
         setFileInputKey(fileInputKey + 1);
       })
-      .catch(() => {
+      .catch((e) => {
         addToast({
           title: t('user.update_failure_title'),
-          body: t('user.update_failure'),
+          body: t('user.update_failure', { error: e.response?.data?.ErrorDescription }),
           color: 'danger',
           autohide: true,
         });
@@ -171,7 +173,7 @@ const ProfilePage = () => {
       };
 
       axiosInstance
-        .put(`${endpoints.ucentralsec}/api/v1/user/${user.Id}`, parameters, options)
+        .put(`${endpoints.owsec}/api/v1/user/${user.Id}`, parameters, options)
         .then(() => {
           addToast({
             title: t('user.update_success_title'),
@@ -180,10 +182,10 @@ const ProfilePage = () => {
             autohide: true,
           });
         })
-        .catch(() => {
+        .catch((e) => {
           addToast({
             title: t('user.update_failure_title'),
-            body: t('user.update_failure'),
+            body: t('user.update_failure', { error: e.response?.data?.ErrorDescription }),
             color: 'danger',
             autohide: true,
           });
@@ -213,7 +215,7 @@ const ProfilePage = () => {
     };
 
     axiosInstance
-      .put(`${endpoints.ucentralsec}/api/v1/user/${user.Id}`, parameters, options)
+      .put(`${endpoints.owsec}/api/v1/user/${user.Id}`, parameters, options)
       .then(() => {
         getUser();
       })
@@ -238,7 +240,7 @@ const ProfilePage = () => {
       },
     };
     return axiosInstance
-      .delete(`${endpoints.ucentralsec}/api/v1/avatar/${user.Id}`, options)
+      .delete(`${endpoints.owsec}/api/v1/avatar/${user.Id}`, options)
       .then(() => {
         getAvatar();
       })
@@ -260,12 +262,20 @@ const ProfilePage = () => {
 
   return (
     <CCard>
+      <CCardHeader>
+        <div className="text-right">
+          <CPopover content={t('common.save')}>
+            <CButton onClick={updateUser} color="primary" variant="outline" disabled={loading}>
+              <CIcon content={cilSave} />
+            </CButton>
+          </CPopover>
+        </div>
+      </CCardHeader>
       <CCardBody>
         <EditMyProfile
           t={t}
           user={userForm}
           updateUserWithId={updateWithId}
-          saveUser={updateUser}
           loading={loading}
           policies={policies}
           addNote={addNote}

src/pages/SystemPage/index.js

@@ -16,9 +16,13 @@ const SystemPage = () => {
     const systemInfo = {
       title: key,
       endpoint,
+      hostname: t('common.unknown'),
+      os: t('common.unknown'),
+      processors: t('common.unknown'),
       uptime: t('common.unknown'),
       version: t('common.unknown'),
       start: t('common.unknown'),
+      subsystems: [],
     };
 
     const options = {
@@ -28,37 +32,72 @@ const SystemPage = () => {
       },
     };
 
-    const getUptime = axiosInstance.get(`${endpoint}/api/v1/system?command=times`, options);
-    const getVersion = axiosInstance.get(`${endpoint}/api/v1/system?command=version`, options);
+    const getInfo = axiosInstance.get(`${endpoint}/api/v1/system?command=info`, options);
+    const getSubsystems = axiosInstance.post(
+      `${endpoint}/api/v1/system`,
+      { command: 'getsubsystemnames' },
+      options,
+    );
 
-    return Promise.all([getUptime, getVersion])
-      .then(([newUptime, newVersion]) => {
-        const uptimeObj = newUptime.data.times.find((obj) => obj.tag === 'uptime');
-        const startObj = newUptime.data.times.find((obj) => obj.tag === 'start');
-        return {
-          title: key,
-          endpoint,
-          uptime: uptimeObj?.value
-            ? secondsToDetailed(
-                uptimeObj.value,
-                t('common.day'),
-                t('common.days'),
-                t('common.hour'),
-                t('common.hours'),
-                t('common.minute'),
-                t('common.minutes'),
-                t('common.second'),
-                t('common.seconds'),
-              )
-            : t('common.unknown'),
-          version: newVersion.data.value,
-          start: prettyDate(startObj.value),
-        };
+    return Promise.all([getInfo, getSubsystems])
+      .then(([newInfo, newSubs]) => {
+        systemInfo.uptime = secondsToDetailed(
+          newInfo.data.uptime,
+          t('common.day'),
+          t('common.days'),
+          t('common.hour'),
+          t('common.hours'),
+          t('common.minute'),
+          t('common.minutes'),
+          t('common.second'),
+          t('common.seconds'),
+        );
+        systemInfo.hostname = newInfo.data.hostname;
+        systemInfo.os = newInfo.data.os;
+        systemInfo.processors = newInfo.data.processors;
+        systemInfo.version = newInfo.data.version;
+        systemInfo.start = prettyDate(newInfo.data.start);
+        systemInfo.subsystems = newSubs.data.list.sort((a, b) => {
+          if (a < b) return -1;
+          if (a > b) return 1;
+          return 0;
+        });
+        return systemInfo;
       })
-      .catch(() => {
-        throw new Error('Error while fetching');
+      .catch(() => systemInfo);
+  };
+
+  const reload = (subsystems, endpoint) => {
+    const options = {
+      headers: {
+        Accept: 'application/json',
+        Authorization: `Bearer ${currentToken}`,
+      },
+    };
+
+    const parameters = {
+      command: 'reload',
+      subsystems,
+    };
+
+    axiosInstance
+      .post(`${endpoint}/api/v1/system?command=info`, parameters, options)
+      .then(() => {
+        addToast({
+          title: t('common.success'),
+          body: t('system.success_reload'),
+          color: 'success',
+          autohide: true,
+        });
       })
-      .finally(() => systemInfo);
+      .catch((e) => {
+        addToast({
+          title: t('common.error'),
+          body: t('system.error_reloading', { error: e.response?.data?.ErrorDescription }),
+          color: 'danger',
+          autohide: true,
+        });
+      });
   };
 
   const getAllInfo = async () => {
@@ -81,17 +120,37 @@ const SystemPage = () => {
     }
   };
 
+  const getColumn = (index) => {
+    const rows = [];
+
+    for (let i = index; i < endpointsInfo.length; i += 3) {
+      rows.push(endpointsInfo[i]);
+    }
+
+    return rows;
+  };
+
   useEffect(() => {
     getAllInfo();
   }, []);
 
   return (
     <CRow>
-      {endpointsInfo.map((info) => (
-        <CCol key={createUuid()} md="4">
-          <ApiStatusCard t={t} info={info} />
-        </CCol>
-      ))}
+      <CCol md="12" lg="6" xxl="4">
+        {getColumn(0).map((info) => (
+          <ApiStatusCard key={createUuid()} t={t} info={info} reload={reload} />
+        ))}
+      </CCol>
+      <CCol md="12" lg="6" xxl="4">
+        {getColumn(1).map((info) => (
+          <ApiStatusCard key={createUuid()} t={t} info={info} reload={reload} />
+        ))}
+      </CCol>
+      <CCol md="12" lg="6" xxl="4">
+        {getColumn(2).map((info) => (
+          <ApiStatusCard key={createUuid()} t={t} info={info} reload={reload} />
+        ))}
+      </CCol>
     </CRow>
   );
 };

src/pages/UserListPage/index.js

@@ -39,13 +39,19 @@ const UserListPage = () => {
     };
 
     axiosInstance
-      .get(`${endpoints.ucentralsec}/api/v1/users?idOnly=true`, {
+      .get(`${endpoints.owsec}/api/v1/users?idOnly=true`, {
         headers,
       })
       .then((response) => {
         setUsers(response.data.users);
       })
-      .catch(() => {
+      .catch((e) => {
+        addToast({
+          title: t('common.error'),
+          body: t('user.error_fetching_users', { error: e.response?.data?.ErrorDescription }),
+          color: 'danger',
+          autohide: true,
+        });
         setLoading(false);
       });
   };
@@ -61,7 +67,7 @@ const UserListPage = () => {
 
     const promises = userIds.map(async (id) =>
       axiosInstance.get(
-        `${endpoints.ucentralsec}/api/v1/avatar/${id}?timestamp=${new Date().toString()}`,
+        `${endpoints.owsec}/api/v1/avatar/${id}?timestamp=${new Date().toString()}`,
         options,
       ),
     );
@@ -99,7 +105,7 @@ const UserListPage = () => {
     );
 
     axiosInstance
-      .get(`${endpoints.ucentralsec}/api/v1/users?select=${idsToGet}`, {
+      .get(`${endpoints.owsec}/api/v1/users?select=${idsToGet}`, {
         headers,
       })
       .then((response) => {
@@ -113,7 +119,13 @@ const UserListPage = () => {
         setUsersToDisplay(newUsers);
         setLoading(false);
       })
-      .catch(() => {
+      .catch((e) => {
+        addToast({
+          title: t('common.error'),
+          body: t('user.error_fetching_users', { error: e.response?.data?.ErrorDescription }),
+          color: 'danger',
+          autohide: true,
+        });
         setLoading(false);
       });
   };
@@ -127,7 +139,7 @@ const UserListPage = () => {
     };
 
     axiosInstance
-      .delete(`${endpoints.ucentralsec}/api/v1/user/${userId}`, {
+      .delete(`${endpoints.owsec}/api/v1/user/${userId}`, {
         headers,
       })
       .then(() => {
@@ -139,10 +151,10 @@ const UserListPage = () => {
         });
         getUsers();
       })
-      .catch(() => {
+      .catch((e) => {
         addToast({
           title: t('common.error'),
-          body: t('user.delete_failure'),
+          body: t('user.delete_failure', { error: e.response?.data?.ErrorDescription }),
           color: 'danger',
           autohide: true,
         });
@@ -186,6 +198,7 @@ const UserListPage = () => {
         usersPerPage={usersPerPage}
         setUsersPerPage={updateUsersPerPage}
         pageCount={pageCount}
+        currentPage={page.selected}
         setPage={setPage}
         deleteUser={deleteUser}
         deleteLoading={deleteLoading}

src/pages/WifiAnalysisPage/index.js

@@ -14,8 +14,12 @@ import {
   CModal,
   CModalHeader,
   CModalBody,
+  CModalTitle,
   CRow,
+  CPopover,
 } from '@coreui/react';
+import CIcon from '@coreui/icons-react';
+import { cilX } from '@coreui/icons';
 
 const WifiAnalysisPage = () => {
   const { t } = useTranslation();
@@ -168,10 +172,7 @@ const WifiAnalysisPage = () => {
     };
 
     axiosInstance
-      .get(
-        `${endpoints.ucentralgw}/api/v1/device/${deviceId}/statistics?newest=true&limit=20`,
-        options,
-      )
+      .get(`${endpoints.owgw}/api/v1/device/${deviceId}/statistics?newest=true&limit=20`, options)
       .then((response) => {
         parseAssociationStats(response.data);
       })
@@ -201,7 +202,7 @@ const WifiAnalysisPage = () => {
               <h5 className="mb-0">{t('common.device', { serialNumber: deviceId })}</h5>
             </CCol>
             <CCol className="text-right">
-              <CButton color="secondary" onClick={toggleModal}>
+              <CButton color="primary" variant="outline" onClick={toggleModal}>
                 {t('wifi_analysis.network_diagram')}
               </CButton>
             </CCol>
@@ -238,7 +239,16 @@ const WifiAnalysisPage = () => {
         </CCardBody>
       </CCard>
       <CModal size="xl" show={showModal} onClose={toggleModal}>
-        <CModalHeader closeButton>{t('wifi_analysis.network_diagram')}</CModalHeader>
+        <CModalHeader className="p-1">
+          <CModalTitle className="pl-1 pt-1">{t('wifi_analysis.network_diagram')}</CModalTitle>
+          <div className="text-right">
+            <CPopover content={t('common.close')}>
+              <CButton color="primary" variant="outline" className="ml-2" onClick={toggleModal}>
+                <CIcon content={cilX} />
+              </CButton>
+            </CPopover>
+          </div>
+        </CModalHeader>
         <CModalBody>
           {showModal ? (
             <NetworkDiagram

src/utils/axiosInstance.js

@@ -8,7 +8,7 @@ axiosRetry(axiosInstance, {
   retryDelay: () => axiosRetry.exponentialDelay,
 });
 
-axiosInstance.defaults.timeout = 30000;
+axiosInstance.defaults.timeout = 60000;
 axiosInstance.defaults.headers.get.Accept = 'application/json';
 axiosInstance.defaults.headers.post.Accept = 'application/json';