Hotfix for BSSID -> Station ID bug

2.5.44

.github/workflows/ci.yml

@@ -24,45 +24,16 @@ jobs:
       DOCKER_REGISTRY_URL: tip-tip-wlan-cloud-ucentral.jfrog.io
       DOCKER_REGISTRY_USERNAME: ucentral
     steps:
-    - uses: actions/checkout@v2
-
-    - name: Build Docker image
-      run: docker build -t wlan-cloud-ucentralgw-ui:${{ github.sha }} .
-
-    - name: Tag Docker image
-      run: |
-        TAGS="${{ github.sha }}"
-
-        if [[ ${GITHUB_REF} == "refs/heads/"* ]]
-        then
-          CURRENT_TAG=$(echo ${GITHUB_REF#refs/heads/} | tr '/' '-')
-          TAGS="$TAGS $CURRENT_TAG"
-        else
-          if [[ ${GITHUB_REF} == "refs/tags/"* ]]
-          then
-            CURRENT_TAG=$(echo ${GITHUB_REF#refs/tags/} | tr '/' '-')
-            TAGS="$TAGS $CURRENT_TAG"
-          else # PR build
-            CURRENT_TAG=$(echo ${GITHUB_HEAD_REF#refs/heads/} | tr '/' '-')
-            TAGS="$TAGS $CURRENT_TAG"
-          fi
-        fi
-
-        echo "Result tags: $TAGS"
-
-        for tag in $TAGS; do
-          docker tag wlan-cloud-ucentralgw-ui:${{ github.sha }} ${{ env.DOCKER_REGISTRY_URL }}/ucentralgw-ui:$tag
-        done
-
-    - name: Log into Docker registry
-      if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/pull/') || github.ref == 'refs/heads/main'
-      uses: docker/login-action@v1
+    - name: Checkout actions repo
+      uses: actions/checkout@v2
       with:
-        registry: ${{ env.DOCKER_REGISTRY_URL }}
-        username: ${{ env.DOCKER_REGISTRY_USERNAME }}
-        password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
+        repository: Telecominfraproject/.github
+        path: github
 
-    - name: Push Docker images
-      if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/pull/') || github.ref == 'refs/heads/main'
-      run: |
-        docker images | grep ${{ env.DOCKER_REGISTRY_URL }}/ucentralgw-ui | awk -F ' ' '{print $1":"$2}' | xargs -I {} docker push {}
+    - name: Build and push Docker image
+      uses: ./github/composite-actions/docker-image-build
+      with:
+        image_name: owgw-ui
+        registry: tip-tip-wlan-cloud-ucentral.jfrog.io
+        registry_user: ucentral
+        registry_password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}

.github/workflows/cleanup.yml

@@ -16,4 +16,4 @@ jobs:
     steps:
       - run: |
           export PR_BRANCH_TAG=$(echo ${GITHUB_HEAD_REF#refs/heads/} | tr '/' '-')
-          curl -uucentral:${{ secrets.DOCKER_REGISTRY_PASSWORD }} -X DELETE "https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral/ucentralgw-ui/$PR_BRANCH_TAG"
+          curl -uucentral:${{ secrets.DOCKER_REGISTRY_PASSWORD }} -X DELETE "https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral/owgw-ui/$PR_BRANCH_TAG"

.github/workflows/enforce-jira-issue-key.yml

@@ -0,0 +1,24 @@
+name: Ensure Jira issue is linked
+
+on:
+  pull_request:
+    types: [opened, edited, reopened, synchronize]
+    branches:
+      - 'release/*'
+
+jobs:
+  check_for_issue_key:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout actions repo
+        uses: actions/checkout@v2
+        with:
+          repository: Telecominfraproject/.github
+          path: github
+
+      - name: Run JIRA check
+        uses: ./github/composite-actions/enforce-jira-issue-key
+        with:
+          jira_base_url: ${{ secrets.TIP_JIRA_URL }}
+          jira_user_email: ${{ secrets.TIP_JIRA_USER_EMAIL }}
+          jira_api_token: ${{ secrets.TIP_JIRA_API_TOKEN }}

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',

docker-entrypoint.d/40-generate-config.sh

@@ -1,6 +1,6 @@
 #!/bin/ash
 # Check if variables are set
-export DEFAULT_UCENTRALSEC_URL="${DEFAULT_UCENTRALSEC_URL:-https://ucentral.dpaas.arilia.com:16001}"
-export ALLOW_UCENTRALSEC_CHANGE="${ALLOW_UCENTRALSEC_CHANGE:-false}"
+export DEFAULT_OWSEC_URL="${DEFAULT_OWSEC_URL:-https://ucentral.dpaas.arilia.com:16001}"
+export ALLOW_OWSEC_CHANGE="${ALLOW_OWSEC_CHANGE:-false}"
 
 echo '{"DEFAULT_UCENTRALSEC_URL": "'$DEFAULT_UCENTRALSEC_URL'","ALLOW_UCENTRALSEC_CHANGE": '$ALLOW_UCENTRALSEC_CHANGE'}' > /usr/share/nginx/html/config.json

helm/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
-name: ucentralgwui
+name: owgwui
 version: 0.1.0

helm/README.md

@@ -1,6 +1,6 @@
-# ucentralgwui
+# owgwui
 
-This Helm chart helps to deploy uCentralGW-UI to the Kubernetes clusters. It is mainly used in [assembly chart](https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy/tree/main/chart) as uCentralGW-UI requires other services as dependencies that are considered in that Helm chart. This chart is purposed to define deployment logic close to the application code itself and define default values that could be overriden during deployment.
+This Helm chart helps to deploy OpenWIFI Web UI (further on refered as __Web UI__) to the Kubernetes clusters. It is mainly used in [assembly chart](https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy/tree/main/chart) as Web UI requires other services as dependencies that are considered in that Helm chart. This chart is purposed to define deployment logic close to the application code itself and define default values that could be overriden during deployment.
 
 
 ## TL;DR;
@@ -11,7 +11,7 @@ $ helm install .
 
 ## Introduction
 
-This chart bootstraps an ucentralgwui on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
+This chart bootstraps the Web UI on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
 
 ## Installing the Chart
 
@@ -20,10 +20,10 @@ Currently this chart is not assembled in charts archives, so [helm-git](https://
 To install the chart with the release name `my-release`:
 
 ```bash
-$ helm install --name my-release git+https://github.com/Telecominfraproject/wlan-cloud-ucentralgw-ui@helm?ref=main
+$ helm install --name my-release git+https://github.com/Telecominfraproject/wlan-cloud-ucentralgw-ui@helm/owgwui-0.1.0.tgz?ref=main
 ```
 
-The command deploys ucentralgwui on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
+The command deploys the Web UI on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
 
 > **Tip**: List all releases using `helm list`
 
@@ -46,21 +46,21 @@ The following table lists the configurable parameters of the chart and their def
 | replicaCount | number | Amount of replicas to be deployed | `1` |
 | nameOverride | string | Override to be used for application deployment |  |
 | fullnameOverride | string | Override to be used for application deployment (has priority over nameOverride) |  |
-| images.ucentralgwui.repository | string | Docker image repository |  |
-| images.ucentralgwui.tag | string | Docker image tag | `'master'` |
-| images.ucentralgwui.pullPolicy | string | Docker image pull policy | `'Always'` |
-| services.ucentralgwui.type | string | uCentralGW-UI service type | `'ClusterIP'` |
-| services.ucentralgwui.ports.http.servicePort | number | Websocket endpoint port to be exposed on service | `80` |
-| services.ucentralgwui.ports.http.targetPort | number | Websocket endpoint port to be targeted by service | `80` |
-| services.ucentralgwui.ports.http.protocol | string | Websocket endpoint protocol | `'TCP'` |
-| checks.ucentralgwui.liveness.httpGet.path | string | Liveness check path to be used | `'/'` |
-| checks.ucentralgwui.liveness.httpGet.port | number | Liveness check port to be used (should be pointint to ALB endpoint) | `http` |
-| checks.ucentralgwui.readiness.httpGet.path | string | Readiness check path to be used | `'/'` |
-| checks.ucentralgwui.readiness.httpGet.port | number | Readiness check port to be used | `http` |
-| ingresses.default.enabled | boolean | Defines if uCentralGW-UI should be exposed via Ingress controller | `False` |
-| ingresses.default.hosts | array | List of hosts for exposed uCentralGW-UI |  |
-| ingresses.default.paths | array | List of paths to be exposed for uCentralGW-UI |  |
-| public_env_variables | hash | Defines list of environment variables to be passed to uCentralGW-UI (required for application configuration) | |
+| images.owgwui.repository | string | Docker image repository |  |
+| images.owgwui.tag | string | Docker image tag | `'master'` |
+| images.owgwui.pullPolicy | string | Docker image pull policy | `'Always'` |
+| services.owgwui.type | string | OpenWIFI Web UI service type | `'ClusterIP'` |
+| services.owgwui.ports.http.servicePort | number | Websocket endpoint port to be exposed on service | `80` |
+| services.owgwui.ports.http.targetPort | number | Websocket endpoint port to be targeted by service | `80` |
+| services.owgwui.ports.http.protocol | string | Websocket endpoint protocol | `'TCP'` |
+| checks.owgwui.liveness.httpGet.path | string | Liveness check path to be used | `'/'` |
+| checks.owgwui.liveness.httpGet.port | number | Liveness check port to be used (should be pointint to ALB endpoint) | `http` |
+| checks.owgwui.readiness.httpGet.path | string | Readiness check path to be used | `'/'` |
+| checks.owgwui.readiness.httpGet.port | number | Readiness check port to be used | `http` |
+| ingresses.default.enabled | boolean | Defines if the Web UI should be exposed via Ingress controller | `False` |
+| ingresses.default.hosts | array | List of hosts for the exposed Web UI |  |
+| ingresses.default.paths | array | List of paths to be exposed for the Web UI |  |
+| public_env_variables | hash | Defines list of environment variables to be passed to the Web UI (required for application configuration) | |
 
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,

helm/templates/_helpers.tpl

@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "ucentralgwui.name" -}}
+{{- define "owgwui.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
@@ -11,7 +11,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "ucentralgwui.fullname" -}}
+{{- define "owgwui.fullname" -}}
 {{- if .Values.fullnameOverride -}}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
@@ -27,6 +27,6 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "ucentralgwui.chart" -}}
+{{- define "owgwui.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}

helm/templates/deployment.yaml

@@ -3,36 +3,43 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "ucentralgwui.fullname" . }}
+  name: {{ include "owgwui.fullname" . }}
   labels:
-    app.kubernetes.io/name: {{ include "ucentralgwui.name" . }}
-    helm.sh/chart: {{ include "ucentralgwui.chart" . }}
+    app.kubernetes.io/name: {{ include "owgwui.name" . }}
+    helm.sh/chart: {{ include "owgwui.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
+  revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "ucentralgwui.name" . }}
+      app.kubernetes.io/name: {{ include "owgwui.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
-      {{- with .Values.services.ucentralgwui.labels }}
+      {{- with .Values.services.owgwui.labels }}
       {{- toYaml . | nindent 6 }}
       {{- end }}
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{ include "ucentralgwui.name" . }}
+        app.kubernetes.io/name: {{ include "owgwui.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-        {{- with .Values.services.ucentralgwui.labels }}
+        {{- with .Values.services.owgwui.labels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
+      {{- if .Values.podAnnotations }}
+      annotations:
+        {{- with .Values.podAnnotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      {{- end }}
     spec:
 
       containers:
 
-        - name: ucentralgwui
-          image: "{{ .Values.images.ucentralgwui.repository }}:{{ .Values.images.ucentralgwui.tag }}"
-          imagePullPolicy: {{ .Values.images.ucentralgwui.pullPolicy }}
+        - name: owgwui
+          image: "{{ .Values.images.owgwui.repository }}:{{ .Values.images.owgwui.tag }}"
+          imagePullPolicy: {{ .Values.images.owgwui.pullPolicy }}
 
           env:
             - name: KUBERNETES_DEPLOYED
@@ -43,19 +50,19 @@ spec:
           {{- end }}
 
           ports:
-          {{- range $key, $value := .Values.services.ucentralgwui.ports }}
+          {{- range $key, $value := .Values.services.owgwui.ports }}
             - name: {{ $key }}
               containerPort: {{ $value.targetPort }}
               protocol: {{ $value.protocol }}
           {{- end }}
 
-          {{- if .Values.checks.ucentralgwui.liveness }}
+          {{- if .Values.checks.owgwui.liveness }}
           livenessProbe:
-            {{- toYaml .Values.checks.ucentralgwui.liveness | nindent 12 }}
+            {{- toYaml .Values.checks.owgwui.liveness | nindent 12 }}
           {{- end }}
-          {{- if .Values.checks.ucentralgwui.readiness }}
+          {{- if .Values.checks.owgwui.readiness }}
           readinessProbe:
-            {{- toYaml .Values.checks.ucentralgwui.readiness | nindent 12 }}
+            {{- toYaml .Values.checks.owgwui.readiness | nindent 12 }}
           {{- end }}
 
           {{- with .Values.resources }}
@@ -66,7 +73,7 @@ spec:
       imagePullSecrets:
       {{- range $image, $imageValue := .Values.images }}
         {{- if $imageValue.regcred }}
-      - name: {{ include "ucentralgwui.fullname" $root }}-{{ $image }}-regcred
+      - name: {{ include "owgwui.fullname" $root }}-{{ $image }}-regcred
         {{- end }}
       {{- end }}
 

helm/templates/ingress.yaml

@@ -5,10 +5,10 @@
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: {{ include "ucentralgwui.fullname" $root }}-{{ $ingress }}
+  name: {{ include "owgwui.fullname" $root }}-{{ $ingress }}
   labels:
-    app.kubernetes.io/name: {{ include "ucentralgwui.name" $root }}
-    helm.sh/chart: {{ include "ucentralgwui.chart" $root }}
+    app.kubernetes.io/name: {{ include "owgwui.name" $root }}
+    helm.sh/chart: {{ include "owgwui.chart" $root }}
     app.kubernetes.io/instance: {{ $root.Release.Name }}
     app.kubernetes.io/managed-by: {{ $root.Release.Service }}
   {{- with $ingressValue.annotations }}
@@ -37,7 +37,7 @@ spec:
       {{- range $ingressValue.paths }}
         - path: {{ .path }}
           backend:
-            serviceName: {{ include "ucentralgwui.fullname" $root }}-{{ .serviceName }}
+            serviceName: {{ include "owgwui.fullname" $root }}-{{ .serviceName }}
             servicePort: {{ .servicePort }}
       {{- end }}
   {{- end }}

helm/templates/secret-regcred.yaml

@@ -10,11 +10,11 @@ kind: Secret
 type: kubernetes.io/dockerconfigjson
 metadata:
   labels:
-    app.kuberentes.io/name: {{ include "ucentralgwui.name" $root }}
-    helm.sh/chart: {{ include "ucentralgwui.chart" $root }}
+    app.kuberentes.io/name: {{ include "owgwui.name" $root }}
+    helm.sh/chart: {{ include "owgwui.chart" $root }}
     app.kubernetes.io/instance: {{ $root.Release.Name }}
     app.kubernetes.io/managed-by: {{ $root.Release.Service }}
-  name: {{ include "ucentralgwui.fullname" $root }}-{{ $image }}-regcred
+  name: {{ include "owgwui.fullname" $root }}-{{ $image }}-regcred
 data:
   .dockerconfigjson: {{ template "imagePullSecret" $imageValue.regcred }}
 {{- end }}

helm/templates/service.yaml

@@ -4,14 +4,14 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "ucentralgwui.fullname" $root }}-{{ $service }}
+  name: {{ include "owgwui.fullname" $root }}-{{ $service }}
   {{- with $serviceValue.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: {{ include "ucentralgwui.name" $root }}
-    helm.sh/chart: {{ include "ucentralgwui.chart" $root }}
+    app.kubernetes.io/name: {{ include "owgwui.name" $root }}
+    helm.sh/chart: {{ include "owgwui.chart" $root }}
     app.kubernetes.io/instance: {{ $root.Release.Name }}
     app.kubernetes.io/managed-by: {{ $root.Release.Service }}
 
@@ -39,7 +39,7 @@ spec:
       {{- end }}
   {{- end }}
   selector:
-    app.kubernetes.io/name: {{ include "ucentralgwui.name" $root }}
+    app.kubernetes.io/name: {{ include "owgwui.name" $root }}
     app.kubernetes.io/instance: {{ $root.Release.Name }}
     {{- with $serviceValue.labels }}
     {{- toYaml . | nindent 4 }}

helm/values.yaml

@@ -1,18 +1,19 @@
 # System
 replicaCount: 1
+revisionHistoryLimit: 2
 
 nameOverride: ""
 fullnameOverride: ""
 
 images:
-  ucentralgwui:
-    repository: tip-tip-wlan-cloud-ucentral.jfrog.io/ucentralgw-ui
-    tag: main
+  owgwui:
+    repository: tip-tip-wlan-cloud-ucentral.jfrog.io/owgw-ui
+    tag: v2.5.0
     pullPolicy: Always
 
 services:
-  ucentralgwui:
-    type: ClusterIP
+  owgwui:
+    type: NodePort
     ports:
       http:
         servicePort: 80
@@ -20,7 +21,7 @@ services:
         protocol: TCP
 
 checks:
-  ucentralgwui:
+  owgwui:
     liveness:
       httpGet:
         path: /
@@ -37,7 +38,7 @@ ingresses:
       # kubernetes.io/ingress.class: nginx
       # kubernetes.io/tls-acme: "true"
     # tls:
-    # - secretName: '{{ include "ucentralgwui.fullname" . }}-default-tls' # template may be used
+    # - secretName: '{{ include "owgwui.fullname" . }}-default-tls' # template may be used
     #   cert: |
     #     CERT_HERE_IN_PEM
     #   key: |
@@ -48,7 +49,7 @@ ingresses:
     - chart-example.local
     paths:
     - path: /
-      serviceName: ucentralgwui
+      serviceName: owgwui
       servicePort: http
 
 resources: {}
@@ -69,6 +70,8 @@ tolerations: []
 
 affinity: {}
 
+podAnnotations: {}
+
 # Application
 public_env_variables:
   DEFAULT_UCENTRALSEC_URL: https://ucentral.dpaas.arilia.com:16001

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ucentral-client",
-  "version": "2.1.0",
+  "version": "2.5.44",
   "dependencies": {
     "@coreui/coreui": "^3.4.0",
     "@coreui/icons": "^2.0.1",
@@ -17,6 +17,7 @@
     "prop-types": "^15.7.2",
     "react": "^17.0.2",
     "react-apexcharts": "^1.3.9",
+    "react-csv": "^2.2.2",
     "react-dom": "^17.0.2",
     "react-flow-renderer": "^9.6.6",
     "react-i18next": "^11.11.0",
@@ -26,7 +27,7 @@
     "react-tooltip": "^4.2.21",
     "react-widgets": "^5.1.1",
     "sass": "^1.35.1",
-    "ucentral-libs": "^0.8.82",
+    "ucentral-libs": "^1.0.60",
     "uuid": "^8.3.2"
   },
   "main": "index.js",
@@ -82,7 +83,6 @@
     "husky": "^4.3.8",
     "lint-staged": "^11.0.0",
     "mini-css-extract-plugin": "^1.6.1",
-    "node-sass": "^5.0.0",
     "path": "^0.12.7",
     "prettier": "^2.3.2",
     "react-refresh": "^0.9.0",
@@ -91,7 +91,7 @@
     "terser-webpack-plugin": "^5.1.4",
     "webpack": "^5.40.0",
     "webpack-bundle-analyzer": "^4.4.2",
-    "webpack-cli": "^4.7.2",
+    "webpack-cli": "^4.9.1",
     "webpack-dev-server": "^3.11.2",
     "webpack-merge": "^5.8.0"
   },

public/index.html

@@ -5,7 +5,7 @@
     <link rel="icon" href="favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
-    <title>uCentralGW</title>
+    <title>Gateway</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

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"
@@ -16,53 +17,70 @@
 		"blink": "LEDs Blinken",
 		"device_leds": "LEDs",
 		"execute_now": "Möchten Sie dieses Muster jetzt einstellen?",
+		"explanation": "Welches Muster möchten Sie auf diesem Gerät für 30 Sekunden einstellen?",
 		"pattern": "Wählen Sie das Muster, das Sie verwenden möchten:",
 		"set_leds": "LEDs einstellen",
 		"when_blink_leds": "Wann möchten Sie die LEDs blinken lassen?"
 	},
 	"commands": {
+		"command_success": "Befehl erfolgreich übermittelt",
 		"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",
 		"add": "Hinzufügen",
+		"add_items": "Füge Artikel hinzu",
+		"add_note": "Notiz hinzufügen",
+		"add_note_explanation": "Schreiben Sie unten Ihre neue Notiz und klicken Sie auf die Schaltfläche \"+\", wo Sie fertig sind",
 		"adding_ellipsis": "Hinzufügen ...",
+		"all": "Alles",
 		"are_you_sure": "Bist du sicher?",
 		"back_to_login": "Zurück zur Anmeldung",
+		"back_to_start": "Zurück zum Start",
+		"blacklist": "Schwarze Liste",
+		"by": "Durch",
 		"cancel": "Abbrechen",
 		"certificate": "Zertifikat",
 		"certificates": "Zertifikate",
+		"claim": "Anspruch",
 		"clear": "Löschen",
 		"close": "Schließen",
+		"code": "Code",
 		"command": "Befehl",
 		"commands": "Befehle",
 		"commands_executed": "Ausgeführte Befehle",
 		"compatible": "kompatibel",
 		"completed": "Abgeschlossen",
+		"concurrent_devices": "Gleichzeitige Geräte",
 		"config_id": "Konfigurations ID",
 		"confirm": "Bestätigen",
+		"confirm_stop_editing": "Möchten Sie die Bearbeitung wirklich beenden? Dadurch werden alle nicht gespeicherten Änderungen, die Sie vorgenommen haben, verworfen.",
 		"connected": "Verbindung wurde hergestellt",
 		"copied": "kopiert!",
+		"copied_to_clipboard": "In die Zwischenablage kopiert!",
 		"copy_to_clipboard": "In die Zwischenablage kopieren",
 		"create": "Erstellen",
 		"created": "Erstellt",
 		"created_by": "Erstellt von",
+		"creator": "Schöpfer",
 		"current": "Aktuell",
 		"custom_date": "Benutzerdefiniertes Datum",
 		"dashboard": "Instrumententafel",
 		"date": "Datum",
 		"day": "tag",
 		"days": "tage",
+		"default_map": "Standardkarte",
 		"delete": "Löschen",
 		"delete_device": "Gerät löschen",
 		"details": "Einzelheiten",
 		"device": "Gerät #{{serialNumber}}",
 		"device_dashboard": "Geräte-Dashboard",
-		"device_delete": "Gerät Nr.{{serialNumber}}löschen",
+		"device_delete": "#{{serialNumber}}löschen",
 		"device_deleted": "Gerät erfolgreich gelöscht",
 		"device_health": "Gerätezustand",
 		"device_list": "Liste der Geräte",
@@ -74,6 +92,7 @@
 		"dismiss": "entlassen",
 		"do_now": "Sofort",
 		"download": "Herunterladen",
+		"duplicate": "Duplikat",
 		"duration": "Dauer",
 		"edit": "Bearbeiten",
 		"edit_user": "Bearbeiten",
@@ -81,6 +100,9 @@
 		"endpoint": "Endpunkt",
 		"endpoints": "Endpunkte",
 		"error": "Fehler",
+		"error_adding_note": "Fehler beim Hinzufügen einer Notiz",
+		"error_code": "Fehlercode",
+		"errors": "Fehler",
 		"execute_now": "Möchten Sie diesen Befehl jetzt ausführen?",
 		"executed": "Ausgeführt",
 		"exit": "Ausgang",
@@ -91,11 +113,22 @@
 		"forgot_password_title": "Passwort vergessen",
 		"from": "Von",
 		"general_error": "API-Fehler, wenden Sie sich bitte an Ihren Administrator",
+		"go_back": "Geh zurück",
 		"hide": "verbergen",
 		"hour": "stunde",
 		"hours": "std",
 		"id": "ID",
+		"invalid_credentials": "Ungültiger Benutzername und / oder Passwort",
+		"invalid_date_explanation": "Ungültiges Datum, bitte verwenden Sie den Kalender, auf den Sie über die Schaltfläche rechts zugreifen können",
+		"invalid_file": "Die ausgewählte Datei war ungültig, bitte lesen Sie die Anweisungen und passen Sie Ihre Datei entsprechend an",
+		"invalid_password": "Dieses Passwort entspricht nicht den grundlegenden Passwortregeln. Bitte besuchen Sie unsere Seite Passwortrichtlinien, um mehr zu erfahren",
+		"invalid_pem": "Ihre PEM-Datei ist ungültig. Es sollte mit '-----BEGIN CERTIFICATE-----' ODER '-----BEGIN PRIVATE KEY-----' beginnen und mit '-----END CERTIFICATE--- enden. --' ODER '-----END PRIVATSCHLÜSSEL-----'",
 		"ip_address": "IP Adresse",
+		"ips": "IPs",
+		"item": "Artikel",
+		"items": "Artikel",
+		"items_per_page": "Objekte pro Seite:",
+		"key": "Schlüssel",
 		"last_dashboard_refresh": "Letzte Dashboard-Aktualisierung",
 		"later_tonight": "Später am Abend",
 		"latest": "Neueste",
@@ -104,25 +137,35 @@
 		"loading_more_ellipsis": "Mehr laden ...",
 		"logout": "Ausloggen",
 		"mac": "MAC-Adresse",
+		"main": "Main",
 		"manufacturer": "Hersteller",
 		"memory_used": "Verwendeter Speicher",
+		"min_max": "Min: {{min}}, Max: {{max}}",
 		"minute": "Minute",
 		"minutes": "protokoll",
+		"modified": "Geändert",
 		"na": "(unbekannt)",
 		"need_date": "Du brauchst ein Datum...",
 		"no": "Nein",
+		"no_addresses_found": "Keine Adressen gefunden",
 		"no_devices_found": "Keine Geräte gefunden",
 		"no_items": "Keine Gegenstände",
+		"none": "Keiner",
 		"not_connected": "Nicht verbunden",
-		"of_connected": "% der Geräte",
+		"of_connected": "% der verbundenen Geräte",
 		"off": "Aus",
 		"on": "An",
 		"optional": "Wahlweise",
 		"overall_health": "Allgemeine Gesundheit",
 		"password_policy": "Kennwortrichtlinie",
+		"preferences": "Einstellungen",
+		"preview": "Vorschau",
+		"program": "Programm",
+		"reason": "Grund",
 		"recorded": "Verzeichnet",
 		"refresh": "Aktualisierung",
 		"refresh_device": "Gerät aktualisieren",
+		"remove_claim": "Anspruch entfernen",
 		"required": "Erforderlich",
 		"result": "Ergebnis",
 		"save": "Sparen",
@@ -133,40 +176,96 @@
 		"second": "zweite",
 		"seconds": "sekunden",
 		"seconds_elapsed": "Sekunden verstrichen",
+		"see_details": "Siehe Einzelheiten",
+		"select": "wählen",
+		"serial_num": "Seriennummer",
 		"serial_number": "Seriennummer",
 		"show_all": "Zeige alles",
+		"socket_connection_closed": "Verbindung geschlossen!",
 		"start": "Start",
+		"status": "Status",
+		"stop_editing": "Stoppen Sie die Bearbeitung",
 		"submit": "Absenden",
 		"submitted": "Eingereicht",
 		"success": "Erfolg",
 		"system": "System",
 		"table": "Tabelle",
+		"time_per_device": "Gerät/Sekunde",
 		"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",
 		"up_to_date": "Aktuelle Geräte",
 		"uptimes": "Betriebszeiten",
+		"use_file": "Datei verwenden",
 		"uuid": "UUID",
 		"vendors": "Anbieter",
 		"view_more": "Mehr anzeigen",
+		"visibility": "Sichtweite",
+		"waiting_for_update": "Warten auf Aktualisierung",
 		"yes": "Ja"
 	},
 	"configuration": {
+		"add_configuration": "Konfiguration hinzufügen",
+		"add_new_block": "Neuen Konfigurationsblock hinzufügen",
+		"add_or_link": "Verlinken oder hinzufügen",
+		"add_radio": "Radio hinzufügen",
+		"ca_cert_explanation": "Bitte verwenden Sie eine .pem-Datei, die mit \"-----BEGIN CERTIFICATE-----\" beginnt und mit \"-----END CERTIFICATE-----\" endet. Das Ergebnis wird im Feld darunter angezeigt. Sie können das Zertifikat, das Sie verwenden möchten, auch direkt kopieren und einfü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_radio_band": "Welche Radioband möchten Sie gründen?",
+		"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}}",
+		"default_configs": "Standardkonfigurationen",
+		"default_configurations": "Standardkonfigurationen",
+		"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",
+		"devices_affected": "Von dieser Konfiguration betroffene Geräte:",
+		"edit_configuration": "Konfiguration bearbeiten",
+		"error_delete": "Fehler beim Versuch zu löschen: {{error}}",
+		"error_delete_blacklist": "Fehler beim Löschen aus der schwarzen Liste: {{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",
+		"key_pem_explanation": "Bitte .pem-Datei auswählen",
+		"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_affected_devices": "Betroffene Geräte anzeigen",
+		"view_config": "Konfiguration anzeigen",
+		"view_in_use": "In Verwendung anzeigen",
 		"view_json": "Rohe Konfiguration anzeigen"
 	},
 	"configure": {
@@ -176,6 +275,41 @@
 		"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}}"
+	},
+	"contact": {
+		"access_pin": "Zugangs-PIN",
+		"add_contact": "Kontakt hinzufügen",
+		"contact": "Kontakt",
+		"create_contact": "Kontakt erstellen",
+		"currently_selected_contact": "Aktuell ausgewählter Kontakt: {{contact}}",
+		"delete": "Kontakt löschen?",
+		"error_assign": "Fehler beim Versuch, Kontakt zuzuweisen: {{error}}",
+		"error_creation": "Fehler beim Versuch, einen Kontakt zu erstellen: {{error}}",
+		"error_delete": "Fehler beim Versuch, den Kontakt zu löschen: {{error}}",
+		"error_fetching_list": "Fehler beim Abrufen der Kontakte",
+		"error_fetching_single": "Fehler beim Abrufen des Kontakts: {{error}}",
+		"error_unassign": "Fehler beim Versuch, die Zuweisung des Kontakts aufzuheben: {{error}}",
+		"first_name": "Vorname",
+		"identifier": "Identifikator",
+		"initials": "Initialen",
+		"last_name": "Nachname",
+		"no_associated_contact": "Kein zugehöriger Kontakt",
+		"primary_email": "Erste Email",
+		"salutation": "Anrede",
+		"secondary_email": "Alternative Email",
+		"successful_assign": "Kontakt erfolgreich zugewiesen!",
+		"successful_creation": "Kontakt Erstellt!",
+		"successful_delete": "Kontakt erfolgreich gelöscht!",
+		"successful_unassign": "Erfolgreich nicht zugewiesener Kontakt",
+		"successful_update": "Kontakt erfolgreich aktualisiert",
+		"title": "Kontakte",
+		"type": "Art",
+		"update_error": "Fehler beim Aktualisieren des Kontakts: {{error}}",
+		"user_title": "Titel",
+		"visual": "Korrespondenzname"
+	},
 	"delete_command": {
 		"explanation": "Möchten Sie diesen Befehl wirklich löschen? Diese Aktion ist nicht umkehrbar.",
 		"title": "Befehl löschen"
@@ -186,6 +320,25 @@
 		"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": {
+		"add_to_blacklist": "Gerät zur Blacklist hinzufügen",
+		"all_devices": "Alle Geräte",
+		"blacklisted_on": "Datum",
+		"capabilities": "Fähigkeiten",
+		"certificate_explanation": "Zertifikate der angeschlossenen Geräte",
+		"edit_blacklist": "Gerät auf der schwarzen Liste bearbeiten",
+		"error_adding_blacklist": "Fehler beim Hinzufügen des Geräts zur Blacklist: {{error}}",
+		"error_edit_blacklist": "Fehler beim Bearbeiten der schwarzen Liste: {{error}}",
+		"error_fetching_device": "Fehler beim Abrufen der Geräteinformationen: {{error}}",
+		"error_fetching_devices": "Fehler beim Abrufen von Geräten: {{error}}",
+		"health_explanation": "Zustand der verbundenen Geräte ((Geräte = 100 % * 100 + Geräte > 90 % * 95 + Geräte > 60 % * 75 + Geräte < 60 % * 35) / Verbundene Geräte)",
+		"memory_explanation": "Anzahl verbundener Geräte mit entsprechendem belegtem Speicher %",
+		"remove_from_blacklist": "Von der schwarzen Liste entfernen",
+		"success_added_blacklist": "Gerät erfolgreich zur Blacklist hinzugefügt!",
+		"success_edit_blacklist": "Blacklist erfolgreich bearbeitet!",
+		"success_removed_blacklist": "Gerät erfolgreich von Blacklist entfernt!",
+		"uptimes_explanation": "Anzahl der verbundenen Geräte basierend auf ihrer Betriebszeit"
+	},
 	"device_logs": {
 		"log": "Protokoll",
 		"severity": "Wichtigkeit",
@@ -194,16 +347,48 @@
 	"entity": {
 		"add_child": "Untergeordnete Entität zu {{entityName}}hinzufügen",
 		"add_failure": "Fehler, der Server hat zurückgegeben: {{error}}",
+		"add_ips": "IPs verwalten",
 		"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.",
+		"confirm_map_delete": "Möchten Sie die Karte {{name}}wirklich löschen? Diese Aktion kann nicht rückgängig gemacht werden",
+		"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",
+		"duplicate_from_node": "Mit einem bestimmten Root-Knoten duplizieren",
+		"duplicate_map": "Karte duplizieren",
+		"duplicate_with_node": "Dupliziere {{mapName}} mit {{rootName}} als Root-Knoten",
 		"edit_failure": "Aktualisierung fehlgeschlagen : {{error}}",
+		"enter_here": "Geben Sie hier die IP(s) ein, die Sie hinzufügen möchten",
+		"entire_tree": "Netzwerkkarte",
 		"entities": "Entitäten",
 		"entity": "Entität",
+		"error_deleting_map": "Fehler beim Löschen der Karte: {{error}}",
+		"error_fetch_entity": "Fehler beim Abrufen von Entitätsinformationen",
+		"error_fetching": "Fehler beim Abrufen von Entitäten",
+		"error_fetching_map": "Fehler beim Abrufen der Karte: {{error}}",
+		"error_fetching_tree": "Fehler beim Abrufen des Baums: {{error}}",
+		"error_saving": "Fehler beim Speichern der Entität",
+		"error_saving_map": "Fehler beim Speichern der Karte: {{error}}",
+		"higher_priority": "Stellen Sie eine höhere Priorität ein",
+		"ip_detection": "IP-Erkennung",
+		"ip_formats": "Sie können IPv4- oder IPv6-Adressen in den folgenden Formaten hinzufügen:",
+		"lower_priority": "Niedrigere Priorität setzen",
+		"map": "Karte",
+		"map_delete_success": "Karte erfolgreich gelöscht!",
+		"need_select_entity": "sSie müssen eine Entität aus der folgenden Tabelle auswählen",
+		"no_ips": "Keine IPs ausgewählt",
+		"not_assigned": "Nicht zugeordnet",
 		"only_unassigned": "Nur nicht zugewiesen",
-		"valid_serial": "Muss eine gültige Seriennummer sein (12 HEX-Zeichen)"
+		"select_entity": "Wählen Sie diese Entität aus",
+		"selected_entity": "Ausgewählte Einheit",
+		"selected_map": "Ausgewählte Karte",
+		"tree_saved": "Karte erfolgreich gespeichert!",
+		"update_failure_error": "Fehler beim Versuch, die Entität zu aktualisieren: {{error}}",
+		"valid_serial": "Muss eine gültige Seriennummer sein (12 HEX-Zeichen)",
+		"venues": "Veranstaltungsorte"
 	},
 	"factory_reset": {
 		"redirector": "Gatewaykonfiguration beibehalten:",
@@ -213,6 +398,7 @@
 		"warning": "Achtung: Nach dem Absenden kann dies nicht rückgängig gemacht werden"
 	},
 	"firmware": {
+		"age_explanation": "Durchschnittliche Anzahl der Tage für alle Geräte, von denen wir diesen Wert erhalten können",
 		"average_age": "Durchschnittliches Firmware-Alter",
 		"choose_custom": "Wählen",
 		"details_title": "Bild #{{image}} Details",
@@ -225,9 +411,11 @@
 		"image": "Bild",
 		"image_date": "Bilddatum",
 		"installed_firmware": "Installierte Firmware",
+		"latest_explanation": "Geräte, auf denen erkannte Firmware in der neuesten Version ausgeführt wird",
 		"latest_version_installed": "Neueste Version installiert Version",
 		"newer_firmware_available": "Neuere Versionen verfügbar",
 		"reinstall_latest": "Neu installieren",
+		"release": "Veröffentlichung",
 		"revision": "Revision",
 		"show_dev": "Dev-Releases anzeigen",
 		"size": "Größe",
@@ -251,33 +439,129 @@
 		"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_ent_ven": "Zu Entität oder Veranstaltungsort zuweisen",
+		"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_pushing_config": "Fehler beim Versuch, die Konfiguration auf das Gerät zu übertragen: {{error}}",
 		"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",
-		"venue": "Tagungsort"
+		"validating_import_file": "Importdatei und -daten werden validiert...",
+		"venue": "Tagungsort",
+		"view_in_gateway": "Im Gateway anzeigen"
+	},
+	"location": {
+		"add": "Ort hinzufügen",
+		"building_name": "Gebäudename",
+		"city": "Stadt",
+		"country": "Land",
+		"create": "Standort erstellen",
+		"currently_selected": "Aktuell ausgewählter Standort: {{location}}",
+		"delete": "Ort löschen?",
+		"error_assign": "Fehler beim Versuch, den Standort zuzuweisen: {{error}}",
+		"error_creation": "Fehler beim Versuch, Standorte zu erstellen: {{error}}",
+		"error_delete": "Fehler beim Löschen des Standorts: {{error}}",
+		"error_fetching_single": "Fehler beim Versuch, den Standort abzurufen: {{error}}",
+		"geocode": "GeoCode",
+		"mobiles": "MOBILES",
+		"no_associated": "Kein zugeordneter Standort",
+		"phones": "Telefone",
+		"postal": "Postleitzahl",
+		"search": "Suchen Sie nach Standorten, um die Felder unten automatisch auszufüllen",
+		"state": "Zustand",
+		"street_address": "Adresse",
+		"successful_creation": "Standort erfolgreich erstellt!",
+		"successful_delete": "Standort erfolgreich gelöscht!",
+		"successful_update": "Standort erfolgreich aktualisiert!",
+		"successfully_assigned": "Standort erfolgreich zugewiesen!",
+		"title": "Standorte",
+		"update_error": "Fehler beim Aktualisieren des Standorts: {{error}}"
 	},
 	"login": {
+		"account_verification": "Bestätigung des Kontos",
+		"authentication_expired": "Authentifizierung abgelaufen, bitte starten Sie den Anmeldevorgang erneut",
 		"change_password": "Ändere das Passwort",
 		"change_password_error": "Fehler beim Ändern des Passworts. Stellen Sie sicher, dass das neue Passwort gültig ist, indem Sie die Seite \"Passwortrichtlinie\" besuchen",
 		"change_password_instructions": "Geben Sie Ihr neues Passwort ein und bestätigen Sie es",
 		"changing_password": "Passwort ändern...",
 		"confirm_new_password": "Bestätige neues Passwort",
 		"different_passwords": "Sie müssen das gleiche Passwort zweimal eingeben",
+		"email_code_validation": "Bitte überprüfen Sie Ihr E-Mail-Postfach und geben Sie den Bestätigungscode, den wir Ihnen gerade gesendet haben, in das Feld unten ein",
 		"forgot_password_error": "Fehler beim Versuch, eine E-Mail mit vergessenem Passwort zu senden. Stellen Sie sicher, dass diese Benutzer-ID mit einem Konto verknüpft ist.",
 		"forgot_password_explanation": "Geben Sie Ihren Benutzernamen ein, um eine E-Mail mit Anweisungen zum Zurücksetzen Ihres Passworts zu erhalten",
 		"forgot_password_success": "Sie sollten in Kürze eine E-Mail mit Anweisungen zum Zurücksetzen Ihres Passworts erhalten. Bitte überprüfen Sie Ihren Spam, wenn Sie die E-Mail nicht finden können",
@@ -286,6 +570,7 @@
 		"login_error": "Anmeldefehler, stellen Sie sicher, dass die von Ihnen angegebenen Informationen gültig sind",
 		"new_password": "Neues Kennwort",
 		"password": "Passwort",
+		"phone_validation_explanation": "Bitte überprüfen Sie Ihr Mobilgerät und geben Sie den Bestätigungscode, den wir Ihnen gerade gesendet haben, in das Feld unten ein",
 		"please_enter_gateway": "Bitte geben Sie eine uCentralSec-URL ein",
 		"please_enter_password": "Bitte geben Sie Ihr Passwort ein",
 		"please_enter_username": "Bitte geben Sie Ihren Benutzernamen ein",
@@ -294,7 +579,12 @@
 		"sending_ellipsis": "Senden…",
 		"sign_in_to_account": "Melden Sie sich bei Ihrem Konto an",
 		"url": "uCentralSec-URL",
-		"username": "Benutzername"
+		"username": "Benutzername",
+		"verification_code": "Geben Sie hier Ihre Bestätigung ein",
+		"wrong_code": "Der eingegebene Bestätigungscode ist ungültig."
+	},
+	"preferences": {
+		"provisioning": "Bereitstellung"
 	},
 	"reboot": {
 		"directions": "Wann möchten Sie dieses Gerät neu starten?",
@@ -306,7 +596,7 @@
 		"channel": "Kanal",
 		"directions": "Starten Sie einen WiFi-Scan dieses Geräts, der ungefähr 25 Sekunden dauern sollte.",
 		"re_scan": "Erneut scannen",
-		"result_directions": "Bitte klicken Sie auf die Schaltfläche '$t(scan.re_scan)', wenn Sie einen Scan mit derselben Konfiguration wie beim letzten Scan durchführen möchten.",
+		"result_directions": "Sie können oben rechts auf die Schaltfläche „Scannen“ klicken, um $t(scan.re_scan)",
 		"results": "Ergebnisse des WiFi-Scans",
 		"scan": "Scan",
 		"scanning": "Scannen... ",
@@ -315,29 +605,117 @@
 	"settings": {
 		"title": "die Einstellungen"
 	},
+	"simulation": {
+		"add": "Simulation hinzufügen",
+		"cancel": "Stornieren",
+		"cancel_success": "Simulationslauf erfolgreich abgebrochen!",
+		"check_ongoing_sims": "Folge laufender Sim",
+		"client_interval": "Kundenintervall",
+		"delete_simulation": "Sim löschen. {{name}}",
+		"end": "Endete",
+		"error_creating": "Fehler beim Erstellen der Simulation: {{error}}",
+		"error_delete": "Fehler beim Löschen der Simulation: {{error}}",
+		"error_devices": "Fehler Geräte",
+		"error_edit": "Fehler beim Versuch, die Simulation zu speichern: {{error}}",
+		"error_edit_run": "Fehler beim Versuch, den Ausführungsstatus zu ändern: {{error}}",
+		"error_fetching_simulations": "Fehler beim Abrufen der Simulationen: {{error}}",
+		"error_start_run": "Fehler beim Versuch, einen Simulationslauf zu starten: {{error}}",
+		"gateway": "Tor",
+		"healtcheck_interval": "Healthcheck-Intervall",
+		"keep_alive": "Bleib am Leben",
+		"last_refresh": "Letzte Aktualisierung",
+		"length": "Länge",
+		"live_devices": "Live-Geräte",
+		"mac_prefix": "MAC-Präfix",
+		"max_associations": "max. Verbände",
+		"max_clients": "Max. Kunden",
+		"messages_transmitted": "Nachricht TX",
+		"min_associations": "Mindest. Verbände",
+		"min_clients": "Mindest. Kunden",
+		"pause": "Pause",
+		"pause_success": "Lauf pausiert!",
+		"prefix_length": "Erforderlich, muss eine Länge von 6 Zeichen haben",
+		"previous_runs": "Vorherige Läufe",
+		"received": "empfangen",
+		"received_messages": "Nachricht RX",
+		"reconnect_interval": "Wiederverbindungsintervall",
+		"resume": "Fortsetzen",
+		"resume_success": "Lauf wieder aufgenommen!",
+		"run": "Simulationslauf",
+		"run_simulation": "Simulation ausführen",
+		"started": "gestartet",
+		"state_interval": "Zustandsintervall",
+		"stop": "Halt",
+		"stop_success": "Lauf gestoppt!",
+		"success_creating": "Simulation erfolgreich erstellt!",
+		"success_run_start": "Erfolgreich gestarteter Lauf!",
+		"successful_delete": "Simulation erfolgreich gelöscht!",
+		"successful_edit": "Erfolgreich bearbeitete Simulation!",
+		"threads": "Themen",
+		"time_full_devices": "Zeit für volle Geräte",
+		"title": "Simulationen",
+		"transmitted": "Übertragen",
+		"valid_cert": "Gültiges Zertifikat",
+		"valid_key": "Gültiger Schlüssel"
+	},
 	"statistics": {
 		"data": "Daten (KB)",
+		"data_mb": "Daten (MB)",
 		"latest_statistics": "Neueste Statistiken",
 		"lifetime_stats": "Lifetime-Statistik",
+		"memory": "Erinnerung",
 		"no_interfaces": "Keine Statistiken zur Schnittstellenlebensdauer verfügbar",
 		"show_latest": "Letzte Statistik",
-		"title": "Statistiken"
+		"title": "Statistiken",
+		"used": "Verwendeter Speicher %"
 	},
 	"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",
 		"percentage_used": "{{percentage}}% von {{total}} verwendet",
 		"title": "#{{serialNumber}} Status",
+		"total_memory": "Gesamtspeicher",
 		"uptime": "Betriebszeit",
 		"used_total_memory": "{{used}} verwendet / {{total}} insgesamt"
 	},
+	"subscriber": {
+		"add_device_subscriber_explanation": "Um andere Geräte zu reklamieren, kannst du unsere Suchleiste verwenden oder direkt aus der Tabelle reklamieren. Wenn ein Gerät bereits von einem Benutzer beansprucht wurde, müssen Sie zu dessen Details gehen und die Zuweisung aufheben, bevor Sie es beanspruchen.",
+		"create": "Abonnenten erstellen",
+		"devices_one": "{{count}} Gerät",
+		"devices_other": "{{count}} Geräte",
+		"edit": "Abonnent bearbeiten",
+		"error_create": "Fehler beim Erstellen des Abonnenten: {{error}}",
+		"error_delete": "Fehler beim Löschen des Abonnenten: {{error}}",
+		"error_fetching": "Fehler beim Abrufen von Abonnenten: {{error}}",
+		"error_fetching_single": "Fehler beim Abrufen des Abonnenten: {{error}}",
+		"error_update": "Fehler beim Aktualisieren des Abonnenten: {{error}}",
+		"is_already_claimed": "wird bereits beansprucht von",
+		"subscribers": "Abonnenten",
+		"success_create": "Abonnent erfolgreich erstellt!",
+		"success_delete": "Abonnent erfolgreich gelöscht!",
+		"success_update": "Abonnent erfolgreich aktualisiert!"
+	},
 	"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",
+		"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",
@@ -368,14 +746,17 @@
 		"waiting_for_device": "Warten, bis das Gerät wieder verbunden ist"
 	},
 	"user": {
+		"add_phone_number": "Telefonnummer hinzufügen",
 		"avatar": "Dein Avatar",
 		"avatar_file": "Dein Avatar (max. 2 MB)",
+		"check_phone": "Bitte überprüfen Sie Ihr Telefon auf Ihren Validierungscode",
+		"confirm_new_password": "Bestätige neues Passwort",
 		"create": "Benutzer erstellen",
-		"create_failure": "Fehler beim Erstellen des Benutzers. Bitte stellen Sie sicher, dass diese E-Mail-Adresse nicht bereits mit einem Konto verknüpft ist.",
+		"create_failure": "Fehler beim Erstellen des Benutzers: {{error}}",
 		"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,35 +764,51 @@
 		"description": "Beschreibung",
 		"edit": "Benutzer bearbeiten",
 		"email_address": "E-Mail-Addresse",
+		"enter_new_phone": "Geben Sie Ihre neue Telefonnummer ein:",
+		"error_fetching_users": "Fehler beim Abrufen der Nutzer: {{error}}",
+		"error_retrieving": "Fehler beim Abrufen des Benutzers",
+		"error_sending_code": "Fehler beim Versuch, den Validierungscode zu senden. Bitte bestätigen Sie, dass Ihre Telefonnummer gültig ist.",
 		"force_password_change": "Passwortänderung bei der Anmeldung erzwingen",
 		"id": "Benutzeridentifikation.",
 		"last_login": "Letzte Anmeldung",
 		"login_id": "Anmelde-ID.",
+		"make_sure_same_password": "Stellen Sie sicher, dass beide Passwörter gleich und gültig sind",
 		"my_profile": "Mein Profil",
 		"name": "Name",
+		"new_code_sent": "Neuer Code gesendet!",
 		"nickname": "Spitzname",
 		"nickname_explanation": "Spitzname (optional)",
 		"not_validated": "Nicht validiert",
 		"note": "Hinweis",
 		"password": "Passwort",
+		"phone_number": "Telefonnummer",
 		"provide_email": "Bitte geben Sie eine gültige E-Mail Adresse an",
 		"provide_password": "Bitte geben Sie ein gültiges Passwort ein",
 		"save_avatar": "Avatar speichern",
+		"send_code": "Code senden",
+		"send_code_again": "Code nochmal senden",
 		"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.",
+		"successful_validation": "Telefonnummer bestätigt! Klicken Sie auf die Schaltfläche Speichern, um es mit Ihrem Profil zu verknüpfen",
+		"table_title": "Admin-Benutzer",
+		"update_failure": "Fehler beim Aktualisieren: {{error}}",
 		"update_failure_title": "Update fehlgeschlagen",
 		"update_success": "Benutzer erfolgreich aktualisiert",
 		"update_success_title": "Erfolg",
 		"user_role": "Rolle",
 		"users": "Benutzer",
-		"validated": "Bestätigt"
+		"validate_phone": "Bestätigen",
+		"validated": "Bestätigt",
+		"wrong_validation_code": "Sie haben keinen gültigen Code eingegeben. Bitte versuchen Sie es erneut und vergewissern Sie sich, dass Sie die richtige Telefonnummer eingegeben haben"
 	},
 	"wifi_analysis": {
 		"association": "Verband",
 		"associations": "Verbände",
 		"mode": "Modus",
 		"network_diagram": "Netzwerkdiagramm",
+		"override_dfs": "DFS überschreiben",
 		"radios": "Radios",
-		"title": "WLAN-Analyse"
+		"scan_warning": "Ihr 5G-Funkgerät befindet sich auf einem Radarkanal, Sie müssen „Override DFS“ aktivieren, um das Scannen aller 5G-Kanäle zu ermöglichen",
+		"title": "WLAN-Analyse",
+		"vendor": "Verkäufer"
 	}
 }

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"
@@ -16,53 +17,70 @@
 		"blink": "Blink",
 		"device_leds": "Device LEDs",
 		"execute_now": "Would you like to set this pattern now?",
+		"explanation": "What pattern would you like to set on this device for 30 seconds?",
 		"pattern": "LEDs pattern: ",
 		"set_leds": "Set LEDs",
 		"when_blink_leds": "When would you like to make the device LEDs blink?"
 	},
 	"commands": {
+		"command_success": "Command Submitted Successfully",
 		"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",
 		"add": "Add",
+		"add_items": "Add Items",
+		"add_note": "Add Note",
+		"add_note_explanation": "Write your new note below and click the '+' button where you are done",
 		"adding_ellipsis": "Adding...",
+		"all": "All",
 		"are_you_sure": "Are you sure?",
 		"back_to_login": "Back to Login",
+		"back_to_start": "Back to start",
+		"blacklist": "Blacklist",
+		"by": "By",
 		"cancel": "Cancel",
 		"certificate": "Certificate",
 		"certificates": "Certificates",
+		"claim": "Claim",
 		"clear": "Clear",
 		"close": "Close",
+		"code": "Code",
 		"command": "Command",
 		"commands": "Commands",
 		"commands_executed": "Commands Executed",
 		"compatible": "Compatible",
 		"completed": "Completed",
+		"concurrent_devices": "Concurrent Devices",
 		"config_id": "Config. Id",
 		"confirm": "Confirm",
+		"confirm_stop_editing": "Are you sure you want to stop editing? This will cancel any unsaved changes you have made.",
 		"connected": "Connected",
 		"copied": "Copied!",
+		"copied_to_clipboard": "Copied to Clipboard!",
 		"copy_to_clipboard": "Copy to clipboard",
 		"create": "Create",
 		"created": "Created",
 		"created_by": "Created By",
+		"creator": "Creator",
 		"current": "Current ",
 		"custom_date": "Custom Date",
 		"dashboard": "Dashboard",
 		"date": "Date",
 		"day": "day",
 		"days": "days",
+		"default_map": "Default Map",
 		"delete": "Delete",
 		"delete_device": "Delete Device",
 		"details": "Details",
 		"device": "Device #{{serialNumber}}",
 		"device_dashboard": "Device Dashboard",
-		"device_delete": "Delete Device #{{serialNumber}}",
+		"device_delete": "Delete #{{serialNumber}}",
 		"device_deleted": "Device Successfully Deleted",
 		"device_health": "Device Health",
 		"device_list": "List of Devices",
@@ -74,6 +92,7 @@
 		"dismiss": "Dismiss",
 		"do_now": "Do Now!",
 		"download": "Download",
+		"duplicate": "Duplicate",
 		"duration": "Duration",
 		"edit": "Edit",
 		"edit_user": "Edit",
@@ -81,6 +100,9 @@
 		"endpoint": "Endpoint",
 		"endpoints": "Endpoints",
 		"error": "Error",
+		"error_adding_note": "Error while adding note",
+		"error_code": "Error Code",
+		"errors": "Errors",
 		"execute_now": "Would you like to execute this command now?",
 		"executed": "Executed",
 		"exit": "Exit",
@@ -91,11 +113,22 @@
 		"forgot_password_title": "Forgot Password",
 		"from": "From",
 		"general_error": "API Error, please consult your administrator",
+		"go_back": "Go Back",
 		"hide": "Hide",
 		"hour": "hour",
 		"hours": "hours",
 		"id": "Id",
+		"invalid_credentials": "Invalid username and/or password",
+		"invalid_date_explanation": "Invalid Date, please use the calendar accessible with the button on the right ",
+		"invalid_file": "The chosen file was invalid, please read the instructions and adjust your file accordingly",
+		"invalid_password": "This password does not confirm to basic password rules. Please visit our Password Policy page to learn more",
+		"invalid_pem": "Your .pem file is invalid. It should start with '-----BEGIN CERTIFICATE-----' OR '-----BEGIN PRIVATE KEY-----' and it should end with '-----END CERTIFICATE-----' OR '-----END PRIVATE KEY-----'",
 		"ip_address": "IP Address",
+		"ips": "IPs",
+		"item": "Item",
+		"items": "Items",
+		"items_per_page": "Items per page: ",
+		"key": "Key",
 		"last_dashboard_refresh": "Last Dashboard Refresh",
 		"later_tonight": "Later tonight",
 		"latest": "Latest",
@@ -104,25 +137,35 @@
 		"loading_more_ellipsis": "Loading more...",
 		"logout": "Logout",
 		"mac": "MAC Address",
+		"main": "Main",
 		"manufacturer": "Manufacturer",
 		"memory_used": "Memory Used",
+		"min_max": "Min: {{min}}, Max: {{max}}",
 		"minute": "minute",
 		"minutes": "minutes",
+		"modified": "Modified",
 		"na": "N/A",
 		"need_date": "You need a date...",
 		"no": "No",
+		"no_addresses_found": "No Addresses Found",
 		"no_devices_found": "No Devices Found",
 		"no_items": "No Items",
+		"none": "None",
 		"not_connected": "Not Connected",
-		"of_connected": "% of devices",
+		"of_connected": "% of connected devices",
 		"off": "Off",
 		"on": "On",
 		"optional": "Optional",
 		"overall_health": "Overall Health",
 		"password_policy": "Password Policy",
+		"preferences": "Preferences",
+		"preview": "Preview",
+		"program": "Program",
+		"reason": "Reason",
 		"recorded": "Recorded",
 		"refresh": "Refresh",
 		"refresh_device": "Refresh Device",
+		"remove_claim": "Remove Claim",
 		"required": "Required",
 		"result": "Result",
 		"save": "Save",
@@ -133,40 +176,96 @@
 		"second": "second",
 		"seconds": "seconds",
 		"seconds_elapsed": "Seconds elapsed",
+		"see_details": "See Details",
+		"select": "Select",
+		"serial_num": "Serial #",
 		"serial_number": "Serial Number",
 		"show_all": "Show All",
+		"socket_connection_closed": "Connection closed!",
 		"start": "Start",
+		"status": "Status",
+		"stop_editing": "Stop Editing",
 		"submit": "Submit",
 		"submitted": "Submitted",
 		"success": "Success",
 		"system": "System",
 		"table": "Table",
+		"time_per_device": "Devices/Second",
 		"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",
 		"up_to_date": "Up to Date Devices",
 		"uptimes": "Uptimes",
+		"use_file": "Use File",
 		"uuid": "UUID",
 		"vendors": "Vendors",
 		"view_more": "View more",
+		"visibility": "Visibility",
+		"waiting_for_update": "Waiting for Update",
 		"yes": "Yes"
 	},
 	"configuration": {
+		"add_configuration": "Add Configuration",
+		"add_new_block": "Add new Configuration Block",
+		"add_or_link": "Link or Add",
+		"add_radio": "Add Radio",
+		"ca_cert_explanation": "Please use a .pem file that starts with \"-----BEGIN CERTIFICATE-----\" and ends with \"-----END CERTIFICATE-----\". The result will be shown in the field below. You can also copy and paste the certificate you would like to use directly.",
+		"cannot_delete": "This configuration cannot be deleted because it is being used by at least one entity, venue or device",
+		"choose_radio_band": "What radio band you would like to create?",
+		"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}}",
+		"default_configs": "Default Configs",
+		"default_configurations": "Default Configurations",
+		"delete_config": "Delete Config",
 		"details": "Details",
 		"device_password": "Password",
-		"last_configuration_change": "Last Configuration Change",
+		"device_type": "Device Type",
+		"device_types": "Device Types",
+		"devices_affected": "Devices affected by this configuration: ",
+		"edit_configuration": "Edit Configuration",
+		"error_delete": "Error while trying to delete: {{error}}",
+		"error_delete_blacklist": "Error deleting from blacklist: {{error}}",
+		"error_fetching_config": "Error while fetching configuration",
+		"error_trying_delete": "Error while trying to delete: {{error}}",
+		"error_update": "Error: {{error}}",
+		"explanation": "Explanation",
+		"key_pem_explanation": "Please select .pem file",
+		"last_configuration_change": "Configuration 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_affected_devices": "View Affected Devices",
+		"view_config": "View Configuration",
+		"view_in_use": "View In Use",
 		"view_json": "View raw JSON"
 	},
 	"configure": {
@@ -176,6 +275,41 @@
 		"title": "Configure",
 		"valid_json": "You need to enter valid JSON"
 	},
+	"connect": {
+		"error_trying_to_connect": "Error while trying to connect to device: {{error}}"
+	},
+	"contact": {
+		"access_pin": "Access PIN",
+		"add_contact": "Add Contact",
+		"contact": "Contact",
+		"create_contact": "Create Contact",
+		"currently_selected_contact": "Currently Selected Contact: {{contact}}",
+		"delete": "Delete Contact?",
+		"error_assign": "Error while trying to assign contact: {{error}}",
+		"error_creation": "Error while trying to create contact: {{error}}",
+		"error_delete": "Error trying to delete contact: {{error}}",
+		"error_fetching_list": "Error fetching contacts",
+		"error_fetching_single": "Error fetching contact: {{error}}",
+		"error_unassign": "Error while trying to unassign contact: {{error}}",
+		"first_name": "First Name",
+		"identifier": "Identifier",
+		"initials": "Initials",
+		"last_name": "Last Name",
+		"no_associated_contact": "No Associated Contact",
+		"primary_email": "Primary Email",
+		"salutation": "Salutation",
+		"secondary_email": "Secondary Email",
+		"successful_assign": "Successfully assigned contact!",
+		"successful_creation": "Contact Created!",
+		"successful_delete": "Successfully Deleted Contact!",
+		"successful_unassign": "Successfully Unassigned Contact",
+		"successful_update": "Successfully Updated Contact",
+		"title": "Contacts",
+		"type": "Type",
+		"update_error": "Error updating contact: {{error}}",
+		"user_title": "Title",
+		"visual": "Correspondence Name"
+	},
 	"delete_command": {
 		"explanation": "Are you sure you want to delete this command? This action is not reversible.",
 		"title": "Delete Command"
@@ -186,6 +320,25 @@
 		"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": {
+		"add_to_blacklist": "Add Device To Blacklist",
+		"all_devices": "All Devices",
+		"blacklisted_on": "Date",
+		"capabilities": "Capabilities",
+		"certificate_explanation": "Certificates of connected devices",
+		"edit_blacklist": "Edit Blacklisted Device",
+		"error_adding_blacklist": "Error adding device to blacklist: {{error}}",
+		"error_edit_blacklist": "Error editing blacklist: {{error}}",
+		"error_fetching_device": "Error fetching device information: {{error}}",
+		"error_fetching_devices": "Error while fetching devices: {{error}}",
+		"health_explanation": "Health of connected devices ((Devices=100% * 100 + Devices>90% * 95 + Devices>60% * 75 + Devices<60% * 35) / ConnectedDevices)",
+		"memory_explanation": "Amount of connected devices with corresponding memory used percentage",
+		"remove_from_blacklist": "Remove from blacklist",
+		"success_added_blacklist": "Device successfully added to blacklist!",
+		"success_edit_blacklist": "Successfully edited blacklist!",
+		"success_removed_blacklist": "Successfully removed device from blacklist!",
+		"uptimes_explanation": "Amount of devices connected based on their uptime"
+	},
 	"device_logs": {
 		"log": "Log",
 		"severity": "Severity",
@@ -194,16 +347,48 @@
 	"entity": {
 		"add_child": "Add Child Entity to {{entityName}}",
 		"add_failure": "Error, the server returned : {{error}}",
+		"add_ips": "Manage IPs",
 		"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.",
+		"confirm_map_delete": "Are you sure you want to delete the map {{name}}? This action cannot be reverted",
+		"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",
+		"duplicate_from_node": "Duplicate with specific Root Node",
+		"duplicate_map": "Duplicate Map",
+		"duplicate_with_node": "Duplicate {{mapName}} with {{rootName}} as root node",
 		"edit_failure": "Update unsuccessful : {{error}}",
+		"enter_here": "Enter the IP(s) you'd like to add here",
+		"entire_tree": "Network Map",
 		"entities": "Entities",
 		"entity": "Entity",
+		"error_deleting_map": "Error deleting map: {{error}}",
+		"error_fetch_entity": "Error while fetching entity information",
+		"error_fetching": "Error while fetching entities",
+		"error_fetching_map": "Error fetching map: {{error}}",
+		"error_fetching_tree": "Error while fetching tree: {{error}}",
+		"error_saving": "Error while saving entity",
+		"error_saving_map": "Error saving map: {{error}}",
+		"higher_priority": "Make Higher Priority",
+		"ip_detection": "IP Detection",
+		"ip_formats": "You can add IPv4 or IPv6 addresses in the following formats:",
+		"lower_priority": "Make Lower Priority",
+		"map": "Map",
+		"map_delete_success": "Map Successfully Deleted!",
+		"need_select_entity": "You need to select an entity from the table below",
+		"no_ips": "No IPs selected",
+		"not_assigned": "Not Assigned",
 		"only_unassigned": "Only Unassigned",
-		"valid_serial": "Needs to be a valid serial number (12 HEX characters)"
+		"select_entity": "Select this Entity",
+		"selected_entity": "Selected Entity",
+		"selected_map": "Selected Map",
+		"tree_saved": "Map Successfully Saved!",
+		"update_failure_error": "Error while trying to update entity: {{error}}",
+		"valid_serial": "Needs to be a valid serial number (12 HEX characters)",
+		"venues": "Venues"
 	},
 	"factory_reset": {
 		"redirector": "Keep redirector: ",
@@ -213,6 +398,7 @@
 		"warning": "Warning: Once you submit this cannot be reverted"
 	},
 	"firmware": {
+		"age_explanation": "Average number of days for all devices from which we can obtain that value",
 		"average_age": "Average Firmware Age",
 		"choose_custom": "Choose",
 		"details_title": "Image #{{image}} Details",
@@ -225,9 +411,11 @@
 		"image": "Image",
 		"image_date": "Image Date",
 		"installed_firmware": "Installed Firmware",
+		"latest_explanation": "Devices running recognized firmware at its latest version",
 		"latest_version_installed": "Latest Version Installed",
 		"newer_firmware_available": "Newer Revisions Available",
 		"reinstall_latest": "Reinstall ",
+		"release": "Release",
 		"revision": "Revision",
 		"show_dev": "Show Dev Releases",
 		"size": "Size",
@@ -251,33 +439,129 @@
 		"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_ent_ven": "Assign to Entity or 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_pushing_config": "Error while trying to push configuration to device: {{error}}",
 		"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",
-		"venue": "Venue"
+		"validating_import_file": "Validating import file and data...",
+		"venue": "Venue",
+		"view_in_gateway": "Details in Gateway"
+	},
+	"location": {
+		"add": "Add Location",
+		"building_name": "Building Name",
+		"city": "City",
+		"country": "Country",
+		"create": "Create Location",
+		"currently_selected": "Currently Selected Location: {{location}}",
+		"delete": "Delete Location?",
+		"error_assign": "Error while trying to assign location: {{error}}",
+		"error_creation": "Error while trying to create locations: {{error}}",
+		"error_delete": "Error while deleting location: {{error}}",
+		"error_fetching_single": "Error while trying to fetch location: {{error}}",
+		"geocode": "GeoCode",
+		"mobiles": "Mobiles",
+		"no_associated": "No Associated Location",
+		"phones": "Phones",
+		"postal": "ZIP/Postal Code",
+		"search": "Search locations to auto fill the fields below",
+		"state": "State",
+		"street_address": "Street Address",
+		"successful_creation": "Location Successfully Created!",
+		"successful_delete": "Successfully Deleted Location!",
+		"successful_update": "Successfully updated location!",
+		"successfully_assigned": "Location Successfully Assigned!",
+		"title": "Locations",
+		"update_error": "Error updating location: {{error}}"
 	},
 	"login": {
+		"account_verification": "Account Verification",
+		"authentication_expired": "Authentication expired, please start the login process again",
 		"change_password": "Change Password",
 		"change_password_error": "Error while changing password. Make sure the new password is valid by visiting the 'Password Policy' page",
 		"change_password_instructions": "Enter and confirm your new password",
 		"changing_password": "Changing Password... ",
 		"confirm_new_password": "Confirm New Password",
 		"different_passwords": "You need to enter the same password twice",
+		"email_code_validation": "Please check your email box and enter the verification code we have just sent you in the box below",
 		"forgot_password_error": "Error while trying to send Forgot Password email. Please make sure this userId is associated to an account.",
 		"forgot_password_explanation": "Enter your username  to receive an email containing the instructions to reset your password",
 		"forgot_password_success": "You should soon receive an email containing the instructions to reset your password. Please make sure to check your spam if you can't find the email",
@@ -286,6 +570,7 @@
 		"login_error": "Login error, make sure the information you are providing is valid",
 		"new_password": "New Password",
 		"password": "Password",
+		"phone_validation_explanation": "Please check your mobile device and enter the verification code we have just sent you in the box below",
 		"please_enter_gateway": "Please enter a uCentralSec URL",
 		"please_enter_password": "Please enter your password",
 		"please_enter_username": "Please enter your username",
@@ -294,7 +579,12 @@
 		"sending_ellipsis": "Sending... ",
 		"sign_in_to_account": "Sign in to your account",
 		"url": "uCentralSec URL",
-		"username": "Username"
+		"username": "Username",
+		"verification_code": "Enter your verification here",
+		"wrong_code": "The verification code that was entered is not valid. "
+	},
+	"preferences": {
+		"provisioning": "Provisioning"
 	},
 	"reboot": {
 		"directions": "When would you like to reboot this device?",
@@ -306,7 +596,7 @@
 		"channel": "Channel",
 		"directions": "Launch a wifi scan of this device, which should take approximately 25 seconds.",
 		"re_scan": "Re-Scan",
-		"result_directions": "Please click the '$t(scan.re_scan)' button if you would like to do a scan with the same configuration as the last.",
+		"result_directions": "You can click the 'Scan' button at the top right to $t(scan.re_scan)",
 		"results": "Wi-Fi Scan Results",
 		"scan": "Scan",
 		"scanning": "Scanning... ",
@@ -315,29 +605,117 @@
 	"settings": {
 		"title": "Settings"
 	},
+	"simulation": {
+		"add": "Add Simulation",
+		"cancel": "Cancel",
+		"cancel_success": "Simulation Run Successfully Cancelled!",
+		"check_ongoing_sims": "Follow Ongoing Sim",
+		"client_interval": "Client Interval",
+		"delete_simulation": "Delete Sim. {{name}}",
+		"end": "Ended",
+		"error_creating": "Error creating simulation: {{error}}",
+		"error_delete": "Error while deleting simulation: {{error}}",
+		"error_devices": "Error Devices",
+		"error_edit": "Error while trying to save simulation: {{error}}",
+		"error_edit_run": "Error while trying to change run state: {{error}}",
+		"error_fetching_simulations": "Error fetching simulations: {{error}}",
+		"error_start_run": "Error while trying to start a simulation run: {{error}}",
+		"gateway": "Gateway",
+		"healtcheck_interval": "Healthcheck Interval",
+		"keep_alive": "Keep Alive",
+		"last_refresh": "Last Refresh",
+		"length": "Length",
+		"live_devices": "Live Devices",
+		"mac_prefix": "MAC Prefix",
+		"max_associations": "Max. Associations",
+		"max_clients": "Max. Clients",
+		"messages_transmitted": "Msgs TX",
+		"min_associations": "Min. Associations",
+		"min_clients": "Min. Clients",
+		"pause": "Pause",
+		"pause_success": "Run Paused!",
+		"prefix_length": "Required, needs to be of a length of 6 characters",
+		"previous_runs": "Previous Runs",
+		"received": "Received",
+		"received_messages": "Msgs RX",
+		"reconnect_interval": "Reconnect Interval",
+		"resume": "Resume",
+		"resume_success": "Run Resumed!",
+		"run": "Simulation Run",
+		"run_simulation": "Run Simulation",
+		"started": "Started",
+		"state_interval": "State Interval",
+		"stop": "Stop",
+		"stop_success": "Run Stopped!",
+		"success_creating": "Simulation Successfully Created!",
+		"success_run_start": "Successfully Started Run!",
+		"successful_delete": "Successfully Deleted Simulation!",
+		"successful_edit": "Successfully Edited Simulation!",
+		"threads": "Threads",
+		"time_full_devices": "Time to Full Devices",
+		"title": "Simulations",
+		"transmitted": "Transmitted",
+		"valid_cert": "Valid Certificate",
+		"valid_key": "Valid Key"
+	},
 	"statistics": {
 		"data": "Data (KB)",
+		"data_mb": "Data (MB)",
 		"latest_statistics": "Latest Statistics",
 		"lifetime_stats": "Lifetime Statistics",
+		"memory": "Memory",
 		"no_interfaces": "No interface lifetime statistics available",
 		"show_latest": "Last Statistics",
-		"title": "Statistics"
+		"title": "Statistics",
+		"used": "Used Memory %"
 	},
 	"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",
 		"percentage_used": "{{percentage}}% of {{total}} used",
 		"title": "#{{serialNumber}} Status",
+		"total_memory": "Total Memory",
 		"uptime": "Uptime",
 		"used_total_memory": "{{used}} used / {{total}} total "
 	},
+	"subscriber": {
+		"add_device_subscriber_explanation": "To claim devices, you can use our search bar or claim directly from the table. If a device was already claimed by a user, you will need to go to to their details and unassign it before claiming it.",
+		"create": "Create Subscriber",
+		"devices_one": "{{count}} Device",
+		"devices_other": "{{count}} Devices",
+		"edit": "Edit Subscriber",
+		"error_create": "Error creating subscriber: {{error}}",
+		"error_delete": "Error deleting subscriber: {{error}}",
+		"error_fetching": "Error fetching subscribers: {{error}}",
+		"error_fetching_single": "Error fetching subscriber: {{error}}",
+		"error_update": "Error updating subscriber: {{error}}",
+		"is_already_claimed": "is already claimed by ",
+		"subscribers": "Subscribers",
+		"success_create": "Subscriber successfully created!",
+		"success_delete": "Subscriber successfully deleted!",
+		"success_update": "Successfully updated subscriber!"
+	},
 	"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",
+		"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",
@@ -368,14 +746,17 @@
 		"waiting_for_device": "Waiting for device to reconnect"
 	},
 	"user": {
+		"add_phone_number": "Add Phone Number",
 		"avatar": "Your Avatar",
 		"avatar_file": "Your Avatar (max. of 2 MB)",
+		"check_phone": "Please check your phone for your validation code",
+		"confirm_new_password": "Confirm New Password",
 		"create": "Create User",
-		"create_failure": "Error while creating user. Please make sure this email address is not already linked to an account.",
+		"create_failure": "Error while creating user: {{error}}",
 		"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,35 +764,51 @@
 		"description": "Description",
 		"edit": "Edit User",
 		"email_address": "Email Address",
+		"enter_new_phone": "Enter your new phone number: ",
+		"error_fetching_users": "Error fetching users: {{error}}",
+		"error_retrieving": "Error retrieving user",
+		"error_sending_code": "Error while trying to send validation code. Please confirm that your phone number is valid.",
 		"force_password_change": "Force Password Change on Login",
 		"id": "User Id.",
 		"last_login": "Last Login",
 		"login_id": "Login Id.",
+		"make_sure_same_password": "Make sure both passwords are the same and are valid",
 		"my_profile": "My Profile",
 		"name": "Name",
+		"new_code_sent": "New Code Sent!",
 		"nickname": "Nickname",
 		"nickname_explanation": "Nickname (optional)",
 		"not_validated": "Not Validated",
 		"note": "Note",
 		"password": "Password",
+		"phone_number": "Phone Number",
 		"provide_email": "Please provide a valid email address",
 		"provide_password": "Please provide a valid password",
 		"save_avatar": "Save Avatar",
+		"send_code": "Send Code",
+		"send_code_again": "Send Code Again",
 		"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.",
+		"successful_validation": "Phone Number Validated! Click the save button to link it to your profile",
+		"table_title": "Admin Users",
+		"update_failure": "Error while trying to update: {{error}}",
 		"update_failure_title": "Update Failed",
 		"update_success": "User Updated Successfully",
 		"update_success_title": "Success",
 		"user_role": "Role",
 		"users": "Users",
-		"validated": "Validated"
+		"validate_phone": "Validate",
+		"validated": "Validated",
+		"wrong_validation_code": "You have not entered a valid code. Please try again and make sure you have entered the right phone number"
 	},
 	"wifi_analysis": {
 		"association": "Association",
 		"associations": "Associations",
 		"mode": "Mode",
 		"network_diagram": "Network Diagram",
+		"override_dfs": "Override DFS",
 		"radios": "Radios",
-		"title": "Wi-Fi Analysis"
+		"scan_warning": "Your 5G radio is on a radar channel, you must enable “Override DFS” to allow scanning of all 5G channels",
+		"title": "Wi-Fi Analysis",
+		"vendor": "Vendor"
 	}
 }

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 "
@@ -16,53 +17,70 @@
 		"blink": "Parpadeo",
 		"device_leds": "LED de dispositivo",
 		"execute_now": "¿Le gustaría establecer este patrón ahora?",
+		"explanation": "¿Qué patrón le gustaría establecer en este dispositivo durante 30 segundos?",
 		"pattern": "Elija el patrón que le gustaría usar:",
 		"set_leds": "Establecer LED",
 		"when_blink_leds": "¿Cuándo desea que los LED del dispositivo parpadeen?"
 	},
 	"commands": {
+		"command_success": "Comando enviado con éxito",
 		"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",
 		"add": "Añadir",
+		"add_items": "Agregar articulos",
+		"add_note": "Añadir la nota",
+		"add_note_explanation": "Escriba su nueva nota a continuación y haga clic en el botón '+' donde haya terminado",
 		"adding_ellipsis": "Añadiendo ...",
+		"all": "TODOS",
 		"are_you_sure": "¿Estás seguro?",
 		"back_to_login": "Atrás para iniciar sesión",
+		"back_to_start": "volver a empezar",
+		"blacklist": "Lista negra",
+		"by": "Por",
 		"cancel": "Cancelar",
 		"certificate": "Certificado",
 		"certificates": "Certificados",
+		"claim": "Reclamación",
 		"clear": "Claro",
 		"close": "Cerrar",
+		"code": "Código",
 		"command": "Mando",
 		"commands": "comandos",
 		"commands_executed": "Comandos ejecutados",
 		"compatible": "Compatible",
 		"completed": "terminado",
+		"concurrent_devices": "Dispositivos concurrentes",
 		"config_id": "Config. Identificación",
 		"confirm": "Confirmar",
+		"confirm_stop_editing": "¿Estás seguro de que quieres dejar de editar? Esto cancelará cualquier cambio no guardado que haya realizado.",
 		"connected": "Conectado",
 		"copied": "Copiado!",
+		"copied_to_clipboard": "¡Copiado al portapapeles!",
 		"copy_to_clipboard": "Copiar al portapapeles",
 		"create": "Crear",
 		"created": "creado",
 		"created_by": "Creado por",
+		"creator": "Creador",
 		"current": "Corriente",
 		"custom_date": "Fecha personalizada",
 		"dashboard": "Tablero",
 		"date": "Fecha",
 		"day": "día",
 		"days": "días",
+		"default_map": "Mapa predeterminado",
 		"delete": "Borrar",
 		"delete_device": "Eliminar dispositivo",
 		"details": "Detalles",
 		"device": "Dispositivo n.º{{serialNumber}}",
 		"device_dashboard": "Panel de control del dispositivo",
-		"device_delete": "Eliminar dispositivo n.º{{serialNumber}}",
+		"device_delete": "Eliminar #{{serialNumber}}",
 		"device_deleted": "Dispositivo eliminado correctamente",
 		"device_health": "Salud del dispositivo",
 		"device_list": "Listado de dispositivos",
@@ -74,6 +92,7 @@
 		"dismiss": "Despedir",
 		"do_now": "¡Hagan ahora!",
 		"download": "Descargar",
+		"duplicate": "Duplicar",
 		"duration": "Duración",
 		"edit": "Editar",
 		"edit_user": "Editar",
@@ -81,6 +100,9 @@
 		"endpoint": "punto final",
 		"endpoints": "Puntos finales",
 		"error": "Error",
+		"error_adding_note": "Error al agregar una nota",
+		"error_code": "código de error",
+		"errors": "Los errores",
 		"execute_now": "¿Le gustaría ejecutar este comando ahora?",
 		"executed": "ejecutado",
 		"exit": "salida",
@@ -91,11 +113,22 @@
 		"forgot_password_title": "Se te olvidó tu contraseña",
 		"from": "Desde",
 		"general_error": "Error de API, consulte a su administrador",
+		"go_back": "Regresa",
 		"hide": "Esconder",
 		"hour": "hora",
 		"hours": "horas",
 		"id": "Carné de identidad",
+		"invalid_credentials": "Nombre de usuario y / o contraseña inválido",
+		"invalid_date_explanation": "Fecha no válida, utilice el calendario accesible con el botón de la derecha",
+		"invalid_file": "El archivo elegido no es válido, lea las instrucciones y ajuste su archivo en consecuencia",
+		"invalid_password": "Esta contraseña no confirma las reglas básicas de contraseña. Visite nuestra página de Política de contraseñas para obtener más información.",
+		"invalid_pem": "Su archivo .pem no es válido. Debe comenzar con '----- BEGIN CERTIFICATE -----' O '----- BEGIN PRIVATE KEY -----' y debe terminar con '----- END CERTIFICATE --- - 'O' ----- FIN DE CLAVE PRIVADA ----- '",
 		"ip_address": "Dirección IP",
+		"ips": "IPs",
+		"item": "ít",
+		"items": "artículos",
+		"items_per_page": "Artículos por página:",
+		"key": "Llave",
 		"last_dashboard_refresh": "Última actualización del panel",
 		"later_tonight": "Más tarde esta noche",
 		"latest": "último",
@@ -104,25 +137,35 @@
 		"loading_more_ellipsis": "Cargando más ...",
 		"logout": "Cerrar sesión",
 		"mac": "Dirección MAC",
+		"main": "Principal",
 		"manufacturer": "Fabricante",
 		"memory_used": "Memoria usada",
+		"min_max": "Mín .: {{min}}, Máx .: {{max}}",
 		"minute": "minuto",
 		"minutes": "minutos",
+		"modified": "Modificado",
 		"na": "N / A",
 		"need_date": "Necesitas una cita ...",
 		"no": "No",
+		"no_addresses_found": "No se encontraron direcciones",
 		"no_devices_found": "No se encontraron dispositivos",
 		"no_items": "No hay articulos",
+		"none": "Ninguna",
 		"not_connected": "No conectado",
-		"of_connected": "% de dispositivos",
+		"of_connected": "% de dispositivos conectados",
 		"off": "Apagado",
 		"on": "en",
 		"optional": "Opcional",
 		"overall_health": "Salud en general",
 		"password_policy": "Política de contraseñas",
+		"preferences": "Preferencias",
+		"preview": "Avance",
+		"program": "Programa",
+		"reason": "Razón",
 		"recorded": "Grabado",
 		"refresh": "Refrescar",
 		"refresh_device": "Actualizar dispositivo",
+		"remove_claim": "Quitar reclamo",
 		"required": "Necesario",
 		"result": "Resultado",
 		"save": "Salvar",
@@ -133,40 +176,96 @@
 		"second": "segundo",
 		"seconds": "segundos",
 		"seconds_elapsed": "Segundos transcurridos",
+		"see_details": "Ver detalles",
+		"select": "Seleccionar",
+		"serial_num": "Número de serie",
 		"serial_number": "Número de serie",
 		"show_all": "Mostrar todo",
+		"socket_connection_closed": "¡Conexión cerrada!",
 		"start": "comienzo",
+		"status": "Estado",
+		"stop_editing": "Dejar de editar",
 		"submit": "Enviar",
 		"submitted": "Presentado",
 		"success": "Éxito",
 		"system": "Sistema",
 		"table": "Mesa",
+		"time_per_device": "Dispositivo / segundo",
 		"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",
 		"up_to_date": "Dispositivos actualizados",
 		"uptimes": "Tiempos de actividad",
+		"use_file": "Usar archivo",
 		"uuid": "UUID",
 		"vendors": "Vendedores",
 		"view_more": "Ver más",
+		"visibility": "Visibilidad",
+		"waiting_for_update": "Esperando actualización",
 		"yes": "Sí"
 	},
 	"configuration": {
+		"add_configuration": "Agregar configuración",
+		"add_new_block": "Agregar nuevo bloque de configuración",
+		"add_or_link": "Vincular o agregar",
+		"add_radio": "Agregar radio",
+		"ca_cert_explanation": "Utilice un archivo .pem que comience con \"----- BEGIN CERTIFICATE -----\" y termine con \"----- END CERTIFICATE -----\". El resultado se mostrará en el campo siguiente. También puede copiar y pegar el certificado que le gustaría usar directamente.",
+		"cannot_delete": "Esta configuración no se puede eliminar porque está siendo utilizada por al menos una entidad, lugar o dispositivo",
+		"choose_radio_band": "¿Qué banda de radio te gustaría crear?",
+		"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}}",
+		"default_configs": "Configuraciones predeterminadas",
+		"default_configurations": "Configuraciones predeterminadas",
+		"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",
+		"devices_affected": "Dispositivos afectados por esta configuración:",
+		"edit_configuration": "Editar configuración",
+		"error_delete": "Error al intentar eliminar: {{error}}",
+		"error_delete_blacklist": "Error al eliminar de la lista negra: {{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",
+		"key_pem_explanation": "Seleccione el archivo .pem",
+		"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_affected_devices": "Ver dispositivos afectados",
+		"view_config": "Ver configuración",
+		"view_in_use": "Ver en uso",
 		"view_json": "Ver JSON sin procesar"
 	},
 	"configure": {
@@ -176,6 +275,41 @@
 		"title": "Configurar",
 		"valid_json": "Debes ingresar un JSON válido"
 	},
+	"connect": {
+		"error_trying_to_connect": "Error al intentar conectarse al dispositivo: {{error}}"
+	},
+	"contact": {
+		"access_pin": "PIN de acceso",
+		"add_contact": "Agregar contacto",
+		"contact": "Contacto",
+		"create_contact": "Crear contacto",
+		"currently_selected_contact": "Contacto seleccionado actualmente: {{contact}}",
+		"delete": "¿Borrar contacto?",
+		"error_assign": "Error al intentar asignar el contacto: {{error}}",
+		"error_creation": "Error al intentar crear contacto: {{error}}",
+		"error_delete": "Error al intentar eliminar el contacto: {{error}}",
+		"error_fetching_list": "Error al obtener los contactos",
+		"error_fetching_single": "Error al obtener el contacto: {{error}}",
+		"error_unassign": "Error al intentar anular la asignación del contacto: {{error}}",
+		"first_name": "Nombre de pila",
+		"identifier": "Identificador",
+		"initials": "Iniciales",
+		"last_name": "Apellido",
+		"no_associated_contact": "Sin contacto asociado",
+		"primary_email": "Correo electrónico principal",
+		"salutation": "saludo",
+		"secondary_email": "Email secundario",
+		"successful_assign": "¡Contacto asignado correctamente!",
+		"successful_creation": "Contacto Creado!",
+		"successful_delete": "¡Contacto eliminado con éxito!",
+		"successful_unassign": "Contacto no asignado correctamente",
+		"successful_update": "Contacto actualizado con éxito",
+		"title": "Contactos",
+		"type": "Tipo",
+		"update_error": "Error al actualizar el contacto: {{error}}",
+		"user_title": "Título",
+		"visual": "Nombre de correspondencia"
+	},
 	"delete_command": {
 		"explanation": "¿Está seguro de que desea eliminar este comando? Esta acción no es reversible.",
 		"title": "Eliminar comando"
@@ -186,6 +320,25 @@
 		"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": {
+		"add_to_blacklist": "Agregar dispositivo a la lista negra",
+		"all_devices": "Todos los dispositivos",
+		"blacklisted_on": "Fecha",
+		"capabilities": "capacidades",
+		"certificate_explanation": "Certificados de dispositivos conectados",
+		"edit_blacklist": "Editar dispositivo incluido en la lista negra",
+		"error_adding_blacklist": "Error al agregar el dispositivo a la lista negra: {{error}}",
+		"error_edit_blacklist": "Error al editar la lista negra: {{error}}",
+		"error_fetching_device": "Error al obtener la información del dispositivo: {{error}}",
+		"error_fetching_devices": "Error al recuperar dispositivos: {{error}}",
+		"health_explanation": "Estado de los dispositivos conectados ((Dispositivos = 100% * 100 + Dispositivos> 90% * 95 + Dispositivos> 60% * 75 + Dispositivos <60% * 35) / Dispositivos conectados)",
+		"memory_explanation": "Cantidad de dispositivos conectados con la memoria correspondiente utilizada%",
+		"remove_from_blacklist": "ELIMINAR DE LA LISTA NEGRA",
+		"success_added_blacklist": "¡Dispositivo agregado exitosamente a la lista negra!",
+		"success_edit_blacklist": "Lista negra editada con éxito!",
+		"success_removed_blacklist": "¡Dispositivo eliminado con éxito de la lista negra!",
+		"uptimes_explanation": "Cantidad de dispositivos conectados según su tiempo de actividad"
+	},
 	"device_logs": {
 		"log": "Iniciar sesión",
 		"severity": "Gravedad",
@@ -194,16 +347,48 @@
 	"entity": {
 		"add_child": "Agregar entidad secundaria a {{entityName}}",
 		"add_failure": "Error, el servidor devolvió: {{error}}",
+		"add_ips": "Administrar direcciones IP",
 		"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.",
+		"confirm_map_delete": "¿Está seguro de que desea eliminar el mapa {{name}}? Esta acción no se puede revertir",
+		"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",
+		"duplicate_from_node": "Duplicar con un nodo raíz específico",
+		"duplicate_map": "Mapa duplicado",
+		"duplicate_with_node": "Duplicar {{mapName}} con {{rootName}} como nodo raíz",
 		"edit_failure": "Actualización fallida: {{error}}",
+		"enter_here": "Ingrese las IP que desea agregar aquí",
+		"entire_tree": "Mapa de red",
 		"entities": "entidades",
 		"entity": "Entidad",
+		"error_deleting_map": "Error al eliminar el mapa: {{error}}",
+		"error_fetch_entity": "Error al obtener la información de la entidad",
+		"error_fetching": "Error al recuperar entidades",
+		"error_fetching_map": "Error al obtener el mapa: {{error}}",
+		"error_fetching_tree": "Error al obtener el árbol: {{error}}",
+		"error_saving": "Error al guardar la entidad",
+		"error_saving_map": "Error al guardar el mapa: {{error}}",
+		"higher_priority": "Dar mayor prioridad",
+		"ip_detection": "Detección de IP",
+		"ip_formats": "Puede agregar direcciones IPv4 o IPv6 en los siguientes formatos:",
+		"lower_priority": "Hacer una prioridad más baja",
+		"map": "Mapa",
+		"map_delete_success": "¡Mapa eliminado correctamente!",
+		"need_select_entity": "Debe seleccionar una entidad de la siguiente tabla",
+		"no_ips": "No se seleccionaron direcciones IP",
+		"not_assigned": "No asignado",
 		"only_unassigned": "Solo sin asignar",
-		"valid_serial": "Debe ser un número de serie válido (12 caracteres HEX)"
+		"select_entity": "Seleccione esta entidad",
+		"selected_entity": "Entidad seleccionada",
+		"selected_map": "Mapa seleccionado",
+		"tree_saved": "¡Mapa guardado con éxito!",
+		"update_failure_error": "Error al intentar actualizar la entidad: {{error}}",
+		"valid_serial": "Debe ser un número de serie válido (12 caracteres HEX)",
+		"venues": "Sedes"
 	},
 	"factory_reset": {
 		"redirector": "Mantener el redirector:",
@@ -213,6 +398,7 @@
 		"warning": "Advertencia: una vez que envíe, esto no se podrá revertir"
 	},
 	"firmware": {
+		"age_explanation": "Número medio de días para todos los dispositivos de los que podemos obtener ese valor",
 		"average_age": "Edad promedio del firmware",
 		"choose_custom": "Escoger",
 		"details_title": "Detalles de la imagen n. °{{image}} ",
@@ -225,9 +411,11 @@
 		"image": "Imagen",
 		"image_date": "Fecha de la imagen",
 		"installed_firmware": "Firmware instalado",
+		"latest_explanation": "Dispositivos que ejecutan firmware reconocido en su última versión",
 		"latest_version_installed": "Última versión instalada",
 		"newer_firmware_available": "Nuevas revisiones disponibles",
 		"reinstall_latest": "Reinstalar",
+		"release": "Lanzamiento",
 		"revision": "Revisión",
 		"show_dev": "Mostrar lanzamientos para desarrolladores",
 		"size": "Tamaño",
@@ -251,33 +439,129 @@
 		"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_ent_ven": "Asignar a entidad o 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_pushing_config": "Error al intentar enviar la configuración al dispositivo: {{error}}",
 		"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",
-		"venue": "Lugar de encuentro"
+		"validating_import_file": "Validando archivo y datos de importación ...",
+		"venue": "Lugar de encuentro",
+		"view_in_gateway": "Ver en Gateway"
+	},
+	"location": {
+		"add": "Añade una ubicación",
+		"building_name": "Nombre del edificio",
+		"city": "ciudad",
+		"country": "País",
+		"create": "Crear ubicación",
+		"currently_selected": "Ubicación seleccionada actualmente: {{location}}",
+		"delete": "¿Eliminar ubicación?",
+		"error_assign": "Error al intentar asignar la ubicación: {{error}}",
+		"error_creation": "Error al intentar crear ubicaciones: {{error}}",
+		"error_delete": "Error al eliminar la ubicación: {{error}}",
+		"error_fetching_single": "Error al intentar obtener la ubicación: {{error}}",
+		"geocode": "Geocode",
+		"mobiles": "MOBILES",
+		"no_associated": "Sin ubicación asociada",
+		"phones": "Los telefonos",
+		"postal": "código postal",
+		"search": "Busque ubicaciones para completar automáticamente los campos a continuación",
+		"state": "Estado",
+		"street_address": "Dirección",
+		"successful_creation": "¡Ubicación creada con éxito!",
+		"successful_delete": "¡Ubicación eliminada con éxito!",
+		"successful_update": "¡Ubicación actualizada con éxito!",
+		"successfully_assigned": "¡Ubicación asignada correctamente!",
+		"title": "Ubicaciones",
+		"update_error": "Error al actualizar la ubicación: {{error}}"
 	},
 	"login": {
+		"account_verification": "Verificación de la cuenta",
+		"authentication_expired": "Autenticación caducada, vuelva a iniciar el proceso de inicio de sesión",
 		"change_password": "Cambia la contraseña",
 		"change_password_error": "Error al cambiar la contraseña. Asegúrese de que la nueva contraseña sea válida visitando la página 'Política de contraseñas'",
 		"change_password_instructions": "Ingrese y confirme su nueva contraseña",
 		"changing_password": "Cambio de contraseña ...",
 		"confirm_new_password": "confirmar nueva contraseña",
 		"different_passwords": "Debes ingresar la misma contraseña dos veces",
+		"email_code_validation": "Por favor, marque su casilla de correo electrónico e ingrese el código de verificación que le acabamos de enviar en la casilla a continuación.",
 		"forgot_password_error": "Error al intentar enviar el correo electrónico de Olvidé mi contraseña. Asegúrese de que este ID de usuario esté asociado a una cuenta.",
 		"forgot_password_explanation": "Ingrese su nombre de usuario para recibir un correo electrónico con las instrucciones para restablecer su contraseña",
 		"forgot_password_success": "Pronto debería recibir un correo electrónico con las instrucciones para restablecer su contraseña. Asegúrese de verificar su correo no deseado si no puede encontrar el correo electrónico",
@@ -286,6 +570,7 @@
 		"login_error": "Error de inicio de sesión, asegúrese de que la información que proporciona sea válida",
 		"new_password": "Nueva contraseña",
 		"password": "Contraseña",
+		"phone_validation_explanation": "Verifique su dispositivo móvil e ingrese el código de verificación que le acabamos de enviar en el cuadro a continuación",
 		"please_enter_gateway": "Ingrese una URL de uCentralSec",
 		"please_enter_password": "Por favor, introduzca su contraseña",
 		"please_enter_username": "Por favor, ingrese su nombre de usuario",
@@ -294,7 +579,12 @@
 		"sending_ellipsis": "Enviando...",
 		"sign_in_to_account": "Iniciar sesión en su cuenta",
 		"url": "URL de uCentralSec",
-		"username": "Nombre de usuario"
+		"username": "Nombre de usuario",
+		"verification_code": "Ingrese su verificación aquí",
+		"wrong_code": "El código de verificación que se ingresó no es válido."
+	},
+	"preferences": {
+		"provisioning": "Aprovisionamiento"
 	},
 	"reboot": {
 		"directions": "¿Cuándo le gustaría reiniciar este dispositivo?",
@@ -306,7 +596,7 @@
 		"channel": "Canal",
 		"directions": "Ejecute un escaneo wifi de este dispositivo, que debería tomar aproximadamente 25 segundos.",
 		"re_scan": "Vuelva a escanear",
-		"result_directions": "Haga clic en el botón '$ t (scan.re_scan)' si desea realizar un escaneo con la misma configuración que el anterior.",
+		"result_directions": "Puede hacer clic en el botón 'Escanear' en la parte superior derecha para $t(scan.re_scan)",
 		"results": "Resultados de escaneo Wi-Fi",
 		"scan": "Escanear",
 		"scanning": "Exploración... ",
@@ -315,29 +605,117 @@
 	"settings": {
 		"title": "Ajustes"
 	},
+	"simulation": {
+		"add": "Agregar simulación",
+		"cancel": "Cancelar",
+		"cancel_success": "¡La ejecución de la simulación se canceló con éxito!",
+		"check_ongoing_sims": "Seguir Sim en curso",
+		"client_interval": "Intervalo de cliente",
+		"delete_simulation": "Eliminar Sim. {{name}}",
+		"end": "Término",
+		"error_creating": "Error al crear la simulación: {{error}}",
+		"error_delete": "Error al eliminar la simulación: {{error}}",
+		"error_devices": "Dispositivos de error",
+		"error_edit": "Error al intentar guardar la simulación: {{error}}",
+		"error_edit_run": "Error al intentar cambiar el estado de ejecución: {{error}}",
+		"error_fetching_simulations": "Error al obtener simulaciones: {{error}}",
+		"error_start_run": "Error al intentar iniciar una ejecución de simulación: {{error}}",
+		"gateway": "Puerta",
+		"healtcheck_interval": "Intervalo de comprobación de estado",
+		"keep_alive": "Mantener viva",
+		"last_refresh": "Última actualización",
+		"length": "Longitud",
+		"live_devices": "Dispositivos en vivo",
+		"mac_prefix": "Prefijo MAC",
+		"max_associations": "Max. Asociaciones",
+		"max_clients": "Max. Clientela",
+		"messages_transmitted": "Mensajes TX",
+		"min_associations": "Min. Asociaciones",
+		"min_clients": "Min. Clientela",
+		"pause": "pausa",
+		"pause_success": "¡Ejecutar en pausa!",
+		"prefix_length": "Obligatorio, debe tener una longitud de 6 caracteres",
+		"previous_runs": "Ejecuciones anteriores",
+		"received": "recibido",
+		"received_messages": "Msgs RX",
+		"reconnect_interval": "Intervalo de reconexión",
+		"resume": "Currículum",
+		"resume_success": "¡Ejecutar reanudado!",
+		"run": "Ejecución de simulación",
+		"run_simulation": "Ejecutar simulación",
+		"started": "Empezado",
+		"state_interval": "Intervalo de estado",
+		"stop": "Detener",
+		"stop_success": "¡Corre, detenido!",
+		"success_creating": "¡Simulación creada con éxito!",
+		"success_run_start": "¡Ejecución iniciada con éxito!",
+		"successful_delete": "¡Simulación eliminada con éxito!",
+		"successful_edit": "¡Simulación editada con éxito!",
+		"threads": "Trapos",
+		"time_full_devices": "Tiempo para dispositivos completos",
+		"title": "Simulaciones",
+		"transmitted": "Transmitido",
+		"valid_cert": "Certificado válido",
+		"valid_key": "Clave válida"
+	},
 	"statistics": {
 		"data": "Datos (KB)",
+		"data_mb": "Datos (MB)",
 		"latest_statistics": "Últimas estadísticas",
 		"lifetime_stats": "Estadísticas de por vida",
+		"memory": "Memoria",
 		"no_interfaces": "No hay estadísticas de vida útil de la interfaz disponibles",
 		"show_latest": "Últimas estadísticas",
-		"title": "estadística"
+		"title": "estadística",
+		"used": "Memoria usada %"
 	},
 	"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",
 		"percentage_used": "{{percentage}}% de {{total}} utilizado",
 		"title": "#{{serialNumber}} Estado",
+		"total_memory": "Memoria total",
 		"uptime": "Tiempo de actividad",
 		"used_total_memory": "{{used}} usado / {{total}} total"
 	},
+	"subscriber": {
+		"add_device_subscriber_explanation": "Para reclamar otros dispositivos, puede usar nuestra barra de búsqueda o reclamar directamente desde la tabla. Si un dispositivo ya fue reclamado por un usuario, deberá ir a sus detalles y anular la asignación antes de reclamarlo.",
+		"create": "Crear suscriptor",
+		"devices_one": "{{count}} dispositivo",
+		"devices_other": "{{count}} dispositivos",
+		"edit": "Editar suscriptor",
+		"error_create": "Error al crear el suscriptor: {{error}}",
+		"error_delete": "Error al eliminar el suscriptor: {{error}}",
+		"error_fetching": "Error al obtener suscriptores: {{error}}",
+		"error_fetching_single": "Error al obtener el suscriptor: {{error}}",
+		"error_update": "Error al actualizar el suscriptor: {{error}}",
+		"is_already_claimed": "ya es reclamado por",
+		"subscribers": "Suscriptores",
+		"success_create": "¡Suscriptor creado correctamente!",
+		"success_delete": "¡Suscriptor eliminado correctamente!",
+		"success_update": "Suscriptor actualizado con éxito!"
+	},
 	"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",
+		"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",
@@ -368,14 +746,17 @@
 		"waiting_for_device": "Esperando que el dispositivo se vuelva a conectar"
 	},
 	"user": {
+		"add_phone_number": "Agregar el número de teléfono",
 		"avatar": "Tu avatar",
 		"avatar_file": "Tu avatar (máx. De 2 MB)",
+		"check_phone": "Por favor revise su teléfono para su código de validación",
+		"confirm_new_password": "confirmar nueva contraseña",
 		"create": "Crear usuario",
-		"create_failure": "Error al crear usuario. Asegúrese de que esta dirección de correo electrónico no esté vinculada a una cuenta.",
+		"create_failure": "Error al crear el usuario: {{error}}",
 		"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,35 +764,51 @@
 		"description": "Descripción",
 		"edit": "editar usuario",
 		"email_address": "Dirección de correo electrónico",
+		"enter_new_phone": "Ingrese su nuevo número de teléfono:",
+		"error_fetching_users": "Error al obtener usuarios: {{error}}",
+		"error_retrieving": "Error al recuperar usuario",
+		"error_sending_code": "Error al intentar enviar el código de validación. Confirma que tu número de teléfono es válido.",
 		"force_password_change": "Forzar cambio de contraseña al iniciar sesión",
 		"id": "Id. De usuario",
 		"last_login": "Último acceso",
 		"login_id": "Ingresar identificación.",
+		"make_sure_same_password": "Asegúrese de que ambas contraseñas sean iguales y válidas",
 		"my_profile": "Mi perfil",
 		"name": "Nombre",
+		"new_code_sent": "¡Nuevo código enviado!",
 		"nickname": "Apodo",
 		"nickname_explanation": "Apodo (opcional)",
 		"not_validated": "No validado",
 		"note": "Nota",
 		"password": "Contraseña",
+		"phone_number": "Número de teléfono",
 		"provide_email": "Por favor ingrese su dirección de correo electrónico válida",
 		"provide_password": "Proporcione una contraseña válida",
 		"save_avatar": "Guardar avatar",
+		"send_code": "Enviar código",
+		"send_code_again": "Enviar Código De nuevo",
 		"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.",
+		"successful_validation": "¡Número de teléfono validado! Haga clic en el botón guardar para vincularlo a su perfil",
+		"table_title": "Usuarios administrativos",
+		"update_failure": "Error al intentar actualizar: {{error}}",
 		"update_failure_title": "Actualización fallida",
 		"update_success": "Usuario actualizado con éxito",
 		"update_success_title": "Éxito",
 		"user_role": "papel",
 		"users": "Usuarios",
-		"validated": "Validado"
+		"validate_phone": "validar",
+		"validated": "Validado",
+		"wrong_validation_code": "No ha introducido un código válido. Vuelve a intentarlo y asegúrate de haber ingresado el número de teléfono correcto."
 	},
 	"wifi_analysis": {
 		"association": "Asociación",
 		"associations": "Asociaciones",
 		"mode": "Modo",
 		"network_diagram": "Diagrama de Red",
+		"override_dfs": "Anular DFS",
 		"radios": "Radios",
-		"title": "Análisis de Wi-Fi"
+		"scan_warning": "Su radio 5G está en un canal de radar, debe habilitar \"Anular DFS\" para permitir el escaneo de todos los canales 5G",
+		"title": "Análisis de Wi-Fi",
+		"vendor": "Vendedor"
 	}
 }

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"
@@ -16,53 +17,70 @@
 		"blink": "Cligner",
 		"device_leds": "LED de l'appareil",
 		"execute_now": "Souhaitez-vous définir ce modèle maintenant ?",
+		"explanation": "Quel modèle souhaitez-vous définir sur cet appareil pendant 30 secondes ?",
 		"pattern": "Choisissez le modèle que vous souhaitez utiliser :",
 		"set_leds": "Définir les LED",
 		"when_blink_leds": "Quand souhaitez-vous faire clignoter les LED de l'appareil ?"
 	},
 	"commands": {
+		"command_success": "Commande soumise avec succès",
 		"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",
 		"add": "Ajouter",
+		"add_items": "Ajouter des articles",
+		"add_note": "Ajouter une note",
+		"add_note_explanation": "Écrivez votre nouvelle note ci-dessous et cliquez sur le bouton '+' où vous avez terminé",
 		"adding_ellipsis": "Ajouter...",
+		"all": "Tout",
 		"are_you_sure": "Êtes-vous sûr?",
 		"back_to_login": "Retour connexion",
+		"back_to_start": "Retour au début",
+		"blacklist": "Liste noire",
+		"by": "Par",
 		"cancel": "annuler",
 		"certificate": "Certificat",
 		"certificates": "Certificats",
+		"claim": "Prétendre",
 		"clear": "Clair",
 		"close": "Fermer",
+		"code": "Code",
 		"command": "Commander",
 		"commands": "Les commandes",
 		"commands_executed": "commandes exécutées",
 		"compatible": "Compatible",
 		"completed": "Terminé",
+		"concurrent_devices": "Périphériques simultanés",
 		"config_id": "Config. Identifiant",
 		"confirm": "Confirmer",
+		"confirm_stop_editing": "Voulez-vous vraiment arrêter la modification ? Cela annulera toutes les modifications non enregistrées que vous avez apportées.",
 		"connected": "Connecté",
 		"copied": "Copié!",
+		"copied_to_clipboard": "Copié dans le presse-papier!",
 		"copy_to_clipboard": "Copier dans le presse-papier",
 		"create": "Créer",
 		"created": "Créé",
 		"created_by": "Créé par",
+		"creator": "Créateur",
 		"current": "Actuel",
 		"custom_date": "Date personnalisée",
 		"dashboard": "Tableau de bord",
 		"date": "Rendez-vous amoureux",
 		"day": "journée",
 		"days": "journées",
+		"default_map": "Carte par défaut",
 		"delete": "Effacer",
 		"delete_device": "Supprimer le périphérique",
 		"details": "Détails",
 		"device": "N° d'appareil{{serialNumber}}",
 		"device_dashboard": "Tableau de bord de l'appareil",
-		"device_delete": "Supprimer l'appareil n°{{serialNumber}}",
+		"device_delete": "Supprimer #{{serialNumber}}",
 		"device_deleted": "Appareil supprimé avec succès",
 		"device_health": "Santé de l'appareil",
 		"device_list": "Liste des appareils",
@@ -74,6 +92,7 @@
 		"dismiss": "Rejeter",
 		"do_now": "Faire maintenant!",
 		"download": "Télécharger",
+		"duplicate": "Dupliquer",
 		"duration": "Durée",
 		"edit": "modifier",
 		"edit_user": "Modifier",
@@ -81,6 +100,9 @@
 		"endpoint": "Point final",
 		"endpoints": "Points de terminaison",
 		"error": "Erreur",
+		"error_adding_note": "Erreur lors de l'ajout de la note",
+		"error_code": "Code d'erreur",
+		"errors": "les erreurs",
 		"execute_now": "Souhaitez-vous exécuter cette commande maintenant ?",
 		"executed": "réalisé",
 		"exit": "Sortie",
@@ -91,11 +113,22 @@
 		"forgot_password_title": "Mot de passe oublié",
 		"from": "De",
 		"general_error": "Erreur API, veuillez consulter votre administrateur",
+		"go_back": "Retourner",
 		"hide": "Cacher",
 		"hour": "heure",
 		"hours": "heures",
 		"id": "Id",
+		"invalid_credentials": "Nom d'utilisateur et / ou mot de passe incorrect",
+		"invalid_date_explanation": "Date invalide, merci d'utiliser le calendrier accessible avec le bouton à droite",
+		"invalid_file": "Le fichier choisi n'était pas valide, veuillez lire les instructions et ajuster votre fichier en conséquence",
+		"invalid_password": "Ce mot de passe ne confirme pas les règles de base des mots de passe. Veuillez visiter notre page Politique de mot de passe pour en savoir plus",
+		"invalid_pem": "Votre fichier .pem n'est pas valide. Il doit commencer par '-----BEGIN CERTIFICATE-----' OU '-----BEGIN PRIVATE KEY-----' et il doit se terminer par '-----END CERTIFICATE--- --' OU '-----FIN CLÉ PRIVÉE-----'",
 		"ip_address": "Adresse IP",
+		"ips": "IPS",
+		"item": "article",
+		"items": "Articles",
+		"items_per_page": "Objets par page:",
+		"key": "Clé",
 		"last_dashboard_refresh": "Dernière actualisation du tableau de bord",
 		"later_tonight": "Plus tard ce soir",
 		"latest": "Dernier",
@@ -104,25 +137,35 @@
 		"loading_more_ellipsis": "Chargement plus ...",
 		"logout": "Connectez - Out",
 		"mac": "ADRESSE MAC",
+		"main": "Principale",
 		"manufacturer": "fabricant",
 		"memory_used": "Mémoire utilisée",
+		"min_max": "Min : {{min}}, Max : {{max}}",
 		"minute": "minute",
 		"minutes": "minutes",
+		"modified": "Modifié",
 		"na": "N / A",
 		"need_date": "Vous avez besoin d'un rendez-vous...",
 		"no": "Non",
+		"no_addresses_found": "Aucune adresse trouvée",
 		"no_devices_found": "Aucun périphérique trouvé",
 		"no_items": "Pas d'objet",
+		"none": "Aucun",
 		"not_connected": "Pas connecté",
-		"of_connected": "% d'appareils",
+		"of_connected": "% d'appareils connectés",
 		"off": "De",
 		"on": "sur",
 		"optional": "Optionnel",
 		"overall_health": "Santé globale",
 		"password_policy": "Politique de mot de passe",
+		"preferences": "Préférences",
+		"preview": "Aperçu",
+		"program": "Programme",
+		"reason": "raison",
 		"recorded": "Enregistré",
 		"refresh": "Rafraîchir",
 		"refresh_device": "Actualiser l'appareil",
+		"remove_claim": "Supprimer la réclamation",
 		"required": "Champs obligatoires",
 		"result": "Résultat",
 		"save": "Sauvegarder",
@@ -133,40 +176,96 @@
 		"second": "seconde",
 		"seconds": "secondes",
 		"seconds_elapsed": "Secondes écoulées",
+		"see_details": "Voir les détails",
+		"select": "sélectionner",
+		"serial_num": "Numéro de série",
 		"serial_number": "Numéro de série",
 		"show_all": "Montre tout",
+		"socket_connection_closed": "Connexion fermée !",
 		"start": "Début",
+		"status": "Statut",
+		"stop_editing": "Arrêter la modification",
 		"submit": "Soumettre",
 		"submitted": "Soumis",
 		"success": "Succès",
 		"system": "Système",
 		"table": "Table",
+		"time_per_device": "Appareils/Seconde",
 		"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",
 		"up_to_date": "Appareils à jour",
 		"uptimes": "Disponibilités",
+		"use_file": "Utiliser le fichier",
 		"uuid": "UUID",
 		"vendors": "Vendeurs",
 		"view_more": "Afficher plus",
+		"visibility": "Visibilité",
+		"waiting_for_update": "En attente de mise à jour",
 		"yes": "Oui"
 	},
 	"configuration": {
+		"add_configuration": "Ajouter une configuration",
+		"add_new_block": "Ajouter un nouveau bloc de configuration",
+		"add_or_link": "Lier ou ajouter",
+		"add_radio": "Ajouter une radio",
+		"ca_cert_explanation": "Veuillez utiliser un fichier .pem qui commence par \"-----BEGIN CERTIFICATE-----\" et se termine par \"-----END CERTIFICATE-----\". Le résultat sera affiché dans le champ ci-dessous. Vous pouvez également copier et coller le certificat que vous souhaitez utiliser directement.",
+		"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_radio_band": "Quelle bande de radio voudriez-vous créer ?",
+		"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}}",
+		"default_configs": "Configurations par défaut",
+		"default_configurations": "Configurations par défaut",
+		"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",
+		"devices_affected": "Appareils concernés par cette configuration :",
+		"edit_configuration": "Modifier la configuration",
+		"error_delete": "Erreur lors de la tentative de suppression : {{error}}",
+		"error_delete_blacklist": "Erreur lors de la suppression de la liste noire : {{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",
+		"key_pem_explanation": "Veuillez sélectionner le fichier .pem",
+		"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_affected_devices": "Afficher les appareils concernés",
+		"view_config": "Afficher la configuration",
+		"view_in_use": "Afficher en cours d'utilisation",
 		"view_json": "Afficher le JSON brut"
 	},
 	"configure": {
@@ -176,6 +275,41 @@
 		"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}}"
+	},
+	"contact": {
+		"access_pin": "NIP d'accès",
+		"add_contact": "Ajouter le contact",
+		"contact": "Contact",
+		"create_contact": "Créer un contact",
+		"currently_selected_contact": "Contact actuellement sélectionné : {{contact}}",
+		"delete": "Effacer le contact?",
+		"error_assign": "Erreur lors de la tentative d'attribution du contact : {{error}}",
+		"error_creation": "Erreur lors de la tentative de création du contact : {{error}}",
+		"error_delete": "Erreur lors de la tentative de suppression du contact : {{error}}",
+		"error_fetching_list": "Erreur lors de la récupération des contacts",
+		"error_fetching_single": "Erreur lors de la récupération du contact : {{error}}",
+		"error_unassign": "Erreur lors de la tentative de désattribution du contact : {{error}}",
+		"first_name": "Prénom",
+		"identifier": "Identifiant",
+		"initials": "Initiales",
+		"last_name": "Nom de famille",
+		"no_associated_contact": "Aucun contact associé",
+		"primary_email": "Email primaire",
+		"salutation": "salutation",
+		"secondary_email": "Email secondaire",
+		"successful_assign": "Contact attribué avec succès !",
+		"successful_creation": "Contact créé!",
+		"successful_delete": "Contact supprimé avec succès !",
+		"successful_unassign": "Contact non attribué avec succès",
+		"successful_update": "Contact mis à jour avec succès",
+		"title": "Contacts",
+		"type": "Type",
+		"update_error": "Erreur lors de la mise à jour du contact : {{error}}",
+		"user_title": "Titre",
+		"visual": "Nom de la correspondance"
+	},
 	"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 +320,25 @@
 		"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": {
+		"add_to_blacklist": "Ajouter un appareil à la liste noire",
+		"all_devices": "Tous les dispositifs",
+		"blacklisted_on": "Rendez-vous amoureux",
+		"capabilities": "Capacités",
+		"certificate_explanation": "Certificats des appareils connectés",
+		"edit_blacklist": "Modifier l'appareil sur liste noire",
+		"error_adding_blacklist": "Erreur lors de l'ajout de l'appareil à la liste noire : {{error}}",
+		"error_edit_blacklist": "Erreur lors de la modification de la liste noire : {{error}}",
+		"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}}",
+		"health_explanation": "Santé des appareils connectés ((Appareils = 100 % * 100 + Appareils> 90 % * 95 + Appareils> 60 % * 75 + Appareils < 60 % * 35) / Appareils connectés)",
+		"memory_explanation": "Nombre d'appareils connectés avec la mémoire correspondante utilisée %",
+		"remove_from_blacklist": "Supprimer de la liste noire",
+		"success_added_blacklist": "Appareil ajouté avec succès à la liste noire !",
+		"success_edit_blacklist": "Liste noire modifiée avec succès !",
+		"success_removed_blacklist": "Appareil supprimé de la liste noire !",
+		"uptimes_explanation": "Nombre d'appareils connectés en fonction de leur disponibilité"
+	},
 	"device_logs": {
 		"log": "Bûche",
 		"severity": "Gravité",
@@ -194,16 +347,48 @@
 	"entity": {
 		"add_child": "Ajouter une entité enfant à {{entityName}}",
 		"add_failure": "Erreur, le serveur a renvoyé : {{error}}",
+		"add_ips": "Gérer les IP",
 		"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.",
+		"confirm_map_delete": "Êtes-vous sûr de vouloir supprimer la carte {{name}}? Cette action ne peut pas être annulée",
+		"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",
+		"duplicate_from_node": "Dupliquer avec un nœud racine spécifique",
+		"duplicate_map": "Carte en double",
+		"duplicate_with_node": "Dupliquer {{mapName}} avec {{rootName}} comme nœud racine",
 		"edit_failure": "Échec de la mise à jour : {{error}}",
+		"enter_here": "Entrez les IP que vous souhaitez ajouter ici",
+		"entire_tree": "Carte du réseau",
 		"entities": "Entités",
 		"entity": "Entité",
+		"error_deleting_map": "Erreur lors de la suppression de la carte : {{error}}",
+		"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_fetching_map": "Erreur lors de la récupération de la carte : {{error}}",
+		"error_fetching_tree": "Erreur lors de la récupération de l'arborescence : {{error}}",
+		"error_saving": "Erreur lors de l'enregistrement de l'entité",
+		"error_saving_map": "Erreur lors de l'enregistrement de la carte : {{error}}",
+		"higher_priority": "Faire une priorité plus élevée",
+		"ip_detection": "Détection IP",
+		"ip_formats": "Vous pouvez ajouter des adresses IPv4 ou IPv6 aux formats suivants :",
+		"lower_priority": "Faire une priorité inférieure",
+		"map": "Carte",
+		"map_delete_success": "Carte supprimée avec succès !",
+		"need_select_entity": "Vous devez sélectionner une entité dans le tableau ci-dessous",
+		"no_ips": "Aucune adresse IP sélectionnée",
+		"not_assigned": "Non attribué",
 		"only_unassigned": "Uniquement non attribué",
-		"valid_serial": "Doit être un numéro de série valide (12 caractères HEX)"
+		"select_entity": "Sélectionnez cette entité",
+		"selected_entity": "Entité sélectionnée",
+		"selected_map": "Carte sélectionnée",
+		"tree_saved": "Carte enregistrée avec succès !",
+		"update_failure_error": "Erreur lors de la tentative de mise à jour de l'entité : {{error}}",
+		"valid_serial": "Doit être un numéro de série valide (12 caractères HEX)",
+		"venues": "Les lieux"
 	},
 	"factory_reset": {
 		"redirector": "Conserver le redirecteur :",
@@ -213,6 +398,7 @@
 		"warning": "Avertissement : Une fois que vous avez soumis, cela ne peut pas être annulé"
 	},
 	"firmware": {
+		"age_explanation": "Nombre moyen de jours pour tous les appareils à partir desquels nous pouvons obtenir cette valeur",
 		"average_age": "Âge moyen du micrologiciel",
 		"choose_custom": "Choisir",
 		"details_title": "Image #{{image}} Détails",
@@ -225,9 +411,11 @@
 		"image": "Image",
 		"image_date": "Date de l'image",
 		"installed_firmware": "Micrologiciel installé",
+		"latest_explanation": "Appareils exécutant un firmware reconnu dans sa dernière version",
 		"latest_version_installed": "Dernière version installée",
 		"newer_firmware_available": "Révisions plus récentes disponibles",
 		"reinstall_latest": "Réinstaller",
+		"release": "libération",
 		"revision": "Révision",
 		"show_dev": "Afficher les versions des développeurs",
 		"size": "Taille",
@@ -251,33 +439,129 @@
 		"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_ent_ven": "Attribuer à une entité ou à 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_pushing_config": "Erreur lors de la tentative d'envoi de la configuration sur l'appareil : {{error}}",
 		"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",
-		"venue": "Lieu"
+		"validating_import_file": "Validation du fichier d'importation et des données...",
+		"venue": "Lieu",
+		"view_in_gateway": "Afficher dans la passerelle"
+	},
+	"location": {
+		"add": "Ajouter un emplacement",
+		"building_name": "Nom du bâtiment",
+		"city": "Ville",
+		"country": "Pays",
+		"create": "Créer un lieu",
+		"currently_selected": "Emplacement actuellement sélectionné : {{location}}",
+		"delete": "Supprimer le lieu?",
+		"error_assign": "Erreur lors de la tentative d'attribution de l'emplacement : {{error}}",
+		"error_creation": "Erreur lors de la tentative de création d'établissements : {{error}}",
+		"error_delete": "Erreur lors de la suppression de l'emplacement : {{error}}",
+		"error_fetching_single": "Erreur lors de la tentative de récupération de l'emplacement : {{error}}",
+		"geocode": "Géocode",
+		"mobiles": "MOBILES",
+		"no_associated": "Aucun emplacement associé",
+		"phones": "Téléphones",
+		"postal": "Zip / code postal",
+		"search": "Recherchez des emplacements pour remplir automatiquement les champs ci-dessous",
+		"state": "Etat",
+		"street_address": "Adresse de rue",
+		"successful_creation": "Emplacement créé avec succès !",
+		"successful_delete": "Emplacement supprimé avec succès !",
+		"successful_update": "Emplacement mis à jour avec succès !",
+		"successfully_assigned": "Emplacement attribué avec succès !",
+		"title": "Emplacements",
+		"update_error": "Erreur lors de la mise à jour de l'emplacement : {{error}}"
 	},
 	"login": {
+		"account_verification": "Vérification de compte",
+		"authentication_expired": "Authentification expirée, veuillez recommencer le processus de connexion",
 		"change_password": "Changer le mot de passe",
 		"change_password_error": "Erreur lors du changement de mot de passe. Assurez-vous que le nouveau mot de passe est valide en visitant la page « Politique de mot de passe »",
 		"change_password_instructions": "Saisissez et confirmez votre nouveau mot de passe",
 		"changing_password": "Modification du mot de passe...",
 		"confirm_new_password": "Confirmer le nouveau mot de passe",
 		"different_passwords": "Vous devez saisir deux fois le même mot de passe",
+		"email_code_validation": "Veuillez vérifier votre boîte e-mail et entrer le code de vérification que nous venons de vous envoyer dans la case ci-dessous",
 		"forgot_password_error": "Erreur lors de la tentative d'envoi de l'e-mail Mot de passe oublié. Veuillez vous assurer que cet identifiant est associé à un compte.",
 		"forgot_password_explanation": "Entrez votre nom d'utilisateur pour recevoir un e-mail contenant les instructions pour réinitialiser votre mot de passe",
 		"forgot_password_success": "Vous devriez bientôt recevoir un e-mail contenant les instructions pour réinitialiser votre mot de passe. S'il vous plaît assurez-vous de vérifier vos spams si vous ne trouvez pas l'e-mail",
@@ -286,6 +570,7 @@
 		"login_error": "Erreur de connexion, assurez-vous que les informations que vous fournissez sont valides",
 		"new_password": "Nouveau mot de passe",
 		"password": "Mot de passe",
+		"phone_validation_explanation": "Veuillez vérifier votre appareil mobile et entrer le code de vérification que nous venons de vous envoyer dans la case ci-dessous",
 		"please_enter_gateway": "Veuillez saisir une URL uCentralSec",
 		"please_enter_password": "s'il vous plait entrez votre mot de passe",
 		"please_enter_username": "s'il vous plaît entrez votre nom d'utilisateur",
@@ -294,7 +579,12 @@
 		"sending_ellipsis": "Envoi...",
 		"sign_in_to_account": "Connectez-vous à votre compte",
 		"url": "URL uCentralSec",
-		"username": "Nom d'utilisateur"
+		"username": "Nom d'utilisateur",
+		"verification_code": "Entrez votre vérification ici",
+		"wrong_code": "Le code de vérification saisi n'est pas valide."
+	},
+	"preferences": {
+		"provisioning": "Provisioning"
 	},
 	"reboot": {
 		"directions": "Quand souhaitez-vous redémarrer cet appareil ?",
@@ -306,7 +596,7 @@
 		"channel": "Canal",
 		"directions": "Lancez une analyse wifi de cet appareil, ce qui devrait prendre environ 25 secondes.",
 		"re_scan": "Nouvelle analyse",
-		"result_directions": "Veuillez cliquer sur le bouton '$t(scan.re_scan)' si vous souhaitez effectuer un scan avec la même configuration que le précédent.",
+		"result_directions": "Vous pouvez cliquer sur le bouton 'Scan' en haut à droite pour $t(scan.re_scan)",
 		"results": "Résultats de l'analyse Wi-Fi",
 		"scan": "Balayage",
 		"scanning": "Balayage... ",
@@ -315,29 +605,117 @@
 	"settings": {
 		"title": "Réglages"
 	},
+	"simulation": {
+		"add": "Ajouter une simulation",
+		"cancel": "annuler",
+		"cancel_success": "Exécution de la simulation annulée avec succès !",
+		"check_ongoing_sims": "Suivre le Sim en cours",
+		"client_interval": "Intervalle client",
+		"delete_simulation": "Supprimer Sim. {{name}}",
+		"end": "Terminé",
+		"error_creating": "Erreur lors de la création de la simulation : {{error}}",
+		"error_delete": "Erreur lors de la suppression de la simulation : {{error}}",
+		"error_devices": "Périphériques d'erreur",
+		"error_edit": "Erreur lors de la tentative d'enregistrement de la simulation : {{error}}",
+		"error_edit_run": "Erreur lors de la tentative de modification de l'état d'exécution : {{error}}",
+		"error_fetching_simulations": "Erreur lors de la récupération des simulations : {{error}}",
+		"error_start_run": "Erreur lors de la tentative de démarrage d'une simulation : {{error}}",
+		"gateway": "passerelle",
+		"healtcheck_interval": "Intervalle de vérification de l'état",
+		"keep_alive": "Rester en vie",
+		"last_refresh": "Dernier rafraîchissement",
+		"length": "Longueur",
+		"live_devices": "Appareils en direct",
+		"mac_prefix": "Préfixe MAC",
+		"max_associations": "Max. Les associations",
+		"max_clients": "Max. Clients",
+		"messages_transmitted": "Émission de messages",
+		"min_associations": "Min. Les associations",
+		"min_clients": "Min. Clients",
+		"pause": "Pause",
+		"pause_success": "Exécuter en pause !",
+		"prefix_length": "Obligatoire, doit être d'une longueur de 6 caractères",
+		"previous_runs": "Courses précédentes",
+		"received": "reçu",
+		"received_messages": "Réception des messages",
+		"reconnect_interval": "Intervalle de reconnexion",
+		"resume": "CV",
+		"resume_success": "Exécution reprise !",
+		"run": "Exécution de simulation",
+		"run_simulation": "Exécuter la simulation",
+		"started": "commencé",
+		"state_interval": "Intervalle d'état",
+		"stop": "Arrêtez",
+		"stop_success": "Exécution arrêtée !",
+		"success_creating": "Simulation créée avec succès !",
+		"success_run_start": "Exécution démarrée avec succès !",
+		"successful_delete": "Simulation supprimée avec succès !",
+		"successful_edit": "Simulation éditée avec succès !",
+		"threads": "Fils",
+		"time_full_devices": "Temps pour les appareils pleins",
+		"title": "Simulations",
+		"transmitted": "Transmis",
+		"valid_cert": "Certificat valide",
+		"valid_key": "Clé valide"
+	},
 	"statistics": {
 		"data": "Données (Ko)",
+		"data_mb": "Données (Mo)",
 		"latest_statistics": "Dernières statistiques",
 		"lifetime_stats": "Statistiques à vie",
+		"memory": "mémoire",
 		"no_interfaces": "Aucune statistique de durée de vie de l'interface disponible",
 		"show_latest": "Dernières statistiques",
-		"title": "statistiques"
+		"title": "statistiques",
+		"used": "Mémoire utilisée %"
 	},
 	"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",
 		"percentage_used": "{{percentage}}% de {{total}} utilisé",
 		"title": "#{{serialNumber}} état",
+		"total_memory": "Mémoire totale",
 		"uptime": "La disponibilité",
 		"used_total_memory": "{{used}} utilisé / {{total}} total"
 	},
+	"subscriber": {
+		"add_device_subscriber_explanation": "Pour réclamer d'autres appareils, vous pouvez utiliser notre barre de recherche ou réclamer directement à partir du tableau. Si un appareil a déjà été réclamé par un utilisateur, vous devrez accéder à ses détails et le désaffecter avant de le réclamer.",
+		"create": "Créer un abonné",
+		"devices_one": "{{count}} Appareil",
+		"devices_other": "{{count}} appareils",
+		"edit": "Modifier l'abonné",
+		"error_create": "Erreur lors de la création de l'abonné : {{error}}",
+		"error_delete": "Erreur lors de la suppression de l'abonné : {{error}}",
+		"error_fetching": "Erreur lors de la récupération des abonnés : {{error}}",
+		"error_fetching_single": "Erreur lors de la récupération de l'abonné : {{error}}",
+		"error_update": "Erreur lors de la mise à jour de l'abonné : {{error}}",
+		"is_already_claimed": "est déjà réclamé par",
+		"subscribers": "Les abonnés",
+		"success_create": "Abonné créé avec succès !",
+		"success_delete": "Abonné supprimé avec succès !",
+		"success_update": "Abonné mis à jour avec succès !"
+	},
 	"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",
+		"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",
@@ -368,14 +746,17 @@
 		"waiting_for_device": "En attente de la reconnexion de l'appareil"
 	},
 	"user": {
+		"add_phone_number": "Ajouter un numéro de téléphone",
 		"avatar": "Votre avatar",
 		"avatar_file": "Votre Avatar (max. de 2 Mo)",
+		"check_phone": "Veuillez vérifier votre téléphone pour votre code de validation",
+		"confirm_new_password": "Confirmer le nouveau mot de passe",
 		"create": "Créer un utilisateur",
-		"create_failure": "Erreur lors de la création de l'utilisateur. Veuillez vous assurer que cette adresse e-mail n'est pas déjà liée à un compte.",
+		"create_failure": "Erreur lors de la création de l'utilisateur : {{error}}",
 		"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,35 +764,51 @@
 		"description": "La description",
 		"edit": "Modifier l'utilisateur",
 		"email_address": "Adresse électronique",
+		"enter_new_phone": "Saisissez votre nouveau numéro de téléphone :",
+		"error_fetching_users": "Erreur lors de la récupération des utilisateurs : {{error}}",
+		"error_retrieving": "Erreur lors de la récupération de l'utilisateur",
+		"error_sending_code": "Erreur lors de la tentative d'envoi du code de validation. Veuillez confirmer que votre numéro de téléphone est valide.",
 		"force_password_change": "Forcer le changement de mot de passe lors de la connexion",
 		"id": "Identifiant d'utilisateur.",
 		"last_login": "Dernière connexion",
 		"login_id": "Identifiant de connexion.",
+		"make_sure_same_password": "Assurez-vous que les deux mots de passe sont identiques et valides",
 		"my_profile": "Mon profil",
 		"name": "Prénom",
+		"new_code_sent": "Nouveau code envoyé !",
 		"nickname": "Surnom",
 		"nickname_explanation": "Surnom (optionnel)",
 		"not_validated": "Pas valide",
 		"note": "Remarque",
 		"password": "Mot de passe",
+		"phone_number": "Numéro de téléphone",
 		"provide_email": "Veuillez fournir une adresse email valide",
 		"provide_password": "Veuillez fournir un mot de passe valide",
 		"save_avatar": "Enregistrer l'avatar",
+		"send_code": "Envoyer le code",
+		"send_code_again": "Envoyer code à nouveau",
 		"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.",
+		"successful_validation": "Numéro de téléphone validé ! Cliquez sur le bouton Enregistrer pour le lier à votre profil",
+		"table_title": "Utilisateurs administrateurs",
+		"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",
 		"user_role": "Rôle",
 		"users": "Utilisateurs",
-		"validated": "Validé"
+		"validate_phone": "Valider",
+		"validated": "Validé",
+		"wrong_validation_code": "Vous n'avez pas entré de code valide. Veuillez réessayer et assurez-vous d'avoir entré le bon numéro de téléphone"
 	},
 	"wifi_analysis": {
 		"association": "Association",
 		"associations": "Les associations",
 		"mode": "Mode",
 		"network_diagram": "Diagramme de réseau",
+		"override_dfs": "Remplacer DFS",
 		"radios": "Radios",
-		"title": "Analyse Wi-Fi"
+		"scan_warning": "Votre radio 5G est sur un canal radar, vous devez activer \"Override DFS\" pour permettre le balayage de tous les canaux 5G",
+		"title": "Analyse Wi-Fi",
+		"vendor": "vendeur"
 	}
 }

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"
@@ -16,53 +17,70 @@
 		"blink": "Piscar",
 		"device_leds": "LEDs do dispositivo",
 		"execute_now": "Você gostaria de definir este padrão agora?",
+		"explanation": "Que padrão você gostaria de definir neste dispositivo por 30 segundos?",
 		"pattern": "Escolha o padrão que deseja usar:",
 		"set_leds": "Definir LEDs",
 		"when_blink_leds": "Quando você gostaria de fazer os LEDs do dispositivo piscarem?"
 	},
 	"commands": {
+		"command_success": "Comando enviado com sucesso",
 		"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",
 		"add": "Adicionar",
+		"add_items": "Adicionar itens",
+		"add_note": "Adicionar nota",
+		"add_note_explanation": "Escreva sua nova nota abaixo e clique no botão '+' quando terminar",
 		"adding_ellipsis": "Adicionando ...",
+		"all": "Todos",
 		"are_you_sure": "Você tem certeza?",
 		"back_to_login": "Volte ao login",
+		"back_to_start": "Voltar ao Início",
+		"blacklist": "Lista negra",
+		"by": "Por",
 		"cancel": "Cancelar",
 		"certificate": "Certificado",
 		"certificates": "Certificados",
+		"claim": "Afirmação",
 		"clear": "Claro",
 		"close": "Perto",
+		"code": "Código",
 		"command": "Comando",
 		"commands": "comandos",
 		"commands_executed": "Comandos Executados",
 		"compatible": "Compatível",
 		"completed": "Concluído",
+		"concurrent_devices": "Dispositivos Simultâneos",
 		"config_id": "Config. Identidade",
 		"confirm": "confirme",
+		"confirm_stop_editing": "Tem certeza que deseja parar de editar? Isso cancelará todas as alterações não salvas que você fez.",
 		"connected": "Conectado",
 		"copied": "Copiado!",
+		"copied_to_clipboard": "Copiado para a área de transferência!",
 		"copy_to_clipboard": "Copiar para área de transferência",
 		"create": "Crio",
 		"created": "Criado",
 		"created_by": "Criado Por",
+		"creator": "O Criador",
 		"current": "Atual",
 		"custom_date": "Data personalizada",
 		"dashboard": "painel de controle",
 		"date": "Encontro",
 		"day": "dia",
 		"days": "dias",
+		"default_map": "Mapa Padrão",
 		"delete": "Excluir",
 		"delete_device": "Apagar dispositivo",
 		"details": "Detalhes",
 		"device": "Dispositivo nº{{serialNumber}}",
 		"device_dashboard": "Painel do dispositivo",
-		"device_delete": "Excluir dispositivo nº{{serialNumber}}",
+		"device_delete": "Excluir #{{serialNumber}}",
 		"device_deleted": "Dispositivo excluído com sucesso",
 		"device_health": "Saúde do Dispositivo",
 		"device_list": "Lista de Dispositivos",
@@ -74,6 +92,7 @@
 		"dismiss": "Dispensar",
 		"do_now": "Faça agora!",
 		"download": "Baixar",
+		"duplicate": "Duplicado",
 		"duration": "Duração",
 		"edit": "Editar",
 		"edit_user": "Editar",
@@ -81,6 +100,9 @@
 		"endpoint": "Ponto final",
 		"endpoints": "Pontos finais",
 		"error": "Erro",
+		"error_adding_note": "Erro ao adicionar nota",
+		"error_code": "Erro de código",
+		"errors": "Erros",
 		"execute_now": "Você gostaria de executar este comando agora?",
 		"executed": "Executado",
 		"exit": "Saída",
@@ -91,11 +113,22 @@
 		"forgot_password_title": "Esqueceu a senha",
 		"from": "De",
 		"general_error": "Erro de API, consulte o seu administrador",
+		"go_back": "Volte",
 		"hide": "Ocultar",
 		"hour": "hora",
 		"hours": "horas",
 		"id": "identidade",
+		"invalid_credentials": "Nome de usuário e / ou senha inválidos",
+		"invalid_date_explanation": "Data inválida, use o calendário acessível com o botão à direita",
+		"invalid_file": "O arquivo escolhido era inválido, por favor, leia as instruções e ajuste seu arquivo de acordo",
+		"invalid_password": "Esta senha não está de acordo com as regras básicas de senha. Visite nossa página de Política de Senha para saber mais",
+		"invalid_pem": "Seu arquivo .pem é inválido. Deve começar com '----- BEGIN CERTIFICATE -----' OU '----- BEGIN PRIVATE KEY -----' e deve terminar com '----- END CERTIFICATE --- - 'OU' ----- END PRIVATE KEY ----- '",
 		"ip_address": "Endereço de IP",
+		"ips": "IPs",
+		"item": "Item",
+		"items": "Unid",
+		"items_per_page": "Itens por página:",
+		"key": "Chave",
 		"last_dashboard_refresh": "Última atualização do painel",
 		"later_tonight": "Logo à noite",
 		"latest": "Mais recentes",
@@ -104,25 +137,35 @@
 		"loading_more_ellipsis": "Carregando mais ...",
 		"logout": "Sair",
 		"mac": "Endereço MAC",
+		"main": "a Principal",
 		"manufacturer": "Fabricante",
 		"memory_used": "Memória Usada",
+		"min_max": "Mín: {{min}}, Máx: {{max}}",
 		"minute": "minuto",
 		"minutes": "minutos",
+		"modified": "Modificado",
 		"na": "N / D",
 		"need_date": "Você precisa de um encontro ...",
 		"no": "Não",
+		"no_addresses_found": "Nenhum endereço encontrado",
 		"no_devices_found": "Nenhum dispositivo encontrado",
 		"no_items": "Nenhum item",
+		"none": "Nenhum",
 		"not_connected": "Não conectado",
-		"of_connected": "% de dispositivos",
+		"of_connected": "% de dispositivos conectados",
 		"off": "Fora",
 		"on": "em",
 		"optional": "Opcional",
 		"overall_health": "Saúde geral",
 		"password_policy": "Política de Senha",
+		"preferences": "Preferências",
+		"preview": "Visualizar",
+		"program": "Programa",
+		"reason": "RAZÃO",
 		"recorded": "Gravado",
 		"refresh": "REFRESH",
 		"refresh_device": "Atualizar dispositivo",
+		"remove_claim": "Remover reivindicação",
 		"required": "Requeridos",
 		"result": "Resultado",
 		"save": "Salve",
@@ -133,40 +176,96 @@
 		"second": "segundo",
 		"seconds": "segundos",
 		"seconds_elapsed": "Segundos decorridos",
+		"see_details": "Veja detalhes",
+		"select": "Selecione",
+		"serial_num": "Nº de série",
 		"serial_number": "Número de série",
 		"show_all": "mostre tudo",
+		"socket_connection_closed": "Conexão fechada!",
 		"start": "Começar",
+		"status": "Status",
+		"stop_editing": "Pare de editar",
 		"submit": "Enviar",
 		"submitted": "Submetido",
 		"success": "Sucesso",
 		"system": "Sistema",
 		"table": "Mesa",
+		"time_per_device": "Dispositivo / segundo",
 		"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",
 		"up_to_date": "Dispositivos atualizados",
 		"uptimes": "Uptimes",
+		"use_file": "Usar arquivo",
 		"uuid": "UUID",
 		"vendors": "Vendedores",
 		"view_more": "Veja mais",
+		"visibility": "visibilidade",
+		"waiting_for_update": "Aguardando atualização",
 		"yes": "sim"
 	},
 	"configuration": {
+		"add_configuration": "Adicionar configuração",
+		"add_new_block": "Adicionar novo bloco de configuração",
+		"add_or_link": "Link ou adicionar",
+		"add_radio": "Adicionar rádio",
+		"ca_cert_explanation": "Use um arquivo .pem que comece com \"----- BEGIN CERTIFICATE -----\" e termine com \"----- END CERTIFICATE -----\". O resultado será mostrado no campo abaixo. Você também pode copiar e colar o certificado que deseja usar diretamente.",
+		"cannot_delete": "Esta configuração não pode ser excluída porque está sendo usada por pelo menos uma entidade, local ou dispositivo",
+		"choose_radio_band": "Que banda de rádio você gostaria de criar?",
+		"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}}",
+		"default_configs": "Configurações padrão",
+		"default_configurations": "Configurações padrão",
+		"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",
+		"devices_affected": "Dispositivos afetados por esta configuração:",
+		"edit_configuration": "Editar configuração",
+		"error_delete": "Erro ao tentar excluir: {{error}}",
+		"error_delete_blacklist": "Erro ao excluir da lista negra: {{error}}",
+		"error_fetching_config": "Erro ao buscar configuração",
+		"error_trying_delete": "Erro ao tentar excluir: {{error}}",
+		"error_update": "Erro: {{error}}",
+		"explanation": "Explicação",
+		"key_pem_explanation": "Selecione o arquivo .pem",
+		"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_affected_devices": "Exibir dispositivos afetados",
+		"view_config": "Ver configuração",
+		"view_in_use": "Visualização em uso",
 		"view_json": "Exibir JSON bruto"
 	},
 	"configure": {
@@ -176,6 +275,41 @@
 		"title": "Configurar",
 		"valid_json": "Você precisa inserir um JSON válido"
 	},
+	"connect": {
+		"error_trying_to_connect": "Erro ao tentar conectar ao dispositivo: {{error}}"
+	},
+	"contact": {
+		"access_pin": "PIN de acesso",
+		"add_contact": "Adicionar contato",
+		"contact": "Contato",
+		"create_contact": "Criar Contato",
+		"currently_selected_contact": "Contato atualmente selecionado: {{contact}}",
+		"delete": "Excluir contato?",
+		"error_assign": "Erro ao tentar atribuir contato: {{error}}",
+		"error_creation": "Erro ao tentar criar contato: {{error}}",
+		"error_delete": "Erro ao tentar excluir contato: {{error}}",
+		"error_fetching_list": "Erro ao buscar contatos",
+		"error_fetching_single": "Erro ao buscar contato: {{error}}",
+		"error_unassign": "Erro ao tentar cancelar a atribuição do contato: {{error}}",
+		"first_name": "Primeiro nome",
+		"identifier": "Identificador",
+		"initials": "Iniciais",
+		"last_name": "Último nome",
+		"no_associated_contact": "Nenhum contato associado",
+		"primary_email": "e-mail primário",
+		"salutation": "Saudação",
+		"secondary_email": "Email secundário",
+		"successful_assign": "Contato atribuído com sucesso!",
+		"successful_creation": "Contato criado!",
+		"successful_delete": "Contato excluído com sucesso!",
+		"successful_unassign": "Contato não atribuído com sucesso",
+		"successful_update": "Contato atualizado com sucesso",
+		"title": "Contatos",
+		"type": "Tipo",
+		"update_error": "Erro ao atualizar contato: {{error}}",
+		"user_title": "Título",
+		"visual": "Nome para Correspondência"
+	},
 	"delete_command": {
 		"explanation": "Tem certeza de que deseja excluir este comando? esta ação não é reversível.",
 		"title": "Apagar Comando"
@@ -186,6 +320,25 @@
 		"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": {
+		"add_to_blacklist": "Adicionar dispositivo à lista negra",
+		"all_devices": "Todos os dispositivos",
+		"blacklisted_on": "Encontro",
+		"capabilities": "Recursos",
+		"certificate_explanation": "Certificados de dispositivos conectados",
+		"edit_blacklist": "Editar dispositivo na lista negra",
+		"error_adding_blacklist": "Erro ao adicionar dispositivo à lista negra: {{error}}",
+		"error_edit_blacklist": "Erro ao editar a lista negra: {{error}}",
+		"error_fetching_device": "Erro ao buscar informações do dispositivo: {{error}}",
+		"error_fetching_devices": "Erro ao buscar dispositivos: {{error}}",
+		"health_explanation": "Integridade dos dispositivos conectados ((Dispositivos = 100% * 100 + Dispositivos> 90% * 95 + Dispositivos> 60% * 75 + Dispositivos <60% * 35) / Dispositivos Conectados)",
+		"memory_explanation": "Quantidade de dispositivos conectados com a memória correspondente usada%",
+		"remove_from_blacklist": "Remover da lista negra",
+		"success_added_blacklist": "Dispositivo adicionado à lista negra com sucesso!",
+		"success_edit_blacklist": "Lista negra editada com sucesso!",
+		"success_removed_blacklist": "Dispositivo removido com sucesso da lista negra!",
+		"uptimes_explanation": "Quantidade de dispositivos conectados com base em seu tempo de atividade"
+	},
 	"device_logs": {
 		"log": "Registro",
 		"severity": "Gravidade",
@@ -194,16 +347,48 @@
 	"entity": {
 		"add_child": "Adicionar Entidade Filha a {{entityName}}",
 		"add_failure": "Erro, o servidor retornou: {{error}}",
+		"add_ips": "Gerenciar IPs",
 		"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.",
+		"confirm_map_delete": "Tem certeza que deseja excluir o mapa {{name}}? Esta ação não pode ser revertida",
+		"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",
+		"duplicate_from_node": "Duplicar com nó raiz específico",
+		"duplicate_map": "Mapa duplicado",
+		"duplicate_with_node": "Duplicar {{mapName}} com {{rootName}} como nó raiz",
 		"edit_failure": "Atualização malsucedida: {{error}}",
+		"enter_here": "Digite o (s) IP (s) que deseja adicionar aqui",
+		"entire_tree": "Mapa de Rede",
 		"entities": "Entidades",
 		"entity": "Entidade",
+		"error_deleting_map": "Erro ao excluir mapa: {{error}}",
+		"error_fetch_entity": "Erro ao buscar informações da entidade",
+		"error_fetching": "Erro ao buscar entidades",
+		"error_fetching_map": "Erro ao buscar mapa: {{error}}",
+		"error_fetching_tree": "Erro ao buscar árvore: {{error}}",
+		"error_saving": "Erro ao salvar entidade",
+		"error_saving_map": "Erro ao salvar o mapa: {{error}}",
+		"higher_priority": "Dê maior prioridade",
+		"ip_detection": "Detecção de IP",
+		"ip_formats": "Você pode adicionar endereços IPv4 ou IPv6 nos seguintes formatos:",
+		"lower_priority": "Faça menor prioridade",
+		"map": "Mapa",
+		"map_delete_success": "Mapa excluído com sucesso!",
+		"need_select_entity": "Você precisa selecionar uma entidade da tabela abaixo",
+		"no_ips": "Nenhum IP selecionado",
+		"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)"
+		"select_entity": "Selecione esta Entidade",
+		"selected_entity": "Entidade Selecionada",
+		"selected_map": "Mapa Selecionado",
+		"tree_saved": "Mapa salvo com sucesso!",
+		"update_failure_error": "Erro ao tentar atualizar a entidade: {{error}}",
+		"valid_serial": "Precisa ser um número de série válido (12 caracteres HEX)",
+		"venues": "Locais"
 	},
 	"factory_reset": {
 		"redirector": "Manter redirecionador:",
@@ -213,6 +398,7 @@
 		"warning": "Aviso: depois de enviar, isso não pode ser revertido"
 	},
 	"firmware": {
+		"age_explanation": "Número médio de dias para todos os dispositivos dos quais podemos obter esse valor",
 		"average_age": "Idade Média do Firmware",
 		"choose_custom": "Escolher",
 		"details_title": "Detalhes da imagem #{{image}} ",
@@ -225,9 +411,11 @@
 		"image": "Imagem",
 		"image_date": "Data da Imagem",
 		"installed_firmware": "Firmware Instalado",
+		"latest_explanation": "Dispositivos executando firmware reconhecido em sua versão mais recente",
 		"latest_version_installed": "Última versão instalada",
 		"newer_firmware_available": "Novas revisões disponíveis",
 		"reinstall_latest": "Reinstalar",
+		"release": "LANÇAMENTO",
 		"revision": "Revisão",
 		"show_dev": "Mostrar lançamentos de desenvolvimento",
 		"size": "Tamanho",
@@ -251,33 +439,129 @@
 		"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_ent_ven": "Atribuir à Entidade ou 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_pushing_config": "Erro ao tentar enviar a configuração para o dispositivo: {{error}}",
 		"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",
-		"venue": "Local"
+		"validating_import_file": "Validando arquivo de importação e dados ...",
+		"venue": "Local",
+		"view_in_gateway": "Ver no Gateway"
+	},
+	"location": {
+		"add": "Adicionar Local",
+		"building_name": "nome do edifício",
+		"city": "Cidade",
+		"country": "País",
+		"create": "Criar local",
+		"currently_selected": "Local selecionado atualmente: {{location}}",
+		"delete": "Excluir localização?",
+		"error_assign": "Erro ao tentar atribuir local: {{error}}",
+		"error_creation": "Erro ao tentar criar locais: {{error}}",
+		"error_delete": "Erro ao excluir localização: {{error}}",
+		"error_fetching_single": "Erro ao tentar buscar localização: {{error}}",
+		"geocode": "GeoCode",
+		"mobiles": "Móbiles",
+		"no_associated": "Sem localização associada",
+		"phones": "Telefones",
+		"postal": "CEP / Código Postal",
+		"search": "Pesquise locais para preencher automaticamente os campos abaixo",
+		"state": "Estado",
+		"street_address": "Endereço",
+		"successful_creation": "Local criado com sucesso!",
+		"successful_delete": "Local excluído com sucesso!",
+		"successful_update": "Local atualizado com sucesso!",
+		"successfully_assigned": "Local atribuído com sucesso!",
+		"title": "Localizações",
+		"update_error": "Erro ao atualizar local: {{error}}"
 	},
 	"login": {
+		"account_verification": "Verificação de conta",
+		"authentication_expired": "Autenticação expirada, reinicie o processo de login",
 		"change_password": "Mudar senha",
 		"change_password_error": "Erro ao alterar a senha. Certifique-se de que a nova senha é válida visitando a página 'Política de senha'",
 		"change_password_instructions": "Digite e confirme sua nova senha",
 		"changing_password": "Alterando senha ...",
 		"confirm_new_password": "confirme a nova senha",
 		"different_passwords": "Você precisa inserir a mesma senha duas vezes",
+		"email_code_validation": "Verifique sua caixa de e-mail e insira o código de verificação que acabamos de enviar na caixa abaixo",
 		"forgot_password_error": "Erro ao tentar enviar e-mail Esqueci a senha. Certifique-se de que este userId esteja associado a uma conta.",
 		"forgot_password_explanation": "Digite seu nome de usuário para receber um e-mail contendo as instruções para redefinir sua senha",
 		"forgot_password_success": "Em breve, você receberá um e-mail com as instruções para redefinir sua senha. Certifique-se de verificar o seu spam se você não conseguir encontrar o e-mail",
@@ -286,6 +570,7 @@
 		"login_error": "Erro de login, certifique-se de que as informações que você está fornecendo são válidas",
 		"new_password": "Nova senha",
 		"password": "Senha",
+		"phone_validation_explanation": "Verifique seu dispositivo móvel e insira o código de verificação que acabamos de enviar na caixa abaixo",
 		"please_enter_gateway": "Insira um URL uCentralSec",
 		"please_enter_password": "Por favor, insira sua senha",
 		"please_enter_username": "Por favor insira seu nome de usuário",
@@ -294,7 +579,12 @@
 		"sending_ellipsis": "Enviando ...",
 		"sign_in_to_account": "Faça login em sua conta",
 		"url": "URL uCentralSec",
-		"username": "Nome de usuário"
+		"username": "Nome de usuário",
+		"verification_code": "Insira sua verificação aqui",
+		"wrong_code": "O código de verificação inserido não é válido."
+	},
+	"preferences": {
+		"provisioning": "Provisioning"
 	},
 	"reboot": {
 		"directions": "Quando você gostaria de reinicializar este dispositivo?",
@@ -306,7 +596,7 @@
 		"channel": "Canal",
 		"directions": "Inicie uma verificação de wi-fi deste dispositivo, o que deve levar aproximadamente 25 segundos.",
 		"re_scan": "Verificar novamente",
-		"result_directions": "Clique no botão '$ t (scan.re_scan)' se desejar fazer uma varredura com a mesma configuração da anterior.",
+		"result_directions": "Você pode clicar no botão 'Scan' no canto superior direito para $t(scan.re_scan)",
 		"results": "Resultados da verificação de Wi-Fi",
 		"scan": "Varredura",
 		"scanning": "Scanning... ",
@@ -315,29 +605,117 @@
 	"settings": {
 		"title": "Definições"
 	},
+	"simulation": {
+		"add": "Adicionar Simulação",
+		"cancel": "Cancelar",
+		"cancel_success": "Simulação cancelada com sucesso!",
+		"check_ongoing_sims": "Seguir Sim em Curso",
+		"client_interval": "Intervalo do Cliente",
+		"delete_simulation": "Excluir Sim. {{name}}",
+		"end": "Terminado",
+		"error_creating": "Erro ao criar simulação: {{error}}",
+		"error_delete": "Erro ao excluir simulação: {{error}}",
+		"error_devices": "Dispositivos de Erro",
+		"error_edit": "Erro ao tentar salvar a simulação: {{error}}",
+		"error_edit_run": "Erro ao tentar alterar o estado de execução: {{error}}",
+		"error_fetching_simulations": "Erro ao buscar simulações: {{error}}",
+		"error_start_run": "Erro ao tentar iniciar uma simulação: {{error}}",
+		"gateway": "Gateway",
+		"healtcheck_interval": "Intervalo de verificação de saúde",
+		"keep_alive": "Mantenha vivo",
+		"last_refresh": "Última atualização",
+		"length": "Comprimento",
+		"live_devices": "Dispositivos Live",
+		"mac_prefix": "Prefixo MAC",
+		"max_associations": "Máx. Associações",
+		"max_clients": "Máx. Clientes",
+		"messages_transmitted": "Msgs TX",
+		"min_associations": "Min. Associações",
+		"min_clients": "Min. Clientes",
+		"pause": "pausa",
+		"pause_success": "Executar em pausa!",
+		"prefix_length": "Obrigatório, deve ter 6 caracteres",
+		"previous_runs": "Execuções anteriores",
+		"received": "recebido",
+		"received_messages": "Msgs RX",
+		"reconnect_interval": "Intervalo de reconexão",
+		"resume": "Currículo",
+		"resume_success": "Executar retomado!",
+		"run": "Simulação Rodada",
+		"run_simulation": "Executar Simulação",
+		"started": "Começado",
+		"state_interval": "Intervalo de estado",
+		"stop": "Pare",
+		"stop_success": "Run Stopped!",
+		"success_creating": "Simulação criada com sucesso!",
+		"success_run_start": "Execução iniciada com sucesso!",
+		"successful_delete": "Simulação excluída com sucesso!",
+		"successful_edit": "Simulação editada com sucesso!",
+		"threads": "Tópicos",
+		"time_full_devices": "Tempo para dispositivos completos",
+		"title": "Simulações",
+		"transmitted": "Transmitido",
+		"valid_cert": "Certificado Válido",
+		"valid_key": "Chave Válida"
+	},
 	"statistics": {
 		"data": "Dados (KB)",
+		"data_mb": "Dados (MB)",
 		"latest_statistics": "Estatísticas mais recentes",
 		"lifetime_stats": "Estatísticas de vida",
+		"memory": "Memória",
 		"no_interfaces": "Nenhuma estatística de tempo de vida da interface disponível",
 		"show_latest": "Últimas estatísticas",
-		"title": "Estatisticas"
+		"title": "Estatisticas",
+		"used": "Memoria usada %"
 	},
 	"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",
 		"percentage_used": "{{percentage}}% de {{total}} usado",
 		"title": "#{{serialNumber}} status",
+		"total_memory": "Memória total",
 		"uptime": "Tempo de atividade",
 		"used_total_memory": "{{used}} usado / {{total}} total"
 	},
+	"subscriber": {
+		"add_device_subscriber_explanation": "Para reivindicar outros dispositivos, você pode usar nossa barra de pesquisa ou reivindicar diretamente na tabela. Se um dispositivo já foi reivindicado por um usuário, você precisará acessar os detalhes dele e cancelar a atribuição antes de reivindicá-lo.",
+		"create": "Criar assinante",
+		"devices_one": "{{count}} Dispositivo",
+		"devices_other": "{{count}} dispositivos",
+		"edit": "Editar Assinante",
+		"error_create": "Erro ao criar assinante: {{error}}",
+		"error_delete": "Erro ao excluir assinante: {{error}}",
+		"error_fetching": "Erro ao buscar assinantes: {{error}}",
+		"error_fetching_single": "Erro ao buscar assinante: {{error}}",
+		"error_update": "Erro ao atualizar assinante: {{error}}",
+		"is_already_claimed": "já é reivindicado por",
+		"subscribers": "Inscritos",
+		"success_create": "Assinante criado com sucesso!",
+		"success_delete": "Assinante excluído com sucesso!",
+		"success_update": "Assinante atualizado com sucesso!"
+	},
 	"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",
+		"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",
@@ -368,14 +746,17 @@
 		"waiting_for_device": "Esperando que o dispositivo se reconecte"
 	},
 	"user": {
+		"add_phone_number": "ADICIONAR NÚMERO DE TELEFONE",
 		"avatar": "Seu avatar",
 		"avatar_file": "Seu avatar (máx. De 2 MB)",
+		"check_phone": "Por favor, verifique o seu telefone para o seu código de validação",
+		"confirm_new_password": "confirme a nova senha",
 		"create": "Criar usuário",
-		"create_failure": "Erro ao criar usuário. Certifique-se de que este endereço de e-mail ainda não esteja vinculado a uma conta.",
+		"create_failure": "Erro ao criar usuário: {{error}}",
 		"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,35 +764,51 @@
 		"description": "Descrição",
 		"edit": "Editar usuário",
 		"email_address": "Endereço de e-mail",
+		"enter_new_phone": "Insira seu novo número de telefone:",
+		"error_fetching_users": "Erro ao buscar usuários: {{error}}",
+		"error_retrieving": "Erro ao recuperar usuário",
+		"error_sending_code": "Erro ao tentar enviar o código de validação. Por favor, confirme se o seu número de telefone é válido.",
 		"force_password_change": "Forçar mudança de senha no login",
 		"id": "ID do usuário.",
 		"last_login": "Último login",
 		"login_id": "Identificação de usuário.",
+		"make_sure_same_password": "Certifique-se de que ambas as senhas são iguais e válidas",
 		"my_profile": "Meu perfil",
 		"name": "Nome",
+		"new_code_sent": "Novo código enviado!",
 		"nickname": "Apelido",
 		"nickname_explanation": "Apelido (opcional)",
 		"not_validated": "Não validado",
 		"note": "Nota",
 		"password": "Senha",
+		"phone_number": "Número de telefone",
 		"provide_email": "Por favor, forneça um endereço de e-mail válido",
 		"provide_password": "Forneça uma senha válida",
 		"save_avatar": "Salvar Avatar",
+		"send_code": "Enviar código",
+		"send_code_again": "Envie o Código Novamente",
 		"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.",
+		"successful_validation": "Número de telefone validado! Clique no botão Salvar para vinculá-lo ao seu perfil",
+		"table_title": "Usuários administrativos",
+		"update_failure": "Erro ao tentar atualizar: {{error}}",
 		"update_failure_title": "Atualização falhou",
 		"update_success": "Usuário atualizado com sucesso",
 		"update_success_title": "Sucesso",
 		"user_role": "Função",
 		"users": "Comercial",
-		"validated": "Validado"
+		"validate_phone": "validar",
+		"validated": "Validado",
+		"wrong_validation_code": "Você não digitou um código válido. Por favor, tente novamente e certifique-se de ter inserido o número de telefone correto"
 	},
 	"wifi_analysis": {
 		"association": "Associação",
 		"associations": "Associações",
 		"mode": "Modo",
 		"network_diagram": "Diagrama de rede",
+		"override_dfs": "Substituir DFS",
 		"radios": "Rádios",
-		"title": "Análise de Wi-Fi"
+		"scan_warning": "Seu rádio 5G está em um canal de radar, você deve habilitar “Override DFS” para permitir a varredura de todos os canais 5G",
+		"title": "Análise de Wi-Fi",
+		"vendor": "fornecedor"
 	}
 }

src/App.js

@@ -5,6 +5,7 @@ import Router from 'router';
 import { AuthProvider } from 'ucentral-libs';
 import { checkIfJson } from 'utils/helper';
 import axiosInstance from 'utils/axiosInstance';
+import { getItem } from 'utils/localStorageHelper';
 
 const loading = (
   <div className="pt-3 text-center">
@@ -13,9 +14,9 @@ const loading = (
 );
 
 const App = () => {
-  const storageToken = sessionStorage.getItem('access_token');
-  const apiEndpoints = checkIfJson(sessionStorage.getItem('gateway_endpoints'))
-    ? JSON.parse(sessionStorage.getItem('gateway_endpoints'))
+  const storageToken = getItem('access_token');
+  const apiEndpoints = checkIfJson(getItem('gateway_endpoints'))
+    ? JSON.parse(getItem('gateway_endpoints'))
     : {};
 
   return (

src/assets/icons/index.js

@@ -13,6 +13,7 @@ import {
   cilArrowTop,
   cilAsterisk,
   cilBan,
+  cilBarcode,
   cilBasket,
   cilBell,
   cilBold,
@@ -108,6 +109,7 @@ export const icons = {
   cilArrowTop,
   cilAsterisk,
   cilBan,
+  cilBarcode,
   cilBasket,
   cilBell,
   cilBold,

src/components/AddConfigurationModal/Form.js

@@ -0,0 +1,163 @@
+import React, { useState, useEffect } from 'react';
+import PropTypes from 'prop-types';
+import Select from 'react-select';
+import {
+  CForm,
+  CInput,
+  CLabel,
+  CCol,
+  CFormGroup,
+  CInvalidFeedback,
+  CFormText,
+  CRow,
+  CTextarea,
+} from '@coreui/react';
+import { CopyToClipboardButton } from 'ucentral-libs';
+
+const AddDefaultConfigurationForm = ({
+  t,
+  disable,
+  fields,
+  updateField,
+  updateFieldWithKey,
+  deviceTypes,
+}) => {
+  const [typeOptions, setTypeOptions] = useState([]);
+  const [chosenTypes, setChosenTypes] = useState([]);
+
+  const parseOptions = () => {
+    const options = [{ value: '*', label: 'All' }];
+    const newOptions = deviceTypes.map((option) => ({
+      value: option,
+      label: option,
+    }));
+    options.push(...newOptions);
+    setTypeOptions(options);
+    setChosenTypes([]);
+  };
+
+  const typeOnChange = (chosenArray) => {
+    const allIndex = chosenArray.findIndex((el) => el.value === '*');
+
+    // If the All option was chosen before, we take it out of the array
+    if (allIndex === 0 && chosenTypes.length > 0) {
+      const newResults = chosenArray.slice(1);
+      setChosenTypes(newResults);
+      updateFieldWithKey('deviceTypes', {
+        value: newResults.map((el) => el.value),
+        error: false,
+        notEmpty: true,
+      });
+    } else if (allIndex > 0) {
+      setChosenTypes([{ value: '*', label: 'All' }]);
+      updateFieldWithKey('deviceTypes', { value: ['*'], error: false, notEmpty: true });
+    } else if (chosenArray.length > 0) {
+      setChosenTypes(chosenArray);
+      updateFieldWithKey('deviceTypes', {
+        value: chosenArray.map((el) => el.value),
+        error: false,
+        notEmpty: true,
+      });
+    } else {
+      setChosenTypes([]);
+      updateFieldWithKey('deviceTypes', { value: [], error: false, notEmpty: true });
+    }
+  };
+
+  useEffect(() => {
+    parseOptions();
+  }, [deviceTypes]);
+
+  return (
+    <CForm>
+      <CFormGroup row className="pb-3">
+        <CLabel col htmlFor="name">
+          {t('user.name')}
+        </CLabel>
+        <CCol sm="7">
+          <CInput
+            id="name"
+            type="text"
+            required
+            value={fields.name.value}
+            onChange={updateField}
+            invalid={fields.name.error}
+            disabled={disable}
+            maxLength="50"
+          />
+          <CInvalidFeedback>{t('common.required')}</CInvalidFeedback>
+        </CCol>
+      </CFormGroup>
+      <CFormGroup row className="pb-3">
+        <CLabel col htmlFor="description">
+          {t('user.description')}
+        </CLabel>
+        <CCol sm="7">
+          <CInput
+            id="description"
+            type="text"
+            required
+            value={fields.description.value}
+            onChange={updateField}
+            invalid={fields.description.error}
+            disabled={disable}
+            maxLength="50"
+          />
+          <CInvalidFeedback>{t('common.required')}</CInvalidFeedback>
+        </CCol>
+      </CFormGroup>
+      <CRow className="pb-3">
+        <CLabel col htmlFor="deviceTypes">
+          <div>{t('configuration.supported_device_types')}:</div>
+        </CLabel>
+        <CCol sm="7">
+          <Select
+            isMulti
+            closeMenuOnSelect={false}
+            id="deviceTypes"
+            options={typeOptions}
+            onChange={typeOnChange}
+            value={chosenTypes}
+            className={`basic-multi-select ${fields.deviceTypes.error ? 'border-danger' : ''}`}
+            classNamePrefix="select"
+          />
+          <CFormText hidden={!fields.deviceTypes.error} color="danger">
+            {t('configuration.need_device_type')}
+          </CFormText>
+        </CCol>
+      </CRow>
+      <div className="pb-3">
+        {t('configure.enter_new')}
+        <CopyToClipboardButton t={t} size="sm" content={fields.configuration.value} />
+      </div>
+      <CRow className="pb-3">
+        <CCol>
+          <CTextarea
+            style={{ overflowY: 'scroll', height: '500px' }}
+            id="configuration"
+            type="text"
+            required
+            value={fields.configuration.value}
+            onChange={updateField}
+            invalid={fields.configuration.error}
+            disabled={disable}
+          />
+          <CFormText hidden={!fields.configuration.error} color="danger">
+            {t('configure.valid_json')}
+          </CFormText>
+        </CCol>
+      </CRow>
+    </CForm>
+  );
+};
+
+AddDefaultConfigurationForm.propTypes = {
+  t: PropTypes.func.isRequired,
+  disable: PropTypes.bool.isRequired,
+  fields: PropTypes.instanceOf(Object).isRequired,
+  updateField: PropTypes.func.isRequired,
+  updateFieldWithKey: PropTypes.func.isRequired,
+  deviceTypes: PropTypes.instanceOf(Array).isRequired,
+};
+
+export default AddDefaultConfigurationForm;

src/components/AddConfigurationModal/index.js

@@ -0,0 +1,183 @@
+import React, { useState, useEffect } from 'react';
+import PropTypes from 'prop-types';
+import { CModal, CModalHeader, CModalTitle, CModalBody, CButton, CPopover } from '@coreui/react';
+import CIcon from '@coreui/icons-react';
+import { cilX, cilSave } from '@coreui/icons';
+import { useToast, useFormFields, useAuth } from 'ucentral-libs';
+import axiosInstance from 'utils/axiosInstance';
+import { useTranslation } from 'react-i18next';
+import { checkIfJson } from 'utils/helper';
+import Form from './Form';
+
+const initialForm = {
+  name: {
+    value: '',
+    error: false,
+    required: true,
+  },
+  description: {
+    value: '',
+    error: false,
+  },
+  deviceTypes: {
+    value: [],
+    error: false,
+    notEmpty: true,
+  },
+  configuration: {
+    value: '',
+    error: false,
+    required: true,
+  },
+};
+
+const AddConfigurationModal = ({ show, toggle, refresh }) => {
+  const { t } = useTranslation();
+  const { addToast } = useToast();
+  const { currentToken, endpoints } = useAuth();
+  const [fields, updateFieldWithId, updateField, setFormFields] = useFormFields(initialForm);
+  const [loading, setLoading] = useState(false);
+  const [deviceTypes, setDeviceTypes] = useState([]);
+
+  const getDeviceTypes = () => {
+    setLoading(true);
+
+    const headers = {
+      Accept: 'application/json',
+      Authorization: `Bearer ${currentToken}`,
+    };
+
+    axiosInstance
+      .get(`${endpoints.owfms}/api/v1/firmwares?deviceSet=true`, {
+        headers,
+      })
+      .then((response) => {
+        setDeviceTypes([...response.data.deviceTypes]);
+      })
+      .catch(() => {})
+      .finally(() => {
+        setLoading(false);
+      });
+  };
+
+  const validation = () => {
+    let success = true;
+
+    for (const [key, field] of Object.entries(fields)) {
+      if (field.required && field.value === '') {
+        updateField(key, { error: true });
+        success = false;
+        break;
+      }
+      if (field.notEmpty && field.value.length === 0) {
+        updateField(key, { error: true, notEmpty: true });
+        success = false;
+        break;
+      }
+    }
+
+    if (!checkIfJson(fields.configuration.value)) {
+      updateField('configuration', { error: true });
+      success = false;
+    }
+
+    return success;
+  };
+
+  const addConfiguration = () => {
+    if (validation()) {
+      setLoading(true);
+      const options = {
+        headers: {
+          Accept: 'application/json',
+          Authorization: `Bearer ${currentToken}`,
+        },
+      };
+
+      const parameters = {
+        name: fields.name.value,
+        description: fields.description.value,
+        modelIds: fields.deviceTypes.value,
+        configuration: fields.configuration.value,
+      };
+
+      axiosInstance
+        .post(
+          `${endpoints.owgw}/api/v1/default_configuration/${fields.name.value}`,
+          parameters,
+          options,
+        )
+        .then(() => {
+          if (refresh !== null) refresh();
+          toggle();
+          addToast({
+            title: t('common.success'),
+            body: t('configuration.creation_success'),
+            color: 'success',
+            autohide: true,
+          });
+        })
+        .catch((e) => {
+          addToast({
+            title: t('common.error'),
+            body: t('entity.add_failure', { error: e.response?.data?.ErrorDescription }),
+            color: 'danger',
+            autohide: true,
+          });
+        })
+        .finally(() => {
+          setLoading(false);
+        });
+    }
+  };
+
+  useEffect(() => {
+    if (show) {
+      getDeviceTypes();
+      setFormFields(initialForm);
+    }
+  }, [show]);
+
+  return (
+    <CModal className="text-dark" size="lg" show={show} onClose={toggle}>
+      <CModalHeader className="p-1">
+        <CModalTitle className="pl-1 pt-1">{t('configuration.create')}</CModalTitle>
+        <div className="text-right">
+          <CPopover content={t('common.add')}>
+            <CButton color="primary" variant="outline" className="ml-2" onClick={addConfiguration}>
+              <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 className="px-5">
+        <Form
+          t={t}
+          disable={loading}
+          fields={fields}
+          updateField={updateFieldWithId}
+          updateFieldWithKey={updateField}
+          deviceTypes={deviceTypes}
+          show={show}
+        />
+      </CModalBody>
+    </CModal>
+  );
+};
+
+AddConfigurationModal.propTypes = {
+  show: PropTypes.bool.isRequired,
+  toggle: PropTypes.func.isRequired,
+  refresh: PropTypes.func,
+};
+
+AddConfigurationModal.defaultProps = {
+  refresh: null,
+};
+
+export default AddConfigurationModal;

src/components/AddToBlacklistModal/index.js

@@ -0,0 +1,158 @@
+import React, { useEffect, useState } from 'react';
+import PropTypes from 'prop-types';
+import { useTranslation } from 'react-i18next';
+import {
+  CButton,
+  CModal,
+  CModalHeader,
+  CModalTitle,
+  CModalBody,
+  CPopover,
+  CRow,
+  CCol,
+  CLabel,
+  CTextarea,
+  CInput,
+  CInvalidFeedback,
+} from '@coreui/react';
+import CIcon from '@coreui/icons-react';
+import { useAuth, useToast } from 'ucentral-libs';
+import { cilPlus, cilX } from '@coreui/icons';
+import axiosInstance from 'utils/axiosInstance';
+
+const AddToBlacklistModal = ({ show, toggle, serialNumber, refresh }) => {
+  const { t } = useTranslation();
+  const [loading, setLoading] = useState(false);
+  const { addToast } = useToast();
+  const { endpoints, currentToken } = useAuth();
+  const [chosenSerialNumber, setChosenSerialNumber] = useState('');
+  const [reason, setReason] = useState('');
+
+  const addToBlacklist = () => {
+    setLoading(true);
+
+    const parameters = {
+      serialNumber: chosenSerialNumber,
+      reason,
+    };
+
+    const headers = {
+      Accept: 'application/json',
+      Authorization: `Bearer ${currentToken}`,
+    };
+
+    axiosInstance
+      .post(`${endpoints.owgw}/api/v1/blacklist/${chosenSerialNumber}`, parameters, { headers })
+      .then(() => {
+        addToast({
+          title: t('common.success'),
+          body: t('device.success_added_blacklist'),
+          color: 'success',
+          autohide: true,
+        });
+        toggle();
+        if (refresh) refresh();
+      })
+      .catch((e) => {
+        addToast({
+          title: t('common.error'),
+          body: t('device.error_adding_blacklist', { error: e.response?.data?.ErrorDescription }),
+          color: 'danger',
+          autohide: true,
+        });
+      })
+      .finally(() => {
+        setLoading(false);
+      });
+  };
+
+  useEffect(() => {
+    if (show) {
+      if (serialNumber) setChosenSerialNumber(serialNumber);
+      else setChosenSerialNumber('');
+    }
+  }, [show, serialNumber]);
+
+  return (
+    <CModal className="text-dark" size="lg" show={show} onClose={toggle}>
+      <CModalHeader className="p-1">
+        <CModalTitle className="pl-1 pt-1">{t('device.add_to_blacklist')}</CModalTitle>
+        <div className="text-right">
+          <CPopover content={t('common.add')}>
+            <CButton
+              color="primary"
+              variant="outline"
+              className="ml-2"
+              onClick={addToBlacklist}
+              disabled={
+                chosenSerialNumber.length !== 12 ||
+                !chosenSerialNumber.match('^[a-fA-F0-9]+$') ||
+                reason === '' ||
+                loading
+              }
+            >
+              <CIcon content={cilPlus} />
+            </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>
+        <CRow>
+          <CLabel col sm="3">
+            {t('common.serial_number')}
+          </CLabel>
+          <CCol sm="9" className="pt-1">
+            <CInput
+              id="description"
+              type="text"
+              required
+              value={chosenSerialNumber}
+              onChange={(e) => setChosenSerialNumber(e.target.value)}
+              invalid={
+                chosenSerialNumber.length !== 12 && chosenSerialNumber.match('^[a-fA-F0-9]+$')
+              }
+              disabled={loading}
+              maxLength="50"
+            />
+            <CInvalidFeedback>{t('entity.valid_serial')}</CInvalidFeedback>
+          </CCol>
+        </CRow>
+        <CRow>
+          <CLabel col sm="3">
+            {t('common.reason')}
+          </CLabel>
+          <CCol sm="9" className="pt-2">
+            <CTextarea
+              name="reason"
+              id="reason"
+              rows="3"
+              type="text"
+              required
+              value={reason}
+              onChange={(e) => setReason(e.target.value)}
+            />
+          </CCol>
+        </CRow>
+      </CModalBody>
+    </CModal>
+  );
+};
+
+AddToBlacklistModal.propTypes = {
+  show: PropTypes.bool.isRequired,
+  toggle: PropTypes.func.isRequired,
+  serialNumber: PropTypes.string,
+  refresh: PropTypes.func,
+};
+
+AddToBlacklistModal.defaultProps = {
+  serialNumber: '',
+  refresh: null,
+};
+
+export default AddToBlacklistModal;

src/components/BlacklistTable/Table/index.js

@@ -0,0 +1,210 @@
+import React, { useEffect } from 'react';
+import PropTypes from 'prop-types';
+import ReactPaginate from 'react-paginate';
+import {
+  CCardBody,
+  CDataTable,
+  CButton,
+  CLink,
+  CCard,
+  CCardHeader,
+  CPopover,
+  CSelect,
+  CButtonToolbar,
+} from '@coreui/react';
+import { cilSearch, cilPencil, cilPlus, cilTrash } from '@coreui/icons';
+import CIcon from '@coreui/icons-react';
+import ReactTooltip from 'react-tooltip';
+import { FormattedDate } from 'ucentral-libs';
+
+const BlacklistTable = ({
+  currentPage,
+  devices,
+  toggleAddBlacklist,
+  toggleEditModal,
+  devicesPerPage,
+  loading,
+  removeFromBlacklist,
+  updateDevicesPerPage,
+  pageCount,
+  updatePage,
+  t,
+}) => {
+  const columns = [
+    { key: 'serialNumber', label: t('common.serial_number'), _style: { width: '6%' } },
+    { key: 'created', label: t('device.blacklisted_on'), _style: { width: '1%' } },
+    { key: 'author', label: t('common.by'), filter: false, _style: { width: '15%' } },
+    { key: 'reason', label: t('common.reason'), filter: false },
+    { key: 'actions', label: t('actions.actions'), _style: { width: '1%' } },
+  ];
+
+  const hideTooltips = () => ReactTooltip.hide();
+
+  const escFunction = (event) => {
+    if (event.keyCode === 27) {
+      hideTooltips();
+    }
+  };
+
+  useEffect(() => {
+    document.addEventListener('keydown', escFunction, false);
+
+    return () => {
+      document.removeEventListener('keydown', escFunction, false);
+    };
+  }, []);
+
+  return (
+    <>
+      <CCard className="m-0 p-0">
+        <CCardHeader className="p-0 text-right">
+          <CPopover content={t('device.add_to_blacklist')}>
+            <CButton size="sm" color="primary" onClick={toggleAddBlacklist}>
+              <CIcon content={cilPlus} />
+            </CButton>
+          </CPopover>
+        </CCardHeader>
+        <CCardBody className="p-0">
+          <CDataTable
+            addTableClasses="ignore-overflow table-sm"
+            items={devices ?? []}
+            fields={columns}
+            hover
+            border
+            loading={loading}
+            scopedSlots={{
+              serialNumber: (item) => (
+                <td className="text-center align-middle">
+                  <CLink
+                    className="c-subheader-nav-link"
+                    aria-current="page"
+                    to={() => `/devices/${item.serialNumber}`}
+                  >
+                    {item.serialNumber}
+                  </CLink>
+                </td>
+              ),
+              created: (item) => (
+                <td className="text-left align-middle">
+                  <div style={{ width: '130px' }}>
+                    <FormattedDate date={item.created} />
+                  </div>
+                </td>
+              ),
+              author: (item) => <td className="align-middle">{item.author}</td>,
+              reason: (item) => <td className="align-middle">{item.reason}</td>,
+              actions: (item) => (
+                <td className="text-center align-middle">
+                  <CButtonToolbar
+                    role="group"
+                    className="justify-content-center"
+                    style={{ width: '130px' }}
+                  >
+                    <CPopover content={t('configuration.details')}>
+                      <CLink
+                        className="c-subheader-nav-link"
+                        aria-current="page"
+                        to={() => `/devices/${item.serialNumber}`}
+                      >
+                        <CButton
+                          color="primary"
+                          variant="outline"
+                          shape="square"
+                          size="sm"
+                          className="mx-1"
+                          style={{ width: '33px', height: '30px' }}
+                        >
+                          <CIcon name="cil-search" content={cilSearch} size="sm" />
+                        </CButton>
+                      </CLink>
+                    </CPopover>
+                    <CPopover content={t('device.remove_from_blacklist')}>
+                      <CButton
+                        onClick={() => removeFromBlacklist(item.serialNumber)}
+                        color="primary"
+                        variant="outline"
+                        shape="square"
+                        size="sm"
+                        className="mx-1"
+                        style={{ width: '33px', height: '30px' }}
+                      >
+                        <CIcon content={cilTrash} size="sm" />
+                      </CButton>
+                    </CPopover>
+                    <CPopover content={t('common.edit')}>
+                      <CButton
+                        onClick={() => toggleEditModal(item.serialNumber)}
+                        color="primary"
+                        variant="outline"
+                        shape="square"
+                        size="sm"
+                        className="mx-1"
+                        style={{ width: '33px', height: '30px' }}
+                      >
+                        <CIcon content={cilPencil} size="sm" />
+                      </CButton>
+                    </CPopover>
+                  </CButtonToolbar>
+                </td>
+              ),
+            }}
+          />
+          <div className="d-flex flex-row pl-3">
+            <div className="pr-3">
+              <ReactPaginate
+                previousLabel="← Previous"
+                nextLabel="Next →"
+                pageCount={pageCount}
+                onPageChange={updatePage}
+                forcePage={Number(currentPage)}
+                breakClassName="page-item"
+                breakLinkClassName="page-link"
+                containerClassName="pagination"
+                pageClassName="page-item"
+                pageLinkClassName="page-link"
+                previousClassName="page-item"
+                previousLinkClassName="page-link"
+                nextClassName="page-item"
+                nextLinkClassName="page-link"
+                activeClassName="active"
+              />
+            </div>
+            <p className="pr-2 mt-1">{t('common.items_per_page')}</p>
+            <div style={{ width: '100px' }} className="px-2">
+              <CSelect
+                custom
+                defaultValue={devicesPerPage}
+                onChange={(e) => updateDevicesPerPage(e.target.value)}
+                disabled={loading}
+              >
+                <option value="10">10</option>
+                <option value="25">25</option>
+                <option value="50">50</option>
+              </CSelect>
+            </div>
+          </div>
+        </CCardBody>
+      </CCard>
+    </>
+  );
+};
+
+BlacklistTable.propTypes = {
+  currentPage: PropTypes.string,
+  devices: PropTypes.instanceOf(Array).isRequired,
+  toggleAddBlacklist: PropTypes.func.isRequired,
+  toggleEditModal: PropTypes.func.isRequired,
+  updateDevicesPerPage: PropTypes.func.isRequired,
+  pageCount: PropTypes.number.isRequired,
+  updatePage: PropTypes.func.isRequired,
+  devicesPerPage: PropTypes.string.isRequired,
+  removeFromBlacklist: PropTypes.func.isRequired,
+  t: PropTypes.func.isRequired,
+  loading: PropTypes.bool.isRequired,
+};
+
+BlacklistTable.defaultProps = {
+  currentPage: '0',
+};
+
+export default React.memo(BlacklistTable);

src/components/BlacklistTable/Table/index.module.scss

@@ -0,0 +1,30 @@
+.firmwareTooltip {
+  opacity: 1 !important;
+  padding: 0px 0px 0px 0px !important;
+  border-radius: 1rem !important;
+  background-color: #fff !important;
+  border-color: #321fdb !important;
+  font-size: 0.875rem !important;
+  font-weight: 400 !important;
+  box-shadow: 0 3px 10px rgba(0, 0, 0, 0.2) !important;
+  width: 400px;
+}
+
+.deleteTooltip {
+  opacity: 1 !important;
+  padding: 0px 0px 0px 0px !important;
+  border-radius: 1rem !important;
+  background-color: #fff !important;
+  border-color: #321fdb !important;
+  font-size: 0.875rem !important;
+  font-weight: 400 !important;
+  box-shadow: 0 3px 10px rgba(0, 0, 0, 0.2) !important;
+  width: 200px;
+}
+
+.tooltipHeader {
+  padding-left: 5px;
+  padding-right: 10px;
+  border-top-left-radius: 1rem !important;
+  border-top-right-radius: 1rem !important;
+}

src/components/BlacklistTable/index.js

@@ -0,0 +1,244 @@
+import React, { useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useHistory } from 'react-router-dom';
+import axiosInstance from 'utils/axiosInstance';
+import { getItem, setItem } from 'utils/localStorageHelper';
+import { useAuth, useToast, useToggle } from 'ucentral-libs';
+import AddToBlacklistModal from 'components/AddToBlacklistModal';
+import EditBlacklistModal from 'components/EditBlacklistModal';
+import Table from './Table';
+
+const BlacklistTable = () => {
+  const { t } = useTranslation();
+  const { addToast } = useToast();
+  const history = useHistory();
+  const [page, setPage] = useState(parseInt(sessionStorage.getItem('deviceTable') ?? 0, 10));
+  const { currentToken, endpoints } = useAuth();
+  const [deviceCount, setDeviceCount] = useState(0);
+  const [pageCount, setPageCount] = useState(0);
+  const [devicesPerPage, setDevicesPerPage] = useState(getItem('devicesPerPage') || '10');
+  const [devices, setDevices] = useState([]);
+  const [loading, setLoading] = useState(true);
+  const [editSerial, setEditSerial] = useState('');
+  const [showEditModal, setShowEditModal] = useState(false);
+  const [showAddModal, toggleAddModal] = useToggle(false);
+
+  const toggleEditModal = (serialNumber) => {
+    if (serialNumber) setEditSerial(serialNumber);
+    setShowEditModal(!showEditModal);
+  };
+
+  const getDeviceInformation = (selectedPage = page, devicePerPage = devicesPerPage) => {
+    setLoading(true);
+
+    const options = {
+      headers: {
+        Accept: 'application/json',
+        Authorization: `Bearer ${currentToken}`,
+      },
+    };
+
+    axiosInstance
+      .get(
+        `${endpoints.owgw}/api/v1/blacklist?limit=${devicePerPage}&offset=${
+          devicePerPage * selectedPage
+        }`,
+        options,
+      )
+      .then((response) => {
+        setDevices(response.data.devices);
+        setLoading(false);
+      })
+      .catch((e) => {
+        addToast({
+          title: t('common.error'),
+          body: t('device.error_fetching_devices', { error: e.response?.data?.ErrorDescription }),
+          color: 'danger',
+          autohide: true,
+        });
+        setLoading(false);
+      });
+  };
+
+  const getCount = () => {
+    setLoading(true);
+
+    const headers = {
+      Accept: 'application/json',
+      Authorization: `Bearer ${currentToken}`,
+    };
+
+    axiosInstance
+      .get(`${endpoints.owgw}/api/v1/blacklist?countOnly=true`, {
+        headers,
+      })
+      .then((response) => {
+        const devicesCount = response.data.count;
+        const pagesCount = Math.ceil(devicesCount / devicesPerPage);
+        setPageCount(pagesCount);
+        setDeviceCount(devicesCount);
+
+        let selectedPage = page;
+
+        if (page >= pagesCount) {
+          history.push(`/devices?page=${pagesCount - 1}`);
+          selectedPage = pagesCount - 1;
+        }
+        getDeviceInformation(selectedPage);
+      })
+      .catch((e) => {
+        addToast({
+          title: t('common.error'),
+          body: t('device.error_fetching_devices', { error: e.response?.data?.ErrorDescription }),
+          color: 'danger',
+          autohide: true,
+        });
+        setLoading(false);
+      });
+  };
+
+  const refreshDevice = (serialNumber) => {
+    setLoading(true);
+
+    const options = {
+      headers: {
+        Accept: 'application/json',
+        Authorization: `Bearer ${currentToken}`,
+      },
+    };
+
+    let newDevice;
+
+    axiosInstance
+      .get(
+        `${endpoints.owgw}/api/v1/blacklist?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) => {
+        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] = newDevice;
+        setDevices(newList);
+        setLoading(false);
+      })
+      .catch((e) => {
+        addToast({
+          title: t('common.error'),
+          body: t('device.error_fetching_devices', { error: e.response?.data?.ErrorDescription }),
+          color: 'danger',
+          autohide: true,
+        });
+        setLoading(false);
+      });
+  };
+
+  const updateDevicesPerPage = (value) => {
+    setItem('devicesPerPage', value);
+    setDevicesPerPage(value);
+
+    const newPageCount = Math.ceil(deviceCount / value);
+    setPageCount(newPageCount);
+
+    let selectedPage = page;
+
+    if (page >= newPageCount) {
+      history.push(`/blacklist?page=${newPageCount - 1}`);
+      selectedPage = newPageCount - 1;
+    }
+
+    getDeviceInformation(selectedPage, value);
+  };
+
+  const updatePageCount = ({ selected: selectedPage }) => {
+    sessionStorage.setItem('deviceTable', selectedPage);
+    setPage(selectedPage);
+    getDeviceInformation(selectedPage);
+  };
+
+  const removeFromBlacklist = (serialNumber) => {
+    setLoading(true);
+
+    const headers = {
+      Accept: 'application/json',
+      Authorization: `Bearer ${currentToken}`,
+    };
+
+    axiosInstance
+      .delete(`${endpoints.owgw}/api/v1/blacklist/${serialNumber}`, { headers })
+      .then(() => {
+        addToast({
+          title: t('common.success'),
+          body: t('device.success_removed_blacklist'),
+          color: 'success',
+          autohide: true,
+        });
+        getCount();
+      })
+      .catch((e) => {
+        addToast({
+          title: t('common.error'),
+          body: t('device.error_adding_blacklist', { error: e.response?.data?.ErrorDescription }),
+          color: 'danger',
+          autohide: true,
+        });
+      })
+      .finally(() => {
+        setLoading(false);
+      });
+  };
+
+  useEffect(() => {
+    getCount();
+  }, []);
+
+  return (
+    <div>
+      <Table
+        currentPage={page}
+        t={t}
+        devices={devices}
+        loading={loading}
+        toggleAddBlacklist={toggleAddModal}
+        toggleEditModal={toggleEditModal}
+        updateDevicesPerPage={updateDevicesPerPage}
+        devicesPerPage={devicesPerPage}
+        pageCount={pageCount}
+        updatePage={updatePageCount}
+        pageRangeDisplayed={5}
+        refreshDevice={refreshDevice}
+        removeFromBlacklist={removeFromBlacklist}
+      />
+      {showAddModal ? (
+        <AddToBlacklistModal show={showAddModal} toggle={toggleAddModal} refresh={getCount} />
+      ) : null}
+      <EditBlacklistModal
+        show={showEditModal}
+        toggle={toggleEditModal}
+        refresh={getCount}
+        serialNumber={editSerial}
+      />
+    </div>
+  );
+};
+
+export default BlacklistTable;

src/components/BlinkModal/index.js

@@ -5,60 +5,47 @@ import {
   CModalTitle,
   CModalBody,
   CModalFooter,
-  CSwitch,
   CCol,
-  CRow,
   CFormGroup,
   CInputRadio,
   CLabel,
+  CPopover,
+  CRow,
 } 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';
 import PropTypes from 'prop-types';
-import { dateToUnix } from 'utils/helper';
 import 'react-widgets/styles.css';
 import axiosInstance from 'utils/axiosInstance';
 import eventBus from 'utils/eventBus';
 import SuccessfulActionModalBody from 'components/SuccessfulActionModalBody';
-import { LoadingButton, useAuth, useDevice } from 'ucentral-libs';
+import { LoadingButton, useAuth, useDevice, useToast } from 'ucentral-libs';
 
 const BlinkModal = ({ show, toggleModal }) => {
   const { t } = useTranslation();
   const { currentToken, endpoints } = useAuth();
   const { deviceSerialNumber } = useDevice();
-  const [isNow, setIsNow] = useState(false);
+  const { addToast } = useToast();
   const [waiting, setWaiting] = useState(false);
-  const [chosenDate, setChosenDate] = useState(new Date().toString());
-  const [chosenPattern, setPattern] = useState('on');
+  const [chosenPattern, setPattern] = useState('blink');
   const [result, setResult] = useState(null);
 
-  const toggleNow = () => {
-    setIsNow(!isNow);
-  };
-
-  const setDate = (date) => {
-    if (date) {
-      setChosenDate(date.toString());
-    }
-  };
-
   useEffect(() => {
     if (show) {
       setWaiting(false);
-      setChosenDate(new Date().toString());
-      setPattern('on');
+      setPattern('blink');
       setResult(null);
     }
   }, [show]);
 
   const doAction = () => {
     setWaiting(true);
-    const utcDate = new Date(chosenDate);
 
     const parameters = {
       serialNumber: deviceSerialNumber,
-      when: isNow ? 0 : dateToUnix(utcDate),
+      when: 0,
       pattern: chosenPattern,
       duration: 30,
     };
@@ -70,12 +57,18 @@ const BlinkModal = ({ show, toggleModal }) => {
 
     axiosInstance
       .post(
-        `${endpoints.ucentralgw}/api/v1/device/${encodeURIComponent(deviceSerialNumber)}/leds`,
+        `${endpoints.owgw}/api/v1/device/${encodeURIComponent(deviceSerialNumber)}/leds`,
         parameters,
         { headers },
       )
       .then(() => {
-        setResult('success');
+        addToast({
+          title: t('common.success'),
+          body: t('commands.command_success'),
+          color: 'success',
+          autohide: true,
+        });
+        toggleModal();
       })
       .catch(() => {
         setResult('error');
@@ -88,19 +81,41 @@ 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} />
       ) : (
         <div>
           <CModalBody>
-            <CFormGroup row>
+            <CRow className="mb-3">
+              <CCol>{t('blink.explanation')}</CCol>
+            </CRow>
+            <CFormGroup row className="mb-0">
               <CCol md="3">
                 <CLabel>{t('blink.pattern')}</CLabel>
               </CCol>
               <CCol>
+                <CFormGroup variant="custom-radio" onClick={() => setPattern('blink')} inline>
+                  <CInputRadio
+                    custom
+                    defaultChecked={chosenPattern === 'blink'}
+                    id="radio3"
+                    name="radios"
+                    value="option3"
+                  />
+                  <CLabel variant="custom-checkbox" htmlFor="radio3">
+                    {t('blink.blink')}
+                  </CLabel>
+                </CFormGroup>
                 <CFormGroup variant="custom-radio" onClick={() => setPattern('on')} inline>
                   <CInputRadio
                     custom
@@ -125,55 +140,12 @@ const BlinkModal = ({ show, toggleModal }) => {
                     {t('common.off')}
                   </CLabel>
                 </CFormGroup>
-                <CFormGroup variant="custom-radio" onClick={() => setPattern('blink')} inline>
-                  <CInputRadio
-                    custom
-                    defaultChecked={chosenPattern === 'blink'}
-                    id="radio3"
-                    name="radios"
-                    value="option3"
-                  />
-                  <CLabel variant="custom-checkbox" htmlFor="radio3">
-                    {t('blink.blink')}
-                  </CLabel>
-                </CFormGroup>
               </CCol>
             </CFormGroup>
-            <CRow className="pt-1">
-              <CCol md="8">
-                <p>{t('blink.execute_now')}</p>
-              </CCol>
-              <CCol>
-                <CSwitch
-                  disabled={waiting}
-                  color="primary"
-                  defaultChecked={isNow}
-                  onClick={toggleNow}
-                  labelOn={t('common.yes')}
-                  labelOff={t('common.no')}
-                />
-              </CCol>
-            </CRow>
-            <CRow hidden={isNow} className="pt-3">
-              <CCol md="4" className="pt-2">
-                <p>{t('common.custom_date')}</p>
-              </CCol>
-              <CCol xs="12" md="8">
-                <DatePicker
-                  selected={new Date(chosenDate)}
-                  includeTime
-                  value={new Date(chosenDate)}
-                  placeholder="Select custom date"
-                  disabled={waiting}
-                  onChange={(date) => setDate(date)}
-                  min={new Date()}
-                />
-              </CCol>
-            </CRow>
           </CModalBody>
           <CModalFooter>
             <LoadingButton
-              label={isNow ? t('blink.set_leds') : t('common.schedule')}
+              label={t('blink.set_leds')}
               isLoadingLabel={t('common.loading_ellipsis')}
               isLoading={waiting}
               action={doAction}

src/components/CapabilitiesDisplay/index.js

@@ -0,0 +1,100 @@
+import React, { useEffect, useState } from 'react';
+import PropTypes from 'prop-types';
+import {
+  CRow,
+  CCol,
+  CCard,
+  CCardBody,
+  CCardHeader,
+  CLabel,
+  CPopover,
+  CSpinner,
+  CButton,
+} from '@coreui/react';
+import CIcon from '@coreui/icons-react';
+import { cilSync } from '@coreui/icons';
+import { useTranslation } from 'react-i18next';
+import { CopyToClipboardButton, useAuth, useToast, FormattedDate } from 'ucentral-libs';
+import axiosInstance from 'utils/axiosInstance';
+
+const CapabilitiesDisplay = ({ serialNumber }) => {
+  const { t } = useTranslation();
+  const { currentToken, endpoints } = useAuth();
+  const [capabilities, setCapabilities] = useState({});
+  const { addToast } = useToast();
+  const [loading, setLoading] = useState(false);
+
+  const getCapabilities = () => {
+    const options = {
+      headers: {
+        Accept: 'application/json',
+        Authorization: `Bearer ${currentToken}`,
+      },
+    };
+
+    axiosInstance
+      .get(
+        `${endpoints.owgw}/api/v1/device/${encodeURIComponent(serialNumber)}/capabilities`,
+        options,
+      )
+      .then((response) => {
+        setCapabilities(response.data);
+      })
+      .catch((e) => {
+        addToast({
+          title: t('common.error'),
+          body: t('device.error_fetching_device', { error: e.response?.data?.ErrorDescription }),
+          color: 'danger',
+          autohide: true,
+        });
+      })
+      .finally(() => {
+        setLoading(false);
+      });
+  };
+
+  useEffect(() => {
+    getCapabilities();
+  }, []);
+
+  return (
+    <CCard className="m-0">
+      <CCardHeader className="dark-header">
+        <div className="d-flex flex-row-reverse align-items-center">
+          <div className="text-right">
+            <CPopover content={t('common.refresh')}>
+              <CButton size="sm" color="info" onClick={getCapabilities}>
+                <CIcon content={cilSync} />
+              </CButton>
+            </CPopover>
+          </div>
+        </div>
+      </CCardHeader>
+      <CCardBody>
+        <h5>
+          {t('device.capabilities')}
+          <CopyToClipboardButton
+            t={t}
+            size="sm"
+            content={JSON.stringify(capabilities?.capabilities ?? {})}
+          />
+        </h5>
+        <CRow>
+          <CCol>
+            <CLabel>
+              {t('inventory.last_modification')}: <FormattedDate date={capabilities?.lastUpdate} />
+            </CLabel>
+          </CCol>
+        </CRow>
+        {loading ? <CSpinner /> : null}
+        <pre className="ignore">{JSON.stringify(capabilities?.capabilities ?? {}, null, 4)}</pre>
+      </CCardBody>
+    </CCard>
+  );
+};
+
+CapabilitiesDisplay.propTypes = {
+  serialNumber: PropTypes.string.isRequired,
+};
+
+export default CapabilitiesDisplay;

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>
+      <pre className="ignore">{JSON.stringify(details, null, 2)}</pre>
     </CModalBody>
-    <CModalFooter>
-      <CButton color="secondary" onClick={toggle}>
-        {t('common.close')}
-      </CButton>
-    </CModalFooter>
   </CModal>
 );
 

src/components/CommandHistory/index.js

@@ -2,26 +2,25 @@
 import React, { useState, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
-  CWidgetDropdown,
-  CRow,
-  CCol,
-  CCollapse,
+  CCardHeader,
+  CCardBody,
   CButton,
   CDataTable,
   CCard,
   CPopover,
+  CButtonToolbar,
+  CFormText,
 } from '@coreui/react';
 import CIcon from '@coreui/icons-react';
 import DatePicker from 'react-widgets/DatePicker';
 import { cilCloudDownload, cilSync, cilCalendarCheck } from '@coreui/icons';
-import { prettyDate, dateToUnix } from 'utils/helper';
+import { dateToUnix } from 'utils/helper';
 import axiosInstance from 'utils/axiosInstance';
 import eventBus from 'utils/eventBus';
 import ConfirmModal from 'components/ConfirmModal';
-import { LoadingButton, useAuth, useDevice } from 'ucentral-libs';
+import { LoadingButton, useAuth, useDevice, FormattedDate } from 'ucentral-libs';
 import WifiScanResultModalWidget from 'components/WifiScanResultModal';
 import DetailsModal from './DetailsModal';
-import styles from './index.module.scss';
 
 const DeviceCommands = () => {
   const { t } = useTranslation();
@@ -38,23 +37,18 @@ 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);
   const [start, setStart] = useState('');
+  const [startError, setStartError] = useState(false);
   const [end, setEnd] = useState('');
+  const [endError, setEndError] = useState(false);
   const [commandLimit, setCommandLimit] = useState(25);
   // Load more button related
   const [loadingMore, setLoadingMore] = useState(false);
   const [showLoadingMore, setShowLoadingMore] = useState(true);
 
-  const toggle = (e) => {
-    setCollapse(!collapse);
-    e.preventDefault();
-  };
-
   const toggleScanModal = () => {
     setShowScanModal(!showScanModal);
   };
@@ -73,11 +67,25 @@ const DeviceCommands = () => {
   };
 
   const modifyStart = (value) => {
-    setStart(value);
+    try {
+      new Date(value).toISOString();
+      setStartError(false);
+      setStart(value);
+    } catch (e) {
+      setStart('');
+      setStartError(true);
+    }
   };
 
   const modifyEnd = (value) => {
-    setEnd(value);
+    try {
+      new Date(value).toISOString();
+      setEndError(false);
+      setEnd(value);
+    } catch (e) {
+      setEnd('');
+      setEndError(true);
+    }
   };
 
   const deleteCommandFromList = (commandUuid) => {
@@ -113,7 +121,7 @@ const DeviceCommands = () => {
 
     axiosInstance
       .get(
-        `${endpoints.ucentralgw}/api/v1/commands?serialNumber=${encodeURIComponent(
+        `${endpoints.owgw}/api/v1/commands?serialNumber=${encodeURIComponent(
           deviceSerialNumber,
         )}${extraParams}`,
         options,
@@ -138,10 +146,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 +167,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 +204,17 @@ 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: 'submitted', label: t('common.submitted'), filter: false, _style: { width: '20%' } },
+    { key: 'command', label: t('common.command'), _style: { width: '15%' } },
     { key: 'executed', label: t('common.executed'), filter: false, _style: { width: '16%' } },
+    { key: 'completed', label: t('common.completed'), filter: false, _style: { width: '16%' } },
+    { key: 'errorCode', label: t('common.error_code'), filter: false, _style: { width: '8%' } },
     {
       key: 'show_buttons',
       label: '',
       sorter: false,
       filter: false,
-      _style: { width: '14%' },
+      _style: { width: '1%' },
     },
   ];
 
@@ -255,148 +260,163 @@ 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>
-            <CRow className="mb-2">
-              <CCol>
-                From:
-                <DatePicker includeTime onChange={(date) => modifyStart(date)} />
-              </CCol>
-              <CCol>
-                To:
-                <DatePicker includeTime onChange={(date) => modifyEnd(date)} />
-              </CCol>
-            </CRow>
-            <CCard>
-              <div className={['overflow-auto', styles.scrollableBox].join(' ')}>
-                <CDataTable
-                  loading={loading}
-                  items={commands ?? []}
-                  fields={columns}
-                  className="text-white"
-                  sorterValue={{ column: 'created', desc: 'true' }}
-                  scopedSlots={{
-                    completed: (item) => (
-                      <td>
-                        {item.completed && item.completed !== 0
-                          ? prettyDate(item.completed)
-                          : 'Pending'}
-                      </td>
-                    ),
-                    submitted: (item) => (
-                      <td>
-                        {item.submitted && item.submitted !== ''
-                          ? prettyDate(item.submitted)
-                          : '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')
-                              }
-                            >
-                              <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>
-                      </td>
-                    ),
-                  }}
-                />
-                <CRow className={styles.loadMoreSpacing}>
-                  {showLoadingMore && (
-                    <LoadingButton
-                      label="View More"
-                      isLoadingLabel="Loading More..."
-                      isLoading={loadingMore}
-                      action={showMoreCommands}
-                      variant="outline"
-                    />
-                  )}
-                </CRow>
-              </div>
-            </CCard>
-          </CCollapse>
-          <CButton show={collapse ? 'true' : 'false'} color="transparent" onClick={toggle} block>
-            <CIcon
-              name={collapse ? 'cilChevronTop' : 'cilChevronBottom'}
+    <div>
+      <CCard className="m-0">
+        <CCardHeader className="dark-header">
+          <div className="d-flex flex-row-reverse align-items-center">
+            <div className="pl-2">
+              <CPopover content={t('common.refresh')}>
+                <CButton
+                  size="sm"
+                  color="info"
+                  onClick={getCommands}
+                  disabled={startError || endError}
+                >
+                  <CIcon content={cilSync} />
+                </CButton>
+              </CPopover>
+            </div>
+            <div className="pl-2">
+              <DatePicker
+                includeTime
+                onChange={(date) => modifyEnd(date)}
+                value={end ? new Date(end) : undefined}
+              />
+              <CFormText color="danger" hidden={!endError}>
+                {t('common.invalid_date_explanation')}
+              </CFormText>
+            </div>
+            To:
+            <div className="pl-2">
+              <DatePicker
+                includeTime
+                onChange={(date) => modifyStart(date)}
+                value={start ? new Date(start) : undefined}
+              />
+              <CFormText color="danger" hidden={!startError}>
+                {t('common.invalid_date_explanation')}
+              </CFormText>
+            </div>
+            From:
+          </div>
+        </CCardHeader>
+        <CCardBody className="p-1">
+          <div className="overflow-auto" style={{ height: 'calc(100vh - 620px)' }}>
+            <CDataTable
+              addTableClasses="ignore-overflow table-sm"
+              border
+              loading={loading}
+              items={commands ?? []}
+              fields={columns}
               className="text-white"
-              size="lg"
+              sorterValue={{ column: 'created', desc: 'true' }}
+              scopedSlots={{
+                command: (item) => <td className="align-middle">{item.command}</td>,
+                completed: (item) => (
+                  <td className="align-middle">
+                    {item.completed && item.completed !== 0 ? (
+                      <FormattedDate date={item.completed} />
+                    ) : (
+                      'Pending'
+                    )}
+                  </td>
+                ),
+                executed: (item) => (
+                  <td className="align-middle">
+                    {item.executed && item.executed !== 0 ? (
+                      <FormattedDate date={item.executed} />
+                    ) : (
+                      'Pending'
+                    )}
+                  </td>
+                ),
+                submitted: (item) => (
+                  <td className="align-middle">
+                    {item.submitted && item.submitted !== '' ? (
+                      <FormattedDate date={item.submitted} />
+                    ) : (
+                      'Pending'
+                    )}
+                  </td>
+                ),
+                errorCode: (item) => <td className="align-middle">{item.errorCode}</td>,
+                show_buttons: (item, index) => (
+                  <td className="align-middle">
+                    <CButtonToolbar
+                      role="group"
+                      className="justify-content-flex-end"
+                      style={{ width: '160px' }}
+                    >
+                      <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);
+                          }}
+                        >
+                          {item.command === 'trace' ? (
+                            <CIcon name="cil-cloud-download" content={cilCloudDownload} />
+                          ) : (
+                            <CIcon name="cil-calendar-check" content={cilCalendarCheck} />
+                          )}
+                        </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" />
+                        </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" />
+                        </CButton>
+                      </CPopover>
+                    </CButtonToolbar>
+                  </td>
+                ),
+              }}
             />
-          </CButton>
-        </div>
-      }
-    >
+
+            {showLoadingMore && (
+              <div className="mb-3">
+                <LoadingButton
+                  label={t('common.view_more')}
+                  isLoadingLabel={t('common.loading_more_ellipsis')}
+                  isLoading={loadingMore}
+                  action={showMoreCommands}
+                  variant="outline"
+                />
+              </div>
+            )}
+          </div>
+        </CCardBody>
+      </CCard>
       <WifiScanResultModalWidget
         show={showScanModal}
         toggle={toggleScanModal}
@@ -411,7 +431,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/ConfigurationDisplay/index.js

@@ -0,0 +1,66 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {
+  CRow,
+  CCol,
+  CCard,
+  CCardBody,
+  CCardHeader,
+  CLabel,
+  CPopover,
+  CButton,
+} from '@coreui/react';
+import CIcon from '@coreui/icons-react';
+import { cilSync } from '@coreui/icons';
+import { prettyDate } from 'utils/helper';
+import { useTranslation } from 'react-i18next';
+import { CopyToClipboardButton } from 'ucentral-libs';
+
+const ConfigurationDisplay = ({ getData, deviceConfig }) => {
+  const { t } = useTranslation();
+  return (
+    <CCard className="m-0">
+      <CCardHeader className="dark-header">
+        <div className="d-flex flex-row-reverse align-items-center">
+          <div className="text-right">
+            <CPopover content={t('common.refresh')}>
+              <CButton size="sm" color="info" onClick={getData}>
+                <CIcon content={cilSync} />
+              </CButton>
+            </CPopover>
+          </div>
+        </div>
+      </CCardHeader>
+      <CCardBody>
+        <h5>
+          {t('configuration.title')}
+          <CopyToClipboardButton
+            t={t}
+            size="sm"
+            content={JSON.stringify(deviceConfig?.configuration ?? {})}
+          />
+        </h5>
+        <CRow>
+          <CCol>
+            <CLabel>
+              {t('configuration.last_configuration_change')}:{' '}
+              {prettyDate(deviceConfig?.lastConfigurationChange)}
+            </CLabel>
+          </CCol>
+        </CRow>
+        <pre className="ignore">{JSON.stringify(deviceConfig?.configuration ?? {}, null, 4)}</pre>
+      </CCardBody>
+    </CCard>
+  );
+};
+
+ConfigurationDisplay.propTypes = {
+  getData: PropTypes.func.isRequired,
+  deviceConfig: PropTypes.instanceOf(Object),
+};
+
+ConfigurationDisplay.defaultProps = {
+  deviceConfig: null,
+};
+
+export default ConfigurationDisplay;

src/components/ConfigureModal/index.js

@@ -12,12 +12,15 @@ 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';
 import 'react-widgets/styles.css';
-import { useAuth, useDevice } from 'ucentral-libs';
+import { useAuth, useDevice, useToast } from 'ucentral-libs';
 import { checkIfJson } from 'utils/helper';
 import axiosInstance from 'utils/axiosInstance';
 import eventBus from 'utils/eventBus';
@@ -26,6 +29,7 @@ import SuccessfulActionModalBody from 'components/SuccessfulActionModalBody';
 const ConfigureModal = ({ show, toggleModal }) => {
   const { t } = useTranslation();
   const { currentToken, endpoints } = useAuth();
+  const { addToast } = useToast();
   const { deviceSerialNumber } = useDevice();
   const [hadSuccess, setHadSuccess] = useState(false);
   const [hadFailure, setHadFailure] = useState(false);
@@ -83,12 +87,18 @@ const ConfigureModal = ({ show, toggleModal }) => {
 
     axiosInstance
       .post(
-        `${endpoints.ucentralgw}/api/v1/device/${encodeURIComponent(deviceSerialNumber)}/configure`,
+        `${endpoints.owgw}/api/v1/device/${encodeURIComponent(deviceSerialNumber)}/configure`,
         parameters,
         { headers },
       )
       .then(() => {
-        setHadSuccess(true);
+        addToast({
+          title: t('common.success'),
+          body: t('commands.command_success'),
+          color: 'success',
+          autohide: true,
+        });
+        toggleModal();
       })
       .catch(() => {
         setResponseBody('Error while submitting command!');
@@ -125,8 +135,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,168 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import PropTypes from 'prop-types';
-import { useTranslation } from 'react-i18next';
-import { CModal, CModalHeader, CModalBody } from '@coreui/react';
-import { CreateUserForm, useFormFields, useAuth, useToast } from 'ucentral-libs';
-import axiosInstance from 'utils/axiosInstance';
-import { testRegex, validateEmail } from 'utils/helper';
-
-const initialState = {
-  name: {
-    value: '',
-    error: false,
-    optional: true,
-  },
-  email: {
-    value: '',
-    error: false,
-  },
-  currentPassword: {
-    value: '',
-    error: false,
-  },
-  changePassword: {
-    value: 'on',
-    error: false,
-  },
-  userRole: {
-    value: 'admin',
-    error: false,
-  },
-  notes: {
-    value: '',
-    error: false,
-    optional: true,
-  },
-  description: {
-    value: '',
-    error: false,
-    optional: true,
-  },
-};
-
-const CreateUserModal = ({ show, toggle, getUsers }) => {
-  const { t } = useTranslation();
-  const { currentToken, endpoints } = useAuth();
-  const { addToast } = useToast();
-  const [loading, setLoading] = useState(false);
-  const [policies, setPolicies] = useState({
-    passwordPolicy: '',
-    passwordPattern: '',
-    accessPolicy: '',
-  });
-  const [formFields, updateFieldWithId, updateField, setFormFields] = useFormFields(initialState);
-
-  const toggleChange = () => {
-    updateField('changePassword', { value: !formFields.changePassword.value });
-  };
-
-  const createUser = () => {
-    setLoading(true);
-
-    const parameters = {
-      id: 0,
-    };
-
-    let validationSuccess = true;
-
-    for (const [key, value] of Object.entries(formFields)) {
-      if (!value.optional && value.value === '') {
-        validationSuccess = false;
-        updateField(key, { value: value.value, error: true });
-      } else if (key === 'currentPassword' && !testRegex(value.value, policies.passwordPattern)) {
-        validationSuccess = false;
-        updateField(key, { value: value.value, error: true });
-      } else if (key === 'email' && !validateEmail(value.value)) {
-        validationSuccess = false;
-        updateField(key, { value: value.value, error: true });
-      } else if (key === 'notes') {
-        parameters[key] = [{ note: value.value }];
-      } else if (key === 'changePassword') {
-        parameters[key] = value.value === 'on';
-      } else {
-        parameters[key] = value.value;
-      }
-    }
-
-    if (validationSuccess) {
-      const headers = {
-        Accept: 'application/json',
-        Authorization: `Bearer ${currentToken}`,
-      };
-
-      axiosInstance
-        .post(`${endpoints.ucentralsec}/api/v1/user/0`, parameters, {
-          headers,
-        })
-        .then(() => {
-          getUsers();
-          setFormFields(initialState);
-          addToast({
-            title: t('common.success'),
-            body: t('user.create_success'),
-            color: 'success',
-            autohide: true,
-          });
-          toggle();
-        })
-        .catch(() => {
-          addToast({
-            title: t('common.error'),
-            body: t('user.create_failure'),
-            color: 'danger',
-            autohide: true,
-          });
-        })
-        .finally(() => {
-          setLoading(false);
-        });
-    } else {
-      setLoading(false);
-    }
-  };
-
-  const getPasswordPolicy = () => {
-    axiosInstance
-      .post(`${endpoints.ucentralsec}/api/v1/oauth2?requirements=true`, {})
-      .then((response) => {
-        const newPolicies = response.data;
-        newPolicies.accessPolicy = `${endpoints.ucentralsec}${newPolicies.accessPolicy}`;
-        newPolicies.passwordPolicy = `${endpoints.ucentralsec}${newPolicies.passwordPolicy}`;
-        setPolicies(response.data);
-      })
-      .catch(() => {});
-  };
-
-  useEffect(() => {
-    if (policies.passwordPattern.length === 0) getPasswordPolicy();
-  }, []);
-
-  useEffect(() => {
-    setFormFields(initialState);
-  }, [show]);
-
-  return (
-    <CModal show={show} onClose={toggle} size="xl">
-      <CModalHeader>{t('user.create')}</CModalHeader>
-      <CModalBody>
-        <CreateUserForm
-          t={t}
-          fields={formFields}
-          updateField={updateFieldWithId}
-          createUser={createUser}
-          loading={loading}
-          policies={policies}
-          toggleChange={toggleChange}
-        />
-      </CModalBody>
-    </CModal>
-  );
-};
-
-CreateUserModal.propTypes = {
-  show: PropTypes.bool.isRequired,
-  toggle: PropTypes.func.isRequired,
-  getUsers: PropTypes.func.isRequired,
-};
-
-export default React.memo(CreateUserModal);

src/components/DefaultConfigurationTable/Table/DeleteButton.js

@@ -0,0 +1,88 @@
+import React, { useState } from 'react';
+import ReactTooltip from 'react-tooltip';
+import { v4 as createUuid } from 'uuid';
+import { CButton, CCardBody, CCardHeader, CRow, CCol, CPopover, CButtonClose } from '@coreui/react';
+import { cilTrash } from '@coreui/icons';
+import CIcon from '@coreui/icons-react';
+import { LoadingButton } from 'ucentral-libs';
+import PropTypes from 'prop-types';
+
+import styles from './index.module.scss';
+
+const DeleteButton = ({ t, config, deleteConfig, hideTooltips }) => {
+  const [tooltipId] = useState(createUuid());
+
+  return (
+    <CPopover content={t('common.delete')}>
+      <div className="d-inline">
+        <CButton
+          color="primary"
+          variant="outline"
+          shape="square"
+          size="sm"
+          className="mx-2"
+          data-tip
+          data-for={tooltipId}
+          data-event="click"
+          style={{ width: '33px', height: '30px' }}
+        >
+          <CIcon name="cil-trash" content={cilTrash} size="sm" />
+        </CButton>
+        <ReactTooltip
+          id={tooltipId}
+          place="top"
+          effect="solid"
+          globalEventOff="click"
+          clickable
+          className={[styles.deleteTooltip, 'tooltipRight'].join(' ')}
+          border
+          borderColor="#321fdb"
+          arrowColor="white"
+          overridePosition={({ left, top }) => {
+            const element = document.getElementById(tooltipId);
+            const tooltipWidth = element ? element.offsetWidth : 0;
+            const newLeft = left - tooltipWidth * 0.25;
+            return { top, left: newLeft };
+          }}
+        >
+          <CCardHeader color="primary" className={styles.tooltipHeader}>
+            {t('configuration.delete_config')}
+            <CButtonClose
+              style={{ color: 'white' }}
+              onClick={(e) => {
+                e.target.parentNode.parentNode.classList.remove('show');
+                hideTooltips();
+              }}
+            />
+          </CCardHeader>
+          <CCardBody className="py-1 px-4">
+            <CRow>
+              <CCol>
+                <LoadingButton
+                  data-toggle="dropdown"
+                  variant="outline"
+                  color="danger"
+                  label={t('common.confirm')}
+                  isLoadingLabel={t('user.deleting')}
+                  isLoading={false}
+                  action={() => deleteConfig(config.name)}
+                  block
+                  disabled={false}
+                />
+              </CCol>
+            </CRow>
+          </CCardBody>
+        </ReactTooltip>
+      </div>
+    </CPopover>
+  );
+};
+
+DeleteButton.propTypes = {
+  t: PropTypes.func.isRequired,
+  config: PropTypes.instanceOf(Object).isRequired,
+  deleteConfig: PropTypes.func.isRequired,
+  hideTooltips: PropTypes.func.isRequired,
+};
+
+export default DeleteButton;

src/components/DefaultConfigurationTable/Table/index.js

@@ -0,0 +1,184 @@
+import React, { useEffect } from 'react';
+import PropTypes from 'prop-types';
+import ReactPaginate from 'react-paginate';
+import {
+  CCardBody,
+  CDataTable,
+  CButton,
+  CCard,
+  CCardHeader,
+  CPopover,
+  CSelect,
+  CButtonToolbar,
+} from '@coreui/react';
+import { cilPencil, cilPlus } from '@coreui/icons';
+import ReactTooltip from 'react-tooltip';
+import CIcon from '@coreui/icons-react';
+import { FormattedDate } from 'ucentral-libs';
+import DeleteButton from './DeleteButton';
+
+const DefaultConfigurationTable = ({
+  currentPage,
+  configurations,
+  toggleAddBlacklist,
+  toggleEditModal,
+  configurationsPerPage,
+  loading,
+  deleteConfig,
+  updateDevicesPerPage,
+  pageCount,
+  updatePage,
+  t,
+}) => {
+  const columns = [
+    { key: 'name', label: t('user.name'), _style: { width: '20%' } },
+    { key: 'description', label: t('user.description'), _style: { width: '20%' } },
+    { key: 'created', label: t('common.created'), _style: { width: '10%' } },
+    { key: 'modified', label: t('common.modified'), _style: { width: '10%' } },
+    { key: 'deviceTypes', label: t('firmware.device_types'), _style: { width: '20%' } },
+    { key: 'actions', label: t('actions.actions'), _style: { width: '1%' } },
+  ];
+
+  const hideTooltips = () => ReactTooltip.hide();
+
+  const escFunction = (event) => {
+    if (event.keyCode === 27) {
+      hideTooltips();
+    }
+  };
+
+  useEffect(() => {
+    document.addEventListener('keydown', escFunction, false);
+
+    return () => {
+      document.removeEventListener('keydown', escFunction, false);
+    };
+  }, []);
+
+  return (
+    <>
+      <CCard className="m-0 p-0">
+        <CCardHeader className="dark-header text-right">
+          <div className="text-value-lg float-left">
+            {t('configuration.default_configurations')}
+          </div>
+          <div className="text-right float-right">
+            <CPopover content={t('configuration.create_config')}>
+              <CButton size="sm" color="info" onClick={toggleAddBlacklist}>
+                <CIcon content={cilPlus} />
+              </CButton>
+            </CPopover>
+          </div>
+        </CCardHeader>
+        <CCardBody className="p-0">
+          <CDataTable
+            addTableClasses="ignore-overflow table-sm"
+            items={configurations ?? []}
+            fields={columns}
+            hover
+            border
+            loading={loading}
+            scopedSlots={{
+              name: (item) => <td className="align-middle">{item.name}</td>,
+              description: (item) => <td className="align-middle">{item.description}</td>,
+              deviceTypes: (item) => <td className="align-middle">{item.modelIds.join(', ')}</td>,
+              created: (item) => (
+                <td className="align-middle">
+                  <FormattedDate date={item.created} />
+                </td>
+              ),
+              modified: (item) => (
+                <td className="align-middle">
+                  <FormattedDate date={item.lastModified} />
+                </td>
+              ),
+              actions: (item) => (
+                <td className="text-center align-middle">
+                  <CButtonToolbar
+                    role="group"
+                    className="justify-content-center"
+                    style={{ width: '90px' }}
+                  >
+                    <DeleteButton
+                      t={t}
+                      config={item}
+                      deleteConfig={deleteConfig}
+                      hideTooltips={hideTooltips}
+                    />
+                    <CPopover content={t('common.edit')}>
+                      <CButton
+                        onClick={() => toggleEditModal(item.name)}
+                        color="primary"
+                        variant="outline"
+                        shape="square"
+                        size="sm"
+                        className="mx-1"
+                        style={{ width: '33px', height: '30px' }}
+                      >
+                        <CIcon content={cilPencil} size="sm" />
+                      </CButton>
+                    </CPopover>
+                  </CButtonToolbar>
+                </td>
+              ),
+            }}
+          />
+          <div className="d-flex flex-row pl-3">
+            <div className="pr-3">
+              <ReactPaginate
+                previousLabel="← Previous"
+                nextLabel="Next →"
+                pageCount={pageCount}
+                onPageChange={updatePage}
+                forcePage={Number(currentPage)}
+                breakClassName="page-item"
+                breakLinkClassName="page-link"
+                containerClassName="pagination"
+                pageClassName="page-item"
+                pageLinkClassName="page-link"
+                previousClassName="page-item"
+                previousLinkClassName="page-link"
+                nextClassName="page-item"
+                nextLinkClassName="page-link"
+                activeClassName="active"
+              />
+            </div>
+            <p className="pr-2 mt-1">{t('common.items_per_page')}</p>
+            <div style={{ width: '100px' }} className="px-2">
+              <CSelect
+                custom
+                defaultValue={configurationsPerPage}
+                onChange={(e) => updateDevicesPerPage(e.target.value)}
+                disabled={loading}
+              >
+                <option value="10">10</option>
+                <option value="25">25</option>
+                <option value="50">50</option>
+              </CSelect>
+            </div>
+          </div>
+        </CCardBody>
+      </CCard>
+    </>
+  );
+};
+
+DefaultConfigurationTable.propTypes = {
+  currentPage: PropTypes.string,
+  configurations: PropTypes.instanceOf(Array).isRequired,
+  toggleAddBlacklist: PropTypes.func.isRequired,
+  toggleEditModal: PropTypes.func.isRequired,
+  updateDevicesPerPage: PropTypes.func.isRequired,
+  pageCount: PropTypes.number.isRequired,
+  updatePage: PropTypes.func.isRequired,
+  configurationsPerPage: PropTypes.string.isRequired,
+  deleteConfig: PropTypes.func.isRequired,
+  t: PropTypes.func.isRequired,
+  loading: PropTypes.bool.isRequired,
+};
+
+DefaultConfigurationTable.defaultProps = {
+  currentPage: '0',
+};
+
+export default React.memo(DefaultConfigurationTable);

src/components/DefaultConfigurationTable/Table/index.module.scss

@@ -0,0 +1,32 @@
+.firmwareTooltip {
+  opacity: 1 !important;
+  padding: 0px 0px 0px 0px !important;
+  border-radius: 1rem !important;
+  background-color: #fff !important;
+  border-color: #321fdb !important;
+  font-size: 0.875rem !important;
+  font-weight: 400 !important;
+  box-shadow: 0 3px 10px rgba(0, 0, 0, 0.2) !important;
+  width: 400px;
+}
+
+.deleteTooltip {
+  opacity: 1 !important;
+  padding: 0px 0px 0px 0px !important;
+  border-radius: 1rem !important;
+  background-color: #fff !important;
+  border-color: #321fdb !important;
+  font-size: 0.875rem !important;
+  font-weight: 400 !important;
+  box-shadow: 0 3px 10px rgba(0, 0, 0, 0.2) !important;
+  width: 150px;
+}
+
+.tooltipHeader {
+  padding-left: 5px;
+  padding-right: 10px;
+  padding-top: 5px;
+  padding-bottom: 5px;
+  border-top-left-radius: 1rem !important;
+  border-top-right-radius: 1rem !important;
+}

src/components/DefaultConfigurationTable/index.js

@@ -0,0 +1,199 @@
+import React, { useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useHistory } from 'react-router-dom';
+import axiosInstance from 'utils/axiosInstance';
+import { getItem, setItem } from 'utils/localStorageHelper';
+import { useAuth, useToast, useToggle } from 'ucentral-libs';
+import AddConfigurationModal from 'components/AddConfigurationModal';
+import EditConfigurationModal from 'components/EditConfigurationModal';
+import Table from './Table';
+
+const DefaultConfigurationTable = () => {
+  const { t } = useTranslation();
+  const { addToast } = useToast();
+  const history = useHistory();
+  const [page, setPage] = useState(parseInt(sessionStorage.getItem('configurationTable') ?? 0, 10));
+  const { currentToken, endpoints } = useAuth();
+  const [configurationCount, setConfigurationCount] = useState(0);
+  const [pageCount, setPageCount] = useState(0);
+  const [configurationsPerPage, setConfigurationsPerPage] = useState(
+    getItem('configurationsPerPage') || '10',
+  );
+  const [configurations, setConfigurations] = useState([]);
+  const [loading, setLoading] = useState(true);
+  const [editId, setEditId] = useState('');
+  const [showEditModal, setShowEditModal] = useState(false);
+  const [showAddModal, toggleAddModal] = useToggle(false);
+
+  const toggleEditModal = (serialNumber) => {
+    if (serialNumber) setEditId(serialNumber);
+    setShowEditModal(!showEditModal);
+  };
+
+  const getConfigurationInformation = (
+    selectedPage = page,
+    configurationPerPage = configurationsPerPage,
+  ) => {
+    setLoading(true);
+
+    const options = {
+      headers: {
+        Accept: 'application/json',
+        Authorization: `Bearer ${currentToken}`,
+      },
+    };
+
+    axiosInstance
+      .get(
+        `${endpoints.owgw}/api/v1/default_configurations?limit=${configurationPerPage}&offset=${
+          configurationPerPage * selectedPage
+        }`,
+        options,
+      )
+      .then((response) => {
+        setConfigurations(response.data.configurations);
+        setLoading(false);
+      })
+      .catch((e) => {
+        addToast({
+          title: t('common.error'),
+          body: t('configuration.error_fetching_configurations', {
+            error: e.response?.data?.ErrorDescription,
+          }),
+          color: 'danger',
+          autohide: true,
+        });
+        setLoading(false);
+      });
+  };
+
+  const getCount = () => {
+    setLoading(true);
+
+    const headers = {
+      Accept: 'application/json',
+      Authorization: `Bearer ${currentToken}`,
+    };
+
+    axiosInstance
+      .get(`${endpoints.owgw}/api/v1/default_configurations?countOnly=true`, {
+        headers,
+      })
+      .then((response) => {
+        const configurationsCount = response.data.count;
+        const pagesCount = Math.ceil(configurationsCount / configurationsPerPage);
+        setPageCount(pagesCount);
+        setConfigurationCount(configurationsCount);
+
+        let selectedPage = page;
+
+        if (page >= pagesCount) {
+          history.push(`/defaultconfigurations?page=${pagesCount - 1}`);
+          selectedPage = pagesCount - 1;
+        }
+        getConfigurationInformation(selectedPage);
+      })
+      .catch((e) => {
+        addToast({
+          title: t('common.error'),
+          body: t('configuration.error_fetching_configurations', {
+            error: e.response?.data?.ErrorDescription,
+          }),
+          color: 'danger',
+          autohide: true,
+        });
+        setLoading(false);
+      });
+  };
+
+  const updateConfigurationsPerPage = (value) => {
+    setItem('configurationsPerPage', value);
+    setConfigurationsPerPage(value);
+
+    const newPageCount = Math.ceil(configurationCount / value);
+    setPageCount(newPageCount);
+
+    let selectedPage = page;
+
+    if (page >= newPageCount) {
+      history.push(`/default_configurations?page=${newPageCount - 1}`);
+      selectedPage = newPageCount - 1;
+    }
+
+    getConfigurationInformation(selectedPage, value);
+  };
+
+  const updatePageCount = ({ selected: selectedPage }) => {
+    sessionStorage.setItem('configurationTable', selectedPage);
+    setPage(selectedPage);
+    getConfigurationInformation(selectedPage);
+  };
+
+  const deleteConfig = (name) => {
+    setLoading(true);
+
+    const headers = {
+      Accept: 'application/json',
+      Authorization: `Bearer ${currentToken}`,
+    };
+
+    axiosInstance
+      .delete(`${endpoints.owgw}/api/v1/default_configuration/${name}`, { headers })
+      .then(() => {
+        addToast({
+          title: t('common.success'),
+          body: t('configuration.successful_delete'),
+          color: 'success',
+          autohide: true,
+        });
+        getCount();
+      })
+      .catch((e) => {
+        addToast({
+          title: t('common.error'),
+          body: t('configuration.error_adding_blacklist', {
+            error: e.response?.data?.ErrorDescription,
+          }),
+          color: 'danger',
+          autohide: true,
+        });
+      })
+      .finally(() => {
+        setLoading(false);
+      });
+  };
+
+  useEffect(() => {
+    getCount();
+  }, []);
+
+  return (
+    <div>
+      <Table
+        currentPage={page}
+        t={t}
+        configurations={configurations}
+        loading={loading}
+        toggleAddBlacklist={toggleAddModal}
+        toggleEditModal={toggleEditModal}
+        updateConfigurationsPerPage={updateConfigurationsPerPage}
+        configurationsPerPage={configurationsPerPage}
+        pageCount={pageCount}
+        updatePage={updatePageCount}
+        pageRangeDisplayed={5}
+        deleteConfig={deleteConfig}
+      />
+      {showAddModal ? (
+        <AddConfigurationModal show={showAddModal} toggle={toggleAddModal} refresh={getCount} />
+      ) : null}
+      <EditConfigurationModal
+        show={showEditModal}
+        toggle={toggleEditModal}
+        refresh={getCount}
+        configId={editId}
+      />
+    </div>
+  );
+};
+
+export default DefaultConfigurationTable;

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

@@ -1,8 +1,9 @@
 import React, { useState, useEffect } from 'react';
+import PropTypes from 'prop-types';
 import { useTranslation } from 'react-i18next';
 import { CButton, CCard, CCardHeader, CCardBody, CRow, CCol } from '@coreui/react';
 import axiosInstance from 'utils/axiosInstance';
-import { LoadingButton, useAuth, useDevice, useToast } from 'ucentral-libs';
+import { LoadingButton, useAuth, useDevice, useToast, useToggle } from 'ucentral-libs';
 import RebootModal from 'components/RebootModal';
 import DeviceFirmwareModal from 'components/DeviceFirmwareModal';
 import ConfigureModal from 'components/ConfigureModal';
@@ -11,8 +12,9 @@ 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 DeviceActions = ({ device }) => {
   const { t } = useTranslation();
   const { currentToken, endpoints } = useAuth();
   const { addToast } = useToast();
@@ -20,48 +22,16 @@ const DeviceActions = () => {
   const [upgradeStatus, setUpgradeStatus] = useState({
     loading: false,
   });
-  const [device, setDevice] = useState({});
-  const [showRebootModal, setShowRebootModal] = useState(false);
-  const [showBlinkModal, setShowBlinkModal] = useState(false);
-  const [showUpgradeModal, setShowUpgradeModal] = useState(false);
-  const [showTraceModal, setShowTraceModal] = useState(false);
-  const [showScanModal, setShowScanModal] = useState(false);
   const [connectLoading, setConnectLoading] = useState(false);
-  const [showConfigModal, setConfigModal] = useState(false);
-  const [showFactoryModal, setShowFactoryModal] = useState(false);
-  const [showQueueModal, setShowQueueModal] = useState(false);
-
-  const toggleRebootModal = () => {
-    setShowRebootModal(!showRebootModal);
-  };
-
-  const toggleBlinkModal = () => {
-    setShowBlinkModal(!showBlinkModal);
-  };
-
-  const toggleUpgradeModal = () => {
-    setShowUpgradeModal(!showUpgradeModal);
-  };
-
-  const toggleTraceModal = () => {
-    setShowTraceModal(!showTraceModal);
-  };
-
-  const toggleScanModal = () => {
-    setShowScanModal(!showScanModal);
-  };
-
-  const toggleConfigModal = () => {
-    setConfigModal(!showConfigModal);
-  };
-
-  const toggleFactoryResetModal = () => {
-    setShowFactoryModal(!showFactoryModal);
-  };
-
-  const toggleQueueModal = () => {
-    setShowQueueModal(!showQueueModal);
-  };
+  const [showRebootModal, toggleRebootModal] = useToggle(false);
+  const [showBlinkModal, toggleBlinkModal] = useToggle(false);
+  const [showUpgradeModal, toggleUpgradeModal, setShowUpgradeModal] = useToggle(false);
+  const [showTraceModal, toggleTraceModal] = useToggle(false);
+  const [showScanModal, toggleScanModal] = useToggle(false);
+  const [showConfigModal, toggleConfigModal] = useToggle(false);
+  const [showFactoryModal, toggleFactoryResetModal] = useToggle(false);
+  const [showQueueModal, toggleQueueModal] = useToggle(false);
+  const [showTelemetryModal, toggleTelemetryModal] = useToggle(false);
 
   const getRttysInfo = () => {
     setConnectLoading(true);
@@ -74,36 +44,28 @@ const DeviceActions = () => {
 
     axiosInstance
       .get(
-        `${endpoints.ucentralgw}/api/v1/device/${encodeURIComponent(deviceSerialNumber)}/rtty`,
+        `${endpoints.owgw}/api/v1/device/${encodeURIComponent(deviceSerialNumber)}/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('connect.error_trying_to_connect', { error: e.response?.data?.ErrorDescription }),
+          color: 'danger',
+          autohide: true,
+        });
+      })
       .finally(() => {
         setConnectLoading(false);
       });
   };
 
-  const getDeviceInformation = () => {
-    const options = {
-      headers: {
-        Accept: 'application/json',
-        Authorization: `Bearer ${currentToken}`,
-      },
-    };
-
-    axiosInstance
-      .get(`${endpoints.ucentralgw}/api/v1/device/${deviceSerialNumber}`, options)
-      .then((response) => {
-        setDevice(response.data);
-      })
-      .catch(() => {});
-  };
-
   useEffect(() => {
     if (upgradeStatus.result !== undefined) {
       addToast({
@@ -121,55 +83,57 @@ const DeviceActions = () => {
     }
   }, [upgradeStatus]);
 
-  useEffect(() => {
-    getDeviceInformation();
-  }, [deviceSerialNumber]);
-
   return (
     <CCard>
-      <CCardHeader>
+      <CCardHeader className="dark-header">
         <div className="text-value-lg">{t('actions.title')}</div>
       </CCardHeader>
       <CCardBody>
         <CRow>
           <CCol>
-            <CButton block onClick={toggleRebootModal} color="primary">
+            <CButton block disabled={device === null} onClick={toggleRebootModal} color="primary">
               {t('actions.reboot')}
             </CButton>
           </CCol>
           <CCol>
-            <CButton block onClick={toggleBlinkModal} color="primary">
+            <CButton block disabled={device === null} onClick={toggleBlinkModal} color="primary">
               {t('actions.blink')}
             </CButton>
           </CCol>
         </CRow>
-        <CRow className="mt-3">
+        <CRow className="my-1">
           <CCol>
-            <CButton block color="primary" onClick={toggleUpgradeModal}>
+            <CButton block disabled={device === null} color="primary" onClick={toggleUpgradeModal}>
               {t('actions.firmware_upgrade')}
             </CButton>
           </CCol>
           <CCol>
-            <CButton block color="primary" onClick={toggleTraceModal}>
+            <CButton block disabled={device === null} color="primary" onClick={toggleTraceModal}>
               {t('actions.trace')}
             </CButton>
           </CCol>
         </CRow>
-        <CRow className="mt-3">
+        <CRow className="my-1">
           <CCol>
-            <CButton block color="primary" onClick={toggleScanModal}>
+            <CButton block disabled={device === null} color="primary" onClick={toggleScanModal}>
               {t('actions.wifi_scan')}
             </CButton>
           </CCol>
           <CCol>
-            <CButton block color="primary" onClick={toggleFactoryResetModal}>
+            <CButton
+              block
+              disabled={device === null}
+              color="primary"
+              onClick={toggleFactoryResetModal}
+            >
               {t('actions.factory_reset')}
             </CButton>
           </CCol>
         </CRow>
-        <CRow className="mt-3">
+        <CRow className="my-1">
           <CCol>
             <LoadingButton
+              disabled={device === null}
               isLoading={connectLoading}
               label={t('actions.connect')}
               isLoadingLabel={t('actions.connecting')}
@@ -177,18 +141,27 @@ const DeviceActions = () => {
             />
           </CCol>
           <CCol>
-            <CButton block color="primary" onClick={toggleConfigModal}>
+            <CButton block disabled={device === null} color="primary" onClick={toggleConfigModal}>
               {t('actions.configure')}
             </CButton>
           </CCol>
         </CRow>
-        <CRow className="mt-3">
+        <CRow className="my-1">
           <CCol>
-            <CButton block color="primary" onClick={toggleQueueModal}>
+            <CButton block disabled={device === null} color="primary" onClick={toggleQueueModal}>
               {t('commands.event_queue')}
             </CButton>
           </CCol>
-          <CCol />
+          <CCol>
+            <CButton
+              block
+              disabled={device === null}
+              color="primary"
+              onClick={toggleTelemetryModal}
+            >
+              {t('actions.telemetry')}
+            </CButton>
+          </CCol>
         </CRow>
       </CCardBody>
       <RebootModal show={showRebootModal} toggleModal={toggleRebootModal} />
@@ -208,8 +181,17 @@ const DeviceActions = () => {
       <ConfigureModal show={showConfigModal} toggleModal={toggleConfigModal} />
       <FactoryResetModal show={showFactoryModal} toggleModal={toggleFactoryResetModal} />
       <EventQueueModal show={showQueueModal} toggle={toggleQueueModal} />
+      <TelemetryModal show={showTelemetryModal} toggle={toggleTelemetryModal} />
     </CCard>
   );
 };
 
+DeviceActions.propTypes = {
+  device: PropTypes.instanceOf(Object),
+};
+
+DeviceActions.defaultProps = {
+  device: null,
+};
+
 export default DeviceActions;

src/components/DeviceConfiguration/DeviceConfigurationModal.js

@@ -19,7 +19,7 @@ const DeviceConfigurationModal = ({ show, toggle, configuration }) => (
           <CModalTitle className="text-dark">{t('configuration.title')}</CModalTitle>
         </CModalHeader>
         <CModalBody>
-          <pre className="ignore">{JSON.stringify(configuration, null, 4)}</pre>
+          <pre className="ignore">{JSON.stringify(configuration, null, 2)}</pre>
         </CModalBody>
         <CModalFooter>
           <CButton color="secondary" onClick={toggle}>

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/DeviceDashboard/Dashboard/index.js

@@ -0,0 +1,418 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {
+  CCard,
+  CCardBody,
+  CCardHeader,
+  CCol,
+  CPopover,
+  CRow,
+  CSpinner,
+  CWidgetIcon,
+} from '@coreui/react';
+import { CChartBar, CChartHorizontalBar, CChartPie } from '@coreui/react-chartjs';
+import { cilClock, cilInfo, cilMedicalCross, cilThumbUp, cilWarning } from '@coreui/icons';
+import CIcon from '@coreui/icons-react';
+import { FormattedDate } from 'ucentral-libs';
+
+import styles from './index.module.scss';
+
+const getColor = (health) => {
+  const numberHealth = health ? Number(health.replace('%', '')) : 0;
+  if (numberHealth >= 90) return 'success';
+  if (numberHealth >= 60) return 'warning';
+  return 'danger';
+};
+
+const getIcon = (health) => {
+  const numberHealth = health ? Number(health.replace('%', '')) : 0;
+  if (numberHealth >= 90) return <CIcon width={36} name="cil-thumbs-up" content={cilThumbUp} />;
+  if (numberHealth >= 60) return <CIcon width={36} name="cil-warning" content={cilWarning} />;
+  return <CIcon width={36} name="cil-medical-cross" content={cilMedicalCross} />;
+};
+
+const DeviceDashboard = ({ t, data, loading }) => (
+  <div style={{ position: 'relative' }}>
+    <div style={{ opacity: loading ? '20%' : '100%' }}>
+      <CRow className="mt-3">
+        <CCol>
+          <CWidgetIcon
+            text={t('common.last_dashboard_refresh')}
+            header={data.snapshot ? <FormattedDate date={data.snapshot} size="lg" /> : <h2>-</h2>}
+            color="info"
+            iconPadding={false}
+          >
+            <CIcon width={36} name="cil-clock" content={cilClock} />
+          </CWidgetIcon>
+        </CCol>
+        <CCol>
+          <CWidgetIcon
+            text={
+              <div>
+                <div className="float-left">{t('common.overall_health')}</div>
+                <div className="float-left ml-2">
+                  <CPopover content={t('device.health_explanation')}>
+                    <CIcon content={cilInfo} />
+                  </CPopover>
+                </div>
+              </div>
+            }
+            header={<h2>{data.overallHealth}</h2>}
+            color={getColor(data.overallHealth)}
+            iconPadding={false}
+          >
+            {getIcon(data.overallHealth)}
+          </CWidgetIcon>
+        </CCol>
+        <CCol>
+          <CWidgetIcon
+            text={t('common.devices')}
+            header={<h2>{data.numberOfDevices}</h2>}
+            color="primary"
+            iconPadding={false}
+          >
+            <CIcon width={36} name="cil-router" />
+          </CWidgetIcon>
+        </CCol>
+      </CRow>
+      <CRow>
+        <CCol lg="6" xl="4">
+          <CCard>
+            <CCardHeader className="dark-header">{t('common.device_status')}</CCardHeader>
+            <CCardBody className="p-1">
+              <CChartPie
+                datasets={data.status.datasets}
+                labels={data.status.labels}
+                options={{
+                  tooltips: {
+                    callbacks: {
+                      title: (item, ds) => ds.labels[item[0].index],
+                      label: (item, ds) => `${ds.datasets[0].data[item.index]}%`,
+                    },
+                  },
+                  legend: {
+                    display: true,
+                    position: 'right',
+                  },
+                }}
+              />
+            </CCardBody>
+          </CCard>
+        </CCol>
+        <CCol lg="6" xl="4">
+          <CCard>
+            <CCardHeader className="dark-header">
+              <div>
+                <div className="float-left">{t('common.device_health')}</div>
+                <div className="float-left ml-2">
+                  <CPopover content={t('device.health_explanation')}>
+                    <CIcon content={cilInfo} />
+                  </CPopover>
+                </div>
+              </div>
+            </CCardHeader>
+            <CCardBody className="p-1">
+              <CChartPie
+                datasets={data.healths.datasets}
+                labels={data.healths.labels}
+                options={{
+                  tooltips: {
+                    callbacks: {
+                      title: (item, ds) => ds.labels[item[0].index],
+                      label: (item, ds) =>
+                        `${ds.datasets[0].data[item.index]}${t('common.of_connected')}`,
+                    },
+                  },
+                  legend: {
+                    display: true,
+                    position: 'right',
+                  },
+                }}
+              />
+            </CCardBody>
+          </CCard>
+        </CCol>
+        <CCol lg="6" xl="4">
+          <CCard>
+            <CCardHeader className="dark-header">
+              {data.totalAssociations}{' '}
+              {data.totalAssociations === 1
+                ? t('wifi_analysis.association')
+                : t('wifi_analysis.associations')}
+            </CCardHeader>
+            <CCardBody className="p-1">
+              <CChartPie
+                datasets={data.associations.datasets}
+                labels={data.associations.labels}
+                options={{
+                  tooltips: {
+                    callbacks: {
+                      title: (item, ds) => ds.labels[item[0].index],
+                      label: (item, ds) =>
+                        `${ds.datasets[0].data[item.index]}% of ${
+                          data.totalAssociations
+                        } associations`,
+                    },
+                  },
+                  legend: {
+                    display: true,
+                    position: 'right',
+                  },
+                }}
+              />
+            </CCardBody>
+          </CCard>
+        </CCol>
+        <CCol lg="6" xl="4">
+          <CCard>
+            <CCardHeader className="dark-header">{t('common.vendors')}</CCardHeader>
+            <CCardBody className="p-1">
+              <CChartHorizontalBar
+                datasets={data.vendors.datasets}
+                labels={data.vendors.labels}
+                options={{
+                  tooltips: {
+                    mode: 'index',
+                    intersect: false,
+                    callbacks: {
+                      title: (item, ds) => ds.labels[item[0].index],
+                      label: (item, ds) =>
+                        `${ds.datasets[0].data[item.index]} ${t('common.devices')}`,
+                    },
+                  },
+                  hover: {
+                    mode: 'index',
+                    intersect: false,
+                  },
+                  legend: {
+                    display: false,
+                    position: 'right',
+                  },
+                  scales: {
+                    xAxes: [
+                      {
+                        ticks: {
+                          maxTicksLimit: 5,
+                          beginAtZero: true,
+                          stepSize: 1,
+                        },
+                      },
+                    ],
+                    yAxes: [
+                      {
+                        ticks: {
+                          callback: (value) => value.split(' ')[0],
+                        },
+                      },
+                    ],
+                  },
+                }}
+              />
+            </CCardBody>
+          </CCard>
+        </CCol>
+        <CCol lg="6" xl="4">
+          <CCard>
+            <CCardHeader className="dark-header">{t('firmware.device_types')}</CCardHeader>
+            <CCardBody className="p-1">
+              <CChartPie
+                datasets={data.deviceType.datasets}
+                labels={data.deviceType.labels}
+                options={{
+                  tooltips: {
+                    callbacks: {
+                      title: (item, ds) => ds.labels[item[0].index],
+                      label: (item, ds) =>
+                        `${ds.datasets[0].data[item.index]} ${t('common.devices')}`,
+                    },
+                  },
+                  legend: {
+                    display: true,
+                    position: 'right',
+                  },
+                }}
+              />
+            </CCardBody>
+          </CCard>
+        </CCol>
+        <CCol lg="6" xl="4">
+          <CCard>
+            <CCardHeader className="dark-header">
+              <div>
+                <div className="float-left">{t('common.uptimes')}</div>
+                <div className="float-left ml-2">
+                  <CPopover content={t('device.uptimes_explanation')}>
+                    <CIcon content={cilInfo} />
+                  </CPopover>
+                </div>
+              </div>
+            </CCardHeader>
+            <CCardBody className="p-1">
+              <CChartBar
+                datasets={data.upTimes.datasets}
+                labels={data.upTimes.labels}
+                options={{
+                  tooltips: {
+                    mode: 'index',
+                    intersect: false,
+                    callbacks: {
+                      title: (item, ds) => ds.labels[item[0].index],
+                      label: (item, ds) =>
+                        `${ds.datasets[0].data[item.index]} ${t('common.devices')}`,
+                    },
+                  },
+                  hover: {
+                    mode: 'index',
+                    intersect: false,
+                  },
+                  legend: {
+                    display: false,
+                    position: 'right',
+                  },
+                  scales: {
+                    yAxes: [
+                      {
+                        ticks: {
+                          maxTicksLimit: 5,
+                          beginAtZero: true,
+                          stepSize: 1,
+                        },
+                      },
+                    ],
+                  },
+                }}
+              />
+            </CCardBody>
+          </CCard>
+        </CCol>
+        <CCol lg="6" xl="4">
+          <CCard>
+            <CCardHeader className="dark-header">
+              <div>
+                <div className="float-left">{t('common.certificates')}</div>
+                <div className="float-left ml-2">
+                  <CPopover content={t('device.certificate_explanation')}>
+                    <CIcon content={cilInfo} />
+                  </CPopover>
+                </div>
+              </div>
+            </CCardHeader>
+            <CCardBody className="p-1">
+              <CChartPie
+                datasets={data.certificates.datasets}
+                labels={data.certificates.labels}
+                options={{
+                  tooltips: {
+                    callbacks: {
+                      title: (item, ds) => ds.labels[item[0].index],
+                      label: (item, ds) =>
+                        `${ds.datasets[0].data[item.index]}${t('common.of_connected')}`,
+                    },
+                  },
+                  legend: {
+                    display: true,
+                    position: 'right',
+                  },
+                }}
+              />
+            </CCardBody>
+          </CCard>
+        </CCol>
+        <CCol lg="6" xl="4">
+          <CCard>
+            <CCardHeader className="dark-header">{t('common.commands')}</CCardHeader>
+            <CCardBody className="p-1">
+              <CChartBar
+                datasets={data.commands.datasets}
+                labels={data.commands.labels}
+                options={{
+                  tooltips: {
+                    mode: 'index',
+                    intersect: false,
+                  },
+                  hover: {
+                    mode: 'index',
+                    intersect: false,
+                  },
+                  legend: {
+                    display: false,
+                    position: 'right',
+                  },
+                  scales: {
+                    yAxes: [
+                      {
+                        ticks: {
+                          maxTicksLimit: 5,
+                          beginAtZero: true,
+                          stepSize: 1,
+                        },
+                      },
+                    ],
+                  },
+                }}
+              />
+            </CCardBody>
+          </CCard>
+        </CCol>
+        <CCol lg="6" xl="4">
+          <CCard>
+            <CCardHeader className="dark-header">
+              <div>
+                <div className="float-left">{t('common.memory_used')}</div>
+                <div className="float-left ml-2">
+                  <CPopover content={t('device.memory_explanation')}>
+                    <CIcon content={cilInfo} />
+                  </CPopover>
+                </div>
+              </div>
+            </CCardHeader>
+            <CCardBody className="p-1">
+              <CChartBar
+                datasets={data.memoryUsed.datasets}
+                labels={data.memoryUsed.labels}
+                options={{
+                  tooltips: {
+                    mode: 'index',
+                    intersect: false,
+                  },
+                  hover: {
+                    mode: 'index',
+                    intersect: false,
+                  },
+                  legend: {
+                    display: false,
+                    position: 'right',
+                  },
+                  scales: {
+                    yAxes: [
+                      {
+                        ticks: {
+                          maxTicksLimit: 10,
+                          beginAtZero: true,
+                          stepSize: 1,
+                        },
+                      },
+                    ],
+                  },
+                }}
+              />
+            </CCardBody>
+          </CCard>
+        </CCol>
+      </CRow>
+    </div>
+    {loading ? (
+      <div className={styles.centerContainer}>
+        <CSpinner className={styles.spinner} />
+      </div>
+    ) : null}
+  </div>
+);
+
+DeviceDashboard.propTypes = {
+  t: PropTypes.func.isRequired,
+  data: PropTypes.instanceOf(Object).isRequired,
+  loading: PropTypes.bool.isRequired,
+};
+
+export default React.memo(DeviceDashboard);

src/components/DeviceDashboard/Dashboard/index.module.scss

@@ -0,0 +1,10 @@
+.centerContainer {
+  position: absolute;
+  top: 5%;
+  right: 50%;
+}
+
+.spinner {
+  height: 50px;
+  width: 50px;
+}

src/components/DeviceDashboard/index.js

@@ -1,7 +1,8 @@
 import React, { useState, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
-import { DeviceDashboard as Dashboard, useAuth, COLOR_LIST } from 'ucentral-libs';
+import { useAuth, COLOR_LIST } from 'ucentral-libs';
 import axiosInstance from 'utils/axiosInstance';
+import Dashboard from './Dashboard';
 
 const DeviceDashboard = () => {
   const { t } = useTranslation();
@@ -338,7 +339,7 @@ const DeviceDashboard = () => {
       Authorization: `Bearer ${currentToken}`,
     };
     axiosInstance
-      .get(`${endpoints.ucentralgw}/api/v1/deviceDashboard`, {
+      .get(`${endpoints.owgw}/api/v1/deviceDashboard`, {
         headers,
       })
       .then((response) => {

src/components/DeviceFirmwareModal/Modal/index.js

@@ -0,0 +1,145 @@
+import React, { useEffect, useState } from 'react';
+import PropTypes from 'prop-types';
+import {
+  CButton,
+  CDataTable,
+  CModal,
+  CModalHeader,
+  CModalTitle,
+  CModalBody,
+  CRow,
+  CCol,
+  CInput,
+  CPopover,
+  CSwitch,
+} from '@coreui/react';
+import CIcon from '@coreui/icons-react';
+import { cilX } from '@coreui/icons';
+import { LoadingButton } from 'ucentral-libs';
+import { cleanBytesString, prettyDate } from 'utils/helper';
+
+const DeviceFirmwareModal = ({
+  t,
+  device,
+  show,
+  toggle,
+  firmwareVersions,
+  upgradeToVersion,
+  loading,
+  upgradeStatus,
+  keepRedirector,
+  toggleRedirector,
+}) => {
+  const [filter, setFilter] = useState('');
+
+  const fields = [
+    { key: 'imageDate', label: t('firmware.image_date'), _style: { width: '17%' }, filter: false },
+    { key: 'size', label: t('firmware.size'), _style: { width: '8%' }, filter: false },
+    { key: 'revision', label: t('firmware.revision'), _style: { width: '60%' } },
+    { key: 'show_details', label: '', _style: { width: '15%' }, filter: false },
+  ];
+
+  useEffect(() => {
+    setFilter('');
+  }, [show]);
+
+  return (
+    <CModal show={show} onClose={toggle} size="xl">
+      <CModalHeader className="p-1">
+        <CModalTitle className="pl-1 pt-1">#{device?.serialNumber}</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>
+        {show ? (
+          <div>
+            <CRow>
+              <CCol sm="2" className="pt-2">
+                {t('firmware.installed_firmware')}
+              </CCol>
+              <CCol className="pt-2">{device.firmware}</CCol>
+            </CRow>
+            <CRow className="mt-3">
+              <CCol sm="2" className="pt-2">
+                {t('factory_reset.redirector')}
+              </CCol>
+              <CCol className="pt-2">
+                <CSwitch
+                  color="primary"
+                  defaultChecked={keepRedirector}
+                  onClick={toggleRedirector}
+                  labelOn="Yes"
+                  labelOff="No"
+                />
+              </CCol>
+            </CRow>
+            <CRow className="my-4">
+              <CCol sm="5">
+                <CInput
+                  type="text"
+                  placeholder="Search"
+                  value={filter}
+                  onChange={(e) => setFilter(e.target.value)}
+                />
+              </CCol>
+              <CCol />
+            </CRow>
+            <CRow className="mb-4">
+              <CCol>
+                <div className="overflow-auto" style={{ height: '600px' }}>
+                  <CDataTable
+                    addTableClasses="table-sm"
+                    items={firmwareVersions}
+                    fields={fields}
+                    loading={loading}
+                    hover
+                    tableFilterValue={filter}
+                    border
+                    scopedSlots={{
+                      imageDate: (item) => <td>{prettyDate(item.imageDate)}</td>,
+                      size: (item) => <td>{cleanBytesString(item.size)}</td>,
+                      show_details: (item) => (
+                        <td className="text-center">
+                          <LoadingButton
+                            label={t('firmware.upgrade')}
+                            isLoadingLabel={t('firmware.upgrading')}
+                            isLoading={false}
+                            action={() => upgradeToVersion(item.uri)}
+                            block={false}
+                            disabled={upgradeStatus.loading}
+                          />
+                        </td>
+                      ),
+                    }}
+                  />
+                </div>
+              </CCol>
+            </CRow>
+          </div>
+        ) : (
+          <div />
+        )}
+      </CModalBody>
+    </CModal>
+  );
+};
+
+DeviceFirmwareModal.propTypes = {
+  t: PropTypes.func.isRequired,
+  device: PropTypes.instanceOf(Object).isRequired,
+  show: PropTypes.bool.isRequired,
+  toggle: PropTypes.func.isRequired,
+  firmwareVersions: PropTypes.instanceOf(Array).isRequired,
+  upgradeToVersion: PropTypes.func.isRequired,
+  loading: PropTypes.bool.isRequired,
+  upgradeStatus: PropTypes.instanceOf(Object).isRequired,
+  keepRedirector: PropTypes.bool.isRequired,
+  toggleRedirector: PropTypes.func.isRequired,
+};
+
+export default React.memo(DeviceFirmwareModal);

src/components/DeviceFirmwareModal/index.js

@@ -1,8 +1,10 @@
+/* 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 { useAuth, useToast, useToggle } from 'ucentral-libs';
 import axiosInstance from 'utils/axiosInstance';
 import { useTranslation } from 'react-i18next';
+import Modal from './Modal';
 
 const DeviceFirmwareModal = ({
   device,
@@ -12,37 +14,60 @@ const DeviceFirmwareModal = ({
   upgradeStatus,
 }) => {
   const { t } = useTranslation();
+  const { addToast } = useToast();
   const { currentToken, endpoints } = useAuth();
   const [loading, setLoading] = useState(false);
   const [firmwareVersions, setFirmwareVersions] = useState([]);
+  const [keepRedirector, toggleKeepRedirector, setKeepRedirector] = useToggle(true);
 
-  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 = 0;
+    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,
@@ -55,12 +80,13 @@ const DeviceFirmwareModal = ({
 
     const parameters = {
       serialNumber: device.serialNumber,
+      keepRedirector,
       when: 0,
       uri,
     };
 
     axiosInstance
-      .post(`${endpoints.ucentralgw}/api/v1/device/${device.serialNumber}/upgrade`, parameters, {
+      .post(`${endpoints.owgw}/api/v1/device/${device.serialNumber}/upgrade`, parameters, {
         headers,
       })
       .then((response) => {
@@ -85,6 +111,7 @@ const DeviceFirmwareModal = ({
 
   useEffect(() => {
     if (show && device.compatible) getFirmwareList();
+    if (show) setKeepRedirector(true);
   }, [device, show]);
 
   return (
@@ -97,6 +124,8 @@ const DeviceFirmwareModal = ({
       upgradeToVersion={upgradeToVersion}
       loading={loading}
       upgradeStatus={upgradeStatus}
+      keepRedirector={keepRedirector}
+      toggleRedirector={toggleKeepRedirector}
     />
   );
 };

src/components/DeviceHealth/index.js

@@ -1,36 +1,35 @@
 /* eslint-disable-rule prefer-destructuring */
 import React, { useState, useEffect } from 'react';
 import {
-  CWidgetDropdown,
-  CCollapse,
+  CCardBody,
   CButton,
   CDataTable,
-  CCard,
-  CCardBody,
-  CRow,
-  CCol,
-  CProgress,
+  CCardHeader,
   CPopover,
+  CCard,
+  CFormText,
+  CBadge,
 } from '@coreui/react';
 import CIcon from '@coreui/icons-react';
+import { cilSync, cilTrash } from '@coreui/icons';
 import { useTranslation } from 'react-i18next';
 import DatePicker from 'react-widgets/DatePicker';
-import { prettyDate, dateToUnix } from 'utils/helper';
+import { dateToUnix } from 'utils/helper';
 import axiosInstance from 'utils/axiosInstance';
 import eventBus from 'utils/eventBus';
-import { LoadingButton, useAuth, useDevice } from 'ucentral-libs';
+import { LoadingButton, useAuth, useDevice, FormattedDate } from 'ucentral-libs';
 import DeleteLogModal from 'components/DeleteLogModal';
 
 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([]);
   const [start, setStart] = useState('');
+  const [startError, setStartError] = useState(false);
   const [end, setEnd] = useState('');
+  const [endError, setEndError] = useState(false);
   const [logLimit, setLogLimit] = useState(25);
   const [loadingMore, setLoadingMore] = useState(false);
   const [showLoadingMore, setShowLoadingMore] = useState(true);
@@ -42,19 +41,27 @@ const DeviceHealth = () => {
     setShowDeleteModal(!showDeleteModal);
   };
 
-  const toggle = (e) => {
-    setCollapse(!collapse);
-    e.preventDefault();
-  };
-
   const modifyStart = (value) => {
-    setStart(value);
+    try {
+      new Date(value).toISOString();
+      setStartError(false);
+      setStart(value);
+    } catch (e) {
+      setStart('');
+      setStartError(true);
+    }
   };
 
   const modifyEnd = (value) => {
-    setEnd(value);
+    try {
+      new Date(value).toISOString();
+      setEndError(false);
+      setEnd(value);
+    } catch (e) {
+      setEnd('');
+      setEndError(true);
+    }
   };
-
   const showMoreLogs = () => {
     setLogLimit(logLimit + 50);
   };
@@ -85,7 +92,7 @@ const DeviceHealth = () => {
 
     axiosInstance
       .get(
-        `${endpoints.ucentralgw}/api/v1/device/${encodeURIComponent(
+        `${endpoints.owgw}/api/v1/device/${encodeURIComponent(
           deviceSerialNumber,
         )}/healthchecks${extraParams}`,
         options,
@@ -100,35 +107,11 @@ const DeviceHealth = () => {
       });
   };
 
-  const toggleDetails = (index) => {
-    const position = details.indexOf(index);
-    let newDetails = details.slice();
-
-    if (position !== -1) {
-      newDetails.splice(position, 1);
-    } else {
-      newDetails = [...details, index];
-    }
-    setDetails(newDetails);
-  };
-
-  const getDetails = (index, healthCheckDetails) => {
-    if (details.includes(index))
-      return <pre className="ignore">{JSON.stringify(healthCheckDetails, null, 4)}</pre>;
-    return <pre className="ignore" />;
-  };
-
   const columns = [
-    { key: 'UUID', label: t('common.config_id') },
-    { key: 'recorded', label: t('common.recorded') },
-    { key: 'sanity', label: t('health.sanity') },
-    {
-      key: 'show_details',
-      label: '',
-      _style: { width: '1%' },
-      sorter: false,
-      filter: false,
-    },
+    { key: 'recorded', label: t('common.recorded'), _style: { width: '15%' } },
+    { key: 'UUID', label: t('common.config_id'), _style: { width: '10%' } },
+    { key: 'sanity', label: t('health.sanity'), _style: { width: '5%' } },
+    { key: 'checkDetails', label: t('common.details'), _style: { width: '65%' } },
   ];
 
   useEffect(() => {
@@ -160,14 +143,14 @@ const DeviceHealth = () => {
       const tempSanityLevel = sortedHealthchecks[healthChecks.length - 1].sanity;
       setSanityLevel(tempSanityLevel);
       if (tempSanityLevel === 100) {
-        setBarColor('gradient-success');
+        setBarColor('success');
       } else if (tempSanityLevel >= 90) {
-        setBarColor('gradient-warning');
+        setBarColor('warning');
       } else {
-        setBarColor('gradient-danger');
+        setBarColor('danger');
       }
     } else {
-      setBarColor('gradient-dark');
+      setBarColor('dark');
     }
   }, [healthChecks]);
 
@@ -188,112 +171,104 @@ const DeviceHealth = () => {
   }, []);
 
   return (
-    <CWidgetDropdown
-      header={t('health.title')}
-      text={sanityLevel ? `${sanityLevel}%` : t('common.unknown')}
-      value={sanityLevel ?? 100}
-      color={barColor}
-      inverse="true"
-      footerSlot={
-        <div className="p-4">
-          <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>
-            </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"
+    <CCard className="m-0">
+      <CCardHeader className="dark-header">
+        <div className="float-left align-middle pt-1">
+          <h4>
+            <CBadge color={barColor} className="my-0">
+              {sanityLevel ? `${sanityLevel}%` : `${t('common.unknown')} Sanity Level`}
+            </CBadge>
+          </h4>
+        </div>
+        <div className="d-flex flex-row-reverse align-items-center">
+          <div className="pl-2">
+            <CPopover content={t('common.refresh')}>
+              <CButton
+                size="sm"
+                color="info"
+                onClick={getDeviceHealth}
+                disabled={startError || endError}
+              >
+                <CIcon content={cilSync} />
+              </CButton>
+            </CPopover>
+          </div>
+          <div className="pl-2">
+            <DatePicker
+              includeTime
+              onChange={(date) => modifyEnd(date)}
+              value={end ? new Date(end) : undefined}
             />
-          </CButton>
+            <CFormText color="danger" hidden={!endError}>
+              {t('common.invalid_date_explanation')}
+            </CFormText>
+          </div>
+          To:
+          <div className="pl-2">
+            <DatePicker
+              includeTime
+              onChange={(date) => modifyStart(date)}
+              value={start ? new Date(start) : undefined}
+            />
+            <CFormText color="danger" hidden={!startError}>
+              {t('common.invalid_date_explanation')}
+            </CFormText>
+          </div>
+          From:
+          <div className="px-2">
+            <CPopover content={t('common.delete')}>
+              <CButton onClick={toggleDeleteModal} size="sm" color="danger">
+                <CIcon name="cil-trash" content={cilTrash} />
+              </CButton>
+            </CPopover>
+          </div>
+        </div>
+      </CCardHeader>
+      <CCardBody className="p-1">
+        <div className="overflow-auto" style={{ height: 'calc(100vh - 620px)' }}>
+          <CDataTable
+            addTableClasses="ignore-overflow table-sm"
+            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">
+                  <FormattedDate date={item.recorded} />
+                </td>
+              ),
+              sanity: (item) => <td className="align-middle">{`${item.sanity}%`}</td>,
+              checkDetails: (item) => (
+                <td>
+                  <pre className="my-0">{JSON.stringify(item.values)}</pre>
+                </td>
+              ),
+            }}
+          />
+          {showLoadingMore && (
+            <div className="mb-3">
+              <LoadingButton
+                label={t('common.view_more')}
+                isLoadingLabel={t('common.loading_more_ellipsis')}
+                isLoading={loadingMore}
+                action={showMoreLogs}
+                variant="outline"
+              />
+            </div>
+          )}
           <DeleteLogModal
             serialNumber={deviceSerialNumber}
-            object="healthchecks"
+            object="logs"
             show={showDeleteModal}
             toggle={toggleDeleteModal}
           />
         </div>
-      }
-    />
+      </CCardBody>
+    </CCard>
   );
 };
 

src/components/DeviceListTable/Table/index.js

@@ -0,0 +1,456 @@
+import React, { useEffect } from 'react';
+import PropTypes from 'prop-types';
+import ReactPaginate from 'react-paginate';
+import {
+  CCardBody,
+  CDataTable,
+  CButton,
+  CLink,
+  CCard,
+  CCardHeader,
+  CRow,
+  CCol,
+  CPopover,
+  CSelect,
+  CButtonClose,
+} from '@coreui/react';
+import {
+  cilSync,
+  cilArrowCircleTop,
+  cilCheckCircle,
+  cilTerminal,
+  cilTrash,
+  cilSearch,
+} from '@coreui/icons';
+import CIcon from '@coreui/icons-react';
+import ReactTooltip from 'react-tooltip';
+import { v4 as createUuid } from 'uuid';
+import { cleanBytesString } from 'utils/helper';
+import { DeviceBadge, LoadingButton } from 'ucentral-libs';
+import styles from './index.module.scss';
+
+const DeviceListTable = ({
+  currentPage,
+  devices,
+  searchBar,
+  devicesPerPage,
+  loading,
+  updateDevicesPerPage,
+  pageCount,
+  updatePage,
+  refreshDevice,
+  t,
+  toggleFirmwareModal,
+  toggleHistoryModal,
+  upgradeToLatest,
+  upgradeStatus,
+  deviceIcons,
+  connectRtty,
+  deleteDevice,
+  deleteStatus,
+}) => {
+  const columns = [
+    { key: 'deviceType', label: '', filter: false, sorter: false, _style: { width: '1%' } },
+    { key: 'serialNumber', label: t('common.serial_number'), _style: { width: '6%' } },
+    { key: 'firmware', label: t('firmware.revision') },
+    { key: 'firmware_button', label: '', filter: false, _style: { width: '1%' } },
+    { key: 'compatible', label: t('common.type'), filter: false, _style: { width: '13%' } },
+    { key: 'txBytes', label: 'Tx', filter: false, _style: { width: '14%' } },
+    { key: 'rxBytes', label: 'Rx', filter: false, _style: { width: '14%' } },
+    { key: 'ipAddress', label: t('IP'), _style: { width: '10%' } },
+    { key: 'twoG', label: t('2G'), _style: { width: '10%' } },
+    { key: 'fiveG', label: t('5G'), _style: { width: '10%' } },
+    { key: 'actions', label: t('actions.actions'), _style: { width: '10%' } },
+  ];
+
+  const hideTooltips = () => ReactTooltip.hide();
+
+  const escFunction = (event) => {
+    if (event.keyCode === 27) {
+      hideTooltips();
+    }
+  };
+
+  const getShortRevision = (revision) => {
+    if (revision.includes(' / ')) {
+      return revision.split(' / ')[1];
+    }
+    return revision;
+  };
+
+  useEffect(() => {
+    document.addEventListener('keydown', escFunction, false);
+
+    return () => {
+      document.removeEventListener('keydown', escFunction, false);
+    };
+  }, []);
+
+  const getFirmwareButton = (latest, device) => {
+    const tooltipId = createUuid();
+    let text = t('firmware.unknown_firmware_status');
+    let upgradeText = t('firmware.upgrade_to_latest');
+    let icon = <CIcon name="cil-arrow-circle-top" content={cilArrowCircleTop} />;
+    let color = 'secondary';
+    if (latest !== undefined) {
+      text = t('firmware.newer_firmware_available');
+      color = 'warning';
+
+      if (latest) {
+        icon = <CIcon name="cil-check-circle" content={cilCheckCircle} />;
+        text = t('firmware.latest_version_installed');
+        upgradeText = t('firmware.reinstall_latest');
+        color = 'success';
+      }
+    }
+    return (
+      <div>
+        <CButton size="sm" color={color} data-tip data-for={tooltipId} data-event="click">
+          {icon}
+        </CButton>
+        <ReactTooltip
+          id={tooltipId}
+          place="top"
+          effect="solid"
+          globalEventOff="click"
+          clickable
+          className={[styles.firmwareTooltip, 'tooltipLeft'].join(' ')}
+          border
+          borderColor="#321fdb"
+          arrowColor="white"
+          overridePosition={({ left, top }) => {
+            const element = document.getElementById(tooltipId);
+            const tooltipWidth = element ? element.offsetWidth : 0;
+            const newLeft = left + tooltipWidth * 0.25;
+            return { top, left: newLeft };
+          }}
+        >
+          <CCardHeader color="primary" className={styles.tooltipHeader}>
+            {text}
+            <CButtonClose
+              style={{ color: 'white' }}
+              onClick={(e) => {
+                e.target.parentNode.parentNode.classList.remove('show');
+                hideTooltips();
+              }}
+            />
+          </CCardHeader>
+          <CCardBody>
+            <CRow>
+              <CCol>
+                <LoadingButton
+                  variant="outline"
+                  label={upgradeText}
+                  isLoadingLabel={t('firmware.upgrading')}
+                  isLoading={upgradeStatus.loading}
+                  action={() => upgradeToLatest(device)}
+                  block
+                  disabled={
+                    upgradeStatus.loading && upgradeStatus.serialNumber === device.serialNumber
+                  }
+                />
+              </CCol>
+              <CCol>
+                <CButton
+                  block
+                  variant="outline"
+                  color="primary"
+                  onClick={() => {
+                    toggleFirmwareModal(device);
+                  }}
+                >
+                  {t('firmware.choose_custom')}
+                </CButton>
+              </CCol>
+              <CCol>
+                <CButton
+                  block
+                  variant="outline"
+                  color="primary"
+                  onClick={() => {
+                    toggleHistoryModal(device);
+                  }}
+                >
+                  {t('firmware.history_title')}
+                </CButton>
+              </CCol>
+            </CRow>
+          </CCardBody>
+        </ReactTooltip>
+      </div>
+    );
+  };
+
+  const deleteButton = (serialNumber) => {
+    const tooltipId = createUuid();
+
+    return (
+      <>
+        <CPopover content={t('common.delete_device')}>
+          <CButton
+            color="primary"
+            variant="outline"
+            shape="square"
+            size="sm"
+            className="mx-1 d-inline"
+            data-tip
+            data-for={tooltipId}
+            data-event="click"
+            style={{ width: '33px', height: '30px' }}
+          >
+            <CIcon name="cil-trash" content={cilTrash} size="sm" />
+          </CButton>
+        </CPopover>
+        <ReactTooltip
+          id={tooltipId}
+          place="top"
+          effect="solid"
+          globalEventOff="click"
+          clickable
+          className={[styles.deleteTooltip, 'tooltipRight'].join(' ')}
+          border
+          borderColor="#321fdb"
+          arrowColor="white"
+          overridePosition={({ left, top }) => {
+            const element = document.getElementById(tooltipId);
+            const tooltipWidth = element ? element.offsetWidth : 0;
+            const newLeft = left - tooltipWidth * 0.25;
+            return { top, left: newLeft };
+          }}
+        >
+          <CCardHeader color="primary" className={styles.tooltipHeader}>
+            {t('common.device_delete', { serialNumber })}
+            <CButtonClose
+              className="p-0 mb-1"
+              style={{ color: 'white' }}
+              onClick={(e) => {
+                e.target.parentNode.parentNode.classList.remove('show');
+                hideTooltips();
+              }}
+            />
+          </CCardHeader>
+          <CCardBody>
+            <CRow>
+              <CCol>
+                <LoadingButton
+                  data-toggle="dropdown"
+                  variant="outline"
+                  color="danger"
+                  label={t('common.confirm')}
+                  isLoadingLabel={t('user.deleting')}
+                  isLoading={deleteStatus.loading}
+                  action={(e) => {
+                    e.target.parentNode.parentNode.parentNode.parentNode.classList.remove('show');
+                    hideTooltips();
+                    deleteDevice(serialNumber);
+                  }}
+                  block
+                  disabled={deleteStatus.loading}
+                />
+              </CCol>
+            </CRow>
+          </CCardBody>
+        </ReactTooltip>
+      </>
+    );
+  };
+
+  return (
+    <>
+      <CCard className="m-0 p-0">
+        <CCardHeader className="p-0">
+          <div className="float-left" style={{ width: '400px' }}>
+            {searchBar}
+          </div>
+        </CCardHeader>
+        <CCardBody className="p-0">
+          <CDataTable
+            addTableClasses="ignore-overflow table-sm"
+            items={devices ?? []}
+            fields={columns}
+            hover
+            border
+            loading={loading}
+            scopedSlots={{
+              deviceType: (item) => (
+                <td className="align-middle text-center">
+                  <DeviceBadge t={t} device={item} deviceIcons={deviceIcons} />
+                </td>
+              ),
+              serialNumber: (item) => (
+                <td className="text-center align-middle">
+                  <CLink
+                    className="c-subheader-nav-link"
+                    aria-current="page"
+                    to={() => `/devices/${item.serialNumber}`}
+                  >
+                    {item.serialNumber}
+                  </CLink>
+                </td>
+              ),
+              firmware: (item) => (
+                <td className="align-middle">
+                  <CPopover
+                    content={item.firmware ? item.firmware : t('common.na')}
+                    placement="top"
+                  >
+                    <div style={{ width: 'calc(10vw)' }} className="text-truncate align-middle">
+                      {getShortRevision(item.firmware)}
+                    </div>
+                  </CPopover>
+                </td>
+              ),
+              firmware_button: (item) => (
+                <td className="text-center align-middle">
+                  {item.firmwareInfo
+                    ? getFirmwareButton(item.firmwareInfo.latest, item)
+                    : getFirmwareButton(undefined, item)}
+                </td>
+              ),
+              compatible: (item) => (
+                <td className="align-middle">
+                  <CPopover
+                    content={item.compatible ? item.compatible : t('common.na')}
+                    placement="top"
+                  >
+                    <div style={{ width: 'calc(10vw)' }} className="text-truncate align-middle">
+                      {item.compatible}
+                    </div>
+                  </CPopover>
+                </td>
+              ),
+              txBytes: (item) => <td className="align-middle">{cleanBytesString(item.txBytes)}</td>,
+              rxBytes: (item) => <td className="align-middle">{cleanBytesString(item.rxBytes)}</td>,
+              ipAddress: (item) => (
+                <td className="align-middle">
+                  <CPopover
+                    content={item.ipAddress ? item.ipAddress : t('common.na')}
+                    placement="top"
+                  >
+                    <div style={{ width: 'calc(8vw)' }} className="text-truncate align-middle">
+                      {item.ipAddress}
+                    </div>
+                  </CPopover>
+                </td>
+              ),
+              twoG: (item) => <td className="align-middle">{item.associations_2G ?? 0}</td>,
+              fiveG: (item) => <td className="align-middle">{item.associations_5G ?? 0}</td>,
+              actions: (item) => (
+                <td className="text-center align-middle">
+                  <div role="group" className="justify-content-center" style={{ width: '190px' }}>
+                    <CPopover content={t('actions.connect')}>
+                      <CButton
+                        className="mx-1 d-inline"
+                        color="primary"
+                        variant="outline"
+                        shape="square"
+                        size="sm"
+                        onClick={() => connectRtty(item.serialNumber)}
+                        style={{ width: '33px', height: '30px' }}
+                      >
+                        <CIcon name="cil-terminal" content={cilTerminal} size="sm" />
+                      </CButton>
+                    </CPopover>
+                    {deleteButton(item.serialNumber)}
+                    <CPopover content={t('configuration.details')}>
+                      <CLink
+                        className="c-subheader-nav-link"
+                        aria-current="page"
+                        to={() => `/devices/${item.serialNumber}`}
+                      >
+                        <CButton
+                          color="primary"
+                          variant="outline"
+                          shape="square"
+                          size="sm"
+                          className="mx-1 d-inline"
+                          style={{ width: '33px', height: '30px' }}
+                        >
+                          <CIcon name="cil-search" content={cilSearch} size="sm" />
+                        </CButton>
+                      </CLink>
+                    </CPopover>
+                    <CPopover content={t('common.refresh_device')}>
+                      <CButton
+                        onClick={() => refreshDevice(item.serialNumber)}
+                        color="primary"
+                        variant="outline"
+                        shape="square"
+                        size="sm"
+                        className="mx-1 d-inline"
+                        style={{ width: '33px', height: '30px' }}
+                      >
+                        <CIcon name="cil-sync" content={cilSync} size="sm" />
+                      </CButton>
+                    </CPopover>
+                  </div>
+                </td>
+              ),
+            }}
+          />
+          <div className="d-flex flex-row pl-3">
+            <div className="pr-3">
+              <ReactPaginate
+                previousLabel="← Previous"
+                nextLabel="Next →"
+                pageCount={pageCount}
+                onPageChange={updatePage}
+                forcePage={Number(currentPage)}
+                breakClassName="page-item"
+                breakLinkClassName="page-link"
+                containerClassName="pagination"
+                pageClassName="page-item"
+                pageLinkClassName="page-link"
+                previousClassName="page-item"
+                previousLinkClassName="page-link"
+                nextClassName="page-item"
+                nextLinkClassName="page-link"
+                activeClassName="active"
+              />
+            </div>
+            <p className="pr-2 mt-1">{t('common.items_per_page')}</p>
+            <div style={{ width: '100px' }} className="px-2">
+              <CSelect
+                custom
+                defaultValue={devicesPerPage}
+                onChange={(e) => updateDevicesPerPage(e.target.value)}
+                disabled={loading}
+              >
+                <option value="10">10</option>
+                <option value="25">25</option>
+                <option value="50">50</option>
+              </CSelect>
+            </div>
+          </div>
+        </CCardBody>
+      </CCard>
+    </>
+  );
+};
+
+DeviceListTable.propTypes = {
+  currentPage: PropTypes.oneOf(['string', 'number']),
+  devices: PropTypes.instanceOf(Array).isRequired,
+  searchBar: PropTypes.node.isRequired,
+  updateDevicesPerPage: PropTypes.func.isRequired,
+  pageCount: PropTypes.number.isRequired,
+  updatePage: PropTypes.func.isRequired,
+  devicesPerPage: PropTypes.string.isRequired,
+  refreshDevice: PropTypes.func.isRequired,
+  t: PropTypes.func.isRequired,
+  loading: PropTypes.bool.isRequired,
+  toggleFirmwareModal: PropTypes.func.isRequired,
+  toggleHistoryModal: PropTypes.func.isRequired,
+  upgradeToLatest: PropTypes.func.isRequired,
+  upgradeStatus: PropTypes.instanceOf(Object).isRequired,
+  deviceIcons: PropTypes.instanceOf(Object).isRequired,
+  connectRtty: PropTypes.func.isRequired,
+  deleteDevice: PropTypes.func.isRequired,
+  deleteStatus: PropTypes.instanceOf(Object).isRequired,
+};
+
+DeviceListTable.defaultProps = {
+  currentPage: '0',
+};
+
+export default React.memo(DeviceListTable);

src/components/DeviceListTable/Table/index.module.scss

@@ -0,0 +1,30 @@
+.firmwareTooltip {
+  opacity: 1 !important;
+  padding: 0px 0px 0px 0px !important;
+  border-radius: 1rem !important;
+  background-color: #fff !important;
+  border-color: #321fdb !important;
+  font-size: 0.875rem !important;
+  font-weight: 400 !important;
+  box-shadow: 0 3px 10px rgba(0, 0, 0, 0.2) !important;
+  width: 400px;
+}
+
+.deleteTooltip {
+  opacity: 1 !important;
+  padding: 0px 0px 0px 0px !important;
+  border-radius: 1rem !important;
+  background-color: #fff !important;
+  border-color: #321fdb !important;
+  font-size: 0.875rem !important;
+  font-weight: 400 !important;
+  box-shadow: 0 3px 10px rgba(0, 0, 0, 0.2) !important;
+  width: 200px;
+}
+
+.tooltipHeader {
+  padding-left: 5px;
+  padding-right: 10px;
+  border-top-left-radius: 1rem !important;
+  border-top-right-radius: 1rem !important;
+}

src/components/DeviceListTable/index.js

@@ -1,12 +1,13 @@
 import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useHistory, useLocation } from 'react-router-dom';
+import { useHistory } from 'react-router-dom';
 import axiosInstance from 'utils/axiosInstance';
 import { getItem, setItem } from 'utils/localStorageHelper';
 import DeviceSearchBar from 'components/DeviceSearchBar';
 import DeviceFirmwareModal from 'components/DeviceFirmwareModal';
 import FirmwareHistoryModal from 'components/FirmwareHistoryModal';
-import { DeviceListTable, useAuth, useToast } from 'ucentral-libs';
+import { useAuth, useToast } from 'ucentral-libs';
+import Table from './Table';
 import meshIcon from '../../assets/icons/Mesh.png';
 import apIcon from '../../assets/icons/AP.png';
 import internetSwitch from '../../assets/icons/Switch.png';
@@ -16,8 +17,7 @@ const DeviceList = () => {
   const { t } = useTranslation();
   const { addToast } = useToast();
   const history = useHistory();
-  const { search } = useLocation();
-  const page = new URLSearchParams(search).get('page');
+  const [page, setPage] = useState(parseInt(sessionStorage.getItem('deviceTable') ?? 0, 10));
   const { currentToken, endpoints } = useAuth();
   const [upgradeStatus, setUpgradeStatus] = useState({
     loading: false,
@@ -68,10 +68,8 @@ const DeviceList = () => {
 
     axiosInstance
       .get(
-        `${
-          endpoints.ucentralgw
-        }/api/v1/devices?deviceWithStatus=true&limit=${devicePerPage}&offset=${
-          devicePerPage * selectedPage + 1
+        `${endpoints.owgw}/api/v1/devices?deviceWithStatus=true&limit=${devicePerPage}&offset=${
+          devicePerPage * selectedPage
         }`,
         options,
       )
@@ -79,29 +77,40 @@ const DeviceList = () => {
         fullDevices = response.data.devicesWithStatus;
         const serialsToGet = fullDevices.map((device) => device.serialNumber);
 
+        if (serialsToGet.length === 0) {
+          return null;
+        }
         return axiosInstance.get(
-          `${endpoints.ucentralfms}/api/v1/firmwareAge?select=${serialsToGet}`,
+          `${endpoints.owfms}/api/v1/firmwareAge?select=${serialsToGet}`,
           options,
         );
       })
       .then((response) => {
-        fullDevices = fullDevices.map((device, index) => {
-          const foundAgeDate = response.data.ages[index].age !== undefined;
-          if (foundAgeDate) {
-            return {
-              ...device,
-              firmwareInfo: {
-                age: response.data.ages[index].age,
-                latest: response.data.ages[index].latest,
-              },
-            };
-          }
-          return device;
-        });
+        if (response !== null) {
+          fullDevices = fullDevices.map((device, index) => {
+            const foundAgeDate = response.data.ages[index].age !== undefined;
+            if (foundAgeDate) {
+              return {
+                ...device,
+                firmwareInfo: {
+                  age: response.data.ages[index].age,
+                  latest: response.data.ages[index].latest,
+                },
+              };
+            }
+            return device;
+          });
+        }
         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 +124,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 +141,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 +162,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);
       });
   };
@@ -185,13 +225,15 @@ const DeviceList = () => {
   };
 
   const updatePageCount = ({ selected: selectedPage }) => {
-    history.push(`/devices?page=${selectedPage}`);
+    sessionStorage.setItem('deviceTable', selectedPage);
+    setPage(selectedPage);
     getDeviceInformation(selectedPage);
   };
 
   const upgradeToLatest = (device) => {
     setUpgradeStatus({
       loading: true,
+      serialNumber: device.serialNumber,
     });
 
     const options = {
@@ -203,7 +245,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 +256,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 +301,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 +330,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'),
@@ -317,9 +356,6 @@ const DeviceList = () => {
   };
 
   useEffect(() => {
-    if (page === undefined || page === null || Number.isNaN(page)) {
-      history.push(`/devices?page=0`);
-    }
     getCount();
   }, []);
 
@@ -342,7 +378,7 @@ const DeviceList = () => {
 
   return (
     <div>
-      <DeviceListTable
+      <Table
         currentPage={page}
         t={t}
         searchBar={<DeviceSearchBar />}

src/components/DeviceLogs/index.js

@@ -1,35 +1,36 @@
 /* eslint-disable-rule prefer-destructuring */
 import React, { useState, useEffect } from 'react';
 import {
-  CWidgetDropdown,
-  CRow,
-  CCol,
+  CCardHeader,
+  CCardBody,
   CCollapse,
   CButton,
   CDataTable,
   CCard,
-  CCardBody,
   CPopover,
+  CFormText,
 } from '@coreui/react';
 import CIcon from '@coreui/icons-react';
+import { cilSync, cilTrash } from '@coreui/icons';
 import { useTranslation } from 'react-i18next';
 import DatePicker from 'react-widgets/DatePicker';
-import { prettyDate, dateToUnix } from 'utils/helper';
+import { dateToUnix } from 'utils/helper';
 import axiosInstance from 'utils/axiosInstance';
 import eventBus from 'utils/eventBus';
-import { LoadingButton, useAuth, useDevice } from 'ucentral-libs';
+import { LoadingButton, useAuth, useDevice, FormattedDate } from 'ucentral-libs';
 import DeleteLogModal from 'components/DeleteLogModal';
 
 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([]);
   const [start, setStart] = useState('');
+  const [startError, setStartError] = useState(false);
   const [end, setEnd] = useState('');
+  const [endError, setEndError] = useState(false);
   const [logLimit, setLogLimit] = useState(25);
   const [loadingMore, setLoadingMore] = useState(false);
   const [showLoadingMore, setShowLoadingMore] = useState(true);
@@ -39,17 +40,26 @@ const DeviceLogs = () => {
     setShowDeleteModal(!showDeleteModal);
   };
 
-  const toggle = (e) => {
-    setCollapse(!collapse);
-    e.preventDefault();
-  };
-
   const modifyStart = (value) => {
-    setStart(value);
+    try {
+      new Date(value).toISOString();
+      setStartError(false);
+      setStart(value);
+    } catch (e) {
+      setStart('');
+      setStartError(true);
+    }
   };
 
   const modifyEnd = (value) => {
-    setEnd(value);
+    try {
+      new Date(value).toISOString();
+      setEndError(false);
+      setEnd(value);
+    } catch (e) {
+      setEnd('');
+      setEndError(true);
+    }
   };
 
   const showMoreLogs = () => {
@@ -82,7 +92,7 @@ const DeviceLogs = () => {
 
     axiosInstance
       .get(
-        `${endpoints.ucentralgw}/api/v1/device/${encodeURIComponent(
+        `${endpoints.owgw}/api/v1/device/${encodeURIComponent(
           deviceSerialNumber,
         )}/logs${extraParams}`,
         options,
@@ -111,14 +121,15 @@ const DeviceLogs = () => {
 
   const getDetails = (index, logDetails) => {
     if (details.includes(index))
-      return <pre className="ignore">{JSON.stringify(logDetails, null, 4)}</pre>;
+      return <pre className="ignore">{JSON.stringify(logDetails, null, 2)}</pre>;
     return <pre className="ignore" />;
   };
 
   const columns = [
+    { key: 'recorded', label: t('common.recorded'), _style: { width: '15%' } },
+    { key: 'UUID', label: t('common.config_id'), _style: { width: '10%' } },
+    { key: 'severity', label: t('device_logs.severity'), _style: { width: '5%' } },
     { key: 'log', label: t('device_logs.log') },
-    { key: 'severity', label: t('device_logs.severity') },
-    { key: 'recorded', label: t('common.recorded') },
     {
       key: 'show_details',
       label: '',
@@ -171,96 +182,105 @@ const DeviceLogs = () => {
 
   return (
     <div>
-      <CWidgetDropdown
-        inverse="true"
-        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>
-              <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"
+      <CCard className="m-0">
+        <CCardHeader className="dark-header">
+          <div className="d-flex flex-row-reverse align-items-center">
+            <div className="pl-2">
+              <CPopover content={t('common.refresh')}>
+                <CButton size="sm" color="info" onClick={getLogs} disabled={startError || endError}>
+                  <CIcon content={cilSync} />
+                </CButton>
+              </CPopover>
+            </div>
+            <div className="pl-2">
+              <DatePicker
+                includeTime
+                onChange={(date) => modifyEnd(date)}
+                value={end ? new Date(end) : undefined}
               />
-            </CButton>
+              <CFormText color="danger" hidden={!endError}>
+                {t('common.invalid_date_explanation')}
+              </CFormText>
+            </div>
+            To:
+            <div className="pl-2">
+              <DatePicker
+                includeTime
+                onChange={(date) => modifyStart(date)}
+                value={start ? new Date(start) : undefined}
+              />
+              <CFormText color="danger" hidden={!startError}>
+                {t('common.invalid_date_explanation')}
+              </CFormText>
+            </div>
+            From:
+            <div className="px-2">
+              <CPopover content={t('common.delete')}>
+                <CButton onClick={toggleDeleteModal} size="sm" color="danger">
+                  <CIcon name="cil-trash" content={cilTrash} />
+                </CButton>
+              </CPopover>
+            </div>
           </div>
-        }
-      />
+        </CCardHeader>
+        <CCardBody className="p-1">
+          <div className="overflow-auto" style={{ height: 'calc(100vh - 620px)' }}>
+            <CDataTable
+              addTableClasses="ignore-overflow table-sm"
+              border
+              items={logs ?? []}
+              fields={columns}
+              loading={loading}
+              className="text-white"
+              sorterValue={{ column: 'recorded', desc: 'true' }}
+              scopedSlots={{
+                recorded: (item) => (
+                  <td className="align-middle">
+                    <FormattedDate date={item.recorded} />
+                  </td>
+                ),
+                UUID: (item) => <td className="align-middle">{item.UUID}</td>,
+                severity: (item) => <td className="align-middle">{item.severity}</td>,
+                log: (item) => <td className="align-middle">{item.log}</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" />
+                    </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>
+        </CCardBody>
+      </CCard>
       <DeleteLogModal
         serialNumber={deviceSerialNumber}
         object="logs"

src/components/DeviceSearchBar/index.js

@@ -1,10 +1,11 @@
 import React, { useEffect, useState } from 'react';
+import PropTypes from 'prop-types';
 import { useTranslation } from 'react-i18next';
 import { useHistory } from 'react-router-dom';
 import { useAuth, DeviceSearchBar as SearchBar } from 'ucentral-libs';
 import { checkIfJson } from 'utils/helper';
 
-const DeviceSearchBar = () => {
+const DeviceSearchBar = ({ action }) => {
   const { t } = useTranslation();
   const history = useHistory();
   const { currentToken, endpoints } = useAuth();
@@ -14,7 +15,7 @@ const DeviceSearchBar = () => {
 
   const search = (value) => {
     if (socket.readyState === WebSocket.OPEN) {
-      if (value.length > 0 && value.match('^[a-fA-F0-9]+$')) {
+      if (value.length > 1 && value.match('^[a-fA-F0-9-*]+$')) {
         setWaitingSearch('');
         socket.send(
           JSON.stringify({ command: 'serial_number_search', serial_prefix: value.toLowerCase() }),
@@ -24,7 +25,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,12 +61,20 @@ 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`));
     }
   }, []);
 
-  return <SearchBar t={t} search={search} results={results} history={history} />;
+  return <SearchBar t={t} search={search} results={results} history={history} action={action} />;
+};
+
+DeviceSearchBar.propTypes = {
+  action: PropTypes.func,
+};
+
+DeviceSearchBar.defaultProps = {
+  action: null,
 };
 
 export default DeviceSearchBar;

src/components/DeviceStatusCard/index.js

@@ -1,66 +0,0 @@
-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';
-
-const DeviceStatusCard = () => {
-  const { t } = useTranslation();
-  const { currentToken, endpoints } = useAuth();
-  const { deviceSerialNumber } = useDevice();
-  const [lastStats, setLastStats] = useState(null);
-  const [status, setStatus] = useState(null);
-  const [error, setError] = useState(false);
-  const [loading, setLoading] = useState(false);
-
-  const getData = () => {
-    setLoading(true);
-    const options = {
-      headers: {
-        Accept: 'application/json',
-        Authorization: `Bearer ${currentToken}`,
-      },
-    };
-
-    const lastStatsRequest = axiosInstance.get(
-      `${endpoints.ucentralgw}/api/v1/device/${encodeURIComponent(
-        deviceSerialNumber,
-      )}/statistics?lastOnly=true`,
-      options,
-    );
-    const statusRequest = axiosInstance.get(
-      `${endpoints.ucentralgw}/api/v1/device/${encodeURIComponent(deviceSerialNumber)}/status`,
-      options,
-    );
-
-    Promise.all([lastStatsRequest, statusRequest])
-      .then(([newStats, newStatus]) => {
-        setLastStats(newStats.data);
-        setStatus(newStatus.data);
-      })
-      .catch(() => {
-        setError(true);
-      })
-      .finally(() => {
-        setLoading(false);
-      });
-  };
-
-  useEffect(() => {
-    setError(false);
-    if (deviceSerialNumber) getData();
-  }, [deviceSerialNumber]);
-
-  return (
-    <Card
-      t={t}
-      loading={loading}
-      error={error}
-      deviceSerialNumber={deviceSerialNumber}
-      getData={getData}
-      status={status}
-      lastStats={lastStats}
-    />
-  );
-};
-
-export default DeviceStatusCard;

src/components/EditBlacklistModal/index.js

@@ -0,0 +1,154 @@
+import React, { useEffect, useState } from 'react';
+import PropTypes from 'prop-types';
+import { useTranslation } from 'react-i18next';
+import {
+  CButton,
+  CModal,
+  CModalHeader,
+  CModalTitle,
+  CModalBody,
+  CPopover,
+  CRow,
+  CCol,
+  CLabel,
+  CTextarea,
+} from '@coreui/react';
+import CIcon from '@coreui/icons-react';
+import { useAuth, useToast } from 'ucentral-libs';
+import { cilSave, cilX } from '@coreui/icons';
+import axiosInstance from 'utils/axiosInstance';
+
+const EditBlacklistModal = ({ show, toggle, serialNumber, refresh }) => {
+  const { t } = useTranslation();
+  const [loading, setLoading] = useState(false);
+  const { addToast } = useToast();
+  const { endpoints, currentToken } = useAuth();
+  const [reason, setReason] = useState('');
+
+  const getBlacklistInfo = () => {
+    setLoading(true);
+
+    const headers = {
+      Accept: 'application/json',
+      Authorization: `Bearer ${currentToken}`,
+    };
+
+    axiosInstance
+      .get(`${endpoints.owgw}/api/v1/blacklist/${serialNumber}`, {
+        headers,
+      })
+      .then((response) => {
+        setReason(response.data.reason);
+        setLoading(false);
+      })
+      .catch((e) => {
+        addToast({
+          title: t('common.error'),
+          body: t('device.error_fetching_devices', { error: e.response?.data?.ErrorDescription }),
+          color: 'danger',
+          autohide: true,
+        });
+        setLoading(false);
+        toggle();
+      });
+  };
+
+  const save = () => {
+    setLoading(true);
+
+    const parameters = {
+      reason,
+    };
+
+    const headers = {
+      Accept: 'application/json',
+      Authorization: `Bearer ${currentToken}`,
+    };
+
+    axiosInstance
+      .put(`${endpoints.owgw}/api/v1/blacklist/${serialNumber}`, parameters, { headers })
+      .then(() => {
+        addToast({
+          title: t('common.success'),
+          body: t('device.success_edit_blacklist'),
+          color: 'success',
+          autohide: true,
+        });
+        toggle();
+        if (refresh) refresh();
+      })
+      .catch((e) => {
+        addToast({
+          title: t('common.error'),
+          body: t('device.error_edit_blacklist', { error: e.response?.data?.ErrorDescription }),
+          color: 'danger',
+          autohide: true,
+        });
+      })
+      .finally(() => {
+        setLoading(false);
+      });
+  };
+
+  useEffect(() => {
+    if (show) getBlacklistInfo();
+  }, [show, serialNumber]);
+
+  return (
+    <CModal className="text-dark" size="lg" show={show} onClose={toggle}>
+      <CModalHeader className="p-1">
+        <CModalTitle className="pl-1 pt-1">{t('device.edit_blacklist')}</CModalTitle>
+        <div className="text-right">
+          <CPopover content={t('common.add')}>
+            <CButton
+              color="primary"
+              variant="outline"
+              className="ml-2"
+              onClick={save}
+              disabled={loading || reason === ''}
+            >
+              <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>
+        <CRow>
+          <CLabel col sm="3">
+            {t('common.reason')}
+          </CLabel>
+          <CCol sm="9" className="pt-2">
+            <CTextarea
+              name="reason"
+              id="reason"
+              rows="3"
+              type="text"
+              required
+              value={reason}
+              onChange={(e) => setReason(e.target.value)}
+            />
+          </CCol>
+        </CRow>
+      </CModalBody>
+    </CModal>
+  );
+};
+
+EditBlacklistModal.propTypes = {
+  show: PropTypes.bool.isRequired,
+  toggle: PropTypes.func.isRequired,
+  serialNumber: PropTypes.string,
+  refresh: PropTypes.func,
+};
+
+EditBlacklistModal.defaultProps = {
+  serialNumber: '',
+  refresh: null,
+};
+
+export default EditBlacklistModal;

src/components/EditConfigurationModal/Form.js

@@ -0,0 +1,163 @@
+import React, { useState, useEffect } from 'react';
+import PropTypes from 'prop-types';
+import Select from 'react-select';
+import {
+  CForm,
+  CInput,
+  CLabel,
+  CCol,
+  CFormGroup,
+  CInvalidFeedback,
+  CFormText,
+  CRow,
+  CTextarea,
+} from '@coreui/react';
+import { CopyToClipboardButton } from 'ucentral-libs';
+
+const EditDefaultConfigurationForm = ({
+  t,
+  disable,
+  fields,
+  updateField,
+  updateFieldWithKey,
+  deviceTypes,
+  editing,
+}) => {
+  const [typeOptions, setTypeOptions] = useState([]);
+  const [chosenTypes, setChosenTypes] = useState([]);
+
+  const parseOptions = () => {
+    const options = [{ value: '*', label: 'All' }];
+    const newOptions = deviceTypes.map((option) => ({
+      value: option,
+      label: option,
+    }));
+    options.push(...newOptions);
+    setTypeOptions(options);
+    setChosenTypes([]);
+
+    const newChosenTypes = fields.modelIds.value.map((dType) => ({
+      value: dType,
+      label: dType === '*' ? 'All' : dType,
+    }));
+
+    setChosenTypes(newChosenTypes);
+  };
+
+  const typeOnChange = (chosenArray) => {
+    const allIndex = chosenArray.findIndex((el) => el.value === '*');
+
+    // If the All option was chosen before, we take it out of the array
+    if (allIndex === 0 && chosenTypes.length > 0) {
+      const newResults = chosenArray.slice(1);
+      setChosenTypes(newResults);
+      updateFieldWithKey('modelIds', {
+        value: newResults.map((el) => el.value),
+        error: false,
+        notEmpty: true,
+      });
+    } else if (allIndex > 0) {
+      setChosenTypes([{ value: '*', label: 'All' }]);
+      updateFieldWithKey('modelIds', { value: ['*'], error: false, notEmpty: true });
+    } else if (chosenArray.length > 0) {
+      setChosenTypes(chosenArray);
+      updateFieldWithKey('modelIds', {
+        value: chosenArray.map((el) => el.value),
+        error: false,
+        notEmpty: true,
+      });
+    } else {
+      setChosenTypes([]);
+      updateFieldWithKey('modelIds', { value: [], error: false, notEmpty: true });
+    }
+  };
+
+  useEffect(() => {
+    parseOptions();
+  }, [deviceTypes, fields.name.value]);
+
+  return (
+    <CForm>
+      <CFormGroup row className="pb-3">
+        <CLabel col htmlFor="name">
+          {t('user.name')}
+        </CLabel>
+        <CCol sm="7" className="pt-2">
+          {fields.name.value}
+        </CCol>
+      </CFormGroup>
+      <CFormGroup row className="pb-3">
+        <CLabel col htmlFor="description">
+          {t('user.description')}
+        </CLabel>
+        <CCol sm="7">
+          <CInput
+            id="description"
+            type="text"
+            required
+            value={fields.description.value}
+            onChange={updateField}
+            invalid={fields.description.error}
+            disabled={disable || !editing}
+            maxLength="50"
+          />
+          <CInvalidFeedback>{t('common.required')}</CInvalidFeedback>
+        </CCol>
+      </CFormGroup>
+      <CRow className="pb-3">
+        <CLabel col htmlFor="deviceTypes">
+          <div>{t('configuration.supported_device_types')}:</div>
+        </CLabel>
+        <CCol sm="7">
+          <Select
+            isMulti
+            closeMenuOnSelect={false}
+            id="deviceTypes"
+            options={typeOptions}
+            onChange={typeOnChange}
+            value={chosenTypes}
+            className={`basic-multi-select ${fields.modelIds.error ? 'border-danger' : ''}`}
+            classNamePrefix="select"
+            isDisabled={disable || !editing}
+          />
+          <CFormText hidden={!fields.modelIds.error} color="danger">
+            {t('configuration.need_device_type')}
+          </CFormText>
+        </CCol>
+      </CRow>
+      <div className="pb-3">
+        {t('configuration.title')}
+        <CopyToClipboardButton t={t} size="sm" content={fields.configuration.value} />
+      </div>
+      <CRow className="pb-3">
+        <CCol>
+          <CTextarea
+            style={{ overflowY: 'scroll', height: '500px' }}
+            id="configuration"
+            type="text"
+            required
+            value={fields.configuration.value}
+            onChange={updateField}
+            invalid={fields.configuration.error}
+            disabled={disable || !editing}
+          />
+          <CFormText hidden={!fields.configuration.error} color="danger">
+            {t('common.required')}
+          </CFormText>
+        </CCol>
+      </CRow>
+    </CForm>
+  );
+};
+
+EditDefaultConfigurationForm.propTypes = {
+  t: PropTypes.func.isRequired,
+  disable: PropTypes.bool.isRequired,
+  fields: PropTypes.instanceOf(Object).isRequired,
+  updateField: PropTypes.func.isRequired,
+  updateFieldWithKey: PropTypes.func.isRequired,
+  deviceTypes: PropTypes.instanceOf(Array).isRequired,
+  editing: PropTypes.bool.isRequired,
+};
+
+export default EditDefaultConfigurationForm;

src/components/EditConfigurationModal/index.js

@@ -0,0 +1,243 @@
+import React, { useState, useEffect } from 'react';
+import PropTypes from 'prop-types';
+import { CModal, CModalHeader, CModalTitle, CModalBody, CButton, CPopover } from '@coreui/react';
+import CIcon from '@coreui/icons-react';
+import { cilX, cilSave, cilPencil } from '@coreui/icons';
+import { useToast, useFormFields, useAuth } from 'ucentral-libs';
+import axiosInstance from 'utils/axiosInstance';
+import { useTranslation } from 'react-i18next';
+import { checkIfJson } from 'utils/helper';
+import Form from './Form';
+
+const initialForm = {
+  name: {
+    value: '',
+    error: false,
+    required: true,
+  },
+  description: {
+    value: '',
+    error: false,
+  },
+  modelIds: {
+    value: [],
+    error: false,
+    notEmpty: true,
+  },
+  configuration: {
+    value: '',
+    error: false,
+    required: true,
+  },
+};
+
+const EditConfigurationModal = ({ show, toggle, refresh, configId }) => {
+  const { t } = useTranslation();
+  const { addToast } = useToast();
+  const { currentToken, endpoints } = useAuth();
+  const [fields, updateFieldWithId, updateField, setFormFields] = useFormFields(initialForm);
+  const [loading, setLoading] = useState(false);
+  const [deviceTypes, setDeviceTypes] = useState([]);
+  const [editing, setEditing] = useState(false);
+
+  const getConfig = () => {
+    const options = {
+      headers: {
+        Accept: 'application/json',
+        Authorization: `Bearer ${currentToken}`,
+      },
+    };
+
+    axiosInstance
+      .get(`${endpoints.owgw}/api/v1/default_configuration/${configId}`, options)
+      .then((response) => {
+        const newConfig = {};
+
+        for (const key of Object.keys(response.data)) {
+          if (key in initialForm) {
+            newConfig[key] = {
+              ...initialForm[key],
+              value: response.data[key],
+            };
+          }
+        }
+        newConfig.configuration.value = JSON.stringify(response.data.configuration, null, 2);
+        setFormFields(newConfig);
+      })
+      .catch((e) => {
+        addToast({
+          title: t('common.error'),
+          body: t('configuration.error_fetching_config', {
+            error: e.response?.data?.ErrorDescription,
+          }),
+          color: 'danger',
+          autohide: true,
+        });
+        toggle();
+      });
+  };
+
+  const getDeviceTypes = () => {
+    setLoading(true);
+
+    const headers = {
+      Accept: 'application/json',
+      Authorization: `Bearer ${currentToken}`,
+    };
+
+    axiosInstance
+      .get(`${endpoints.owfms}/api/v1/firmwares?deviceSet=true`, {
+        headers,
+      })
+      .then((response) => {
+        setDeviceTypes([...response.data.deviceTypes]);
+      })
+      .catch(() => {})
+      .finally(() => {
+        setLoading(false);
+      });
+  };
+
+  const validation = () => {
+    let success = true;
+
+    for (const [key, field] of Object.entries(fields)) {
+      if (field.required && field.value === '') {
+        updateField(key, { error: true });
+        success = false;
+        break;
+      }
+      if (field.notEmpty && field.value.length === 0) {
+        updateField(key, { error: true, notEmpty: true });
+        success = false;
+        break;
+      }
+    }
+
+    if (!checkIfJson(fields.configuration.value)) {
+      updateField('configuration', { error: true });
+      success = false;
+    }
+
+    return success;
+  };
+
+  const save = () => {
+    if (validation()) {
+      setLoading(true);
+      const options = {
+        headers: {
+          Accept: 'application/json',
+          Authorization: `Bearer ${currentToken}`,
+        },
+      };
+
+      const parameters = {
+        name: fields.name.value,
+        description: fields.description.value,
+        modelIds: fields.modelIds.value,
+        configuration: fields.configuration.value,
+      };
+
+      axiosInstance
+        .put(`${endpoints.owgw}/api/v1/default_configuration/${configId}`, parameters, options)
+        .then(() => {
+          if (refresh !== null) refresh();
+          toggle();
+          addToast({
+            title: t('common.success'),
+            body: t('configuration.success_update'),
+            color: 'success',
+            autohide: true,
+          });
+        })
+        .catch((e) => {
+          addToast({
+            title: t('common.error'),
+            body: t('configuration.error_update', { error: e.response?.data?.ErrorDescription }),
+            color: 'danger',
+            autohide: true,
+          });
+        })
+        .finally(() => {
+          setLoading(false);
+        });
+    }
+  };
+
+  const toggleEditing = () => {
+    if (editing) getConfig();
+    setEditing(!editing);
+  };
+
+  useEffect(() => {
+    if (show) {
+      setEditing(false);
+      getConfig();
+      getDeviceTypes();
+    }
+  }, [show]);
+
+  return (
+    <CModal className="text-dark" size="lg" show={show} onClose={toggle}>
+      <CModalHeader className="p-1">
+        <CModalTitle className="pl-1 pt-1">{t('configuration.edit_configuration')}</CModalTitle>
+        <div className="text-right">
+          <CPopover content={t('common.save')}>
+            <CButton
+              color="primary"
+              variant="outline"
+              className="ml-2"
+              onClick={save}
+              disabled={!editing}
+            >
+              <CIcon content={cilSave} />
+            </CButton>
+          </CPopover>
+          <CPopover content={t('common.edit')}>
+            <CButton
+              color="primary"
+              variant="outline"
+              className="ml-2"
+              onClick={toggleEditing}
+              disabled={editing}
+            >
+              <CIcon content={cilPencil} />
+            </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 className="px-5">
+        <Form
+          t={t}
+          disable={loading}
+          fields={fields}
+          editing={editing}
+          updateField={updateFieldWithId}
+          updateFieldWithKey={updateField}
+          deviceTypes={deviceTypes}
+          show={show}
+        />
+      </CModalBody>
+    </CModal>
+  );
+};
+
+EditConfigurationModal.propTypes = {
+  show: PropTypes.bool.isRequired,
+  toggle: PropTypes.func.isRequired,
+  refresh: PropTypes.func,
+  configId: PropTypes.string,
+};
+
+EditConfigurationModal.defaultProps = {
+  refresh: null,
+  configId: '',
+};
+
+export default EditConfigurationModal;

src/components/EditFirmwareModal/Form.js

@@ -0,0 +1,54 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { CCardBody, CCol, CInput, CRow } from '@coreui/react';
+import { prettyDate, cleanBytesString } from 'utils/helper';
+
+const FirmwareDetailsForm = ({ t, fields, updateFieldsWithId, editing }) => (
+  <CCardBody className="p-1">
+    <CRow>
+      <CCol sm="2">{t('firmware.release')}</CCol>
+      <CCol sm="4">{fields.release.value}</CCol>
+      <CCol sm="2">{t('common.created')}</CCol>
+      <CCol sm="4">{prettyDate(fields.created.value)}</CCol>
+    </CRow>
+    <CRow className="my-3">
+      <CCol sm="2">{t('firmware.image_date')}</CCol>
+      <CCol sm="4">{prettyDate(fields.imageDate.value)}</CCol>
+      <CCol sm="2">{t('firmware.size')}</CCol>
+      <CCol sm="4">{cleanBytesString(fields.size.value)}</CCol>
+    </CRow>
+    <CRow className="my-3">
+      <CCol sm="2">{t('firmware.image')}</CCol>
+      <CCol sm="4">{fields.image.value}</CCol>
+      <CCol sm="2">{t('firmware.revision')}</CCol>
+      <CCol sm="4">{fields.revision.value}</CCol>
+    </CRow>
+    <CRow className="my-3">
+      <CCol sm="2">URI</CCol>
+      <CCol sm="4">{fields.uri.value}</CCol>
+      <CCol sm="2" className="mt-2">
+        {t('user.description')}
+      </CCol>
+      <CCol sm="4">
+        {editing ? (
+          <CInput
+            id="description"
+            value={fields.description.value}
+            onChange={updateFieldsWithId}
+            maxLength="50"
+          />
+        ) : (
+          <p className="mt-2 mb-0">{fields.description.value}</p>
+        )}
+      </CCol>
+    </CRow>
+  </CCardBody>
+);
+
+FirmwareDetailsForm.propTypes = {
+  t: PropTypes.func.isRequired,
+  fields: PropTypes.instanceOf(Object).isRequired,
+  updateFieldsWithId: PropTypes.func.isRequired,
+  editing: PropTypes.bool.isRequired,
+};
+export default FirmwareDetailsForm;

src/components/EditFirmwareModal/index.js

@@ -0,0 +1,262 @@
+import React, { useEffect, useState } from 'react';
+import PropTypes from 'prop-types';
+import { useTranslation } from 'react-i18next';
+import {
+  CButton,
+  CModal,
+  CModalBody,
+  CModalHeader,
+  CModalTitle,
+  CPopover,
+  CNav,
+  CNavLink,
+  CTabPane,
+  CTabContent,
+} from '@coreui/react';
+import CIcon from '@coreui/icons-react';
+import { cilPencil, cilSave, cilX } from '@coreui/icons';
+import axiosInstance from 'utils/axiosInstance';
+import { useFormFields, useAuth, useToast, DetailedNotesTable } from 'ucentral-libs';
+import Form from './Form';
+
+const initialState = {
+  created: {
+    value: '',
+    error: false,
+    editable: false,
+  },
+  release: {
+    value: false,
+    error: false,
+    editable: false,
+  },
+  image: {
+    value: '',
+    error: false,
+    editable: true,
+  },
+  imageDate: {
+    value: '',
+    error: false,
+    editable: true,
+  },
+  size: {
+    value: '',
+    error: false,
+    editable: true,
+  },
+  revision: {
+    value: '',
+    error: false,
+    editable: false,
+  },
+  uri: {
+    value: '',
+    error: false,
+    editable: true,
+  },
+  description: {
+    value: '',
+    error: false,
+    editable: true,
+  },
+  notes: {
+    value: [],
+    editable: false,
+  },
+};
+
+const EditFirmwareModal = ({ show, toggle, firmwareId, refreshTable }) => {
+  const { t } = useTranslation();
+  const { currentToken, endpoints } = useAuth();
+  const { addToast } = useToast();
+  const [loading, setLoading] = useState(false);
+  const [editing, setEditing] = useState(false);
+  const [index, setIndex] = useState(0);
+  const [firmware, updateWithId, updateWithKey, setFirmware] = useFormFields(initialState);
+
+  const getFirmware = () => {
+    const options = {
+      headers: {
+        Accept: 'application/json',
+        Authorization: `Bearer ${currentToken}`,
+      },
+    };
+
+    axiosInstance
+      .get(`${endpoints.owfms}/api/v1/firmware/${firmwareId}`, options)
+      .then((response) => {
+        const newFirmware = {};
+
+        for (const key of Object.keys(response.data)) {
+          if (key in initialState && key !== 'currentPassword') {
+            newFirmware[key] = {
+              ...initialState[key],
+              value: response.data[key],
+            };
+          }
+        }
+        setFirmware({ ...initialState, ...newFirmware });
+      })
+      .catch(() => {});
+  };
+
+  const toggleEditing = () => {
+    if (editing) {
+      getFirmware();
+    }
+    setEditing(!editing);
+  };
+
+  const toggleModal = () => {
+    toggleEditing();
+    toggle();
+  };
+
+  const updateFirmware = () => {
+    setLoading(true);
+
+    const parameters = {
+      id: firmwareId,
+      description: firmware.description.value,
+    };
+
+    const newNotes = [];
+    for (let i = 0; i < firmware.notes.value.length; i += 1) {
+      if (firmware.notes.value[i].new) newNotes.push({ note: firmware.notes.value[i].note });
+    }
+
+    parameters.notes = newNotes;
+
+    const options = {
+      headers: {
+        Accept: 'application/json',
+        Authorization: `Bearer ${currentToken}`,
+      },
+    };
+
+    axiosInstance
+      .put(`${endpoints.owfms}/api/v1/firmware/${firmwareId}`, parameters, options)
+      .then(() => {
+        addToast({
+          title: t('firmware.update_success_title'),
+          body: t('firmware.update_success'),
+          color: 'success',
+          autohide: true,
+        });
+        refreshTable();
+        toggle();
+      })
+      .catch((e) => {
+        addToast({
+          title: t('firmware.update_failure_title'),
+          body: t('firmware.update_failure', { error: e.response?.data?.ErrorDescription }),
+          color: 'danger',
+          autohide: true,
+        });
+        getFirmware();
+      })
+      .finally(() => {
+        setLoading(false);
+      });
+  };
+
+  const addNote = (currentNote) => {
+    const newNotes = [...firmware.notes.value];
+    newNotes.unshift({
+      note: currentNote,
+      new: true,
+      created: new Date().getTime() / 1000,
+      createdBy: '',
+    });
+    updateWithKey('notes', { value: newNotes });
+  };
+
+  useEffect(() => {
+    if (show) {
+      getFirmware();
+      setEditing(false);
+      setIndex(0);
+    }
+  }, [show]);
+
+  return (
+    <CModal show={show} onClose={toggle} size="xl">
+      <CModalHeader className="p-1">
+        <CModalTitle className="pl-1 pt-1">
+          {t('firmware.details_title', { image: firmware.image.value })}
+        </CModalTitle>
+        <div className="text-right">
+          <CPopover content={t('common.save')}>
+            <CButton color="primary" variant="outline" onClick={updateFirmware} disabled={loading}>
+              <CIcon content={cilSave} />
+            </CButton>
+          </CPopover>
+          <CPopover content={t('common.edit')}>
+            <CButton
+              disabled={editing}
+              color="primary"
+              variant="outline"
+              onClick={toggleEditing}
+              className="ml-2"
+            >
+              <CIcon name="cil-pencil" content={cilPencil} />
+            </CButton>
+          </CPopover>
+          <CPopover content={t('common.close')}>
+            <CButton color="primary" variant="outline" className="ml-2" onClick={toggleModal}>
+              <CIcon content={cilX} />
+            </CButton>
+          </CPopover>
+        </div>
+      </CModalHeader>
+      <CModalBody className="px-3 pt-0">
+        <CNav variant="tabs" className="mb-0 p-0">
+          <CNavLink
+            className="font-weight-bold"
+            href="#"
+            active={index === 0}
+            onClick={() => setIndex(0)}
+          >
+            {t('common.main')}
+          </CNavLink>
+          <CNavLink
+            className="font-weight-bold"
+            href="#"
+            active={index === 1}
+            onClick={() => setIndex(1)}
+          >
+            {t('configuration.notes')}
+          </CNavLink>
+        </CNav>
+        <CTabContent>
+          <CTabPane active={index === 0} className="pt-2">
+            {index === 0 ? (
+              <Form t={t} fields={firmware} updateFieldsWithId={updateWithId} editing={editing} />
+            ) : null}
+          </CTabPane>
+          <CTabPane active={index === 1}>
+            {index === 1 ? (
+              <DetailedNotesTable
+                t={t}
+                notes={firmware.notes.value}
+                addNote={addNote}
+                loading={loading}
+                editable={editing}
+              />
+            ) : null}
+          </CTabPane>
+        </CTabContent>
+      </CModalBody>
+    </CModal>
+  );
+};
+
+EditFirmwareModal.propTypes = {
+  firmwareId: PropTypes.string.isRequired,
+  show: PropTypes.bool.isRequired,
+  toggle: PropTypes.func.isRequired,
+  refreshTable: PropTypes.func.isRequired,
+};
+
+export default React.memo(EditFirmwareModal);

src/components/EditUserModal/index.js

@@ -1,230 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import PropTypes from 'prop-types';
-import { useTranslation } from 'react-i18next';
-import axiosInstance from 'utils/axiosInstance';
-import { useUser, EditUserModal as Modal, useAuth, useToast } from 'ucentral-libs';
-
-const initialState = {
-  Id: {
-    value: '',
-    error: false,
-    editable: false,
-  },
-  changePassword: {
-    value: false,
-    error: false,
-    editable: false,
-  },
-  currentPassword: {
-    value: '',
-    error: false,
-    editable: true,
-  },
-  email: {
-    value: '',
-    error: false,
-    editable: false,
-  },
-  description: {
-    value: '',
-    error: false,
-    editable: true,
-  },
-  name: {
-    value: '',
-    error: false,
-    editable: true,
-  },
-  userRole: {
-    value: '',
-    error: false,
-    editable: true,
-  },
-  notes: {
-    value: [],
-    editable: false,
-  },
-};
-
-const EditUserModal = ({ show, toggle, userId, getUsers }) => {
-  const { t } = useTranslation();
-  const { currentToken, endpoints } = useAuth();
-  const { addToast } = useToast();
-  const [loading, setLoading] = useState(false);
-  const [initialUser, setInitialUser] = useState({});
-  const [user, updateWithId, updateWithKey, setUser] = useUser(initialState);
-  const [policies, setPolicies] = useState({
-    passwordPolicy: '',
-    passwordPattern: '',
-    accessPolicy: '',
-  });
-
-  const getPasswordPolicy = () => {
-    axiosInstance
-      .post(`${endpoints.ucentralsec}/api/v1/oauth2?requirements=true`, {})
-      .then((response) => {
-        const newPolicies = response.data;
-        newPolicies.accessPolicy = `${endpoints.ucentralsec}${newPolicies.accessPolicy}`;
-        newPolicies.passwordPolicy = `${endpoints.ucentralsec}${newPolicies.passwordPolicy}`;
-        setPolicies(response.data);
-      })
-      .catch(() => {});
-  };
-
-  const getUser = () => {
-    const options = {
-      headers: {
-        Accept: 'application/json',
-        Authorization: `Bearer ${currentToken}`,
-      },
-    };
-
-    axiosInstance
-      .get(`${endpoints.ucentralsec}/api/v1/user/${userId}`, options)
-      .then((response) => {
-        const newUser = {};
-
-        for (const key of Object.keys(response.data)) {
-          if (key in initialState && key !== 'currentPassword') {
-            newUser[key] = {
-              ...initialState[key],
-              value: response.data[key],
-            };
-          }
-        }
-        setInitialUser({ ...initialState, ...newUser });
-        setUser({ ...initialState, ...newUser });
-      })
-      .catch(() => {});
-  };
-
-  const updateUser = () => {
-    setLoading(true);
-
-    const parameters = {
-      id: userId,
-    };
-
-    let newData = false;
-
-    for (const key of Object.keys(user)) {
-      if (user[key].editable && user[key].value !== initialUser[key].value) {
-        if (key === 'currentPassword' && user[key].length < 8) {
-          updateWithKey('currentPassword', {
-            error: true,
-          });
-          newData = false;
-          break;
-        } else if (key === 'changePassword') {
-          parameters[key] = user[key].value === 'on';
-          newData = true;
-        } else {
-          parameters[key] = user[key].value;
-          newData = true;
-        }
-      }
-    }
-
-    if (newData) {
-      const options = {
-        headers: {
-          Accept: 'application/json',
-          Authorization: `Bearer ${currentToken}`,
-        },
-      };
-
-      axiosInstance
-        .put(`${endpoints.ucentralsec}/api/v1/user/${userId}`, parameters, options)
-        .then(() => {
-          addToast({
-            title: t('user.update_success_title'),
-            body: t('user.update_success'),
-            color: 'success',
-            autohide: true,
-          });
-          getUsers();
-          toggle();
-        })
-        .catch(() => {
-          addToast({
-            title: t('user.update_failure_title'),
-            body: t('user.update_failure'),
-            color: 'danger',
-            autohide: true,
-          });
-          getUser();
-        })
-        .finally(() => {
-          setLoading(false);
-        });
-    } else {
-      setLoading(false);
-      addToast({
-        title: t('user.update_success_title'),
-        body: t('user.update_success'),
-        color: 'success',
-        autohide: true,
-      });
-      getUsers();
-      toggle();
-    }
-  };
-
-  const addNote = (currentNote) => {
-    setLoading(true);
-
-    const parameters = {
-      id: userId,
-      notes: [{ note: currentNote }],
-    };
-
-    const options = {
-      headers: {
-        Accept: 'application/json',
-        Authorization: `Bearer ${currentToken}`,
-      },
-    };
-
-    axiosInstance
-      .put(`${endpoints.ucentralsec}/api/v1/user/${userId}`, parameters, options)
-      .then(() => {
-        getUser();
-      })
-      .catch(() => {})
-      .finally(() => {
-        setLoading(false);
-      });
-  };
-
-  useEffect(() => {
-    if (userId) {
-      getUser();
-    }
-    if (policies.passwordPattern.length === 0) {
-      getPasswordPolicy();
-    }
-  }, [userId]);
-
-  return (
-    <Modal
-      t={t}
-      user={user}
-      updateUserWithId={updateWithId}
-      saveUser={updateUser}
-      loading={loading}
-      policies={policies}
-      show={show}
-      toggle={toggle}
-      addNote={addNote}
-    />
-  );
-};
-
-EditUserModal.propTypes = {
-  userId: PropTypes.string.isRequired,
-  show: PropTypes.bool.isRequired,
-  toggle: PropTypes.func.isRequired,
-  getUsers: PropTypes.func.isRequired,
-};
-
-export default React.memo(EditUserModal);

src/components/EventQueueModal/Modal.js

@@ -0,0 +1,45 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {
+  CModal,
+  CModalBody,
+  CModalHeader,
+  CModalTitle,
+  CSpinner,
+  CPopover,
+  CButton,
+} from '@coreui/react';
+import CIcon from '@coreui/icons-react';
+import { cilX } from '@coreui/icons';
+
+const EventQueueModal = ({ t, show, toggle, loading, result }) => (
+  <CModal size="lg" show={show} onClose={toggle}>
+    <CModalHeader className="p-1">
+      <CModalTitle className="pl-1 pt-1">{t('commands.event_queue')}</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="text-center">
+      {loading ? (
+        <CSpinner color="primary" size="lg" />
+      ) : (
+        <pre className="ignore text-left">{JSON.stringify(result, null, 4)}</pre>
+      )}
+    </CModalBody>
+  </CModal>
+);
+
+EventQueueModal.propTypes = {
+  t: PropTypes.func.isRequired,
+  show: PropTypes.bool.isRequired,
+  toggle: PropTypes.func.isRequired,
+  loading: PropTypes.bool.isRequired,
+  result: PropTypes.instanceOf(Object).isRequired,
+};
+
+export default EventQueueModal;

src/components/EventQueueModal/index.js

@@ -1,8 +1,9 @@
 import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
-import { EventQueueModal as Modal, useAuth, useDevice, useToast } from 'ucentral-libs';
+import { useAuth, useDevice, useToast } from 'ucentral-libs';
 import { useTranslation } from 'react-i18next';
 import axiosInstance from 'utils/axiosInstance';
+import Modal from './Modal';
 
 const EventQueueModal = ({ show, toggle }) => {
   const { t } = useTranslation();
@@ -28,18 +29,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/FirmwareDashboard/Dashboard/index.js

@@ -0,0 +1,329 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {
+  CCard,
+  CCardBody,
+  CCardHeader,
+  CCol,
+  CDataTable,
+  CPopover,
+  CRow,
+  CSpinner,
+  CWidgetIcon,
+} from '@coreui/react';
+import { CChartBar, CChartHorizontalBar, CChartPie } from '@coreui/react-chartjs';
+import { cilClock, cilHappy, cilMeh, cilFrown, cilBirthdayCake, cilInfo } from '@coreui/icons';
+import CIcon from '@coreui/icons-react';
+import { FormattedDate } from 'ucentral-libs';
+
+import styles from './index.module.scss';
+
+const getLatestColor = (percent = 0) => {
+  const numberPercent = percent ? Number(percent.replace('%', '')) : 0;
+  if (numberPercent >= 90) return 'success';
+  if (numberPercent > 60) return 'warning';
+  return 'danger';
+};
+
+const getLatestIcon = (percent = 0) => {
+  const numberPercent = percent ? Number(percent.replace('%', '')) : 0;
+  if (numberPercent >= 90) return <CIcon width={36} name="cil-happy" content={cilHappy} />;
+  if (numberPercent > 60) return <CIcon width={36} name="cil-meh" content={cilMeh} />;
+  return <CIcon width={36} name="cil-frown" content={cilFrown} />;
+};
+
+const FirmwareDashboard = ({ t, data, loading }) => {
+  const columns = [
+    { key: 'endpoint', label: t('common.endpoint'), filter: false, sorter: false },
+    { key: 'devices', label: t('common.devices') },
+    { key: 'percent', label: '' },
+  ];
+
+  return (
+    <div style={{ position: 'relative' }}>
+      <div style={{ opacity: loading ? '20%' : '100%' }}>
+        <CRow className="mt-3">
+          <CCol>
+            <CWidgetIcon
+              text={t('common.last_dashboard_refresh')}
+              header={data.snapshot ? <FormattedDate date={data.snapshot} size="lg" /> : <h2>-</h2>}
+              color="info"
+              iconPadding={false}
+            >
+              <CIcon width={36} name="cil-clock" content={cilClock} />
+            </CWidgetIcon>
+          </CCol>
+          <CCol>
+            <CWidgetIcon
+              text={t('common.up_to_date')}
+              header={<h2>{data.latestSoftwareRate}</h2>}
+              color={getLatestColor(data.latestSoftwareRate)}
+              iconPadding={false}
+            >
+              {getLatestIcon(data.latestSoftwareRate)}
+            </CWidgetIcon>
+          </CCol>
+          <CCol>
+            <CWidgetIcon
+              text={t('common.devices')}
+              header={<h2>{data.numberOfDevices}</h2>}
+              color="primary"
+              iconPadding={false}
+            >
+              <CIcon width={36} name="cil-router" />
+            </CWidgetIcon>
+          </CCol>
+          <CCol>
+            <CWidgetIcon
+              text={
+                <div>
+                  <div className="float-left">{t('firmware.average_age')}</div>
+                  <div className="float-left ml-2">
+                    <CPopover content={t('firmware.age_explanation')}>
+                      <CIcon content={cilInfo} />
+                    </CPopover>
+                  </div>
+                </div>
+              }
+              header={<h2>{data.averageFirmwareAge}</h2>}
+              color="dark"
+              iconPadding={false}
+            >
+              <CIcon width={36} content={cilBirthdayCake} />
+            </CWidgetIcon>
+          </CCol>
+        </CRow>
+        <CRow>
+          <CCol>
+            <CCard>
+              <CCardHeader className="dark-header">{t('common.firmware_installed')}</CCardHeader>
+              <CCardBody>
+                <CChartPie
+                  datasets={data.firmwareDistribution.datasets}
+                  labels={data.firmwareDistribution.labels}
+                  options={{
+                    legend: {
+                      display: true,
+                      position: 'right',
+                    },
+                  }}
+                />
+              </CCardBody>
+            </CCard>
+          </CCol>
+          <CCol>
+            <CCard>
+              <CCardHeader className="dark-header">
+                <div>
+                  <div className="float-left">{t('common.devices_using_latest')}</div>
+                  <div className="float-left ml-2">
+                    <CPopover content={t('firmware.latest_explanation')}>
+                      <CIcon content={cilInfo} />
+                    </CPopover>
+                  </div>
+                </div>
+              </CCardHeader>
+              <CCardBody>
+                <CChartBar
+                  datasets={data.latest.datasets}
+                  labels={data.latest.labels}
+                  options={{
+                    tooltips: {
+                      mode: 'index',
+                      intersect: false,
+                    },
+                    hover: {
+                      mode: 'index',
+                      intersect: false,
+                    },
+                    legend: {
+                      display: false,
+                      position: 'right',
+                    },
+                    scales: {
+                      yAxes: [
+                        {
+                          ticks: {
+                            maxTicksLimit: 5,
+                            beginAtZero: true,
+                            stepSize: 1,
+                          },
+                        },
+                      ],
+                    },
+                  }}
+                />
+              </CCardBody>
+            </CCard>
+          </CCol>
+          <CCol>
+            <CCard>
+              <CCardHeader className="dark-header">Unknown Firmware</CCardHeader>
+              <CCardBody>
+                <CChartHorizontalBar
+                  datasets={data.unknownFirmwares.datasets}
+                  labels={data.unknownFirmwares.labels}
+                  options={{
+                    tooltips: {
+                      mode: 'index',
+                      intersect: false,
+                    },
+                    hover: {
+                      mode: 'index',
+                      intersect: false,
+                    },
+                    legend: {
+                      display: false,
+                      position: 'right',
+                    },
+                    scales: {
+                      xAxes: [
+                        {
+                          ticks: {
+                            maxTicksLimit: 5,
+                            beginAtZero: true,
+                            stepSize: 1,
+                          },
+                        },
+                      ],
+                      yAxes: [
+                        {
+                          ticks: {
+                            callback: (value) => value.split(' ')[0],
+                          },
+                        },
+                      ],
+                    },
+                  }}
+                />
+              </CCardBody>
+            </CCard>
+          </CCol>
+        </CRow>
+        <CRow>
+          <CCol>
+            <CCard>
+              <CCardHeader className="dark-header">{t('common.device_status')}</CCardHeader>
+              <CCardBody>
+                <CChartPie
+                  datasets={data.status.datasets}
+                  labels={data.status.labels}
+                  options={{
+                    tooltips: {
+                      callbacks: {
+                        title: (item, ds) => ds.labels[item[0].index],
+                        label: (item, ds) => `${ds.datasets[0].data[item.index]}%`,
+                      },
+                    },
+                    legend: {
+                      display: true,
+                      position: 'right',
+                    },
+                  }}
+                />
+              </CCardBody>
+            </CCard>
+          </CCol>
+          <CCol>
+            <CCard>
+              <CCardHeader className="dark-header">{t('firmware.device_types')}</CCardHeader>
+              <CCardBody>
+                <CChartPie
+                  datasets={data.deviceType.datasets}
+                  labels={data.deviceType.labels}
+                  options={{
+                    tooltips: {
+                      callbacks: {
+                        title: (item, ds) => ds.labels[item[0].index],
+                        label: (item, ds) =>
+                          `${ds.datasets[0].data[item.index]} ${t('common.devices')}`,
+                      },
+                    },
+                    legend: {
+                      display: true,
+                      position: 'right',
+                    },
+                  }}
+                />
+              </CCardBody>
+            </CCard>
+          </CCol>
+          <CCol>
+            <CCard>
+              <CCardHeader className="dark-header">OUIs</CCardHeader>
+              <CCardBody>
+                <CChartHorizontalBar
+                  datasets={data.ouis.datasets}
+                  labels={data.ouis.labels}
+                  options={{
+                    tooltips: {
+                      mode: 'index',
+                      intersect: false,
+                    },
+                    hover: {
+                      mode: 'index',
+                      intersect: false,
+                    },
+                    legend: {
+                      display: false,
+                      position: 'right',
+                    },
+                    scales: {
+                      xAxes: [
+                        {
+                          ticks: {
+                            maxTicksLimit: 5,
+                            beginAtZero: true,
+                            stepSize: 1,
+                          },
+                        },
+                      ],
+                      yAxes: [
+                        {
+                          ticks: {
+                            callback: (value) => value.split(' ')[0],
+                          },
+                        },
+                      ],
+                    },
+                  }}
+                />
+              </CCardBody>
+            </CCard>
+          </CCol>
+        </CRow>
+        <CRow>
+          <CCol>
+            <CCard>
+              <CCardHeader className="dark-header">{t('common.endpoints')}</CCardHeader>
+              <CCardBody>
+                <CDataTable
+                  addTableClasses="table-sm"
+                  items={data.endpoints ?? []}
+                  fields={columns}
+                  hover
+                  border
+                />
+              </CCardBody>
+            </CCard>
+          </CCol>
+          <CCol />
+          <CCol />
+        </CRow>
+      </div>
+      {loading ? (
+        <div className={styles.centerContainer}>
+          <CSpinner className={styles.spinner} />
+        </div>
+      ) : null}
+    </div>
+  );
+};
+
+FirmwareDashboard.propTypes = {
+  t: PropTypes.func.isRequired,
+  data: PropTypes.instanceOf(Object).isRequired,
+  loading: PropTypes.bool.isRequired,
+};
+
+export default React.memo(FirmwareDashboard);