From 3f4db59c6d616bf3dbae00806d756340aec3ae84 Mon Sep 17 00:00:00 2001
From: Chris Dons Johansen <cdj@iterator-it.dk>
Date: Fri, 13 Sep 2024 13:47:25 +0200
Subject: [PATCH 1/9] Initial restructure of UI-code to allow having tabs under
 datatarget-details..

---
 .../applications-routing.module.ts            |   4 +
 .../datatarget/datatarget-types.service.ts    |   3 +
 .../datatarget/datatarget.module.ts           |   2 +
 .../httppush-detail-tabs.component.html       |  15 ++
 .../httppush-detail-tabs.component.scss       |   0
 .../httppush-detail-tabs.component.spec.ts    |  23 +++
 .../httppush-detail-tabs.component.ts         | 111 +++++++++++++
 .../httppush-detail.component.html            | 155 ++++++++----------
 .../httppush-detail.component.ts              |  93 +++--------
 .../components/top-bar/top-bar.component.html |   4 +-
 src/app/shared/types/nav-tabs.type.ts         |   5 +
 src/assets/i18n/da.json                       |   1 +
 src/assets/i18n/en.json                       |   1 +
 13 files changed, 265 insertions(+), 152 deletions(-)
 create mode 100644 src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.html
 create mode 100644 src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.scss
 create mode 100644 src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.spec.ts
 create mode 100644 src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.ts
 create mode 100644 src/app/shared/types/nav-tabs.type.ts

diff --git a/src/app/applications/applications-routing.module.ts b/src/app/applications/applications-routing.module.ts
index 5542be8df..869156091 100644
--- a/src/app/applications/applications-routing.module.ts
+++ b/src/app/applications/applications-routing.module.ts
@@ -19,6 +19,7 @@ import { IotDeviceDetailsTabComponent } from "@applications/iot-devices/iot-devi
 import { IotDeviceHistoryTabComponent } from "@applications/iot-devices/iot-device-detail/iot-device-history-tab/iot-device-history-tab.component";
 import { IotDeviceDataPacketsTabComponent } from "@applications/iot-devices/iot-device-detail/iot-device-data-packets-tab/iot-device-data-packets-tab.component";
 import { IotDeviceDownlinkTabComponent } from "@applications/iot-devices/iot-device-detail/iot-device-downlink-tab/iot-device-downlink-tab.component";
+import { HttppushDetailComponent } from "./datatarget/httppush/httppush-detail/httppush-detail.component";
 
 const applicationRoutes: Routes = [
   {
@@ -70,6 +71,9 @@ const applicationRoutes: Routes = [
           {
             path: "datatarget/:datatargetId",
             component: DatatargetDetailComponent,
+            children: [
+              {path: "httppush-detail", component: HttppushDetailComponent }
+            ]
           },
           { path: "multicast-edit", component: MulticastEditComponent },
           {
diff --git a/src/app/applications/datatarget/datatarget-types.service.ts b/src/app/applications/datatarget/datatarget-types.service.ts
index de53fe079..68006dfcb 100644
--- a/src/app/applications/datatarget/datatarget-types.service.ts
+++ b/src/app/applications/datatarget/datatarget-types.service.ts
@@ -10,6 +10,7 @@ import { HttppushEditComponent } from "./httppush/httppush-edit/httppush-edit.co
 import { MqttDetailComponent } from "./mqtt-detail/mqtt-detail.component";
 import { MqttEditComponent } from "./mqtt-edit/mqtt-edit.component";
 import { OpendatadkEditComponent } from "./opendatadk/opendatadk-edit/opendatadk-edit.component";
+import { HttppushDetailTabsComponent } from "./httppush/httppush-detail-tabs/httppush-detail-tabs.component";
 
 @Injectable({
   providedIn: "root",
@@ -56,10 +57,12 @@ export class DatatargetTypesService {
 
   getDetailComponent(dataTargetType: DataTargetType): Type<DatatargetDetail> {
     if (dataTargetType === DataTargetType.HTTPPUSH) {
+      return HttppushDetailTabsComponent;
       return HttppushDetailComponent;
     }
 
     if (dataTargetType === DataTargetType.OPENDATADK) {
+      return HttppushDetailTabsComponent;
       return HttppushDetailComponent;
     }
 
diff --git a/src/app/applications/datatarget/datatarget.module.ts b/src/app/applications/datatarget/datatarget.module.ts
index ea0361994..8bcb804b8 100644
--- a/src/app/applications/datatarget/datatarget.module.ts
+++ b/src/app/applications/datatarget/datatarget.module.ts
@@ -16,6 +16,7 @@ import { SharedModule } from "@shared/shared.module";
 import { PipesModule } from "@shared/pipes/pipes.module";
 import { DatatargetNewComponent } from "./datatarget-new/datatarget-new.component";
 import { FiwareEditComponent } from "./fiware/fiware-edit/fiware-edit.component";
+import { HttppushDetailTabsComponent } from "./httppush/httppush-detail-tabs/httppush-detail-tabs.component";
 import { FiwareDetailComponent } from "./fiware/fiware-detail/fiware-detail.component";
 import { HttppushDetailComponent } from "./httppush/httppush-detail/httppush-detail.component";
 import { HttppushEditComponent } from "./httppush/httppush-edit/httppush-edit.component";
@@ -35,6 +36,7 @@ import { OpenDataDkWarningDialogComponent } from "./opendatadk/opendatadk-edit/o
     DatatargetDetailComponent,
     FiwareDetailComponent,
     FiwareEditComponent,
+    HttppushDetailTabsComponent,
     HttppushDetailComponent,
     HttppushEditComponent,
     OpendatadkComponent,
diff --git a/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.html b/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.html
new file mode 100644
index 000000000..77bbde6cc
--- /dev/null
+++ b/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.html
@@ -0,0 +1,15 @@
+<app-top-bar *ngIf="datatarget" [data]="datatarget" [backButton]="backButton" [subPage]="true"
+  [addDetailDowndown]="true" [dropDownButton]="dropdownButton" (deleteSelectedInDropdown)="onDeleteDatatarget()"
+  [canEdit]="canEdit">
+</app-top-bar>
+
+<div *ngIf="datatarget?.type === dataTargetType.HTTPPUSH">
+  <nav mat-tab-nav-bar [tabPanel]="tabPanel">
+    <a mat-tab-link *ngFor="let link of navTabs" [routerLink]="'./' + link.link" routerLinkActive
+      #rla="routerLinkActive" [active]="rla.isActive">{{ link.label | translate }}</a>
+  </nav>
+  <mat-divider></mat-divider>
+  <mat-tab-nav-panel #tabPanel></mat-tab-nav-panel>
+</div>
+
+<router-outlet></router-outlet>
diff --git a/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.scss b/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.spec.ts b/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.spec.ts
new file mode 100644
index 000000000..ced4a7a5d
--- /dev/null
+++ b/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { HttppushDetailTabsComponent } from './httppush-detail-tabs.component';
+
+describe('HttppushDetailTabsComponent', () => {
+  let component: HttppushDetailTabsComponent;
+  let fixture: ComponentFixture<HttppushDetailTabsComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [HttppushDetailTabsComponent]
+    })
+    .compileComponents();
+    
+    fixture = TestBed.createComponent(HttppushDetailTabsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.ts b/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.ts
new file mode 100644
index 000000000..7e4970317
--- /dev/null
+++ b/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.ts
@@ -0,0 +1,111 @@
+import { Location } from "@angular/common";
+import { HttpResponse } from "@angular/common/http";
+import { Component, OnDestroy } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { DatatargetDetail } from "@applications/datatarget/datatarget-detail/datatarget-detail";
+import { Datatarget } from "@applications/datatarget/datatarget.model";
+import { DatatargetService } from "@applications/datatarget/datatarget.service";
+import { TranslateService } from "@ngx-translate/core";
+import { DeleteDialogService } from "@shared/components/delete-dialog/delete-dialog.service";
+import { OrganizationAccessScope } from "@shared/enums/access-scopes";
+import { DataTargetType } from "@shared/enums/datatarget-type";
+import { BackButton } from "@shared/models/back-button.model";
+import { DropdownButton } from "@shared/models/dropdown-button.model";
+import { MeService } from "@shared/services/me.service";
+import { NavTab } from "@shared/types/nav-tabs.type";
+import { Subscription } from "rxjs";
+
+@Component({
+  selector: "app-httppush-detail-tabs",
+  templateUrl: "./httppush-detail-tabs.component.html",
+  styleUrl: "./httppush-detail-tabs.component.scss",
+})
+export class HttppushDetailTabsComponent implements DatatargetDetail, OnDestroy {
+  dataTargetType = DataTargetType;
+
+  navTabs: NavTab[] = [
+    {
+      label: "APPLICATION.DETAILS",
+      link: "httppush-detail",
+      index: 0,
+    },
+    {
+      label: "IOTDEVICE.HISTORY",
+      link: "datatarget-log",
+      index: 1,
+    },
+  ];
+
+  datatarget: Datatarget;
+  dropdownButton: DropdownButton;
+  backButton: BackButton = { label: "", routerLink: undefined };
+  canEdit: boolean;
+
+  private subscriptions: Subscription[] = [];
+  private deleteDialogSubscription: Subscription;
+
+  constructor(
+    route: ActivatedRoute,
+    router: Router,
+    translate: TranslateService,
+    meService: MeService,
+    private location: Location,
+    private datatargetService: DatatargetService,
+    public deleteDialogService: DeleteDialogService
+  ) {
+    // Load first tab if none was selected
+    const path = this.location.path();
+    if (!this.navTabs.some(tab => path.includes(tab.link))) {
+      router.navigate([path, this.navTabs[0].link], { replaceUrl: true });
+    }
+    // URL params
+    const paramMap = route.snapshot.paramMap;
+    const id: number = +paramMap.get("datatargetId");
+    const appId: number = +paramMap.get("id");
+    if (id) {
+      this.subscriptions.push(this.getDatatarget(id));
+      this.dropdownButton = {
+        label: "",
+        editRouterLink: "../../datatarget-edit/" + id,
+        isErasable: true,
+      };
+    }
+
+    this.subscriptions.push(
+      translate.get(["NAV.MY-DATATARGET", "DATATARGET.SHOW-OPTIONS"]).subscribe(translations => {
+        this.backButton.label = translations["NAV.MY-DATATARGET"];
+        this.dropdownButton.label = translations["DATATARGET.SHOW-OPTIONS"];
+      })
+    );
+
+    this.canEdit = meService.hasAccessToTargetOrganization(OrganizationAccessScope.ApplicationWrite, undefined, appId);
+  }
+
+  ngOnDestroy(): void {
+    this.subscriptions?.forEach(s => s?.unsubscribe());
+    this.deleteDialogSubscription?.unsubscribe();
+  }
+
+  getDatatarget = (id: number) =>
+    this.datatargetService.get(id).subscribe((dataTarget: Datatarget) => {
+      this.datatarget = dataTarget;
+    });
+
+  onDeleteDatatarget() {
+    this.deleteDialogSubscription?.unsubscribe();
+    this.deleteDialogSubscription = this.deleteDialogService.showSimpleDialog().subscribe(response => {
+      // Do nothing if user cancels
+      if (!response) return;
+      this.subscriptions.push(
+        this.datatargetService.delete(this.datatarget.id).subscribe((deleteResponse: HttpResponse<any>) => {
+          if (deleteResponse?.ok) {
+            this.location.back();
+          } else {
+            // TODO: Show error / snackbar??
+            console.log("Delete failed", deleteResponse);
+          }
+        })
+      );
+    });
+  }
+}
diff --git a/src/app/applications/datatarget/httppush/httppush-detail/httppush-detail.component.html b/src/app/applications/datatarget/httppush/httppush-detail/httppush-detail.component.html
index e298c88ee..d79dbb70b 100644
--- a/src/app/applications/datatarget/httppush/httppush-detail/httppush-detail.component.html
+++ b/src/app/applications/datatarget/httppush/httppush-detail/httppush-detail.component.html
@@ -1,101 +1,88 @@
-<div *ngIf="datatarget">
-  <app-top-bar
-    [data]="datatarget"
-    [backButton]="backButton"
-    [subPage]="true"
-    [addDetailDowndown]="true"
-    [dropDownButton]="dropdownButton"
-    (deleteSelectedInDropdown)="onDeleteDatatarget()"
-    [canEdit]="canEdit"
-  ></app-top-bar>
-  <div class="container-fluid">
-    <div class="row">
-      <div class="col-md-6 d-flex align-items-stretch">
-        <div class="jumbotron jumbotron--m-right jumbotron--full-width width100percent">
-          <h3>{{ "DATATARGET.DETAILS" | translate }}</h3>
-          <app-general-details [data]="datatarget"></app-general-details>
+<div *ngIf="datatarget" class="container-fluid">
+  <div class="row">
+    <div class="col-md-6 d-flex align-items-stretch">
+      <div class="jumbotron jumbotron--m-right jumbotron--full-width width100percent">
+        <h3>{{ "DATATARGET.DETAILS" | translate }}</h3>
+        <app-general-details [data]="datatarget"></app-general-details>
+        <mat-divider></mat-divider>
+        <span *ngIf="datatarget.type !== dataTargetType.OPENDATADK">
+          <p>
+            <strong>{{ "DATATARGET.URL" | translate }}</strong>{{ datatarget.url }}
+          </p>
+          <p>
+            <strong>{{ "DATATARGET.TIMEOUT" | translate }}</strong>{{ datatarget.timeout }}
+          </p>
+        </span>
+        <p>
+          <strong>{{ "DATATARGET.TYPE" | translate }}</strong>{{ "DATATARGET." + datatarget.type + ".TYPE" | translate
+          }}
+        </p>
+        <span *ngIf="datatarget.type !== dataTargetType.OPENDATADK">
           <mat-divider></mat-divider>
-          <span *ngIf="datatarget.type !== dataTargetType.OPENDATADK">
-            <p>
-              <strong>{{ "DATATARGET.URL" | translate }}</strong
-              >{{ datatarget.url }}
-            </p>
-            <p>
-              <strong>{{ "DATATARGET.TIMEOUT" | translate }}</strong
-              >{{ datatarget.timeout }}
-            </p>
-          </span>
           <p>
-            <strong>{{ "DATATARGET.TYPE" | translate }}</strong
-            >{{ "DATATARGET." + datatarget.type + ".TYPE" | translate }}
+            <strong>{{ "DATATARGET.AUTHORIZATIONHEADER" | translate }}</strong>
           </p>
-          <span *ngIf="datatarget.type !== dataTargetType.OPENDATADK">
-            <mat-divider></mat-divider>
-            <p>
-              <strong>{{ "DATATARGET.AUTHORIZATIONHEADER" | translate }}</strong>
-            </p>
-            <code>
+          <code>
               <pre *ngIf="datatarget.authorizationHeader; else showNoAuthText">{{
                 datatarget.authorizationHeader
               }}</pre>
             </code>
-            <ng-template #showNoAuthText>
-              <p>{{ "DATATARGET.NO-AUTHORIZATIONHEADER" | translate }}</p>
-            </ng-template>
-          </span>
-        </div>
-      </div>
-      <div *ngIf="datatarget.type === dataTargetType.OPENDATADK" class="col-md-6 d-flex align-items-stretch">
-        <div class="jumbotron jumbotron--m-left jumbotron--full-width">
-          <h3>{{ "DATATARGET.OPENDATA-DK.TYPE" | translate }}</h3>
-          <div *ngIf="datatarget.setToOpendataDk; else noOpendataDk">
-            <app-opendatadk-detail [openDataDkDataset]="datatarget.openDataDkDataset"></app-opendatadk-detail>
-          </div>
-          <ng-template #noOpendataDk>
-            <p>{{ "DATATARGET.NO-OPENDATA-DK" | translate }}</p>
+          <ng-template #showNoAuthText>
+            <p>{{ "DATATARGET.NO-AUTHORIZATIONHEADER" | translate }}</p>
           </ng-template>
+        </span>
+      </div>
+    </div>
+    <div *ngIf="datatarget.type === dataTargetType.OPENDATADK" class="col-md-6 d-flex align-items-stretch">
+      <div class="jumbotron jumbotron--m-left jumbotron--full-width">
+        <h3>{{ "DATATARGET.OPENDATA-DK.TYPE" | translate }}</h3>
+        <div *ngIf="datatarget.setToOpendataDk; else noOpendataDk">
+          <app-opendatadk-detail [openDataDkDataset]="datatarget.openDataDkDataset"></app-opendatadk-detail>
         </div>
+        <ng-template #noOpendataDk>
+          <p>{{ "DATATARGET.NO-OPENDATA-DK" | translate }}</p>
+        </ng-template>
       </div>
     </div>
+  </div>
 
-    <div class="row">
-      <div class="col-12">
-        <div class="jumbotron">
-          <div class="form-group">
-            <h3>{{ "DATATARGET.RELATIONS" | translate }}</h3>
-            <div *ngIf="dataTargetRelations?.length === 0">
-              <p>{{ "DATATARGET.NO-RELATIONS" | translate }}</p>
-            </div>
-            <div *ngIf="dataTargetRelations">
-              <div *ngFor="let relation of dataTargetRelations">
-                <div class="row">
-                  <div class="col-md-4 d-flex align-items-center">
-                    <p>
-                      <strong>{{ "DATATARGET.PAYLOADEDECODER" | translate }}</strong
-                      ><span *ngIf="relation.payloadDecoder; else noDecoder">
-                        <a [routerLink]="['/payload-decoder/payload-decoder-detail/', relation.payloadDecoder.id]">{{
-                          relation.payloadDecoder.name
+  <div class="row">
+    <div class="col-12">
+      <div class="jumbotron">
+        <div class="form-group">
+          <h3>{{ "DATATARGET.RELATIONS" | translate }}</h3>
+          <div *ngIf="dataTargetRelations?.length === 0">
+            <p>{{ "DATATARGET.NO-RELATIONS" | translate }}</p>
+          </div>
+          <div *ngIf="dataTargetRelations">
+            <div *ngFor="let relation of dataTargetRelations">
+              <div class="row">
+                <div class="col-md-4 d-flex align-items-center">
+                  <p>
+                    <strong>{{ "DATATARGET.PAYLOADEDECODER" | translate }}</strong><span
+                      *ngIf="relation.payloadDecoder; else noDecoder">
+                      <a [routerLink]="['/payload-decoder/payload-decoder-detail/', relation.payloadDecoder.id]">{{
+                        relation.payloadDecoder.name
                         }}</a>
-                      </span>
-                      <ng-template #noDecoder>{{ "DATATARGET.NO-PAYLOADDECODER" | translate }}</ng-template>
-                    </p>
-                  </div>
-                  <div class="col-md-1 d-flex align-items-center justify-content-center">
-                    <fa-icon [icon]="arrowsAltH" class="icon--primary icon--medium icon--disabled"></fa-icon>
-                  </div>
-                  <div class="col-md-7 d-flex align-items-center">
-                    <p>
-                      <strong>{{ "DATATARGET.IOTDEVICE" | translate }}</strong>
-                      <span *ngFor="let device of relation.iotDevices; let first = first">
-                        <ng-container *ngIf="!first">, </ng-container>
-                        <a [routerLink]="['/applications', device.application.id, 'iot-device', device.id]">{{
-                          device.name
+                    </span>
+                    <ng-template #noDecoder>{{ "DATATARGET.NO-PAYLOADDECODER" | translate }}</ng-template>
+                  </p>
+                </div>
+                <div class="col-md-1 d-flex align-items-center justify-content-center">
+                  <fa-icon [icon]="arrowsAltH" class="icon--primary icon--medium icon--disabled"></fa-icon>
+                </div>
+                <div class="col-md-7 d-flex align-items-center">
+                  <p>
+                    <strong>{{ "DATATARGET.IOTDEVICE" | translate }}</strong>
+                    <span *ngFor="let device of relation.iotDevices; let first = first">
+                      <ng-container *ngIf="!first">, </ng-container>
+                      <a [routerLink]="['/applications', device.application.id, 'iot-device', device.id]">{{
+                        device.name
                         }}</a>
-                      </span>
-                    </p>
-                  </div>
-                  <mat-divider></mat-divider>
+                    </span>
+                  </p>
                 </div>
+                <mat-divider></mat-divider>
               </div>
             </div>
           </div>
@@ -103,4 +90,4 @@ <h3>{{ "DATATARGET.RELATIONS" | translate }}</h3>
       </div>
     </div>
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/applications/datatarget/httppush/httppush-detail/httppush-detail.component.ts b/src/app/applications/datatarget/httppush/httppush-detail/httppush-detail.component.ts
index 7c2f9f146..3fce32cff 100644
--- a/src/app/applications/datatarget/httppush/httppush-detail/httppush-detail.component.ts
+++ b/src/app/applications/datatarget/httppush/httppush-detail/httppush-detail.component.ts
@@ -1,97 +1,58 @@
-import { Component, OnDestroy, OnInit } from "@angular/core";
-import { Subscription } from "rxjs";
+import { Component, OnDestroy } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
-import { TranslateService } from "@ngx-translate/core";
 import { PayloadDeviceDatatargetGetByDataTarget } from "@app/payload-decoder/payload-device-data.model";
 import { PayloadDeviceDatatargetService } from "@app/payload-decoder/payload-device-datatarget.service";
-import { BackButton } from "@shared/models/back-button.model";
-import { DatatargetService } from "../../datatarget.service";
-import { Location } from "@angular/common";
-import { DeleteDialogService } from "@shared/components/delete-dialog/delete-dialog.service";
-import { Datatarget } from "../../datatarget.model";
-import { DropdownButton } from "@shared/models/dropdown-button.model";
-import { faArrowsAltH } from "@fortawesome/free-solid-svg-icons";
 import { DatatargetDetail } from "@applications/datatarget/datatarget-detail/datatarget-detail";
-import { MeService } from "@shared/services/me.service";
+import { faArrowsAltH } from "@fortawesome/free-solid-svg-icons";
 import { OrganizationAccessScope } from "@shared/enums/access-scopes";
 import { DataTargetType } from "@shared/enums/datatarget-type";
+import { MeService } from "@shared/services/me.service";
+import { Subscription } from "rxjs";
+import { Datatarget } from "../../datatarget.model";
+import { DatatargetService } from "../../datatarget.service";
 
 @Component({
   selector: "app-httppush-detail",
   templateUrl: "./httppush-detail.component.html",
   styleUrls: ["./httppush-detail.component.scss"],
 })
-export class HttppushDetailComponent implements DatatargetDetail, OnInit, OnDestroy {
+export class HttppushDetailComponent implements DatatargetDetail, OnDestroy {
   dataTargetType = DataTargetType;
-
-  public datatargetSubscription: Subscription;
-  public datatarget: Datatarget;
-  public backButton: BackButton = { label: "", routerLink: undefined };
-  public dataTargetRelations: PayloadDeviceDatatargetGetByDataTarget[];
-  private deleteDialogSubscription: Subscription;
-  public dropdownButton: DropdownButton;
   arrowsAltH = faArrowsAltH;
+
+  datatarget: Datatarget;
+  dataTargetRelations: PayloadDeviceDatatargetGetByDataTarget[];
   canEdit: boolean;
 
+  private subscriptions: Subscription[];
+
   constructor(
-    private route: ActivatedRoute,
-    private deleteDialogService: DeleteDialogService,
-    private location: Location,
-    private datatargetRelationServicer: PayloadDeviceDatatargetService,
+    route: ActivatedRoute,
+    meService: MeService,
     private datatargetService: DatatargetService,
-    public translate: TranslateService,
-    private meService: MeService
-  ) {}
+    private datatargetRelationServicer: PayloadDeviceDatatargetService
+  ) {
+    const paramMap = route.parent.snapshot.paramMap;
+    const id: number = +paramMap.get("datatargetId");
+    const appId: number = +paramMap.get("id");
 
-  ngOnInit(): void {
-    const id: number = +this.route.snapshot.paramMap.get("datatargetId");
-    const appId: number = +this.route.snapshot.paramMap.get("id");
     if (id) {
-      this.getDatatarget(id);
-      this.getDatatargetRelations(id);
-      this.dropdownButton = {
-        label: "",
-        editRouterLink: "../../datatarget-edit/" + id,
-        isErasable: true,
-      };
+      this.subscriptions = [this.getDatatarget(id), this.getDatatargetRelations(id)];
     }
-    this.translate.get(["NAV.MY-DATATARGET", "DATATARGET.SHOW-OPTIONS"]).subscribe(translations => {
-      this.backButton.label = translations["NAV.MY-DATATARGET"];
-      this.dropdownButton.label = translations["DATATARGET.SHOW-OPTIONS"];
-    });
-    this.canEdit = this.meService.hasAccessToTargetOrganization(
-      OrganizationAccessScope.ApplicationWrite,
-      undefined,
-      appId
-    );
+    this.canEdit = meService.hasAccessToTargetOrganization(OrganizationAccessScope.ApplicationWrite, undefined, appId);
+  }
+
+  ngOnDestroy(): void {
+    this.subscriptions?.forEach(s => s?.unsubscribe());
   }
 
-  getDatatarget(id: number) {
+  private getDatatarget = (id: number) =>
     this.datatargetService.get(id).subscribe((dataTarget: Datatarget) => {
       this.datatarget = dataTarget;
     });
-  }
 
-  onDeleteDatatarget() {
-    this.deleteDialogSubscription = this.deleteDialogService.showSimpleDialog().subscribe(response => {
-      if (response) {
-        this.datatargetService.delete(this.datatarget.id).subscribe(response => {});
-        this.location.back();
-      } else {
-        console.log(response);
-      }
-    });
-  }
-
-  getDatatargetRelations(id: number) {
+  private getDatatargetRelations = (id: number) =>
     this.datatargetRelationServicer.getByDataTarget(id).subscribe(response => {
       this.dataTargetRelations = response.data;
     });
-  }
-
-  ngOnDestroy(): void {
-    if (this.deleteDialogSubscription) {
-      this.deleteDialogSubscription.unsubscribe();
-    }
-  }
 }
diff --git a/src/app/shared/components/top-bar/top-bar.component.html b/src/app/shared/components/top-bar/top-bar.component.html
index 0d1fdf0b5..9bcc122f6 100644
--- a/src/app/shared/components/top-bar/top-bar.component.html
+++ b/src/app/shared/components/top-bar/top-bar.component.html
@@ -61,7 +61,7 @@ <h3 class="pl-md-3">{{ title || staticTitle }}</h3>
               >
                 <button
                   type="button"
-                  id="dropdown-{{ data.name }}"
+                  id="dropdown-{{ data?.name }}"
                   class="btn btn-primary dropdown-toggle"
                   data-toggle="dropdown"
                   aria-haspopup="true"
@@ -69,7 +69,7 @@ <h3 class="pl-md-3">{{ title || staticTitle }}</h3>
                 >
                   {{ dropDownButton.label }} <span class="caret"></span>
                 </button>
-                <ul class="dropdown-menu" attr.aria-labelledby="dropdown-{{ data.name }}">
+                <ul class="dropdown-menu" attr.aria-labelledby="dropdown-{{ data?.name }}">
                   <li class="dropdown-item">
                     <a [routerLink]="dropDownButton.editRouterLink">{{ "TOPBAR.DROPDOWN.EDIT" | translate }} </a>
                   </li>
diff --git a/src/app/shared/types/nav-tabs.type.ts b/src/app/shared/types/nav-tabs.type.ts
new file mode 100644
index 000000000..469c0d21c
--- /dev/null
+++ b/src/app/shared/types/nav-tabs.type.ts
@@ -0,0 +1,5 @@
+export interface NavTab {
+  label: string;
+  link: string;
+  index?: number;
+}
diff --git a/src/assets/i18n/da.json b/src/assets/i18n/da.json
index c0b735eba..b29500d79 100644
--- a/src/assets/i18n/da.json
+++ b/src/assets/i18n/da.json
@@ -18,6 +18,7 @@
         "OFFLINE": "Offline",
         "NEVER-SEEN": "Aldrig set",
         "DATE": "Dato",
+        "LOG": "Log",
         "NO-DATA": "Der er ingen data at vise"
     },
     "NAV": {
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index d167bd07b..116c962da 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -2,6 +2,7 @@
     "GEN": {
         "CANCEL": "Cancel",
         "SHOW": "Show",
+        "LOG": "Log",
         "PER-PAGE": "Per page"
     },
     "NAV": {

From c98dc156a286fdb40e6139859c220fbc26a713fb Mon Sep 17 00:00:00 2001
From: Chris Dons Johansen <cdj@iterator-it.dk>
Date: Fri, 13 Sep 2024 13:52:11 +0200
Subject: [PATCH 2/9] Cleaned up some unused files..

---
 .../datatarget/datatarget.module.ts           |  2 --
 .../opendatadk/opendatadk.component.html      |  1 -
 .../opendatadk/opendatadk.component.scss      |  3 ---
 .../opendatadk/opendatadk.component.spec.ts   | 24 -------------------
 .../opendatadk/opendatadk.component.ts        | 12 ----------
 5 files changed, 42 deletions(-)
 delete mode 100644 src/app/applications/datatarget/opendatadk/opendatadk.component.html
 delete mode 100644 src/app/applications/datatarget/opendatadk/opendatadk.component.scss
 delete mode 100644 src/app/applications/datatarget/opendatadk/opendatadk.component.spec.ts
 delete mode 100644 src/app/applications/datatarget/opendatadk/opendatadk.component.ts

diff --git a/src/app/applications/datatarget/datatarget.module.ts b/src/app/applications/datatarget/datatarget.module.ts
index 8bcb804b8..d2c6a635a 100644
--- a/src/app/applications/datatarget/datatarget.module.ts
+++ b/src/app/applications/datatarget/datatarget.module.ts
@@ -7,7 +7,6 @@ import { TranslateModule } from "@ngx-translate/core";
 import { RouterModule } from "@angular/router";
 import { NGMaterialModule } from "@shared/Modules/materiale.module";
 import { FormModule } from "@shared/components/forms/form.module";
-import { OpendatadkComponent } from "./opendatadk/opendatadk.component";
 import { OpendatadkEditComponent } from "./opendatadk/opendatadk-edit/opendatadk-edit.component";
 import { OpendatadkDetailComponent } from "./opendatadk/opendatadk-detail/opendatadk-detail.component";
 import { FontAwesomeModule } from "@fortawesome/angular-fontawesome";
@@ -39,7 +38,6 @@ import { OpenDataDkWarningDialogComponent } from "./opendatadk/opendatadk-edit/o
     HttppushDetailTabsComponent,
     HttppushDetailComponent,
     HttppushEditComponent,
-    OpendatadkComponent,
     OpendatadkEditComponent,
     OpendatadkDetailComponent,
     OpenDataDkMailDialogComponent,
diff --git a/src/app/applications/datatarget/opendatadk/opendatadk.component.html b/src/app/applications/datatarget/opendatadk/opendatadk.component.html
deleted file mode 100644
index feb860e1e..000000000
--- a/src/app/applications/datatarget/opendatadk/opendatadk.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>opendatadk works!</p>
diff --git a/src/app/applications/datatarget/opendatadk/opendatadk.component.scss b/src/app/applications/datatarget/opendatadk/opendatadk.component.scss
deleted file mode 100644
index 29373e747..000000000
--- a/src/app/applications/datatarget/opendatadk/opendatadk.component.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-::ng-deep .mdc-text-field--filled:not(.mdc-text-field--disabled) {
-  background-color: white !important;
-}
diff --git a/src/app/applications/datatarget/opendatadk/opendatadk.component.spec.ts b/src/app/applications/datatarget/opendatadk/opendatadk.component.spec.ts
deleted file mode 100644
index 5b4424188..000000000
--- a/src/app/applications/datatarget/opendatadk/opendatadk.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing";
-
-import { OpendatadkComponent } from "./opendatadk.component";
-
-describe("OpendatadkComponent", () => {
-  let component: OpendatadkComponent;
-  let fixture: ComponentFixture<OpendatadkComponent>;
-
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [OpendatadkComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(OpendatadkComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it("should create", () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/applications/datatarget/opendatadk/opendatadk.component.ts b/src/app/applications/datatarget/opendatadk/opendatadk.component.ts
deleted file mode 100644
index 718100481..000000000
--- a/src/app/applications/datatarget/opendatadk/opendatadk.component.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Component, OnInit } from "@angular/core";
-
-@Component({
-  selector: "app-opendatadk",
-  templateUrl: "./opendatadk.component.html",
-  styleUrls: ["./opendatadk.component.scss"],
-})
-export class OpendatadkComponent implements OnInit {
-  constructor() {}
-
-  ngOnInit(): void {}
-}

From e808517dcfb80e2c7e7bbac11b039fcd9fcaaa47 Mon Sep 17 00:00:00 2001
From: Chris Dons Johansen <cdj@iterator-it.dk>
Date: Mon, 16 Sep 2024 11:15:47 +0200
Subject: [PATCH 3/9] Finished the Log-tab UI and added it to HTTP-push type.
 Ready to add to other types..

---
 .../applications-routing.module.ts            |  4 +-
 .../datatarget-detail.component.ts            | 41 +++++++-------
 .../datatarget-log.component.html             | 39 ++++++++++++++
 .../datatarget-log.component.scss             |  5 ++
 .../datatarget-log.component.spec.ts          | 23 ++++++++
 .../datatarget-log.component.ts               | 54 +++++++++++++++++++
 .../datatarget-log/datatarget-log.model.ts    | 11 ++++
 .../datatarget-log/datatarget-log.service.ts  | 17 ++++++
 .../datatarget/datatarget.module.ts           |  2 +
 .../httppush-detail-tabs.component.ts         |  2 +-
 src/assets/i18n/da.json                       |  2 +
 src/assets/i18n/en.json                       |  2 +
 12 files changed, 181 insertions(+), 21 deletions(-)
 create mode 100644 src/app/applications/datatarget/datatarget-log/datatarget-log.component.html
 create mode 100644 src/app/applications/datatarget/datatarget-log/datatarget-log.component.scss
 create mode 100644 src/app/applications/datatarget/datatarget-log/datatarget-log.component.spec.ts
 create mode 100644 src/app/applications/datatarget/datatarget-log/datatarget-log.component.ts
 create mode 100644 src/app/applications/datatarget/datatarget-log/datatarget-log.model.ts
 create mode 100644 src/app/applications/datatarget/datatarget-log/datatarget-log.service.ts

diff --git a/src/app/applications/applications-routing.module.ts b/src/app/applications/applications-routing.module.ts
index 869156091..3060ba572 100644
--- a/src/app/applications/applications-routing.module.ts
+++ b/src/app/applications/applications-routing.module.ts
@@ -20,6 +20,7 @@ import { IotDeviceHistoryTabComponent } from "@applications/iot-devices/iot-devi
 import { IotDeviceDataPacketsTabComponent } from "@applications/iot-devices/iot-device-detail/iot-device-data-packets-tab/iot-device-data-packets-tab.component";
 import { IotDeviceDownlinkTabComponent } from "@applications/iot-devices/iot-device-detail/iot-device-downlink-tab/iot-device-downlink-tab.component";
 import { HttppushDetailComponent } from "./datatarget/httppush/httppush-detail/httppush-detail.component";
+import { DatatargetLogComponent } from "./datatarget/datatarget-log/datatarget-log.component";
 
 const applicationRoutes: Routes = [
   {
@@ -72,7 +73,8 @@ const applicationRoutes: Routes = [
             path: "datatarget/:datatargetId",
             component: DatatargetDetailComponent,
             children: [
-              {path: "httppush-detail", component: HttppushDetailComponent }
+              {path: "datatarget-log", component: DatatargetLogComponent },
+              {path: "httppush-detail", component: HttppushDetailComponent },
             ]
           },
           { path: "multicast-edit", component: MulticastEditComponent },
diff --git a/src/app/applications/datatarget/datatarget-detail/datatarget-detail.component.ts b/src/app/applications/datatarget/datatarget-detail/datatarget-detail.component.ts
index de583de72..8601c18da 100644
--- a/src/app/applications/datatarget/datatarget-detail/datatarget-detail.component.ts
+++ b/src/app/applications/datatarget/datatarget-detail/datatarget-detail.component.ts
@@ -1,6 +1,7 @@
-import { Component, ComponentFactoryResolver, OnDestroy, OnInit, Type, ViewChild } from "@angular/core";
+import { Component, OnDestroy, Type, ViewChild } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import { DataTargetType } from "@shared/enums/datatarget-type";
+import { Subscription } from "rxjs";
 import { DatatargetTypesService } from "../datatarget-types.service";
 import { Datatarget } from "../datatarget.model";
 import { DatatargetService } from "../datatarget.service";
@@ -12,18 +13,31 @@ import { DatatargetDetailTypeSelectorDirective } from "./datatarget-detail-type-
   templateUrl: "./datatarget-detail.component.html",
   styleUrls: ["./datatarget-detail.component.scss"],
 })
-export class DatatargetDetailComponent implements OnInit, OnDestroy {
+export class DatatargetDetailComponent implements OnDestroy {
   @ViewChild(DatatargetDetailTypeSelectorDirective, { static: true })
   adHost!: DatatargetDetailTypeSelectorDirective;
 
   public datatarget: Datatarget;
   private datatargetType: DataTargetType;
 
+  private datatargetSubscription: Subscription;
+
   constructor(
-    private datatargetService: DatatargetService,
-    private route: ActivatedRoute,
-    private datatargetTypesService: DatatargetTypesService
-  ) {}
+    datatargetService: DatatargetService,
+    route: ActivatedRoute,
+    datatargetTypesService: DatatargetTypesService
+  ) {
+    const id: number = +route.snapshot.paramMap.get("datatargetId");
+
+    this.datatargetSubscription = datatargetService.get(id).subscribe((dataTarget: Datatarget) => {
+      this.datatarget = dataTarget;
+      this.datatargetType = dataTarget.type;
+
+      const component = datatargetTypesService.getDetailComponent(this.datatargetType);
+
+      this.loadComponent(component);
+    });
+  }
 
   loadComponent(componentType: Type<any>) {
     const viewContainerRef = this.adHost.viewContainerRef;
@@ -33,18 +47,7 @@ export class DatatargetDetailComponent implements OnInit, OnDestroy {
     viewContainerRef.createComponent<DatatargetDetail>(componentType);
   }
 
-  ngOnInit(): void {
-    const id: number = +this.route.snapshot.paramMap.get("datatargetId");
-
-    this.datatargetService.get(id).subscribe((dataTarget: Datatarget) => {
-      this.datatarget = dataTarget;
-      this.datatargetType = dataTarget.type;
-
-      const component = this.datatargetTypesService.getDetailComponent(this.datatargetType);
-
-      this.loadComponent(component);
-    });
+  ngOnDestroy() {
+    this.datatargetSubscription?.unsubscribe();
   }
-
-  ngOnDestroy() {}
 }
diff --git a/src/app/applications/datatarget/datatarget-log/datatarget-log.component.html b/src/app/applications/datatarget/datatarget-log/datatarget-log.component.html
new file mode 100644
index 000000000..6a345a549
--- /dev/null
+++ b/src/app/applications/datatarget/datatarget-log/datatarget-log.component.html
@@ -0,0 +1,39 @@
+<div class="mat-elevation-z8 datatarget-log-container">
+    <div class="loading-shade" *ngIf="isLoadingResults">
+        <mat-spinner></mat-spinner>
+    </div>
+
+    <table mat-table [dataSource]="dataSource" matSort matSortActive="createdAt" matSortDirection="desc">
+        <!-- Timestamp column -->
+        <ng-container matColumnDef="createdAt">
+            <th mat-header-cell *matHeaderCellDef mat-sort-header>{{ "GATEWAY.STATS-TIMESTAMP" | translate }}</th>
+            <td mat-cell *matCellDef="let element">{{ element.createdAt | tableDateWithSecondsPipe }}</td>
+        </ng-container>
+
+        <!-- Type column -->
+        <ng-container matColumnDef="type">
+            <th mat-header-cell *matHeaderCellDef mat-sort-header>{{ "DATATARGET-TABLE.TYPE" | translate }}</th>
+            <td mat-cell *matCellDef="let element">{{ element.type }}</td>
+        </ng-container>
+
+        <!-- Message column -->
+        <ng-container matColumnDef="message">
+            <th mat-header-cell *matHeaderCellDef mat-sort-header>{{ "GEN.MESSAGE" | translate }}</th>
+            <td mat-cell *matCellDef="let element">{{ element.message }}</td>
+        </ng-container>
+
+        <!-- Device column -->
+        <ng-container matColumnDef="device">
+            <th mat-header-cell *matHeaderCellDef mat-sort-header>{{ "GEN.DEVICE" | translate }}</th>
+            <td mat-cell *matCellDef="let element">{{ element.device }}</td>
+        </ng-container>
+
+        <!-- Actually showing the data -->
+        <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+        <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
+    </table>
+
+    <!-- Pagination -->
+    <mat-paginator [pageSizeOptions]="pageSizeOptions" [pageSize]="pageSize" showFirstLastButtons>
+    </mat-paginator>
+</div>
\ No newline at end of file
diff --git a/src/app/applications/datatarget/datatarget-log/datatarget-log.component.scss b/src/app/applications/datatarget/datatarget-log/datatarget-log.component.scss
new file mode 100644
index 000000000..9fd7d0b49
--- /dev/null
+++ b/src/app/applications/datatarget/datatarget-log/datatarget-log.component.scss
@@ -0,0 +1,5 @@
+:host {
+    .datatarget-log-container {
+        margin: 2em;
+    }
+}
\ No newline at end of file
diff --git a/src/app/applications/datatarget/datatarget-log/datatarget-log.component.spec.ts b/src/app/applications/datatarget/datatarget-log/datatarget-log.component.spec.ts
new file mode 100644
index 000000000..d579851f3
--- /dev/null
+++ b/src/app/applications/datatarget/datatarget-log/datatarget-log.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DatatargetLogComponent } from './datatarget-log.component';
+
+describe('DatatargetLogComponent', () => {
+  let component: DatatargetLogComponent;
+  let fixture: ComponentFixture<DatatargetLogComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [DatatargetLogComponent]
+    })
+    .compileComponents();
+    
+    fixture = TestBed.createComponent(DatatargetLogComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/applications/datatarget/datatarget-log/datatarget-log.component.ts b/src/app/applications/datatarget/datatarget-log/datatarget-log.component.ts
new file mode 100644
index 000000000..095162f09
--- /dev/null
+++ b/src/app/applications/datatarget/datatarget-log/datatarget-log.component.ts
@@ -0,0 +1,54 @@
+import { AfterViewInit, Component, OnDestroy, ViewChild } from "@angular/core";
+import { MatPaginator } from "@angular/material/paginator";
+import { MatSort } from "@angular/material/sort";
+import { MatTableDataSource } from "@angular/material/table";
+import { ActivatedRoute } from "@angular/router";
+import { environment } from "@environments/environment";
+import { DefaultPageSizeOptions } from "@shared/constants/page.constants";
+import { Subscription } from "rxjs";
+import { DatatargetLog } from "./datatarget-log.model";
+import { DatatargetLogService } from "./datatarget-log.service";
+
+@Component({
+  selector: "app-datatarget-log",
+  templateUrl: "./datatarget-log.component.html",
+  styleUrl: "./datatarget-log.component.scss",
+})
+export class DatatargetLogComponent implements OnDestroy, AfterViewInit {
+  @ViewChild(MatPaginator) paginator: MatPaginator;
+  @ViewChild(MatSort) sort: MatSort;
+
+  displayedColumns: string[] = ["createdAt", "type", "message", "device"];
+  pageSizeOptions = DefaultPageSizeOptions;
+  pageSize = environment.tablePageSize;
+
+  dataSource = new MatTableDataSource<DatatargetLog>();
+  isLoadingResults = true;
+
+  private datatargetLogSubscription: Subscription;
+
+  constructor(datatargetLogService: DatatargetLogService, route: ActivatedRoute) {
+    const id: number = +route.parent.snapshot.paramMap.get("datatargetId");
+
+    this.datatargetLogSubscription = datatargetLogService.get(id).subscribe(logs => {
+      this.dataSource = new MatTableDataSource<DatatargetLog>(logs);
+      this.setViewChildren();
+      this.isLoadingResults = false;
+    });
+  }
+
+  ngAfterViewInit(): void {
+    this.setViewChildren();
+  }
+
+  ngOnDestroy(): void {
+    this.datatargetLogSubscription?.unsubscribe();
+  }
+
+  private setViewChildren = () => {
+    if (this.dataSource) {
+      this.dataSource.paginator = this.paginator;
+      this.dataSource.sort = this.sort;
+    }
+  };
+}
diff --git a/src/app/applications/datatarget/datatarget-log/datatarget-log.model.ts b/src/app/applications/datatarget/datatarget-log/datatarget-log.model.ts
new file mode 100644
index 000000000..1c605da60
--- /dev/null
+++ b/src/app/applications/datatarget/datatarget-log/datatarget-log.model.ts
@@ -0,0 +1,11 @@
+export class DatatargetLog {
+  createdAt: Date;
+
+  // TODO: Enum??
+  type: string;
+
+  message: string;
+
+  // TODO: Reference to devices?
+  device?: string;
+}
diff --git a/src/app/applications/datatarget/datatarget-log/datatarget-log.service.ts b/src/app/applications/datatarget/datatarget-log/datatarget-log.service.ts
new file mode 100644
index 000000000..2c6dcbe20
--- /dev/null
+++ b/src/app/applications/datatarget/datatarget-log/datatarget-log.service.ts
@@ -0,0 +1,17 @@
+import { Injectable } from "@angular/core";
+import { RestService } from "@shared/services/rest.service";
+import { Observable } from "rxjs";
+import { DatatargetLog } from "./datatarget-log.model";
+
+const baseUrl = "datatarget-log";
+
+@Injectable({
+  providedIn: "root",
+})
+export class DatatargetLogService {
+  constructor(private restService: RestService) {}
+
+  get(id: number): Observable<DatatargetLog[]> {
+    return this.restService.get(baseUrl, null, id);
+  }
+}
diff --git a/src/app/applications/datatarget/datatarget.module.ts b/src/app/applications/datatarget/datatarget.module.ts
index d2c6a635a..e51aab801 100644
--- a/src/app/applications/datatarget/datatarget.module.ts
+++ b/src/app/applications/datatarget/datatarget.module.ts
@@ -26,6 +26,7 @@ import { MqttDetailComponent } from "./mqtt-detail/mqtt-detail.component";
 import { DatatargetTabComponent } from "./datatarget-tab/datatarget-tab.component";
 import { OpenDataDkMailDialogComponent } from "./opendatadk/opendatadk-edit/opendatadk-mail-dialog/opendatadk-mail-dialog";
 import { OpenDataDkWarningDialogComponent } from "./opendatadk/opendatadk-edit/opendatadk-warning-dialog/opendatadk-warning-dialog";
+import { DatatargetLogComponent } from "./datatarget-log/datatarget-log.component";
 
 @NgModule({
   declarations: [
@@ -33,6 +34,7 @@ import { OpenDataDkWarningDialogComponent } from "./opendatadk/opendatadk-edit/o
     DatatargetEditComponent,
     DatatargetNewComponent,
     DatatargetDetailComponent,
+    DatatargetLogComponent,
     FiwareDetailComponent,
     FiwareEditComponent,
     HttppushDetailTabsComponent,
diff --git a/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.ts b/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.ts
index 7e4970317..938abcf1f 100644
--- a/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.ts
+++ b/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.ts
@@ -30,7 +30,7 @@ export class HttppushDetailTabsComponent implements DatatargetDetail, OnDestroy
       index: 0,
     },
     {
-      label: "IOTDEVICE.HISTORY",
+      label: "GEN.LOG",
       link: "datatarget-log",
       index: 1,
     },
diff --git a/src/assets/i18n/da.json b/src/assets/i18n/da.json
index b29500d79..4b8af7eeb 100644
--- a/src/assets/i18n/da.json
+++ b/src/assets/i18n/da.json
@@ -19,6 +19,8 @@
         "NEVER-SEEN": "Aldrig set",
         "DATE": "Dato",
         "LOG": "Log",
+        "MESSAGE": "Besked",
+        "DEVICE": "Enhed",
         "NO-DATA": "Der er ingen data at vise"
     },
     "NAV": {
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 116c962da..5141ef36a 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -3,6 +3,8 @@
         "CANCEL": "Cancel",
         "SHOW": "Show",
         "LOG": "Log",
+        "MESSAGE": "Message",
+        "DEVICE": "Device",
         "PER-PAGE": "Per page"
     },
     "NAV": {

From 755ae60ed78a40cb40cd7e50418ddcf8957bc39d Mon Sep 17 00:00:00 2001
From: Chris Dons Johansen <cdj@iterator-it.dk>
Date: Mon, 16 Sep 2024 14:39:54 +0200
Subject: [PATCH 4/9] Added logs-tab to fiware and mqtt, and cleaned up unused
 and duplicated code, inconsisten structure etc..

---
 .../applications-routing.module.ts            |  38 ++--
 .../datatarget-detail-tabs-common.ts          | 105 +++++++++
 .../datatarget/datatarget-types.service.ts    |  15 +-
 .../datatarget/datatarget.module.ts           |  38 ++--
 .../fiware-detail-tabs.component.html         |  13 ++
 .../fiware-detail-tabs.component.scss}        |   0
 .../fiware-detail-tabs.component.spec.ts      |  23 ++
 .../fiware-detail-tabs.component.ts           |  35 +++
 .../fiware-detail.component.html              | 200 ++++++++----------
 .../fiware-detail/fiware-detail.component.ts  |  92 ++------
 .../httppush-detail-tabs.component.html       |   2 +-
 .../httppush-detail-tabs.component.ts         |  93 +-------
 .../httppush-detail.component.ts              |  14 +-
 .../mqtt-detail/mqtt-detail.component.html    | 101 ---------
 .../mqtt-detail/mqtt-detail.component.ts      |  92 --------
 .../mqtt-detail-tabs.component.html           |  13 ++
 .../mqtt-detail-tabs.component.scss           |   0
 .../mqtt-detail-tabs.component.spec.ts        |  23 ++
 .../mqtt-detail-tabs.component.ts             |  35 +++
 .../mqtt-detail/mqtt-detail.component.html    |  82 +++++++
 .../mqtt-detail/mqtt-detail.component.scss    |   0
 .../mqtt/mqtt-detail/mqtt-detail.component.ts |  48 +++++
 .../mqtt-edit/mqtt-edit.component.html        |   0
 .../mqtt-edit/mqtt-edit.component.scss        |   0
 .../mqtt-edit/mqtt-edit.component.ts          |   6 +-
 25 files changed, 559 insertions(+), 509 deletions(-)
 create mode 100644 src/app/applications/datatarget/datatarget-detail/datatarget-detail-tabs-common.ts
 create mode 100644 src/app/applications/datatarget/fiware/fiware-detail-tabs/fiware-detail-tabs.component.html
 rename src/app/applications/datatarget/{mqtt-detail/mqtt-detail.component.scss => fiware/fiware-detail-tabs/fiware-detail-tabs.component.scss} (100%)
 create mode 100644 src/app/applications/datatarget/fiware/fiware-detail-tabs/fiware-detail-tabs.component.spec.ts
 create mode 100644 src/app/applications/datatarget/fiware/fiware-detail-tabs/fiware-detail-tabs.component.ts
 delete mode 100644 src/app/applications/datatarget/mqtt-detail/mqtt-detail.component.html
 delete mode 100644 src/app/applications/datatarget/mqtt-detail/mqtt-detail.component.ts
 create mode 100644 src/app/applications/datatarget/mqtt/mqtt-detail-tabs/mqtt-detail-tabs.component.html
 create mode 100644 src/app/applications/datatarget/mqtt/mqtt-detail-tabs/mqtt-detail-tabs.component.scss
 create mode 100644 src/app/applications/datatarget/mqtt/mqtt-detail-tabs/mqtt-detail-tabs.component.spec.ts
 create mode 100644 src/app/applications/datatarget/mqtt/mqtt-detail-tabs/mqtt-detail-tabs.component.ts
 create mode 100644 src/app/applications/datatarget/mqtt/mqtt-detail/mqtt-detail.component.html
 create mode 100644 src/app/applications/datatarget/mqtt/mqtt-detail/mqtt-detail.component.scss
 create mode 100644 src/app/applications/datatarget/mqtt/mqtt-detail/mqtt-detail.component.ts
 rename src/app/applications/datatarget/{ => mqtt}/mqtt-edit/mqtt-edit.component.html (100%)
 rename src/app/applications/datatarget/{ => mqtt}/mqtt-edit/mqtt-edit.component.scss (100%)
 rename src/app/applications/datatarget/{ => mqtt}/mqtt-edit/mqtt-edit.component.ts (97%)

diff --git a/src/app/applications/applications-routing.module.ts b/src/app/applications/applications-routing.module.ts
index 3060ba572..fd12d2197 100644
--- a/src/app/applications/applications-routing.module.ts
+++ b/src/app/applications/applications-routing.module.ts
@@ -1,26 +1,28 @@
 import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
+import { DatatargetTabComponent } from "@applications/datatarget/datatarget-tab/datatarget-tab.component";
+import { IotDeviceDataPacketsTabComponent } from "@applications/iot-devices/iot-device-detail/iot-device-data-packets-tab/iot-device-data-packets-tab.component";
+import { IotDeviceDetailsTabComponent } from "@applications/iot-devices/iot-device-detail/iot-device-details-tab/iot-device-details-tab.component";
+import { IotDeviceDownlinkTabComponent } from "@applications/iot-devices/iot-device-detail/iot-device-downlink-tab/iot-device-downlink-tab.component";
+import { IotDeviceHistoryTabComponent } from "@applications/iot-devices/iot-device-detail/iot-device-history-tab/iot-device-history-tab.component";
+import { IotDevicesTabComponent } from "@applications/iot-devices/iot-devices-tab/iot-devices-tab.component";
+import { MulticastTabComponent } from "@applications/multicast/multicast-tab/multicast-tab.component";
 import { ApplicationDetailComponent } from "./application-detail/application-detail.component";
 import { ApplicationEditComponent } from "./application-edit/application-edit.component";
 import { ApplicationsListComponent } from "./applications-list/applications-list.component";
 import { ApplicationsComponent } from "./applications.component";
-import { IoTDeviceDetailComponent } from "./iot-devices/iot-device-detail/iot-device-detail.component";
-import { IotDeviceEditComponent } from "./iot-devices/iot-device-edit/iot-device-edit.component";
-import { DatatargetEditComponent } from "./datatarget/datatarget-edit/datatarget-edit.component";
-import { DatatargetDetailComponent } from "./datatarget/datatarget-detail/datatarget-detail.component";
 import { BulkImportComponent } from "./bulk-import/bulk-import.component";
-import { MulticastEditComponent } from "./multicast/multicast-edit/multicast-edit.component";
-import { MulticastDetailComponent } from "./multicast/multicast-detail/multicast-detail.component";
+import { DatatargetDetailComponent } from "./datatarget/datatarget-detail/datatarget-detail.component";
+import { DatatargetEditComponent } from "./datatarget/datatarget-edit/datatarget-edit.component";
+import { DatatargetLogComponent } from "./datatarget/datatarget-log/datatarget-log.component";
 import { DatatargetNewComponent } from "./datatarget/datatarget-new/datatarget-new.component";
-import { IotDevicesTabComponent } from "@applications/iot-devices/iot-devices-tab/iot-devices-tab.component";
-import { MulticastTabComponent } from "@applications/multicast/multicast-tab/multicast-tab.component";
-import { DatatargetTabComponent } from "@applications/datatarget/datatarget-tab/datatarget-tab.component";
-import { IotDeviceDetailsTabComponent } from "@applications/iot-devices/iot-device-detail/iot-device-details-tab/iot-device-details-tab.component";
-import { IotDeviceHistoryTabComponent } from "@applications/iot-devices/iot-device-detail/iot-device-history-tab/iot-device-history-tab.component";
-import { IotDeviceDataPacketsTabComponent } from "@applications/iot-devices/iot-device-detail/iot-device-data-packets-tab/iot-device-data-packets-tab.component";
-import { IotDeviceDownlinkTabComponent } from "@applications/iot-devices/iot-device-detail/iot-device-downlink-tab/iot-device-downlink-tab.component";
+import { FiwareDetailComponent } from "./datatarget/fiware/fiware-detail/fiware-detail.component";
 import { HttppushDetailComponent } from "./datatarget/httppush/httppush-detail/httppush-detail.component";
-import { DatatargetLogComponent } from "./datatarget/datatarget-log/datatarget-log.component";
+import { MqttDetailComponent } from "./datatarget/mqtt/mqtt-detail/mqtt-detail.component";
+import { IoTDeviceDetailComponent } from "./iot-devices/iot-device-detail/iot-device-detail.component";
+import { IotDeviceEditComponent } from "./iot-devices/iot-device-edit/iot-device-edit.component";
+import { MulticastDetailComponent } from "./multicast/multicast-detail/multicast-detail.component";
+import { MulticastEditComponent } from "./multicast/multicast-edit/multicast-edit.component";
 
 const applicationRoutes: Routes = [
   {
@@ -73,9 +75,11 @@ const applicationRoutes: Routes = [
             path: "datatarget/:datatargetId",
             component: DatatargetDetailComponent,
             children: [
-              {path: "datatarget-log", component: DatatargetLogComponent },
-              {path: "httppush-detail", component: HttppushDetailComponent },
-            ]
+              { path: "datatarget-log", component: DatatargetLogComponent },
+              { path: "httppush-detail", component: HttppushDetailComponent },
+              { path: "fiware-detail", component: FiwareDetailComponent },
+              { path: "mqtt-detail", component: MqttDetailComponent },
+            ],
           },
           { path: "multicast-edit", component: MulticastEditComponent },
           {
diff --git a/src/app/applications/datatarget/datatarget-detail/datatarget-detail-tabs-common.ts b/src/app/applications/datatarget/datatarget-detail/datatarget-detail-tabs-common.ts
new file mode 100644
index 000000000..ea546e606
--- /dev/null
+++ b/src/app/applications/datatarget/datatarget-detail/datatarget-detail-tabs-common.ts
@@ -0,0 +1,105 @@
+import { Location } from "@angular/common";
+import { HttpResponse } from "@angular/common/http";
+import { ActivatedRoute, Router } from "@angular/router";
+import { DatatargetDetail } from "@applications/datatarget/datatarget-detail/datatarget-detail";
+import { Datatarget } from "@applications/datatarget/datatarget.model";
+import { DatatargetService } from "@applications/datatarget/datatarget.service";
+import { TranslateService } from "@ngx-translate/core";
+import { DeleteDialogService } from "@shared/components/delete-dialog/delete-dialog.service";
+import { OrganizationAccessScope } from "@shared/enums/access-scopes";
+import { BackButton } from "@shared/models/back-button.model";
+import { DropdownButton } from "@shared/models/dropdown-button.model";
+import { MeService } from "@shared/services/me.service";
+import { NavTab } from "@shared/types/nav-tabs.type";
+import { Subscription } from "rxjs";
+
+export abstract class DatatargetDetailTabsCommon implements DatatargetDetail {
+  protected abstract getDetailsLink(): string;
+
+  navTabs: NavTab[] = [
+    {
+      label: "APPLICATION.DETAILS",
+      link: this.getDetailsLink(),
+      index: 0,
+    },
+    {
+      label: "GEN.LOG",
+      link: "datatarget-log",
+      index: 1,
+    },
+  ];
+
+  datatarget: Datatarget;
+  backButton: BackButton = { label: "", routerLink: undefined };
+  dropdownButton: DropdownButton;
+  canEdit: boolean;
+
+  private subscriptions: Subscription[] = [];
+  private deleteDialogSubscription: Subscription;
+
+  constructor(
+    route: ActivatedRoute,
+    router: Router,
+    translate: TranslateService,
+    meService: MeService,
+    private location: Location,
+    private datatargetService: DatatargetService,
+    public deleteDialogService: DeleteDialogService
+  ) {
+    // Load first tab if none was selected
+    const path = this.location.path();
+    if (!this.navTabs.some(tab => path.includes(tab.link))) {
+      router.navigate([path, this.navTabs[0].link], { replaceUrl: true });
+    }
+    // URL params
+    const paramMap = route.snapshot.paramMap;
+    const id: number = +paramMap.get("datatargetId");
+    const appId: number = +paramMap.get("id");
+    if (id) {
+      // Fetch datatarget info
+      this.subscriptions.push(this.getDatatarget(id));
+      this.dropdownButton = {
+        label: "",
+        editRouterLink: "../../datatarget-edit/" + id,
+        isErasable: true,
+      };
+    }
+    // Translate button labels
+    this.subscriptions.push(
+      translate.get(["NAV.MY-DATATARGET", "DATATARGET.SHOW-OPTIONS"]).subscribe(translations => {
+        this.backButton.label = translations["NAV.MY-DATATARGET"];
+        this.dropdownButton.label = translations["DATATARGET.SHOW-OPTIONS"];
+      })
+    );
+    // Check user permissions
+    this.canEdit = meService.hasAccessToTargetOrganization(OrganizationAccessScope.ApplicationWrite, undefined, appId);
+  }
+
+  protected onDestroy(): void {
+    this.subscriptions?.forEach(s => s?.unsubscribe());
+    this.deleteDialogSubscription?.unsubscribe();
+  }
+
+  private getDatatarget = (id: number) =>
+    this.datatargetService.get(id).subscribe((dataTarget: Datatarget) => {
+      this.datatarget = dataTarget;
+    });
+
+  onDeleteDatatarget() {
+    this.deleteDialogSubscription?.unsubscribe();
+    this.deleteDialogSubscription = this.deleteDialogService.showSimpleDialog().subscribe(response => {
+      // Do nothing if user cancels
+      if (!response) return;
+      this.subscriptions.push(
+        this.datatargetService.delete(this.datatarget.id).subscribe((deleteResponse: HttpResponse<any>) => {
+          if (deleteResponse?.ok) {
+            this.location.back();
+          } else {
+            // TODO: Show error / snackbar??
+            console.log("Delete failed", deleteResponse);
+          }
+        })
+      );
+    });
+  }
+}
diff --git a/src/app/applications/datatarget/datatarget-types.service.ts b/src/app/applications/datatarget/datatarget-types.service.ts
index 68006dfcb..7df00c974 100644
--- a/src/app/applications/datatarget/datatarget-types.service.ts
+++ b/src/app/applications/datatarget/datatarget-types.service.ts
@@ -3,14 +3,13 @@ import { DataTargetType } from "@shared/enums/datatarget-type";
 import { DatatargetDetail } from "./datatarget-detail/datatarget-detail";
 import { DatatargetEdit } from "./datatarget-edit/datatarget-edit";
 import { DatatargetTypeDescriptor } from "./datatarget.model";
-import { FiwareDetailComponent } from "./fiware/fiware-detail/fiware-detail.component";
+import { FiwareDetailTabsComponent } from "./fiware/fiware-detail-tabs/fiware-detail-tabs.component";
 import { FiwareEditComponent } from "./fiware/fiware-edit/fiware-edit.component";
-import { HttppushDetailComponent } from "./httppush/httppush-detail/httppush-detail.component";
+import { HttppushDetailTabsComponent } from "./httppush/httppush-detail-tabs/httppush-detail-tabs.component";
 import { HttppushEditComponent } from "./httppush/httppush-edit/httppush-edit.component";
-import { MqttDetailComponent } from "./mqtt-detail/mqtt-detail.component";
-import { MqttEditComponent } from "./mqtt-edit/mqtt-edit.component";
+import { MqttDetailTabsComponent } from "./mqtt/mqtt-detail-tabs/mqtt-detail-tabs.component";
+import { MqttEditComponent } from "./mqtt/mqtt-edit/mqtt-edit.component";
 import { OpendatadkEditComponent } from "./opendatadk/opendatadk-edit/opendatadk-edit.component";
-import { HttppushDetailTabsComponent } from "./httppush/httppush-detail-tabs/httppush-detail-tabs.component";
 
 @Injectable({
   providedIn: "root",
@@ -58,20 +57,18 @@ export class DatatargetTypesService {
   getDetailComponent(dataTargetType: DataTargetType): Type<DatatargetDetail> {
     if (dataTargetType === DataTargetType.HTTPPUSH) {
       return HttppushDetailTabsComponent;
-      return HttppushDetailComponent;
     }
 
     if (dataTargetType === DataTargetType.OPENDATADK) {
       return HttppushDetailTabsComponent;
-      return HttppushDetailComponent;
     }
 
     if (dataTargetType === DataTargetType.FIWARE) {
-      return FiwareDetailComponent;
+      return FiwareDetailTabsComponent;
     }
 
     if (dataTargetType === DataTargetType.MQTT) {
-      return MqttDetailComponent;
+      return MqttDetailTabsComponent;
     }
   }
 
diff --git a/src/app/applications/datatarget/datatarget.module.ts b/src/app/applications/datatarget/datatarget.module.ts
index e51aab801..97d2b495a 100644
--- a/src/app/applications/datatarget/datatarget.module.ts
+++ b/src/app/applications/datatarget/datatarget.module.ts
@@ -1,32 +1,34 @@
-import { NgModule } from "@angular/core";
 import { CommonModule } from "@angular/common";
-import { DatatargetTableComponent } from "./datatarget-table/datatarget-table.component";
-import { DatatargetEditComponent } from "./datatarget-edit/datatarget-edit.component";
-import { DatatargetDetailComponent } from "./datatarget-detail/datatarget-detail.component";
-import { TranslateModule } from "@ngx-translate/core";
+import { NgModule } from "@angular/core";
+import { FormsModule, ReactiveFormsModule } from "@angular/forms";
 import { RouterModule } from "@angular/router";
+import { FontAwesomeModule } from "@fortawesome/angular-fontawesome";
+import { TranslateModule } from "@ngx-translate/core";
 import { NGMaterialModule } from "@shared/Modules/materiale.module";
 import { FormModule } from "@shared/components/forms/form.module";
-import { OpendatadkEditComponent } from "./opendatadk/opendatadk-edit/opendatadk-edit.component";
-import { OpendatadkDetailComponent } from "./opendatadk/opendatadk-detail/opendatadk-detail.component";
-import { FontAwesomeModule } from "@fortawesome/angular-fontawesome";
-import { FormsModule, ReactiveFormsModule } from "@angular/forms";
-import { SharedModule } from "@shared/shared.module";
 import { PipesModule } from "@shared/pipes/pipes.module";
+import { SharedModule } from "@shared/shared.module";
+import { DatatargetDetailTypeSelectorDirective } from "./datatarget-detail/datatarget-detail-type-selector.directive";
+import { DatatargetDetailComponent } from "./datatarget-detail/datatarget-detail.component";
+import { DatatargetEditTypeSelectorDirective } from "./datatarget-edit/datatarget-edit-type-selector.directive";
+import { DatatargetEditComponent } from "./datatarget-edit/datatarget-edit.component";
+import { DatatargetLogComponent } from "./datatarget-log/datatarget-log.component";
 import { DatatargetNewComponent } from "./datatarget-new/datatarget-new.component";
+import { DatatargetTabComponent } from "./datatarget-tab/datatarget-tab.component";
+import { DatatargetTableComponent } from "./datatarget-table/datatarget-table.component";
+import { FiwareDetailTabsComponent } from "./fiware/fiware-detail-tabs/fiware-detail-tabs.component";
+import { FiwareDetailComponent } from "./fiware/fiware-detail/fiware-detail.component";
 import { FiwareEditComponent } from "./fiware/fiware-edit/fiware-edit.component";
 import { HttppushDetailTabsComponent } from "./httppush/httppush-detail-tabs/httppush-detail-tabs.component";
-import { FiwareDetailComponent } from "./fiware/fiware-detail/fiware-detail.component";
 import { HttppushDetailComponent } from "./httppush/httppush-detail/httppush-detail.component";
 import { HttppushEditComponent } from "./httppush/httppush-edit/httppush-edit.component";
-import { DatatargetDetailTypeSelectorDirective } from "./datatarget-detail/datatarget-detail-type-selector.directive";
-import { DatatargetEditTypeSelectorDirective } from "./datatarget-edit/datatarget-edit-type-selector.directive";
-import { MqttEditComponent } from "./mqtt-edit/mqtt-edit.component";
-import { MqttDetailComponent } from "./mqtt-detail/mqtt-detail.component";
-import { DatatargetTabComponent } from "./datatarget-tab/datatarget-tab.component";
+import { MqttDetailTabsComponent } from "./mqtt/mqtt-detail-tabs/mqtt-detail-tabs.component";
+import { MqttDetailComponent } from "./mqtt/mqtt-detail/mqtt-detail.component";
+import { MqttEditComponent } from "./mqtt/mqtt-edit/mqtt-edit.component";
+import { OpendatadkDetailComponent } from "./opendatadk/opendatadk-detail/opendatadk-detail.component";
+import { OpendatadkEditComponent } from "./opendatadk/opendatadk-edit/opendatadk-edit.component";
 import { OpenDataDkMailDialogComponent } from "./opendatadk/opendatadk-edit/opendatadk-mail-dialog/opendatadk-mail-dialog";
 import { OpenDataDkWarningDialogComponent } from "./opendatadk/opendatadk-edit/opendatadk-warning-dialog/opendatadk-warning-dialog";
-import { DatatargetLogComponent } from "./datatarget-log/datatarget-log.component";
 
 @NgModule({
   declarations: [
@@ -35,6 +37,7 @@ import { DatatargetLogComponent } from "./datatarget-log/datatarget-log.componen
     DatatargetNewComponent,
     DatatargetDetailComponent,
     DatatargetLogComponent,
+    FiwareDetailTabsComponent,
     FiwareDetailComponent,
     FiwareEditComponent,
     HttppushDetailTabsComponent,
@@ -44,6 +47,7 @@ import { DatatargetLogComponent } from "./datatarget-log/datatarget-log.componen
     OpendatadkDetailComponent,
     OpenDataDkMailDialogComponent,
     OpenDataDkWarningDialogComponent,
+    MqttDetailTabsComponent,
     MqttDetailComponent,
     MqttEditComponent,
     DatatargetDetailTypeSelectorDirective,
diff --git a/src/app/applications/datatarget/fiware/fiware-detail-tabs/fiware-detail-tabs.component.html b/src/app/applications/datatarget/fiware/fiware-detail-tabs/fiware-detail-tabs.component.html
new file mode 100644
index 000000000..ab093a413
--- /dev/null
+++ b/src/app/applications/datatarget/fiware/fiware-detail-tabs/fiware-detail-tabs.component.html
@@ -0,0 +1,13 @@
+<app-top-bar *ngIf="datatarget" [data]="datatarget" [backButton]="backButton" [subPage]="true"
+    [addDetailDowndown]="true" [dropDownButton]="dropdownButton" (deleteSelectedInDropdown)="onDeleteDatatarget()"
+    [canEdit]="canEdit">
+</app-top-bar>
+
+<nav mat-tab-nav-bar [tabPanel]="tabPanel">
+    <a mat-tab-link *ngFor="let link of navTabs" [routerLink]="'./' + link.link" routerLinkActive
+        #rla="routerLinkActive" [active]="rla.isActive">{{ link.label | translate }}</a>
+</nav>
+<mat-divider></mat-divider>
+<mat-tab-nav-panel #tabPanel></mat-tab-nav-panel>
+
+<router-outlet></router-outlet>
\ No newline at end of file
diff --git a/src/app/applications/datatarget/mqtt-detail/mqtt-detail.component.scss b/src/app/applications/datatarget/fiware/fiware-detail-tabs/fiware-detail-tabs.component.scss
similarity index 100%
rename from src/app/applications/datatarget/mqtt-detail/mqtt-detail.component.scss
rename to src/app/applications/datatarget/fiware/fiware-detail-tabs/fiware-detail-tabs.component.scss
diff --git a/src/app/applications/datatarget/fiware/fiware-detail-tabs/fiware-detail-tabs.component.spec.ts b/src/app/applications/datatarget/fiware/fiware-detail-tabs/fiware-detail-tabs.component.spec.ts
new file mode 100644
index 000000000..d422fedd7
--- /dev/null
+++ b/src/app/applications/datatarget/fiware/fiware-detail-tabs/fiware-detail-tabs.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FiwareDetailTabsComponent } from './fiware-detail-tabs.component';
+
+describe('FiwireDetailTabsComponent', () => {
+  let component: FiwareDetailTabsComponent;
+  let fixture: ComponentFixture<FiwareDetailTabsComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [FiwareDetailTabsComponent]
+    })
+    .compileComponents();
+    
+    fixture = TestBed.createComponent(FiwareDetailTabsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/applications/datatarget/fiware/fiware-detail-tabs/fiware-detail-tabs.component.ts b/src/app/applications/datatarget/fiware/fiware-detail-tabs/fiware-detail-tabs.component.ts
new file mode 100644
index 000000000..9a906a22b
--- /dev/null
+++ b/src/app/applications/datatarget/fiware/fiware-detail-tabs/fiware-detail-tabs.component.ts
@@ -0,0 +1,35 @@
+import { Location } from "@angular/common";
+import { Component, OnDestroy } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { DatatargetDetailTabsCommon } from "@applications/datatarget/datatarget-detail/datatarget-detail-tabs-common";
+import { DatatargetService } from "@applications/datatarget/datatarget.service";
+import { TranslateService } from "@ngx-translate/core";
+import { DeleteDialogService } from "@shared/components/delete-dialog/delete-dialog.service";
+import { MeService } from "@shared/services/me.service";
+
+@Component({
+  selector: "app-fiware-detail-tabs",
+  templateUrl: "./fiware-detail-tabs.component.html",
+  styleUrl: "./fiware-detail-tabs.component.scss",
+})
+export class FiwareDetailTabsComponent extends DatatargetDetailTabsCommon implements OnDestroy {
+  protected override getDetailsLink() {
+    return "fiware-detail";
+  }
+
+  constructor(
+    route: ActivatedRoute,
+    router: Router,
+    translate: TranslateService,
+    meService: MeService,
+    location: Location,
+    datatargetService: DatatargetService,
+    deleteDialogService: DeleteDialogService
+  ) {
+    super(route, router, translate, meService, location, datatargetService, deleteDialogService);
+  }
+
+  ngOnDestroy(): void {
+    super.onDestroy();
+  }
+}
diff --git a/src/app/applications/datatarget/fiware/fiware-detail/fiware-detail.component.html b/src/app/applications/datatarget/fiware/fiware-detail/fiware-detail.component.html
index b3984e37e..7dbf0dc76 100644
--- a/src/app/applications/datatarget/fiware/fiware-detail/fiware-detail.component.html
+++ b/src/app/applications/datatarget/fiware/fiware-detail/fiware-detail.component.html
@@ -1,131 +1,119 @@
-<div *ngIf="datatarget">
-  <app-top-bar
-    [data]="datatarget"
-    [backButton]="backButton"
-    [subPage]="true"
-    [addDetailDowndown]="true"
-    [dropDownButton]="dropdownButton"
-    (deleteSelectedInDropdown)="onDeleteDatatarget()"
-    [canEdit]="canEdit"
-  ></app-top-bar>
-  <div class="container-fluid">
-    <div class="row">
-      <div class="col-md-6 d-flex align-items-stretch">
-        <div class="jumbotron jumbotron--m-right jumbotron--full-width width100percent">
-          <h3>{{ "DATATARGET.DETAILS" | translate }}</h3>
-          <app-general-details [data]="datatarget"></app-general-details>
-          <mat-divider></mat-divider>
-          <p><strong>Context Broker</strong>{{ datatarget.url }}</p>
-          <p>
-            <strong>{{ "DATATARGET.TIMEOUT" | translate }}</strong
-            >{{ datatarget.timeout }}
-          </p>
-          <p>
-            <strong>{{ "DATATARGET.TYPE" | translate }}</strong
-            >{{ "DATATARGET." + datatarget.type + ".TYPE" | translate }}
-          </p>
-          <mat-divider></mat-divider>
+<div *ngIf="datatarget" class="container-fluid">
+  <div class="row">
+    <div class="col-md-6 d-flex align-items-stretch">
+      <div class="jumbotron jumbotron--m-right jumbotron--full-width width100percent">
+        <h3>{{ "DATATARGET.DETAILS" | translate }}</h3>
+        <app-general-details [data]="datatarget"></app-general-details>
+        <mat-divider></mat-divider>
+        <p><strong>Context Broker</strong>{{ datatarget.url }}</p>
+        <p>
+          <strong>{{ "DATATARGET.TIMEOUT" | translate }}</strong>{{ datatarget.timeout }}
+        </p>
+        <p>
+          <strong>{{ "DATATARGET.TYPE" | translate }}</strong>{{ "DATATARGET." + datatarget.type + ".TYPE" | translate
+          }}
+        </p>
+        <mat-divider></mat-divider>
 
-          <p>
-            <strong>{{ "DATATARGET.TENANT" | translate }}</strong>
-          </p>
-          <code>
+        <p>
+          <strong>{{ "DATATARGET.TENANT" | translate }}</strong>
+        </p>
+        <code>
             <pre *ngIf="datatarget.tenant; else showNoTenantText">{{ datatarget.tenant }}</pre>
           </code>
-          <ng-template #showNoTenantText>
-            <p>{{ "DATATARGET.NO-TENANT" | translate }}</p>
-          </ng-template>
+        <ng-template #showNoTenantText>
+          <p>{{ "DATATARGET.NO-TENANT" | translate }}</p>
+        </ng-template>
 
-          <p>
-            <strong>{{ "DATATARGET.CONTEXT" | translate }}</strong>
-          </p>
-          <code>
+        <p>
+          <strong>{{ "DATATARGET.CONTEXT" | translate }}</strong>
+        </p>
+        <code>
             <pre *ngIf="datatarget.context; else showNoContextText">{{ datatarget.context }}</pre>
           </code>
-          <ng-template #showNoContextText>
-            <p>{{ "DATATARGET.NO-CONTEXT" | translate }}</p>
-          </ng-template>
+        <ng-template #showNoContextText>
+          <p>{{ "DATATARGET.NO-CONTEXT" | translate }}</p>
+        </ng-template>
 
-          <p>
-            <strong>{{ "DATATARGET.AUTHORIZATIONHEADER" | translate }}</strong>
-          </p>
-          <code>
+        <p>
+          <strong>{{ "DATATARGET.AUTHORIZATIONHEADER" | translate }}</strong>
+        </p>
+        <code>
             <pre *ngIf="datatarget.authorizationHeader; else showNoAuthText">{{ datatarget.authorizationHeader }}</pre>
           </code>
-          <ng-template #showNoAuthText>
-            <p>{{ "DATATARGET.NO-AUTHORIZATIONHEADER" | translate }}</p>
-          </ng-template>
+        <ng-template #showNoAuthText>
+          <p>{{ "DATATARGET.NO-AUTHORIZATIONHEADER" | translate }}</p>
+        </ng-template>
 
-          <p>
-            <strong>{{ "DATATARGET.TOKENENDPOINT" | translate }}</strong>
-          </p>
-          <code>
+        <p>
+          <strong>{{ "DATATARGET.TOKENENDPOINT" | translate }}</strong>
+        </p>
+        <code>
             <pre *ngIf="datatarget.tokenEndpoint; else showNoTokenEndpointText">{{ datatarget.tokenEndpoint }}</pre>
           </code>
-          <ng-template #showNoTokenEndpointText>
-            <p>{{ "DATATARGET.NO-TOKENENDPOINT" | translate }}</p>
-          </ng-template>
+        <ng-template #showNoTokenEndpointText>
+          <p>{{ "DATATARGET.NO-TOKENENDPOINT" | translate }}</p>
+        </ng-template>
 
-          <p>
-            <strong>{{ "DATATARGET.CLIENTID" | translate }}</strong>
-          </p>
-          <code>
+        <p>
+          <strong>{{ "DATATARGET.CLIENTID" | translate }}</strong>
+        </p>
+        <code>
             <pre *ngIf="datatarget.clientId; else showNoClientIdText">{{ datatarget.clientId }}</pre>
           </code>
-          <ng-template #showNoClientIdText>
-            <p>{{ "DATATARGET.NO-CLIENTID" | translate }}</p>
-          </ng-template>
+        <ng-template #showNoClientIdText>
+          <p>{{ "DATATARGET.NO-CLIENTID" | translate }}</p>
+        </ng-template>
 
-          <p>
-            <strong>{{ "DATATARGET.CLIENTSECRET" | translate }}</strong>
-          </p>
-          <code>
+        <p>
+          <strong>{{ "DATATARGET.CLIENTSECRET" | translate }}</strong>
+        </p>
+        <code>
             <pre *ngIf="datatarget.clientSecret; else showNoClientSecretText">{{ "".padStart(20, "*") }}</pre>
           </code>
-          <ng-template #showNoClientSecretText>
-            <p>{{ "DATATARGET.NO-CLIENTSECRET" | translate }}</p>
-          </ng-template>
-        </div>
+        <ng-template #showNoClientSecretText>
+          <p>{{ "DATATARGET.NO-CLIENTSECRET" | translate }}</p>
+        </ng-template>
       </div>
+    </div>
 
-      <div class="row">
-        <div class="col-12">
-          <div class="jumbotron">
-            <div class="form-group">
-              <h3>{{ "DATATARGET.RELATIONS" | translate }}</h3>
-              <div *ngIf="dataTargetRelations?.length === 0">
-                <p>{{ "DATATARGET.NO-RELATIONS" | translate }}</p>
-              </div>
-              <div *ngIf="dataTargetRelations">
-                <div *ngFor="let relation of dataTargetRelations">
-                  <div class="row">
-                    <div class="col-md-4 d-flex align-items-center">
-                      <p>
-                        <strong>{{ "DATATARGET.PAYLOADEDECODER" | translate }}</strong
-                        ><span *ngIf="relation.payloadDecoder; else noDecoder">
-                          <a [routerLink]="['/payload-decoder/payload-decoder-detail/', relation.payloadDecoder.id]">{{
-                            relation.payloadDecoder.name
+    <div class="row">
+      <div class="col-12">
+        <div class="jumbotron">
+          <div class="form-group">
+            <h3>{{ "DATATARGET.RELATIONS" | translate }}</h3>
+            <div *ngIf="dataTargetRelations?.length === 0">
+              <p>{{ "DATATARGET.NO-RELATIONS" | translate }}</p>
+            </div>
+            <div *ngIf="dataTargetRelations">
+              <div *ngFor="let relation of dataTargetRelations">
+                <div class="row">
+                  <div class="col-md-4 d-flex align-items-center">
+                    <p>
+                      <strong>{{ "DATATARGET.PAYLOADEDECODER" | translate }}</strong><span
+                        *ngIf="relation.payloadDecoder; else noDecoder">
+                        <a [routerLink]="['/payload-decoder/payload-decoder-detail/', relation.payloadDecoder.id]">{{
+                          relation.payloadDecoder.name
                           }}</a>
-                        </span>
-                        <ng-template #noDecoder>{{ "DATATARGET.NO-PAYLOADDECODER" | translate }}</ng-template>
-                      </p>
-                    </div>
-                    <div class="col-md-1 d-flex align-items-center justify-content-center">
-                      <fa-icon [icon]="arrowsAltH" class="icon--primary icon--medium icon--disabled"></fa-icon>
-                    </div>
-                    <div class="col-md-7 d-flex align-items-center">
-                      <p>
-                        <strong>{{ "DATATARGET.IOTDEVICE" | translate }}</strong>
-                        <span *ngFor="let device of relation.iotDevices; let first = first">
-                          <ng-container *ngIf="!first">, </ng-container>
-                          <a [routerLink]="['/applications', device.application.id, 'iot-device', device.id]">{{
-                            device.name
+                      </span>
+                      <ng-template #noDecoder>{{ "DATATARGET.NO-PAYLOADDECODER" | translate }}</ng-template>
+                    </p>
+                  </div>
+                  <div class="col-md-1 d-flex align-items-center justify-content-center">
+                    <fa-icon [icon]="arrowsAltH" class="icon--primary icon--medium icon--disabled"></fa-icon>
+                  </div>
+                  <div class="col-md-7 d-flex align-items-center">
+                    <p>
+                      <strong>{{ "DATATARGET.IOTDEVICE" | translate }}</strong>
+                      <span *ngFor="let device of relation.iotDevices; let first = first">
+                        <ng-container *ngIf="!first">, </ng-container>
+                        <a [routerLink]="['/applications', device.application.id, 'iot-device', device.id]">{{
+                          device.name
                           }}</a>
-                        </span>
-                      </p>
-                    </div>
-                    <mat-divider></mat-divider>
+                      </span>
+                    </p>
                   </div>
+                  <mat-divider></mat-divider>
                 </div>
               </div>
             </div>
@@ -134,4 +122,4 @@ <h3>{{ "DATATARGET.RELATIONS" | translate }}</h3>
       </div>
     </div>
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/applications/datatarget/fiware/fiware-detail/fiware-detail.component.ts b/src/app/applications/datatarget/fiware/fiware-detail/fiware-detail.component.ts
index e4e18d6d4..8a0d423e2 100644
--- a/src/app/applications/datatarget/fiware/fiware-detail/fiware-detail.component.ts
+++ b/src/app/applications/datatarget/fiware/fiware-detail/fiware-detail.component.ts
@@ -1,94 +1,48 @@
-import { Component, OnDestroy, OnInit } from "@angular/core";
-import { Subscription } from "rxjs";
+import { Component, OnDestroy } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
-import { TranslateService } from "@ngx-translate/core";
 import { PayloadDeviceDatatargetGetByDataTarget } from "@app/payload-decoder/payload-device-data.model";
 import { PayloadDeviceDatatargetService } from "@app/payload-decoder/payload-device-datatarget.service";
-import { BackButton } from "@shared/models/back-button.model";
-import { DatatargetService } from "../../datatarget.service";
-import { Location } from "@angular/common";
-import { DeleteDialogService } from "@shared/components/delete-dialog/delete-dialog.service";
-import { Datatarget } from "../../datatarget.model";
-import { DropdownButton } from "@shared/models/dropdown-button.model";
-import { faArrowsAltH } from "@fortawesome/free-solid-svg-icons";
 import { DatatargetDetail } from "@applications/datatarget/datatarget-detail/datatarget-detail";
-import { MeService } from "@shared/services/me.service";
-import { OrganizationAccessScope } from "@shared/enums/access-scopes";
+import { faArrowsAltH } from "@fortawesome/free-solid-svg-icons";
+import { Subscription } from "rxjs";
+import { Datatarget } from "../../datatarget.model";
+import { DatatargetService } from "../../datatarget.service";
 
 @Component({
   selector: "app-fiware-detail",
   templateUrl: "./fiware-detail.component.html",
   styleUrls: ["./fiware-detail.component.scss"],
 })
-export class FiwareDetailComponent implements DatatargetDetail, OnInit, OnDestroy {
-  public datatargetSubscription: Subscription;
-  public datatarget: Datatarget;
-  public backButton: BackButton = { label: "", routerLink: undefined };
-  public dataTargetRelations: PayloadDeviceDatatargetGetByDataTarget[];
-  private deleteDialogSubscription: Subscription;
-  public dropdownButton: DropdownButton;
+export class FiwareDetailComponent implements DatatargetDetail, OnDestroy {
   arrowsAltH = faArrowsAltH;
-  canEdit: boolean;
 
-  constructor(
-    private route: ActivatedRoute,
-    private deleteDialogService: DeleteDialogService,
-    private location: Location,
-    private datatargetRelationServicer: PayloadDeviceDatatargetService,
-    private datatargetService: DatatargetService,
-    public translate: TranslateService,
-    private meService: MeService
-  ) {}
+  datatarget: Datatarget;
+  dataTargetRelations: PayloadDeviceDatatargetGetByDataTarget[];
 
-  ngOnInit(): void {
-    const id: number = +this.route.snapshot.paramMap.get("datatargetId");
-    const appId: number = +this.route.snapshot.paramMap.get("id");
+  private subscriptions: Subscription[];
 
+  constructor(
+    route: ActivatedRoute,
+    private datatargetService: DatatargetService,
+    private datatargetRelationService: PayloadDeviceDatatargetService
+  ) {
+    const id: number = +route.parent.snapshot.paramMap.get("datatargetId");
     if (id) {
-      this.getDatatarget(id);
-      this.getDatatargetRelations(id);
-      this.dropdownButton = {
-        label: "",
-        editRouterLink: "../../datatarget-edit/" + id,
-        isErasable: true,
-      };
+      this.subscriptions = [this.getDatatarget(id), this.getDatatargetRelations(id)];
     }
-    this.translate.get(["NAV.MY-DATATARGET", "DATATARGET.SHOW-OPTIONS"]).subscribe(translations => {
-      this.backButton.label = translations["NAV.MY-DATATARGET"];
-      this.dropdownButton.label = translations["DATATARGET.SHOW-OPTIONS"];
-    });
-    this.canEdit = this.meService.hasAccessToTargetOrganization(
-      OrganizationAccessScope.ApplicationWrite,
-      undefined,
-      appId
-    );
   }
 
-  getDatatarget(id: number) {
+  ngOnDestroy(): void {
+    this.subscriptions?.forEach(s => s?.unsubscribe());
+  }
+
+  private getDatatarget = (id: number) =>
     this.datatargetService.get(id).subscribe((dataTarget: Datatarget) => {
       this.datatarget = dataTarget;
     });
-  }
-  onDeleteDatatarget() {
-    this.deleteDialogSubscription = this.deleteDialogService.showSimpleDialog().subscribe(response => {
-      if (response) {
-        this.datatargetService.delete(this.datatarget.id).subscribe(response => {});
-        this.location.back();
-      } else {
-        console.log(response);
-      }
-    });
-  }
 
-  getDatatargetRelations(id: number) {
-    this.datatargetRelationServicer.getByDataTarget(id).subscribe(response => {
+  private getDatatargetRelations = (id: number) =>
+    this.datatargetRelationService.getByDataTarget(id).subscribe(response => {
       this.dataTargetRelations = response.data;
     });
-  }
-
-  ngOnDestroy(): void {
-    if (this.deleteDialogSubscription) {
-      this.deleteDialogSubscription.unsubscribe();
-    }
-  }
 }
diff --git a/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.html b/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.html
index 77bbde6cc..5ea4ffa54 100644
--- a/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.html
+++ b/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.html
@@ -12,4 +12,4 @@
   <mat-tab-nav-panel #tabPanel></mat-tab-nav-panel>
 </div>
 
-<router-outlet></router-outlet>
+<router-outlet></router-outlet>
\ No newline at end of file
diff --git a/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.ts b/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.ts
index 938abcf1f..c82f7efd0 100644
--- a/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.ts
+++ b/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.ts
@@ -1,111 +1,38 @@
 import { Location } from "@angular/common";
-import { HttpResponse } from "@angular/common/http";
 import { Component, OnDestroy } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
-import { DatatargetDetail } from "@applications/datatarget/datatarget-detail/datatarget-detail";
-import { Datatarget } from "@applications/datatarget/datatarget.model";
+import { DatatargetDetailTabsCommon } from "@applications/datatarget/datatarget-detail/datatarget-detail-tabs-common";
 import { DatatargetService } from "@applications/datatarget/datatarget.service";
 import { TranslateService } from "@ngx-translate/core";
 import { DeleteDialogService } from "@shared/components/delete-dialog/delete-dialog.service";
-import { OrganizationAccessScope } from "@shared/enums/access-scopes";
 import { DataTargetType } from "@shared/enums/datatarget-type";
-import { BackButton } from "@shared/models/back-button.model";
-import { DropdownButton } from "@shared/models/dropdown-button.model";
 import { MeService } from "@shared/services/me.service";
-import { NavTab } from "@shared/types/nav-tabs.type";
-import { Subscription } from "rxjs";
 
 @Component({
   selector: "app-httppush-detail-tabs",
   templateUrl: "./httppush-detail-tabs.component.html",
   styleUrl: "./httppush-detail-tabs.component.scss",
 })
-export class HttppushDetailTabsComponent implements DatatargetDetail, OnDestroy {
+export class HttppushDetailTabsComponent extends DatatargetDetailTabsCommon implements OnDestroy {
   dataTargetType = DataTargetType;
 
-  navTabs: NavTab[] = [
-    {
-      label: "APPLICATION.DETAILS",
-      link: "httppush-detail",
-      index: 0,
-    },
-    {
-      label: "GEN.LOG",
-      link: "datatarget-log",
-      index: 1,
-    },
-  ];
-
-  datatarget: Datatarget;
-  dropdownButton: DropdownButton;
-  backButton: BackButton = { label: "", routerLink: undefined };
-  canEdit: boolean;
-
-  private subscriptions: Subscription[] = [];
-  private deleteDialogSubscription: Subscription;
+  protected override getDetailsLink() {
+    return "httppush-detail";
+  }
 
   constructor(
     route: ActivatedRoute,
     router: Router,
     translate: TranslateService,
     meService: MeService,
-    private location: Location,
-    private datatargetService: DatatargetService,
-    public deleteDialogService: DeleteDialogService
+    location: Location,
+    datatargetService: DatatargetService,
+    deleteDialogService: DeleteDialogService
   ) {
-    // Load first tab if none was selected
-    const path = this.location.path();
-    if (!this.navTabs.some(tab => path.includes(tab.link))) {
-      router.navigate([path, this.navTabs[0].link], { replaceUrl: true });
-    }
-    // URL params
-    const paramMap = route.snapshot.paramMap;
-    const id: number = +paramMap.get("datatargetId");
-    const appId: number = +paramMap.get("id");
-    if (id) {
-      this.subscriptions.push(this.getDatatarget(id));
-      this.dropdownButton = {
-        label: "",
-        editRouterLink: "../../datatarget-edit/" + id,
-        isErasable: true,
-      };
-    }
-
-    this.subscriptions.push(
-      translate.get(["NAV.MY-DATATARGET", "DATATARGET.SHOW-OPTIONS"]).subscribe(translations => {
-        this.backButton.label = translations["NAV.MY-DATATARGET"];
-        this.dropdownButton.label = translations["DATATARGET.SHOW-OPTIONS"];
-      })
-    );
-
-    this.canEdit = meService.hasAccessToTargetOrganization(OrganizationAccessScope.ApplicationWrite, undefined, appId);
+    super(route, router, translate, meService, location, datatargetService, deleteDialogService);
   }
 
   ngOnDestroy(): void {
-    this.subscriptions?.forEach(s => s?.unsubscribe());
-    this.deleteDialogSubscription?.unsubscribe();
-  }
-
-  getDatatarget = (id: number) =>
-    this.datatargetService.get(id).subscribe((dataTarget: Datatarget) => {
-      this.datatarget = dataTarget;
-    });
-
-  onDeleteDatatarget() {
-    this.deleteDialogSubscription?.unsubscribe();
-    this.deleteDialogSubscription = this.deleteDialogService.showSimpleDialog().subscribe(response => {
-      // Do nothing if user cancels
-      if (!response) return;
-      this.subscriptions.push(
-        this.datatargetService.delete(this.datatarget.id).subscribe((deleteResponse: HttpResponse<any>) => {
-          if (deleteResponse?.ok) {
-            this.location.back();
-          } else {
-            // TODO: Show error / snackbar??
-            console.log("Delete failed", deleteResponse);
-          }
-        })
-      );
-    });
+    super.onDestroy();
   }
 }
diff --git a/src/app/applications/datatarget/httppush/httppush-detail/httppush-detail.component.ts b/src/app/applications/datatarget/httppush/httppush-detail/httppush-detail.component.ts
index 3fce32cff..e66a67db0 100644
--- a/src/app/applications/datatarget/httppush/httppush-detail/httppush-detail.component.ts
+++ b/src/app/applications/datatarget/httppush/httppush-detail/httppush-detail.component.ts
@@ -4,9 +4,7 @@ import { PayloadDeviceDatatargetGetByDataTarget } from "@app/payload-decoder/pay
 import { PayloadDeviceDatatargetService } from "@app/payload-decoder/payload-device-datatarget.service";
 import { DatatargetDetail } from "@applications/datatarget/datatarget-detail/datatarget-detail";
 import { faArrowsAltH } from "@fortawesome/free-solid-svg-icons";
-import { OrganizationAccessScope } from "@shared/enums/access-scopes";
 import { DataTargetType } from "@shared/enums/datatarget-type";
-import { MeService } from "@shared/services/me.service";
 import { Subscription } from "rxjs";
 import { Datatarget } from "../../datatarget.model";
 import { DatatargetService } from "../../datatarget.service";
@@ -22,24 +20,18 @@ export class HttppushDetailComponent implements DatatargetDetail, OnDestroy {
 
   datatarget: Datatarget;
   dataTargetRelations: PayloadDeviceDatatargetGetByDataTarget[];
-  canEdit: boolean;
 
   private subscriptions: Subscription[];
 
   constructor(
     route: ActivatedRoute,
-    meService: MeService,
     private datatargetService: DatatargetService,
-    private datatargetRelationServicer: PayloadDeviceDatatargetService
+    private datatargetRelationService: PayloadDeviceDatatargetService
   ) {
-    const paramMap = route.parent.snapshot.paramMap;
-    const id: number = +paramMap.get("datatargetId");
-    const appId: number = +paramMap.get("id");
-
+    const id: number = +route.parent.snapshot.paramMap.get("datatargetId");
     if (id) {
       this.subscriptions = [this.getDatatarget(id), this.getDatatargetRelations(id)];
     }
-    this.canEdit = meService.hasAccessToTargetOrganization(OrganizationAccessScope.ApplicationWrite, undefined, appId);
   }
 
   ngOnDestroy(): void {
@@ -52,7 +44,7 @@ export class HttppushDetailComponent implements DatatargetDetail, OnDestroy {
     });
 
   private getDatatargetRelations = (id: number) =>
-    this.datatargetRelationServicer.getByDataTarget(id).subscribe(response => {
+    this.datatargetRelationService.getByDataTarget(id).subscribe(response => {
       this.dataTargetRelations = response.data;
     });
 }
diff --git a/src/app/applications/datatarget/mqtt-detail/mqtt-detail.component.html b/src/app/applications/datatarget/mqtt-detail/mqtt-detail.component.html
deleted file mode 100644
index 1d9b39237..000000000
--- a/src/app/applications/datatarget/mqtt-detail/mqtt-detail.component.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<div *ngIf="datatarget">
-  <app-top-bar
-    [data]="datatarget"
-    [backButton]="backButton"
-    [subPage]="true"
-    [addDetailDowndown]="true"
-    [dropDownButton]="dropdownButton"
-    (deleteSelectedInDropdown)="onDeleteDatatarget()"
-    [canEdit]="canEdit"
-  >
-  </app-top-bar>
-  <div class="container-fluid">
-    <div class="row">
-      <div class="col-md-6 d-flex align-items-stretch">
-        <div class="jumbotron jumbotron--m-right jumbotron--full-width width100percent">
-          <h3>{{ "DATATARGET.DETAILS" | translate }}</h3>
-          <app-general-details [data]="datatarget"></app-general-details>
-          <mat-divider></mat-divider>
-          <p>
-            <strong>{{ "DATATARGET.MQTT.BROKER-URL" | translate }}</strong
-            >{{ datatarget.url }}
-          </p>
-          <p>
-            <strong>{{ "DATATARGET.TIMEOUT" | translate }}</strong
-            >{{ datatarget.timeout }}
-          </p>
-          <p>
-            <strong>{{ "DATATARGET.TYPE" | translate }}</strong
-            >{{ "DATATARGET." + datatarget.type + ".TYPE" | translate }}
-          </p>
-          <mat-divider></mat-divider>
-          <p>
-            <strong>{{ "DATATARGET.MQTT.PORT" | translate }}</strong
-            >{{ datatarget.mqttPort }}
-          </p>
-          <p>
-            <strong>{{ "DATATARGET.MQTT.TOPIC" | translate }}</strong
-            >{{ datatarget.mqttTopic }}
-          </p>
-          <p>
-            <strong>{{ "DATATARGET.MQTT.QOS" | translate }}</strong
-            >{{ datatarget.mqttQos }}
-          </p>
-          <p>
-            <strong>{{ "DATATARGET.MQTT.USERNAME" | translate }}</strong
-            >{{ datatarget.mqttUsername }}
-          </p>
-          <p>
-            <strong>{{ "DATATARGET.MQTT.PASSWORD" | translate }}</strong
-            >{{ datatarget.mqttPassword }}
-          </p>
-        </div>
-      </div>
-
-      <div class="row">
-        <div class="col-12">
-          <div class="jumbotron">
-            <div class="form-group">
-              <h3>{{ "DATATARGET.RELATIONS" | translate }}</h3>
-              <div *ngIf="dataTargetRelations?.length === 0">
-                <p>{{ "DATATARGET.NO-RELATIONS" | translate }}</p>
-              </div>
-              <div *ngIf="dataTargetRelations">
-                <div *ngFor="let relation of dataTargetRelations">
-                  <div class="row">
-                    <div class="col-md-4 d-flex align-items-center">
-                      <p>
-                        <strong>{{ "DATATARGET.PAYLOADEDECODER" | translate }}</strong
-                        ><span *ngIf="relation.payloadDecoder; else noDecoder">
-                          <a [routerLink]="['/payload-decoder/payload-decoder-detail/', relation.payloadDecoder.id]">{{
-                            relation.payloadDecoder.name
-                          }}</a>
-                        </span>
-                        <ng-template #noDecoder>{{ "DATATARGET.NO-PAYLOADDECODER" | translate }}</ng-template>
-                      </p>
-                    </div>
-                    <div class="col-md-1 d-flex align-items-center justify-content-center">
-                      <fa-icon [icon]="arrowsAltH" class="icon--primary icon--medium icon--disabled"></fa-icon>
-                    </div>
-                    <div class="col-md-7 d-flex align-items-center">
-                      <p>
-                        <strong>{{ "DATATARGET.IOTDEVICE" | translate }}</strong>
-                        <span *ngFor="let device of relation.iotDevices; let first = first">
-                          <ng-container *ngIf="!first">, </ng-container>
-                          <a [routerLink]="['/applications', device.application.id, 'iot-device', device.id]">{{
-                            device.name
-                          }}</a>
-                        </span>
-                      </p>
-                    </div>
-                    <mat-divider></mat-divider>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/src/app/applications/datatarget/mqtt-detail/mqtt-detail.component.ts b/src/app/applications/datatarget/mqtt-detail/mqtt-detail.component.ts
deleted file mode 100644
index 4edc99322..000000000
--- a/src/app/applications/datatarget/mqtt-detail/mqtt-detail.component.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-import { Location } from "@angular/common";
-import { Component, OnDestroy, OnInit } from "@angular/core";
-import { ActivatedRoute } from "@angular/router";
-import { DatatargetDetail } from "@applications/datatarget/datatarget-detail/datatarget-detail";
-import { faArrowsAltH } from "@fortawesome/free-solid-svg-icons";
-import { TranslateService } from "@ngx-translate/core";
-import { PayloadDeviceDatatargetGetByDataTarget } from "@payload-decoder/payload-device-data.model";
-import { PayloadDeviceDatatargetService } from "@payload-decoder/payload-device-datatarget.service";
-import { DeleteDialogService } from "@shared/components/delete-dialog/delete-dialog.service";
-import { BackButton } from "@shared/models/back-button.model";
-import { DropdownButton } from "@shared/models/dropdown-button.model";
-import { Subscription } from "rxjs";
-import { Datatarget } from "../datatarget.model";
-import { DatatargetService } from "../datatarget.service";
-import { MeService } from "@shared/services/me.service";
-import { OrganizationAccessScope } from "@shared/enums/access-scopes";
-
-@Component({
-  selector: "app-mqtt-detail",
-  templateUrl: "./mqtt-detail.component.html",
-  styleUrls: ["./mqtt-detail.component.scss"],
-})
-// TODO: Most of the code is duplicated from other datatarget edit components.
-// Same applies to the html file. One solution is extending a base datatarget-edit component
-export class MqttDetailComponent implements DatatargetDetail, OnInit, OnDestroy {
-  public datatarget: Datatarget;
-  public backButton: BackButton = { label: "", routerLink: undefined };
-  public dataTargetRelations: PayloadDeviceDatatargetGetByDataTarget[];
-  private deleteDialogSubscription: Subscription;
-  public dropdownButton: DropdownButton;
-  arrowsAltH = faArrowsAltH;
-  canEdit: boolean;
-
-  constructor(
-    private route: ActivatedRoute,
-    private deleteDialogService: DeleteDialogService,
-    private location: Location,
-    private datatargetRelationService: PayloadDeviceDatatargetService,
-    private datatargetService: DatatargetService,
-    public translate: TranslateService,
-    private meService: MeService
-  ) {}
-
-  ngOnInit(): void {
-    const id: number = +this.route.snapshot.paramMap.get("datatargetId");
-    const appId: number = +this.route.snapshot.paramMap.get("id");
-
-    if (id) {
-      this.getDatatarget(id);
-      this.getDatatargetRelations(id);
-      this.dropdownButton = {
-        label: "",
-        editRouterLink: "../../datatarget-edit/" + id,
-        isErasable: true,
-      };
-    }
-    this.translate.get(["NAV.MY-DATATARGET", "DATATARGET.SHOW-OPTIONS"]).subscribe(translations => {
-      this.backButton.label = translations["NAV.MY-DATATARGET"];
-      this.dropdownButton.label = translations["DATATARGET.SHOW-OPTIONS"];
-    });
-    this.canEdit = this.meService.hasAccessToTargetOrganization(
-      OrganizationAccessScope.ApplicationWrite,
-      undefined,
-      appId
-    );
-  }
-
-  getDatatarget(id: number) {
-    this.datatargetService.get(id).subscribe((dataTarget: Datatarget) => {
-      this.datatarget = dataTarget;
-    });
-  }
-
-  onDeleteDatatarget() {
-    this.deleteDialogSubscription = this.deleteDialogService.showSimpleDialog().subscribe(response => {
-      if (response) {
-        this.datatargetService.delete(this.datatarget.id).subscribe(() => {});
-        this.location.back();
-      }
-    });
-  }
-
-  getDatatargetRelations(id: number) {
-    this.datatargetRelationService.getByDataTarget(id).subscribe(response => {
-      this.dataTargetRelations = response.data;
-    });
-  }
-
-  ngOnDestroy(): void {
-    this.deleteDialogSubscription?.unsubscribe();
-  }
-}
diff --git a/src/app/applications/datatarget/mqtt/mqtt-detail-tabs/mqtt-detail-tabs.component.html b/src/app/applications/datatarget/mqtt/mqtt-detail-tabs/mqtt-detail-tabs.component.html
new file mode 100644
index 000000000..ab093a413
--- /dev/null
+++ b/src/app/applications/datatarget/mqtt/mqtt-detail-tabs/mqtt-detail-tabs.component.html
@@ -0,0 +1,13 @@
+<app-top-bar *ngIf="datatarget" [data]="datatarget" [backButton]="backButton" [subPage]="true"
+    [addDetailDowndown]="true" [dropDownButton]="dropdownButton" (deleteSelectedInDropdown)="onDeleteDatatarget()"
+    [canEdit]="canEdit">
+</app-top-bar>
+
+<nav mat-tab-nav-bar [tabPanel]="tabPanel">
+    <a mat-tab-link *ngFor="let link of navTabs" [routerLink]="'./' + link.link" routerLinkActive
+        #rla="routerLinkActive" [active]="rla.isActive">{{ link.label | translate }}</a>
+</nav>
+<mat-divider></mat-divider>
+<mat-tab-nav-panel #tabPanel></mat-tab-nav-panel>
+
+<router-outlet></router-outlet>
\ No newline at end of file
diff --git a/src/app/applications/datatarget/mqtt/mqtt-detail-tabs/mqtt-detail-tabs.component.scss b/src/app/applications/datatarget/mqtt/mqtt-detail-tabs/mqtt-detail-tabs.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/applications/datatarget/mqtt/mqtt-detail-tabs/mqtt-detail-tabs.component.spec.ts b/src/app/applications/datatarget/mqtt/mqtt-detail-tabs/mqtt-detail-tabs.component.spec.ts
new file mode 100644
index 000000000..41dd10e32
--- /dev/null
+++ b/src/app/applications/datatarget/mqtt/mqtt-detail-tabs/mqtt-detail-tabs.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { MqttDetailTabsComponent } from './mqtt-detail-tabs.component';
+
+describe('MqttDetailTabsComponent', () => {
+  let component: MqttDetailTabsComponent;
+  let fixture: ComponentFixture<MqttDetailTabsComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [MqttDetailTabsComponent]
+    })
+    .compileComponents();
+    
+    fixture = TestBed.createComponent(MqttDetailTabsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/applications/datatarget/mqtt/mqtt-detail-tabs/mqtt-detail-tabs.component.ts b/src/app/applications/datatarget/mqtt/mqtt-detail-tabs/mqtt-detail-tabs.component.ts
new file mode 100644
index 000000000..ca3484051
--- /dev/null
+++ b/src/app/applications/datatarget/mqtt/mqtt-detail-tabs/mqtt-detail-tabs.component.ts
@@ -0,0 +1,35 @@
+import { Location } from "@angular/common";
+import { Component, OnDestroy } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { DatatargetDetailTabsCommon } from "@applications/datatarget/datatarget-detail/datatarget-detail-tabs-common";
+import { DatatargetService } from "@applications/datatarget/datatarget.service";
+import { TranslateService } from "@ngx-translate/core";
+import { DeleteDialogService } from "@shared/components/delete-dialog/delete-dialog.service";
+import { MeService } from "@shared/services/me.service";
+
+@Component({
+  selector: "app-mqtt-detail-tabs",
+  templateUrl: "./mqtt-detail-tabs.component.html",
+  styleUrl: "./mqtt-detail-tabs.component.scss",
+})
+export class MqttDetailTabsComponent extends DatatargetDetailTabsCommon implements OnDestroy {
+  protected override getDetailsLink() {
+    return "mqtt-detail";
+  }
+
+  constructor(
+    route: ActivatedRoute,
+    router: Router,
+    translate: TranslateService,
+    meService: MeService,
+    location: Location,
+    datatargetService: DatatargetService,
+    deleteDialogService: DeleteDialogService
+  ) {
+    super(route, router, translate, meService, location, datatargetService, deleteDialogService);
+  }
+
+  ngOnDestroy(): void {
+    super.onDestroy();
+  }
+}
diff --git a/src/app/applications/datatarget/mqtt/mqtt-detail/mqtt-detail.component.html b/src/app/applications/datatarget/mqtt/mqtt-detail/mqtt-detail.component.html
new file mode 100644
index 000000000..5b2dc7635
--- /dev/null
+++ b/src/app/applications/datatarget/mqtt/mqtt-detail/mqtt-detail.component.html
@@ -0,0 +1,82 @@
+<div *ngIf="datatarget" class="container-fluid">
+  <div class="row">
+    <div class="col-md-6 d-flex align-items-stretch">
+      <div class="jumbotron jumbotron--m-right jumbotron--full-width width100percent">
+        <h3>{{ "DATATARGET.DETAILS" | translate }}</h3>
+        <app-general-details [data]="datatarget"></app-general-details>
+        <mat-divider></mat-divider>
+        <p>
+          <strong>{{ "DATATARGET.MQTT.BROKER-URL" | translate }}</strong>{{ datatarget.url }}
+        </p>
+        <p>
+          <strong>{{ "DATATARGET.TIMEOUT" | translate }}</strong>{{ datatarget.timeout }}
+        </p>
+        <p>
+          <strong>{{ "DATATARGET.TYPE" | translate }}</strong>{{ "DATATARGET." + datatarget.type + ".TYPE" | translate
+          }}
+        </p>
+        <mat-divider></mat-divider>
+        <p>
+          <strong>{{ "DATATARGET.MQTT.PORT" | translate }}</strong>{{ datatarget.mqttPort }}
+        </p>
+        <p>
+          <strong>{{ "DATATARGET.MQTT.TOPIC" | translate }}</strong>{{ datatarget.mqttTopic }}
+        </p>
+        <p>
+          <strong>{{ "DATATARGET.MQTT.QOS" | translate }}</strong>{{ datatarget.mqttQos }}
+        </p>
+        <p>
+          <strong>{{ "DATATARGET.MQTT.USERNAME" | translate }}</strong>{{ datatarget.mqttUsername }}
+        </p>
+        <p>
+          <strong>{{ "DATATARGET.MQTT.PASSWORD" | translate }}</strong>{{ datatarget.mqttPassword }}
+        </p>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-12">
+        <div class="jumbotron">
+          <div class="form-group">
+            <h3>{{ "DATATARGET.RELATIONS" | translate }}</h3>
+            <div *ngIf="dataTargetRelations?.length === 0">
+              <p>{{ "DATATARGET.NO-RELATIONS" | translate }}</p>
+            </div>
+            <div *ngIf="dataTargetRelations">
+              <div *ngFor="let relation of dataTargetRelations">
+                <div class="row">
+                  <div class="col-md-4 d-flex align-items-center">
+                    <p>
+                      <strong>{{ "DATATARGET.PAYLOADEDECODER" | translate }}</strong><span
+                        *ngIf="relation.payloadDecoder; else noDecoder">
+                        <a [routerLink]="['/payload-decoder/payload-decoder-detail/', relation.payloadDecoder.id]">{{
+                          relation.payloadDecoder.name
+                          }}</a>
+                      </span>
+                      <ng-template #noDecoder>{{ "DATATARGET.NO-PAYLOADDECODER" | translate }}</ng-template>
+                    </p>
+                  </div>
+                  <div class="col-md-1 d-flex align-items-center justify-content-center">
+                    <fa-icon [icon]="arrowsAltH" class="icon--primary icon--medium icon--disabled"></fa-icon>
+                  </div>
+                  <div class="col-md-7 d-flex align-items-center">
+                    <p>
+                      <strong>{{ "DATATARGET.IOTDEVICE" | translate }}</strong>
+                      <span *ngFor="let device of relation.iotDevices; let first = first">
+                        <ng-container *ngIf="!first">, </ng-container>
+                        <a [routerLink]="['/applications', device.application.id, 'iot-device', device.id]">{{
+                          device.name
+                          }}</a>
+                      </span>
+                    </p>
+                  </div>
+                  <mat-divider></mat-divider>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/src/app/applications/datatarget/mqtt/mqtt-detail/mqtt-detail.component.scss b/src/app/applications/datatarget/mqtt/mqtt-detail/mqtt-detail.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/applications/datatarget/mqtt/mqtt-detail/mqtt-detail.component.ts b/src/app/applications/datatarget/mqtt/mqtt-detail/mqtt-detail.component.ts
new file mode 100644
index 000000000..dd870c641
--- /dev/null
+++ b/src/app/applications/datatarget/mqtt/mqtt-detail/mqtt-detail.component.ts
@@ -0,0 +1,48 @@
+import { Component, OnDestroy } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+import { PayloadDeviceDatatargetGetByDataTarget } from "@app/payload-decoder/payload-device-data.model";
+import { PayloadDeviceDatatargetService } from "@app/payload-decoder/payload-device-datatarget.service";
+import { DatatargetDetail } from "@applications/datatarget/datatarget-detail/datatarget-detail";
+import { faArrowsAltH } from "@fortawesome/free-solid-svg-icons";
+import { Subscription } from "rxjs";
+import { Datatarget } from "../../datatarget.model";
+import { DatatargetService } from "../../datatarget.service";
+
+@Component({
+  selector: "app-mqtt-detail",
+  templateUrl: "./mqtt-detail.component.html",
+  styleUrls: ["./mqtt-detail.component.scss"],
+})
+export class MqttDetailComponent implements DatatargetDetail, OnDestroy {
+  arrowsAltH = faArrowsAltH;
+
+  datatarget: Datatarget;
+  dataTargetRelations: PayloadDeviceDatatargetGetByDataTarget[];
+
+  private subscriptions: Subscription[];
+
+  constructor(
+    route: ActivatedRoute,
+    private datatargetService: DatatargetService,
+    private datatargetRelationService: PayloadDeviceDatatargetService
+  ) {
+    const id: number = +route.parent.snapshot.paramMap.get("datatargetId");
+    if (id) {
+      this.subscriptions = [this.getDatatarget(id), this.getDatatargetRelations(id)];
+    }
+  }
+
+  ngOnDestroy(): void {
+    this.subscriptions?.forEach(s => s?.unsubscribe());
+  }
+
+  private getDatatarget = (id: number) =>
+    this.datatargetService.get(id).subscribe((dataTarget: Datatarget) => {
+      this.datatarget = dataTarget;
+    });
+
+  private getDatatargetRelations = (id: number) =>
+    this.datatargetRelationService.getByDataTarget(id).subscribe(response => {
+      this.dataTargetRelations = response.data;
+    });
+}
diff --git a/src/app/applications/datatarget/mqtt-edit/mqtt-edit.component.html b/src/app/applications/datatarget/mqtt/mqtt-edit/mqtt-edit.component.html
similarity index 100%
rename from src/app/applications/datatarget/mqtt-edit/mqtt-edit.component.html
rename to src/app/applications/datatarget/mqtt/mqtt-edit/mqtt-edit.component.html
diff --git a/src/app/applications/datatarget/mqtt-edit/mqtt-edit.component.scss b/src/app/applications/datatarget/mqtt/mqtt-edit/mqtt-edit.component.scss
similarity index 100%
rename from src/app/applications/datatarget/mqtt-edit/mqtt-edit.component.scss
rename to src/app/applications/datatarget/mqtt/mqtt-edit/mqtt-edit.component.scss
diff --git a/src/app/applications/datatarget/mqtt-edit/mqtt-edit.component.ts b/src/app/applications/datatarget/mqtt/mqtt-edit/mqtt-edit.component.ts
similarity index 97%
rename from src/app/applications/datatarget/mqtt-edit/mqtt-edit.component.ts
rename to src/app/applications/datatarget/mqtt/mqtt-edit/mqtt-edit.component.ts
index 7b85d9c8a..11538dc72 100644
--- a/src/app/applications/datatarget/mqtt-edit/mqtt-edit.component.ts
+++ b/src/app/applications/datatarget/mqtt/mqtt-edit/mqtt-edit.component.ts
@@ -4,6 +4,9 @@ import { MatDialog } from "@angular/material/dialog";
 import { ActivatedRoute, Router } from "@angular/router";
 import { Application } from "@applications/application.model";
 import { ApplicationService } from "@applications/application.service";
+import { DatatargetEdit } from "@applications/datatarget/datatarget-edit/datatarget-edit";
+import { Datatarget } from "@applications/datatarget/datatarget.model";
+import { DatatargetService } from "@applications/datatarget/datatarget.service";
 import { IotDevice } from "@applications/iot-devices/iot-device.model";
 import { faQuestionCircle, faTimesCircle } from "@fortawesome/free-solid-svg-icons";
 import { PayloadDecoder, PayloadDecoderMappedResponse } from "@payload-decoder/payload-decoder.model";
@@ -19,9 +22,6 @@ import { ErrorMessageService } from "@shared/error-message.service";
 import { ScrollToTopService } from "@shared/services/scroll-to-top.service";
 import { SnackService } from "@shared/services/snack.service";
 import { Subscription } from "rxjs";
-import { DatatargetEdit } from "../datatarget-edit/datatarget-edit";
-import { Datatarget } from "../datatarget.model";
-import { DatatargetService } from "../datatarget.service";
 
 @Component({
   selector: "app-mqtt-edit",

From e02efba0bc5e1068f18774198c6f01308239b996 Mon Sep 17 00:00:00 2001
From: Chris Dons Johansen <cdj@iterator-it.dk>
Date: Tue, 17 Sep 2024 15:28:20 +0200
Subject: [PATCH 5/9] Minor adjustment for datatarget-log-table..

---
 .../datatarget-log/datatarget-log.component.html         | 8 ++++----
 .../datatarget/datatarget-log/datatarget-log.model.ts    | 9 ++++-----
 src/assets/i18n/da.json                                  | 4 ++++
 src/assets/i18n/en.json                                  | 6 ++++++
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/app/applications/datatarget/datatarget-log/datatarget-log.component.html b/src/app/applications/datatarget/datatarget-log/datatarget-log.component.html
index 6a345a549..4edd7cba3 100644
--- a/src/app/applications/datatarget/datatarget-log/datatarget-log.component.html
+++ b/src/app/applications/datatarget/datatarget-log/datatarget-log.component.html
@@ -7,25 +7,25 @@
         <!-- Timestamp column -->
         <ng-container matColumnDef="createdAt">
             <th mat-header-cell *matHeaderCellDef mat-sort-header>{{ "GATEWAY.STATS-TIMESTAMP" | translate }}</th>
-            <td mat-cell *matCellDef="let element">{{ element.createdAt | tableDateWithSecondsPipe }}</td>
+            <td mat-cell *matCellDef="let element">{{ element.createdAt | date:'dd-MM-yyyy - HH:mm:ss' }}</td>
         </ng-container>
 
         <!-- Type column -->
         <ng-container matColumnDef="type">
             <th mat-header-cell *matHeaderCellDef mat-sort-header>{{ "DATATARGET-TABLE.TYPE" | translate }}</th>
-            <td mat-cell *matCellDef="let element">{{ element.type }}</td>
+            <td mat-cell *matCellDef="let element">{{ ('DATATARGET.RESPONSE_TYPE.' + element.type) | translate }}</td>
         </ng-container>
 
         <!-- Message column -->
         <ng-container matColumnDef="message">
             <th mat-header-cell *matHeaderCellDef mat-sort-header>{{ "GEN.MESSAGE" | translate }}</th>
-            <td mat-cell *matCellDef="let element">{{ element.message }}</td>
+            <td mat-cell *matCellDef="let element">{{ element.statusCode }} {{ element.message }}</td>
         </ng-container>
 
         <!-- Device column -->
         <ng-container matColumnDef="device">
             <th mat-header-cell *matHeaderCellDef mat-sort-header>{{ "GEN.DEVICE" | translate }}</th>
-            <td mat-cell *matCellDef="let element">{{ element.device }}</td>
+            <td mat-cell *matCellDef="let element">{{ element.iotDevice?.name }}</td>
         </ng-container>
 
         <!-- Actually showing the data -->
diff --git a/src/app/applications/datatarget/datatarget-log/datatarget-log.model.ts b/src/app/applications/datatarget/datatarget-log/datatarget-log.model.ts
index 1c605da60..a67a24183 100644
--- a/src/app/applications/datatarget/datatarget-log/datatarget-log.model.ts
+++ b/src/app/applications/datatarget/datatarget-log/datatarget-log.model.ts
@@ -1,11 +1,10 @@
+import { IotDevice } from "@applications/iot-devices/iot-device.model";
+
 export class DatatargetLog {
   createdAt: Date;
 
-  // TODO: Enum??
   type: string;
-
   message: string;
-
-  // TODO: Reference to devices?
-  device?: string;
+  statusCode?: number;
+  iotDevice?: IotDevice;
 }
diff --git a/src/assets/i18n/da.json b/src/assets/i18n/da.json
index 4b8af7eeb..c1f529198 100644
--- a/src/assets/i18n/da.json
+++ b/src/assets/i18n/da.json
@@ -260,6 +260,10 @@
         },
         "OPENDATADK": {
             "TYPE": "OpenDataDK"
+        },
+        "RESPONSE_TYPE": {
+            "ERROR": "Fejl",
+            "OK": "Ok"
         }
     },
     "MULTICAST": {
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 5141ef36a..de070dd0c 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -26,6 +26,12 @@
         "EDIT": "Edit",
         "SHOW-OPTIONS": "Show options"
     },
+    "DATATARGET": {
+        "RESPONSE_TYPE": {
+            "ERROR": "Fejl",
+            "OK": "Ok"
+        }
+    },
     "FORM": {
         "CREATE-NEW-APPLICATION": "Create new application",
         "EDIT-NEW-APPLICATION": "Edit application",

From 76e63cb5449cc6ba2e3a697a61e00023a912cfda Mon Sep 17 00:00:00 2001
From: Chris Dons Johansen <cdj@iterator-it.dk>
Date: Wed, 18 Sep 2024 14:00:30 +0200
Subject: [PATCH 6/9] Added latest message and status-icons to datatarget UI..

---
 .../datatarget-log/datatarget-log.component.html   |  6 +++++-
 .../datatarget-log/datatarget-log.component.scss   | 14 ++++++++++----
 .../datatarget-log/datatarget-log.component.ts     |  3 +++
 .../datatarget/datatarget-response.model.ts        |  1 +
 .../applications/datatarget/datatarget.model.ts    |  1 +
 .../applications/datatarget/datatarget.service.ts  |  1 +
 .../fiware-detail/fiware-detail.component.html     |  3 +++
 .../httppush-detail/httppush-detail.component.html |  3 +++
 .../mqtt/mqtt-detail/mqtt-detail.component.html    |  3 +++
 src/assets/i18n/da.json                            |  1 +
 src/assets/i18n/en.json                            |  1 +
 11 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/app/applications/datatarget/datatarget-log/datatarget-log.component.html b/src/app/applications/datatarget/datatarget-log/datatarget-log.component.html
index 4edd7cba3..ccea3ff8f 100644
--- a/src/app/applications/datatarget/datatarget-log/datatarget-log.component.html
+++ b/src/app/applications/datatarget/datatarget-log/datatarget-log.component.html
@@ -13,7 +13,11 @@
         <!-- Type column -->
         <ng-container matColumnDef="type">
             <th mat-header-cell *matHeaderCellDef mat-sort-header>{{ "DATATARGET-TABLE.TYPE" | translate }}</th>
-            <td mat-cell *matCellDef="let element">{{ ('DATATARGET.RESPONSE_TYPE.' + element.type) | translate }}</td>
+            <td mat-cell *matCellDef="let element">
+                <fa-icon *ngIf="element.type === 'OK'" [icon]="faCheckCircle" class="fa-ok"></fa-icon>
+                <fa-icon *ngIf="element.type === 'ERROR'" [icon]="faExclamationTriangle" class="fa-error"></fa-icon>
+                {{ ('DATATARGET.RESPONSE_TYPE.' + element.type) | translate }}
+            </td>
         </ng-container>
 
         <!-- Message column -->
diff --git a/src/app/applications/datatarget/datatarget-log/datatarget-log.component.scss b/src/app/applications/datatarget/datatarget-log/datatarget-log.component.scss
index 9fd7d0b49..0f0aeca5c 100644
--- a/src/app/applications/datatarget/datatarget-log/datatarget-log.component.scss
+++ b/src/app/applications/datatarget/datatarget-log/datatarget-log.component.scss
@@ -1,5 +1,11 @@
 :host {
-    .datatarget-log-container {
-        margin: 2em;
-    }
-}
\ No newline at end of file
+  .datatarget-log-container {
+    margin: 2em;
+  }
+  .fa-ok {
+    color: green !important;
+  }
+  .fa-error {
+    color: red !important;
+  }
+}
diff --git a/src/app/applications/datatarget/datatarget-log/datatarget-log.component.ts b/src/app/applications/datatarget/datatarget-log/datatarget-log.component.ts
index 095162f09..4a2270136 100644
--- a/src/app/applications/datatarget/datatarget-log/datatarget-log.component.ts
+++ b/src/app/applications/datatarget/datatarget-log/datatarget-log.component.ts
@@ -4,6 +4,7 @@ import { MatSort } from "@angular/material/sort";
 import { MatTableDataSource } from "@angular/material/table";
 import { ActivatedRoute } from "@angular/router";
 import { environment } from "@environments/environment";
+import { faCheckCircle, faExclamationTriangle } from "@fortawesome/free-solid-svg-icons";
 import { DefaultPageSizeOptions } from "@shared/constants/page.constants";
 import { Subscription } from "rxjs";
 import { DatatargetLog } from "./datatarget-log.model";
@@ -21,6 +22,8 @@ export class DatatargetLogComponent implements OnDestroy, AfterViewInit {
   displayedColumns: string[] = ["createdAt", "type", "message", "device"];
   pageSizeOptions = DefaultPageSizeOptions;
   pageSize = environment.tablePageSize;
+  faExclamationTriangle = faExclamationTriangle;
+  faCheckCircle = faCheckCircle;
 
   dataSource = new MatTableDataSource<DatatargetLog>();
   isLoadingResults = true;
diff --git a/src/app/applications/datatarget/datatarget-response.model.ts b/src/app/applications/datatarget/datatarget-response.model.ts
index 7da0490f2..bb31b5be6 100644
--- a/src/app/applications/datatarget/datatarget-response.model.ts
+++ b/src/app/applications/datatarget/datatarget-response.model.ts
@@ -25,4 +25,5 @@ export class DatatargetResponse {
   updatedAt: string;
   createdBy: number;
   updatedBy: number;
+  lastMessageDate?: Date
 }
diff --git a/src/app/applications/datatarget/datatarget.model.ts b/src/app/applications/datatarget/datatarget.model.ts
index 298169b35..68699cc3a 100644
--- a/src/app/applications/datatarget/datatarget.model.ts
+++ b/src/app/applications/datatarget/datatarget.model.ts
@@ -28,6 +28,7 @@ export class Datatarget {
   updatedBy: number;
   createdByName: string;
   updatedByName: string;
+  lastMessageDate?: Date
 }
 
 export class DatatargetData {
diff --git a/src/app/applications/datatarget/datatarget.service.ts b/src/app/applications/datatarget/datatarget.service.ts
index 29dd04ce4..fc8add19e 100644
--- a/src/app/applications/datatarget/datatarget.service.ts
+++ b/src/app/applications/datatarget/datatarget.service.ts
@@ -100,6 +100,7 @@ export class DatatargetService {
       updatedBy: dataTargetResponse.updatedBy,
       createdByName: this.userMinimalService.getUserNameFrom(dataTargetResponse.createdBy),
       updatedByName: this.userMinimalService.getUserNameFrom(dataTargetResponse.updatedBy),
+      lastMessageDate: dataTargetResponse.lastMessageDate
     };
     model.openDataDkDataset.keywordsInput = dataTargetResponse.openDataDkDataset?.keywords?.join(", ");
     model.openDataDkDataset.url = this.getOpendataSharingApiUrl();
diff --git a/src/app/applications/datatarget/fiware/fiware-detail/fiware-detail.component.html b/src/app/applications/datatarget/fiware/fiware-detail/fiware-detail.component.html
index 7dbf0dc76..33e475693 100644
--- a/src/app/applications/datatarget/fiware/fiware-detail/fiware-detail.component.html
+++ b/src/app/applications/datatarget/fiware/fiware-detail/fiware-detail.component.html
@@ -4,6 +4,9 @@
       <div class="jumbotron jumbotron--m-right jumbotron--full-width width100percent">
         <h3>{{ "DATATARGET.DETAILS" | translate }}</h3>
         <app-general-details [data]="datatarget"></app-general-details>
+        <p>
+          <strong>{{ "DATATARGET.LATEST_MESSAGE" | translate }}</strong>{{ datatarget.lastMessageDate | dkTime }}
+        </p>
         <mat-divider></mat-divider>
         <p><strong>Context Broker</strong>{{ datatarget.url }}</p>
         <p>
diff --git a/src/app/applications/datatarget/httppush/httppush-detail/httppush-detail.component.html b/src/app/applications/datatarget/httppush/httppush-detail/httppush-detail.component.html
index d79dbb70b..ad83b7b28 100644
--- a/src/app/applications/datatarget/httppush/httppush-detail/httppush-detail.component.html
+++ b/src/app/applications/datatarget/httppush/httppush-detail/httppush-detail.component.html
@@ -4,6 +4,9 @@
       <div class="jumbotron jumbotron--m-right jumbotron--full-width width100percent">
         <h3>{{ "DATATARGET.DETAILS" | translate }}</h3>
         <app-general-details [data]="datatarget"></app-general-details>
+        <p *ngIf="datatarget.type !== dataTargetType.OPENDATADK">
+          <strong>{{ "DATATARGET.LATEST_MESSAGE" | translate }}</strong>{{ datatarget.lastMessageDate | dkTime }}
+        </p>
         <mat-divider></mat-divider>
         <span *ngIf="datatarget.type !== dataTargetType.OPENDATADK">
           <p>
diff --git a/src/app/applications/datatarget/mqtt/mqtt-detail/mqtt-detail.component.html b/src/app/applications/datatarget/mqtt/mqtt-detail/mqtt-detail.component.html
index 5b2dc7635..dc2845912 100644
--- a/src/app/applications/datatarget/mqtt/mqtt-detail/mqtt-detail.component.html
+++ b/src/app/applications/datatarget/mqtt/mqtt-detail/mqtt-detail.component.html
@@ -4,6 +4,9 @@
       <div class="jumbotron jumbotron--m-right jumbotron--full-width width100percent">
         <h3>{{ "DATATARGET.DETAILS" | translate }}</h3>
         <app-general-details [data]="datatarget"></app-general-details>
+        <p>
+          <strong>{{ "DATATARGET.LATEST_MESSAGE" | translate }}</strong>{{ datatarget.lastMessageDate | dkTime }}
+        </p>
         <mat-divider></mat-divider>
         <p>
           <strong>{{ "DATATARGET.MQTT.BROKER-URL" | translate }}</strong>{{ datatarget.url }}
diff --git a/src/assets/i18n/da.json b/src/assets/i18n/da.json
index c1f529198..62ea7dd67 100644
--- a/src/assets/i18n/da.json
+++ b/src/assets/i18n/da.json
@@ -230,6 +230,7 @@
         "NO-TOKENENDPOINT": "Ingen token endpoint URL",
         "NO-CLIENTID": "Ingen client ID",
         "NO-CLIENTSECRET": "Ingen client secret",
+        "LATEST_MESSAGE": "Seneste besked",
         "ADD-TO-OPENDATADK": "Send data til OpenDataDK",
         "OPENDATA-DK": {
             "TYPE": "OpenDataDK",
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index de070dd0c..148db4b22 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -27,6 +27,7 @@
         "SHOW-OPTIONS": "Show options"
     },
     "DATATARGET": {
+        "LATEST_MESSAGE": "Latest message",
         "RESPONSE_TYPE": {
             "ERROR": "Fejl",
             "OK": "Ok"

From e35903b6aa79517be30251499063e30f2fb86cb7 Mon Sep 17 00:00:00 2001
From: Chris Dons Johansen <cdj@iterator-it.dk>
Date: Thu, 19 Sep 2024 13:08:27 +0200
Subject: [PATCH 7/9] Added status-icons based on recent log-events...

---
 .../datatarget-detail-tabs-common.ts          |  6 ++-
 .../datatarget/datatarget-response.model.ts   |  3 +-
 .../datatarget-table.component.html           | 37 ++++++++++---------
 .../datatarget-table.component.scss           |  8 ++++
 .../datatarget-table.component.ts             | 23 +++++++-----
 .../datatarget/datatarget.model.ts            |  3 +-
 .../datatarget/datatarget.service.ts          |  3 +-
 .../fiware-detail-tabs.component.html         |  7 +++-
 .../fiware-detail-tabs.component.scss         |  6 +++
 .../httppush-detail-tabs.component.html       |  8 +++-
 .../httppush-detail-tabs.component.scss       |  6 +++
 .../httppush-detail-tabs.component.ts         |  1 +
 .../mqtt-detail-tabs.component.html           |  7 +++-
 .../mqtt-detail-tabs.component.scss           |  6 +++
 src/assets/i18n/da.json                       |  1 +
 src/assets/i18n/en.json                       |  1 +
 16 files changed, 91 insertions(+), 35 deletions(-)

diff --git a/src/app/applications/datatarget/datatarget-detail/datatarget-detail-tabs-common.ts b/src/app/applications/datatarget/datatarget-detail/datatarget-detail-tabs-common.ts
index ea546e606..d4ab3967d 100644
--- a/src/app/applications/datatarget/datatarget-detail/datatarget-detail-tabs-common.ts
+++ b/src/app/applications/datatarget/datatarget-detail/datatarget-detail-tabs-common.ts
@@ -4,6 +4,7 @@ import { ActivatedRoute, Router } from "@angular/router";
 import { DatatargetDetail } from "@applications/datatarget/datatarget-detail/datatarget-detail";
 import { Datatarget } from "@applications/datatarget/datatarget.model";
 import { DatatargetService } from "@applications/datatarget/datatarget.service";
+import { faExclamationTriangle } from "@fortawesome/free-solid-svg-icons";
 import { TranslateService } from "@ngx-translate/core";
 import { DeleteDialogService } from "@shared/components/delete-dialog/delete-dialog.service";
 import { OrganizationAccessScope } from "@shared/enums/access-scopes";
@@ -16,6 +17,9 @@ import { Subscription } from "rxjs";
 export abstract class DatatargetDetailTabsCommon implements DatatargetDetail {
   protected abstract getDetailsLink(): string;
 
+  faExclamationTriangle = faExclamationTriangle;
+
+  logLink: "datatarget-log" = "datatarget-log";
   navTabs: NavTab[] = [
     {
       label: "APPLICATION.DETAILS",
@@ -24,7 +28,7 @@ export abstract class DatatargetDetailTabsCommon implements DatatargetDetail {
     },
     {
       label: "GEN.LOG",
-      link: "datatarget-log",
+      link: this.logLink,
       index: 1,
     },
   ];
diff --git a/src/app/applications/datatarget/datatarget-response.model.ts b/src/app/applications/datatarget/datatarget-response.model.ts
index bb31b5be6..7c6a05474 100644
--- a/src/app/applications/datatarget/datatarget-response.model.ts
+++ b/src/app/applications/datatarget/datatarget-response.model.ts
@@ -25,5 +25,6 @@ export class DatatargetResponse {
   updatedAt: string;
   createdBy: number;
   updatedBy: number;
-  lastMessageDate?: Date
+  lastMessageDate?: Date;
+  hasRecentErrors?: boolean;
 }
diff --git a/src/app/applications/datatarget/datatarget-table/datatarget-table.component.html b/src/app/applications/datatarget/datatarget-table/datatarget-table.component.html
index a0399d0e2..0cb3f914f 100644
--- a/src/app/applications/datatarget/datatarget-table/datatarget-table.component.html
+++ b/src/app/applications/datatarget/datatarget-table/datatarget-table.component.html
@@ -11,7 +11,7 @@
       <td mat-cell *matCellDef="let element">
         <a [routerLink]="['../datatarget', element.id]" routerLinkActive="active" class="application-link">{{
           element.name
-        }}</a>
+          }}</a>
       </td>
     </ng-container>
 
@@ -25,25 +25,30 @@
       </td>
     </ng-container>
 
+    <!-- 24h Status Column -->
+    <ng-container matColumnDef="24h_status">
+      <th mat-header-cell *matHeaderCellDef>
+        {{ "DATATARGET.24H_STATUS" | translate }}
+      </th>
+      <td mat-cell *matCellDef="let element">
+        <fa-icon *ngIf="!element.hasRecentErrors" [icon]="faCheckCircle" class="fa-ok"></fa-icon>
+        <fa-icon *ngIf="element.hasRecentErrors" [icon]="faExclamationTriangle" class="fa-error"></fa-icon>
+      </td>
+    </ng-container>
+
     <!-- Menu Column -->
     <ng-container matColumnDef="menu">
       <th mat-header-cell *matHeaderCellDef class="col-1"></th>
       <td mat-cell *matCellDef="let element">
         <div class="dropdown" *ngIf="canEdit">
-          <a
-            href="#"
-            role="button"
-            id="tableRowDropdown-{{ element.id }}"
-            class="applicationRow__edit dropdown-toggle"
-            data-toggle="dropdown"
-            aria-expanded="false"
-            [attr.aria-label]="'DATATARGET-TABLE-ROW.SHOW-OPTIONS' | translate"
-          ></a>
+          <a href="#" role="button" id="tableRowDropdown-{{ element.id }}" class="applicationRow__edit dropdown-toggle"
+            data-toggle="dropdown" aria-expanded="false"
+            [attr.aria-label]="'DATATARGET-TABLE-ROW.SHOW-OPTIONS' | translate"></a>
           <ul class="dropdown-menu dropdown-menu--table" attr.aria-labelledby="tableRowDropdown-{{ element.id }}">
             <li class="dropdown-item">
               <a [routerLink]="['../datatarget-edit', element.id]" routerLinkActive="active">{{
                 "GEN.EDIT" | translate
-              }}</a>
+                }}</a>
             </li>
             <li class="dropdown-item">
               <a (click)="deleteDatatarget(element)" [routerLink]="[]">{{ "GEN.DELETE" | translate }}</a>
@@ -56,11 +61,7 @@
     <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
     <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
   </table>
-  <mat-paginator
-    [pageSizeOptions]="pageSizeOptions"
-    [pageSize]="pageSize"
-    [length]="resultsLength"
-    showFirstLastButtons
-  >
+  <mat-paginator [pageSizeOptions]="pageSizeOptions" [pageSize]="pageSize" [length]="resultsLength"
+    showFirstLastButtons>
   </mat-paginator>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/applications/datatarget/datatarget-table/datatarget-table.component.scss b/src/app/applications/datatarget/datatarget-table/datatarget-table.component.scss
index e69de29bb..ac2b9f2ee 100644
--- a/src/app/applications/datatarget/datatarget-table/datatarget-table.component.scss
+++ b/src/app/applications/datatarget/datatarget-table/datatarget-table.component.scss
@@ -0,0 +1,8 @@
+:host {
+  .fa-ok {
+    color: green !important;
+  }
+  .fa-error {
+    color: red !important;
+  }
+}
diff --git a/src/app/applications/datatarget/datatarget-table/datatarget-table.component.ts b/src/app/applications/datatarget/datatarget-table/datatarget-table.component.ts
index c340bdaab..2026942fa 100644
--- a/src/app/applications/datatarget/datatarget-table/datatarget-table.component.ts
+++ b/src/app/applications/datatarget/datatarget-table/datatarget-table.component.ts
@@ -1,18 +1,19 @@
-import { Component, OnInit, Input, OnDestroy, ViewChild, AfterViewInit } from "@angular/core";
-import { Subscription } from "rxjs";
-import { TranslateService } from "@ngx-translate/core";
-import { ActivatedRoute } from "@angular/router";
-import { Datatarget, DatatargetData } from "../datatarget.model";
-import { DatatargetService } from "../datatarget.service";
-import { DeleteDialogService } from "@shared/components/delete-dialog/delete-dialog.service";
+import { AfterViewInit, Component, Input, OnDestroy, OnInit, ViewChild } from "@angular/core";
 import { MatPaginator } from "@angular/material/paginator";
 import { MatSort } from "@angular/material/sort";
 import { MatTableDataSource } from "@angular/material/table";
+import { ActivatedRoute } from "@angular/router";
 import { environment } from "@environments/environment";
+import { faCheckCircle, faExclamationTriangle } from "@fortawesome/free-solid-svg-icons";
+import { TranslateService } from "@ngx-translate/core";
+import { DeleteDialogService } from "@shared/components/delete-dialog/delete-dialog.service";
+import { DefaultPageSizeOptions } from "@shared/constants/page.constants";
+import { OrganizationAccessScope } from "@shared/enums/access-scopes";
 import { tableSorter } from "@shared/helpers/table-sorting.helper";
 import { MeService } from "@shared/services/me.service";
-import { OrganizationAccessScope } from "@shared/enums/access-scopes";
-import { DefaultPageSizeOptions } from "@shared/constants/page.constants";
+import { Subscription } from "rxjs";
+import { Datatarget, DatatargetData } from "../datatarget.model";
+import { DatatargetService } from "../datatarget.service";
 
 @Component({
   selector: "app-datatarget-table",
@@ -22,7 +23,7 @@ import { DefaultPageSizeOptions } from "@shared/constants/page.constants";
 export class DatatargetTableComponent implements OnInit, AfterViewInit, OnDestroy {
   @ViewChild(MatPaginator) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;
-  displayedColumns: string[] = ["name", "type", "menu"];
+  displayedColumns: string[] = ["name", "type", "24h_status", "menu"];
   dataSource = new MatTableDataSource<Datatarget>();
   datatargets: Datatarget[];
   resultsLength = 0;
@@ -30,6 +31,8 @@ export class DatatargetTableComponent implements OnInit, AfterViewInit, OnDestro
   @Input() isLoadingResults = true;
   public pageSize = environment.tablePageSize;
   pageSizeOptions = DefaultPageSizeOptions;
+  faExclamationTriangle = faExclamationTriangle;
+  faCheckCircle = faCheckCircle;
 
   @Input() pageLimit: number;
   public pageOffset = 0;
diff --git a/src/app/applications/datatarget/datatarget.model.ts b/src/app/applications/datatarget/datatarget.model.ts
index 68699cc3a..ecebb18a8 100644
--- a/src/app/applications/datatarget/datatarget.model.ts
+++ b/src/app/applications/datatarget/datatarget.model.ts
@@ -28,7 +28,8 @@ export class Datatarget {
   updatedBy: number;
   createdByName: string;
   updatedByName: string;
-  lastMessageDate?: Date
+  lastMessageDate?: Date;
+  hasRecentErrors?: boolean;
 }
 
 export class DatatargetData {
diff --git a/src/app/applications/datatarget/datatarget.service.ts b/src/app/applications/datatarget/datatarget.service.ts
index fc8add19e..f6527bced 100644
--- a/src/app/applications/datatarget/datatarget.service.ts
+++ b/src/app/applications/datatarget/datatarget.service.ts
@@ -100,7 +100,8 @@ export class DatatargetService {
       updatedBy: dataTargetResponse.updatedBy,
       createdByName: this.userMinimalService.getUserNameFrom(dataTargetResponse.createdBy),
       updatedByName: this.userMinimalService.getUserNameFrom(dataTargetResponse.updatedBy),
-      lastMessageDate: dataTargetResponse.lastMessageDate
+      lastMessageDate: dataTargetResponse.lastMessageDate,
+      hasRecentErrors: dataTargetResponse.hasRecentErrors,
     };
     model.openDataDkDataset.keywordsInput = dataTargetResponse.openDataDkDataset?.keywords?.join(", ");
     model.openDataDkDataset.url = this.getOpendataSharingApiUrl();
diff --git a/src/app/applications/datatarget/fiware/fiware-detail-tabs/fiware-detail-tabs.component.html b/src/app/applications/datatarget/fiware/fiware-detail-tabs/fiware-detail-tabs.component.html
index ab093a413..8339ff821 100644
--- a/src/app/applications/datatarget/fiware/fiware-detail-tabs/fiware-detail-tabs.component.html
+++ b/src/app/applications/datatarget/fiware/fiware-detail-tabs/fiware-detail-tabs.component.html
@@ -5,7 +5,12 @@
 
 <nav mat-tab-nav-bar [tabPanel]="tabPanel">
     <a mat-tab-link *ngFor="let link of navTabs" [routerLink]="'./' + link.link" routerLinkActive
-        #rla="routerLinkActive" [active]="rla.isActive">{{ link.label | translate }}</a>
+        #rla="routerLinkActive" [active]="rla.isActive">
+        {{ link.label | translate }}
+        <fa-icon *ngIf="link.link === logLink && datatarget?.hasRecentErrors" [icon]="faExclamationTriangle"
+            class="fa-error">
+        </fa-icon>
+    </a>
 </nav>
 <mat-divider></mat-divider>
 <mat-tab-nav-panel #tabPanel></mat-tab-nav-panel>
diff --git a/src/app/applications/datatarget/fiware/fiware-detail-tabs/fiware-detail-tabs.component.scss b/src/app/applications/datatarget/fiware/fiware-detail-tabs/fiware-detail-tabs.component.scss
index e69de29bb..3297737e6 100644
--- a/src/app/applications/datatarget/fiware/fiware-detail-tabs/fiware-detail-tabs.component.scss
+++ b/src/app/applications/datatarget/fiware/fiware-detail-tabs/fiware-detail-tabs.component.scss
@@ -0,0 +1,6 @@
+:host {
+  .fa-error {
+    color: red !important;
+    margin-left: 5px;
+  }
+}
diff --git a/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.html b/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.html
index 5ea4ffa54..792d6d69a 100644
--- a/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.html
+++ b/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.html
@@ -6,7 +6,13 @@
 <div *ngIf="datatarget?.type === dataTargetType.HTTPPUSH">
   <nav mat-tab-nav-bar [tabPanel]="tabPanel">
     <a mat-tab-link *ngFor="let link of navTabs" [routerLink]="'./' + link.link" routerLinkActive
-      #rla="routerLinkActive" [active]="rla.isActive">{{ link.label | translate }}</a>
+      #rla="routerLinkActive" [active]="rla.isActive">
+      {{ link.label | translate }}
+      <fa-icon *ngIf="link.link === logLink && datatarget?.hasRecentErrors" [icon]="faExclamationTriangle"
+        class="fa-error">
+      </fa-icon>
+    </a>
+
   </nav>
   <mat-divider></mat-divider>
   <mat-tab-nav-panel #tabPanel></mat-tab-nav-panel>
diff --git a/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.scss b/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.scss
index e69de29bb..3297737e6 100644
--- a/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.scss
+++ b/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.scss
@@ -0,0 +1,6 @@
+:host {
+  .fa-error {
+    color: red !important;
+    margin-left: 5px;
+  }
+}
diff --git a/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.ts b/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.ts
index c82f7efd0..82aec38b4 100644
--- a/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.ts
+++ b/src/app/applications/datatarget/httppush/httppush-detail-tabs/httppush-detail-tabs.component.ts
@@ -3,6 +3,7 @@ import { Component, OnDestroy } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
 import { DatatargetDetailTabsCommon } from "@applications/datatarget/datatarget-detail/datatarget-detail-tabs-common";
 import { DatatargetService } from "@applications/datatarget/datatarget.service";
+import { faExclamationTriangle } from "@fortawesome/free-solid-svg-icons";
 import { TranslateService } from "@ngx-translate/core";
 import { DeleteDialogService } from "@shared/components/delete-dialog/delete-dialog.service";
 import { DataTargetType } from "@shared/enums/datatarget-type";
diff --git a/src/app/applications/datatarget/mqtt/mqtt-detail-tabs/mqtt-detail-tabs.component.html b/src/app/applications/datatarget/mqtt/mqtt-detail-tabs/mqtt-detail-tabs.component.html
index ab093a413..8339ff821 100644
--- a/src/app/applications/datatarget/mqtt/mqtt-detail-tabs/mqtt-detail-tabs.component.html
+++ b/src/app/applications/datatarget/mqtt/mqtt-detail-tabs/mqtt-detail-tabs.component.html
@@ -5,7 +5,12 @@
 
 <nav mat-tab-nav-bar [tabPanel]="tabPanel">
     <a mat-tab-link *ngFor="let link of navTabs" [routerLink]="'./' + link.link" routerLinkActive
-        #rla="routerLinkActive" [active]="rla.isActive">{{ link.label | translate }}</a>
+        #rla="routerLinkActive" [active]="rla.isActive">
+        {{ link.label | translate }}
+        <fa-icon *ngIf="link.link === logLink && datatarget?.hasRecentErrors" [icon]="faExclamationTriangle"
+            class="fa-error">
+        </fa-icon>
+    </a>
 </nav>
 <mat-divider></mat-divider>
 <mat-tab-nav-panel #tabPanel></mat-tab-nav-panel>
diff --git a/src/app/applications/datatarget/mqtt/mqtt-detail-tabs/mqtt-detail-tabs.component.scss b/src/app/applications/datatarget/mqtt/mqtt-detail-tabs/mqtt-detail-tabs.component.scss
index e69de29bb..3297737e6 100644
--- a/src/app/applications/datatarget/mqtt/mqtt-detail-tabs/mqtt-detail-tabs.component.scss
+++ b/src/app/applications/datatarget/mqtt/mqtt-detail-tabs/mqtt-detail-tabs.component.scss
@@ -0,0 +1,6 @@
+:host {
+  .fa-error {
+    color: red !important;
+    margin-left: 5px;
+  }
+}
diff --git a/src/assets/i18n/da.json b/src/assets/i18n/da.json
index 62ea7dd67..9f216d7f2 100644
--- a/src/assets/i18n/da.json
+++ b/src/assets/i18n/da.json
@@ -231,6 +231,7 @@
         "NO-CLIENTID": "Ingen client ID",
         "NO-CLIENTSECRET": "Ingen client secret",
         "LATEST_MESSAGE": "Seneste besked",
+        "24H_STATUS": "Status (24 timer)",
         "ADD-TO-OPENDATADK": "Send data til OpenDataDK",
         "OPENDATA-DK": {
             "TYPE": "OpenDataDK",
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 148db4b22..933776391 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -28,6 +28,7 @@
     },
     "DATATARGET": {
         "LATEST_MESSAGE": "Latest message",
+        "24H_STATUS": "Status (24 hours)",
         "RESPONSE_TYPE": {
             "ERROR": "Fejl",
             "OK": "Ok"

From b8bae1cb01dcd6ab6a6c4e6a75c3ccb8838c4608 Mon Sep 17 00:00:00 2001
From: Chris Dons Johansen <cdj@iterator-it.dk>
Date: Thu, 19 Sep 2024 13:26:03 +0200
Subject: [PATCH 8/9] Auto-format translation-files, to hopefully easier merge
 with stage..

---
 src/assets/i18n/da.json | 2424 +++++++++++++++++++--------------------
 src/assets/i18n/en.json |  114 +-
 2 files changed, 1269 insertions(+), 1269 deletions(-)

diff --git a/src/assets/i18n/da.json b/src/assets/i18n/da.json
index 9f216d7f2..04cbe1be5 100644
--- a/src/assets/i18n/da.json
+++ b/src/assets/i18n/da.json
@@ -1,1256 +1,1256 @@
 {
-    "GEN": {
-        "CANCEL": "Annuller",
-        "SHOW": "Vis",
-        "PER-PAGE": "Per side",
-        "DELETE": "Slet",
-        "BACK": "Tilbage",
-        "EDIT": "Redigér",
-        "APPLICATION": "Applikation",
-        "HTTP": "Generisk HTTP",
-        "SAVE": "Gem",
-        "KEY": "Nøgle",
-        "VALUE": "Værdi",
-        "NAME": "Navn",
-        "DESCRIPTION": "Beskrivelse",
-        "to": "til",
-        "ONLINE": "Online",
-        "OFFLINE": "Offline",
-        "NEVER-SEEN": "Aldrig set",
-        "DATE": "Dato",
-        "LOG": "Log",
-        "MESSAGE": "Besked",
-        "DEVICE": "Enhed",
-        "NO-DATA": "Der er ingen data at vise"
-    },
-    "NAV": {
-        "APPLICATIONS": "Applikationer",
-        "APPLICATION": "Applikation",
-        "ALL-IOT-DEVICES": "Alle IoT enheder",
-        "LORA-GATEWAYS": "LoRaWAN gateways",
-        "DATATARGET": "Datatarget",
-        "MULTICAST": "Multicast",
-        "MY-DATATARGET": "Tilbage",
-        "DATATARGET-APPLIKATION": "for applikation:",
-        "PROFILES": "LoRaWAN profiler",
-        "PAYLOAD-DECODER": "Payload decoder",
-        "ORGANISATIONS": "Organisationer",
-        "PERMISSIONS": "Brugergrupper",
-        "USERS": "Brugere",
-        "LOGIN": "Login",
-        "ADMIN": "Administration",
-        "SIGFOX": "Sigfox",
-        "SIGFOX-ADMIN": "Sigfox administration",
-        "SIGFOX-DEVICE-TYPES": "Sigfox enhedstyper",
-        "SEARCH": "Søgeresultater",
-        "MENU-ITEM-MISC": "Generelt",
-        "DEVICE-MODEL": "Device model",
-        "BACK": "Tilbage",
-        "LOGOUT": "Log ud",
-        "HELP": "Hjælp",
-        "API-KEY": "API nøgler"
-    },
-    "TOPBAR": {
-        "SEARCH": {
-            "BUTTON": "Søg"
-        },
-        "DROPDOWN": {
-            "EDIT": "Rediger",
-            "DELETE": "Slet"
-        }
-    },
-    "SNACK": {
-        "SAVE": "Gemt succesfuldt",
-        "DELETE": "Slettet succesfuldt",
-        "UPDATE": "Opdateret succesfuldt",
-        "FAIL": "Fejl - aktion ikke fuldført",
-        "LOADFAIL": "Fejl - kunne ikke loade",
-        "QUEUE": "Element sat i kø",
-        "CLOSE": "Luk",
-        "NODEVICES": "Kan ikke sende downlink - der er ingen devices!"
-    },
+  "GEN": {
+    "CANCEL": "Annuller",
+    "SHOW": "Vis",
+    "PER-PAGE": "Per side",
+    "DELETE": "Slet",
+    "BACK": "Tilbage",
+    "EDIT": "Redigér",
+    "APPLICATION": "Applikation",
+    "HTTP": "Generisk HTTP",
+    "SAVE": "Gem",
+    "KEY": "Nøgle",
+    "VALUE": "Værdi",
+    "NAME": "Navn",
+    "DESCRIPTION": "Beskrivelse",
+    "to": "til",
+    "ONLINE": "Online",
+    "OFFLINE": "Offline",
+    "NEVER-SEEN": "Aldrig set",
+    "DATE": "Dato",
+    "LOG": "Log",
+    "MESSAGE": "Besked",
+    "DEVICE": "Enhed",
+    "NO-DATA": "Der er ingen data at vise"
+  },
+  "NAV": {
+    "APPLICATIONS": "Applikationer",
+    "APPLICATION": "Applikation",
+    "ALL-IOT-DEVICES": "Alle IoT enheder",
+    "LORA-GATEWAYS": "LoRaWAN gateways",
+    "DATATARGET": "Datatarget",
+    "MULTICAST": "Multicast",
+    "MY-DATATARGET": "Tilbage",
+    "DATATARGET-APPLIKATION": "for applikation:",
+    "PROFILES": "LoRaWAN profiler",
+    "PAYLOAD-DECODER": "Payload decoder",
+    "ORGANISATIONS": "Organisationer",
+    "PERMISSIONS": "Brugergrupper",
+    "USERS": "Brugere",
+    "LOGIN": "Login",
+    "ADMIN": "Administration",
+    "SIGFOX": "Sigfox",
+    "SIGFOX-ADMIN": "Sigfox administration",
+    "SIGFOX-DEVICE-TYPES": "Sigfox enhedstyper",
+    "SEARCH": "Søgeresultater",
+    "MENU-ITEM-MISC": "Generelt",
+    "DEVICE-MODEL": "Device model",
+    "BACK": "Tilbage",
+    "LOGOUT": "Log ud",
+    "HELP": "Hjælp",
+    "API-KEY": "API nøgler"
+  },
+  "TOPBAR": {
     "SEARCH": {
-        "ICON": "",
-        "TYPE": "Type",
-        "NAME": "Navn",
-        "ID": "Id",
-        "ORGANISATION": "Organisation",
-        "PLACEHOLDER": "Der kan søges efter IoT enheder, applikationer og gateways",
-        "QUERY": "resultater for",
-        "NO-RESULTS": "Du kun kan søge efter IoT enheder, applikationer og gateways",
-        "FETCHING": "Henter søgeresultater"
-    },
-    "SIGFOX-GROUP": {
-        "NAME": "Sigfox administration",
-        "SIGFOX-GROUP": "Sigfox grupper",
-        "SIGFOX-LOGIN": "Sigfox API login",
-        "API-ACCESS": "For at kunne tilgå din Sigfox gruppe skal du først have oprettet en API adgang til gruppen i Sigfox. Denne skal bruges til at logge ind med nedenfor. Læs hvordan du opretter adgangen her -",
-        "LOGIN": "Login",
-        "ADMINISTRATION": {
-            "NAME": "Sigfox grupper",
-            "CREATE-NEW-GROUP": "Opret forbindelse til ny gruppe"
-        },
-        "PROFILES": {
-            "NAME": "Sigfox enhedstyper",
-            "DEVICE-TYPE": "Sigfox enhedstyper",
-            "DEVICE-TYPE-NAME": "Navn",
-            "DEVICE-TYPE-CONTRACT-ID": "kontrakt id",
-            "DEVICE-TYPE-ALERT-EMAIL": "Alarm email",
-            "CREATE-NEW-DEVICE-TYPE": "Opret ny enhedstype",
-            "SAVE": "Gem enhedstype"
-        }
+      "BUTTON": "Søg"
     },
-    "APPLICATION": {
-        "CREATE": "Opret applikation",
-        "SAVE": "Gem applikation",
-        "DELETE": "Slet applikation",
-        "DELETE-HAS-DEVICES-PROMPT": "Der er knyttet IoT-enheder til denne applikation. Disse vil også blive slettet. Slet alligevel?",
-        "DELETE-HAS-SIGFOX-DEVICES-PROMPT": "Applikationen kan ikke slettes, da der er knyttet Sigfox enheder til den",
-        "NAME": "Applikationens navn",
-        "DESCRIPTION": "Applikationens beskrivelse",
-        "ATTACHED-IOT": "Tilknyttede IoT enheder",
-        "DATATARGET-SHOW": "Tilknyttede data targets",
-        "MULTICAST-SHOW": "Tilknyttede multicast",
-        "MULTICAST-GROUPS": "Multicast-grupper",
-        "IMPORT-CSV": "Bulk import",
-        "EXPORT-CSV": "Eksport (CSV)",
-        "IOT-DEVICES": "IoT-enheder",
-        "BULK": {
-            "TEMPLATE": {
-                "GENERIC": "Generic HTTP sample",
-                "LORAWAN": "LoRaWan sample",
-                "SIGFOX": "Sigfox sample"
-            },
-            "TITLE": "Import af .csv",
-            "DOWNLOAD": "Download sample CSV fil",
-            "DROPFILE": "Klik eller drop din .csv file her",
-            "NAME": "Navn",
-            "TYPE": "Type",
-            "IMPORTSTATUS": "Status",
-            "ERROR": "Fejl",
-            "EMPTY": "Der er ingen enheder at vise endnu",
-            "FILEFORMATERRORMESSAGE": "Forkert filformat, upload en .csv fil"
-        },
-        "STATUS": {
-            "NONE": "-",
-            "IN-OPERATION": "I drift",
-            "PROJECT": "Projekt",
-            "PROTOTYPE": "Prototype",
-            "OTHER": "Andet"
-        },
-        "DETAILS": "Detaljer",
-        "METADATA-FIELD": {
-            "PERMISSIONS": "Brugergrupper",
-            "STATUS": "Status",
-            "START-DATE": "Startdato",
-            "END-DATE": "Slutdato",
-            "CATEGORY": "Kategori",
-            "OWNER": "Ejer",
-            "CONTACT-PERSON": "Kontaktperson",
-            "CONTACT-EMAIL": "Kontaktmail",
-            "CONTACT-PHONE": "Kontakttelefon",
-            "PERSONAL-DATA": "Persondata",
-            "HARDWARE": "Hardware",
-            "CONTROLLED-PROPERTY": "Data",
-            "DEVICE-TYPE": "Forbindelsesteknologi"
-        }
-    },
-    "GATEWAY": {
-        "DETAILS": "Detaljer",
-        "CREATED": "Oprettet",
-        "UPDATED": "Senest opdateret",
-        "DESCRIPTION": "LoRaWAN gateway beskrivelse",
-        "LONGITUDE": "Længdegrad",
-        "LATITUDE": "Breddegrad",
-        "ALTITUDE": "Højde",
-        "SAVE": "Gem gateway",
-        "ID": "Gateway id",
-        "LOCATION": "Placering",
-        "TAGS": "Tags",
-        "NAME": "Gatewayens navn",
-        "STATS": "Statistik",
-        "STATS-RXPACKETSRECEIVED": "Pakker modtaget",
-        "STATS-TXPACKETSEMITTED": "Pakker sendt",
-        "STATS-TIMESTAMP": "Tidspunkt",
-        "TABEL-TAB": "Listevisning",
-        "DROPDOWNFILTER": "Organisationsfilter",
-        "DROPDOWNDEFAULT": "Alle",
-        "MAP-TAB": "Kort",
-        "ORGANIZATION": "Organisation",
-        "ONLINE-STATUS": "Online status",
-        "DATA-PACKETS": "Datapakker",
-        "PLACEMENT-LABEL": "Placering",
-        "PLACEMENT": {
-            "NONE": "-",
-            "OUTDOORS": "Udendørs",
-            "INDOORS": "Indendørs",
-            "OTHER": "Andet"
-        },
-        "STATUS-NAME": "Status",
-        "STATUS": {
-            "NONE": "-",
-            "IN-OPERATION": "I drift",
-            "PROJECT": "Projekt",
-            "PROTOTYPE": "Prototype",
-            "OTHER": "Andet"
-        }
-    },
-    "IOT-DEVICE": {
-        "CREATE": "Gem IoT enhed",
-        "SAVE": "Gem IoT enhed",
-        "DELETE": "Slet IoT enhed",
-        "RESTART": "Genstart IoT enhed"
+    "DROPDOWN": {
+      "EDIT": "Rediger",
+      "DELETE": "Slet"
+    }
+  },
+  "SNACK": {
+    "SAVE": "Gemt succesfuldt",
+    "DELETE": "Slettet succesfuldt",
+    "UPDATE": "Opdateret succesfuldt",
+    "FAIL": "Fejl - aktion ikke fuldført",
+    "LOADFAIL": "Fejl - kunne ikke loade",
+    "QUEUE": "Element sat i kø",
+    "CLOSE": "Luk",
+    "NODEVICES": "Kan ikke sende downlink - der er ingen devices!"
+  },
+  "SEARCH": {
+    "ICON": "",
+    "TYPE": "Type",
+    "NAME": "Navn",
+    "ID": "Id",
+    "ORGANISATION": "Organisation",
+    "PLACEHOLDER": "Der kan søges efter IoT enheder, applikationer og gateways",
+    "QUERY": "resultater for",
+    "NO-RESULTS": "Du kun kan søge efter IoT enheder, applikationer og gateways",
+    "FETCHING": "Henter søgeresultater"
+  },
+  "SIGFOX-GROUP": {
+    "NAME": "Sigfox administration",
+    "SIGFOX-GROUP": "Sigfox grupper",
+    "SIGFOX-LOGIN": "Sigfox API login",
+    "API-ACCESS": "For at kunne tilgå din Sigfox gruppe skal du først have oprettet en API adgang til gruppen i Sigfox. Denne skal bruges til at logge ind med nedenfor. Læs hvordan du opretter adgangen her -",
+    "LOGIN": "Login",
+    "ADMINISTRATION": {
+      "NAME": "Sigfox grupper",
+      "CREATE-NEW-GROUP": "Opret forbindelse til ny gruppe"
     },
-    "DATATARGET": {
-        "DETAILS": "Detaljer",
-        "SAVE": "Gem datatarget",
-        "CREATE": "Opret",
-        "READMORE": "Læs mere",
-        "DESCRIPTION": "Beskrivelse",
-        "URL": "URL",
-        "TIMEOUT": "Timeout",
-        "TYPE": "Type",
-        "NAME": "Datatarget navn",
-        "SHOW-OPTIONS": "Håndter datatarget",
-        "DELETE": "Slet",
-        "RELATIONS": "Tilknyttede IoT enheder og payload decoders",
-        "PAYLOADEDECODER": "Payload decoder",
-        "NO-PAYLOADDECODER": "Ingen payload decoder",
-        "IOTDEVICE": "IoT enhed(er)",
-        "NO-RELATIONS": "ingen tilknyttede relationer",
-        "TENANT": "Tenant",
-        "NO-TENANT": "Ingen Tenant angivet",
-        "CONTEXT": "Context",
-        "NO-CONTEXT": "Ingen Context angivet",
-        "AUTHORIZATIONHEADER": "Authorization header",
-        "TOKENENDPOINT": "Token endpoint URL",
-        "CLIENTID": "Client ID",
-        "CLIENTSECRET": "Client secret",
-        "NO-AUTHORIZATIONHEADER": "Ingen Authorization header angivet",
-        "NO-TOKENENDPOINT": "Ingen token endpoint URL",
-        "NO-CLIENTID": "Ingen client ID",
-        "NO-CLIENTSECRET": "Ingen client secret",
-        "LATEST_MESSAGE": "Seneste besked",
-        "24H_STATUS": "Status (24 timer)",
-        "ADD-TO-OPENDATADK": "Send data til OpenDataDK",
-        "OPENDATA-DK": {
-            "TYPE": "OpenDataDK",
-            "NAME": "Open Data DK",
-            "DESCRIPTION": "Offentliggør datasæt i Open Data DK's åbne dataportal."
-        },
-        "NO-OPENDATA-DK": "Der er ikke oprettet nogen datadeling med Open Data DK endnu",
-        "HTTP_PUSH": {
-            "TYPE": "HTTP Push",
-            "NAME": "Generisk HTTP Push",
-            "DESCRIPTION": "Send data med HTTP POST requests til et HTTP URL endpoint"
-        },
-        "FIWARE": {
-            "TYPE": "FIWARE",
-            "NAME": "FIWARE connection",
-            "DESCRIPTION": "En integration til FIWARE Context Broker"
-        },
-        "MQTT": {
-            "TYPE": "MQTT",
-            "NAME": "MQTT forbindelse",
-            "DESCRIPTION": "En integration til MQTT Broker",
-            "BROKER-URL": "Broker URL",
-            "PORT": "Port",
-            "TOPIC": "Topic",
-            "QOS": "QoS",
-            "USERNAME": "Brugernavn",
-            "PASSWORD": "Adgangskode"
-        },
-        "OPENDATADK": {
-            "TYPE": "OpenDataDK"
-        },
-        "RESPONSE_TYPE": {
-            "ERROR": "Fejl",
-            "OK": "Ok"
-        }
-    },
-    "MULTICAST": {
-        "SAVE": "Gem multicast",
-        "BASIC-DETAILS": "Basale detaljer",
-        "LORAWAN-DETAILS": "LoRaWAN detailjer",
-        "GROUPNAME": "Gruppe navn",
-        "ADDRESS": "Adresse",
-        "NETWORK-KEY": "Network session key",
-        "APPLICATION-KEY": "Network application key",
-        "FRAMECOUNTER": "Frame counter",
-        "DATARATE": "Data rate",
-        "FREQUENCY": "Frekvens (Hz)",
-        "GROUPTYPE": "Gruppe type",
-        "PERIODICITY": "Periodicitet",
-        "IOTDEVICE": "IoT enheder",
-        "DOWNLINK": {
-            "PORT": "Angiv den ønskede port",
-            "PAYLOAD": "Angiv det ønskede payload",
-            "START": "Sæt downlink i kø"
-        }
-    },
-    "OPENDATADK": {
-        "INTRO": {
-            "GUIDE_HEADER": "Guide til Open Data DK-data target",
-            "GUIDE1": "Det er nemt at sende data fra OS2iot til Open Data DK (ODDK). Første gange der oprettes et ODDK-data target, bliver det muligt for ODDK at høste oplysninger om jeres datasæt til opendata.dk. Når først høstningen er sat op, vil alle jeres ODDK-data targets automatisk blive oprettet og opdateret på opendata.dk.",
-            "GUIDE2": "Senest modtagede datapakke udstilles via OS2iots API og kan hentes via en URL angivet på det enkelte ODDK-data target og på jeres datasæt på opendata.dk. Der opsamles og udstilles altså ikke historisk data i hverken OS2iot eller på opendata.dk.",
-            "GUIDE3": "Nye ODDK-data targets høstes automatisk, og I behøver ikke gøre noget aktivt for at gøre dem tilgængelige på opendata.dk. Hvis I sletter et ODDK-data target forsvinder det af sig selv fra opendata.dk.",
-            "GUIDE4": "Datasæt fra OS2iot publiceres under licensen",
-            "GUIDE5": "Creative Commons CC0 1.0 Universel.",
-            "PROCEDURE_HEADER": "Procedure ved oprettelse af første data target",
-            "PROCEDURE1": "Bliv medlem af Open Data DK, hvis jeres myndighed ikke allerede er det:",
-            "PROCEDURE2": "Opret første ODDK-data target i OS2iot",
-            "PROCEDURE3": "Ved oprettelsen tilbyder OS2iot at sende en mail til Open Data DK's administrator, som sætter høstningen op. I må forvente op til 2-3 ugers behandlingstid.",
-            "PROCEDURE4": "Når høstningen er aktiv, kan datasæt findes og beriges på",
-            "PROCEDURE4_LINK": "ODDK administrationsmodulet"
-        },
-        "QUESTION": {
-            "GIVE-OPENDATADK-NAME": "Datasæt titel",
-            "GIVE-OPENDATADK-NAME-PLACEHOLDER": "Datasæt titel",
-            "GIVE-OPENDATADK-NAME-INFO": "Overordnet titel på datasættet på opendata.dk",
-            "GIVE-OPENDATADK-RESOURCETITLE": "Data ressource titel",
-            "GIVE-OPENDATADK-RESOURCETITLE-PLACEHOLDER": "Kloaksensorer - Aarhus kommune",
-            "GIVE-OPENDATADK-RESOURCETITLE-INFO": "Titel på den ressource, der vises i datasættet på opendata.dk",
-            "GIVE-OPENDATADK-DESCRIPTION": "Beskrivelse",
-            "GIVE-OPENDATADK-DESCRIPTION-PLACEHOLDER": "Beskrivelse",
-            "GIVE-OPENDATADK-KEYWORDS": "Angiv emneord",
-            "GIVE-OPENDATADK-KEYWORDS-PLACEHOLDER": "Vælg nøgleord fra drop-down",
-            "GIVE-OPENDATADK-AUTHORNAME": "Dataejer",
-            "GIVE-OPENDATADK-AUTHORNAME-PLACEHOLDER": "Jens Jensen",
-            "GIVE-OPENDATADK-AUTHORNAME-INFO": "Ansvarlig afdeling eller person",
-            "GIVE-OPENDATADK-AUTHOR-EMAIL": "Dataejers e-mail",
-            "GIVE-OPENDATADK-AUTHOR-EMAIL-PLACEHOLDER": "jens@jensen.dk",
-            "ACCEPT-TERMS-PART-ONE": "Jeg accepterer hermed, at datasættet udgives under en",
-            "TERMS-AND-CONDITIONS": "Creative Commons CC0 1.0 Universel (CC0 1.0) licens"
-        },
-        "DETAILS": {
-            "NAME": "Datasæt titel",
-            "RESOURCETITLE": "Datakilde titel",
-            "DESCRIPTION": "Beskrivelse",
-            "KEYWORDS": "Emneord",
-            "LICENSE": "Licens",
-            "AUTHORNAME": "Forfatterens navn",
-            "AUTHOREMAIL": "Forfatterens email",
-            "URL": "Endpoint til hentning af data",
-            "NA": "Intet angivet"
-        },
-        "MAIL": {
-            "DIALOG_TITLE": "Anmod Open Data DK om høstning af data",
-            "DIALOG_TEXT1": "For at få",
-            "DIALOG_TEXT2": "s ODDK datatargets gjort synlige på opendata.dk, skal Open Data DK have en anmodning om at begynde at høste jeres oplysninger fra OS2iot. Hvis du udfylder oplysningerne herunder, sender OS2iot automatisk en mail til Open Data DK",
-            "DIALOG_CONFIRM": "Send mail",
-            "GIVE-OPENDATADK-ORGNAME": "Organisation (i Open Data DK)",
-            "GIVE-OPENDATADK-ORGNAME-PLACEHOLDER": "Organisation",
-            "GIVE-OPENDATADK-COMMENT": "Eventuel kommentar",
-            "GIVE-OPENDATADK-COMMENT-PLACEHOLDER": "Kort kommentar",
-            "SELECTED_ORG_FALLBACK": "organisationen",
-            "WARNING": "Advarsel",
-            "WARNING-TEXT": "Hvis Open Data DK ikke får besked om integrationen, vises datasættet ikke på opendata.dk",
-            "NEVER-AGAIN": "Vis ikke igen. Open Data DK høster allerede denne organisation fra OS2iot."
-        }
-    },
-    "APPLICATION-TABLE": {
-        "NAME": "Navn",
-        "IOT-DEVICES": "IoT enheder",
-        "UPDATED": "Senest opdateret",
-        "DATA-TARGETS": "Datatargets",
-        "STATUS": "Status",
-        "START-DATE": "Startdato",
-        "END-DATE": "Slutdato",
-        "CATEGORY": "Kategori",
-        "OWNER": "Ejer",
-        "CONTACT-PERSON": "Kontaktperson",
-        "PERSONAL-DATA": "Persondata",
-        "CONTROLLED-PROPERTIES": "Data",
-        "DEVICE-TYPES": "Forbindelsesteknologi",
-        "OPEN-DATA-DK": "Open Data DK"
+    "PROFILES": {
+      "NAME": "Sigfox enhedstyper",
+      "DEVICE-TYPE": "Sigfox enhedstyper",
+      "DEVICE-TYPE-NAME": "Navn",
+      "DEVICE-TYPE-CONTRACT-ID": "kontrakt id",
+      "DEVICE-TYPE-ALERT-EMAIL": "Alarm email",
+      "CREATE-NEW-DEVICE-TYPE": "Opret ny enhedstype",
+      "SAVE": "Gem enhedstype"
+    }
+  },
+  "APPLICATION": {
+    "CREATE": "Opret applikation",
+    "SAVE": "Gem applikation",
+    "DELETE": "Slet applikation",
+    "DELETE-HAS-DEVICES-PROMPT": "Der er knyttet IoT-enheder til denne applikation. Disse vil også blive slettet. Slet alligevel?",
+    "DELETE-HAS-SIGFOX-DEVICES-PROMPT": "Applikationen kan ikke slettes, da der er knyttet Sigfox enheder til den",
+    "NAME": "Applikationens navn",
+    "DESCRIPTION": "Applikationens beskrivelse",
+    "ATTACHED-IOT": "Tilknyttede IoT enheder",
+    "DATATARGET-SHOW": "Tilknyttede data targets",
+    "MULTICAST-SHOW": "Tilknyttede multicast",
+    "MULTICAST-GROUPS": "Multicast-grupper",
+    "IMPORT-CSV": "Bulk import",
+    "EXPORT-CSV": "Eksport (CSV)",
+    "IOT-DEVICES": "IoT-enheder",
+    "BULK": {
+      "TEMPLATE": {
+        "GENERIC": "Generic HTTP sample",
+        "LORAWAN": "LoRaWan sample",
+        "SIGFOX": "Sigfox sample"
+      },
+      "TITLE": "Import af .csv",
+      "DOWNLOAD": "Download sample CSV fil",
+      "DROPFILE": "Klik eller drop din .csv file her",
+      "NAME": "Navn",
+      "TYPE": "Type",
+      "IMPORTSTATUS": "Status",
+      "ERROR": "Fejl",
+      "EMPTY": "Der er ingen enheder at vise endnu",
+      "FILEFORMATERRORMESSAGE": "Forkert filformat, upload en .csv fil"
     },
-    "IOT-TABLE": {
-        "APPLICATION": "Applikation",
-        "NETWORK-TECHNOLOGY": "Netværksteknologi",
-        "ALARM": "Alarm",
-        "BATTERY": "Batteri",
-        "ACTIVE": "Sidst aktiv",
-        "DATA": "Data(24 timer)",
-        "ORGANISATION": "Organisation",
-        "NAME": "Navn",
-        "RSSI": "RSSI (dBm)",
-        "SNR": "SNR (dB)",
-        "DEV-EUI": "DevEUI",
-        "APP-KEY": "AppKey (OTAA)"
+    "STATUS": {
+      "NONE": "-",
+      "IN-OPERATION": "I drift",
+      "PROJECT": "Projekt",
+      "PROTOTYPE": "Prototype",
+      "OTHER": "Andet"
     },
-    "LORA-GATEWAY-TABLE": {
-        "NAME": "Navn",
-        "GATEWAYID": "Gateway ID",
-        "LOCATION": "Placering",
-        "LAST-SEEN-AT": "Seneste aktivitet",
-        "STATUS": "Status",
-        "ORGANIZATION": "Organisation",
-        "PACKETS-RECEIVED": "Pakker modtaget",
-        "PACKETS-SENT": "Pakker sendt",
-        "PLACEMENT": "Placering",
-        "MODEL-NAME": "Modelnavn",
-        "ANTENNA-TYPE": "Antennetype (dBi)",
-        "RESPONSIBLE-NAME": "Gateway-ansvarlig",
-        "RESPONSIBLE-EMAIL": "Kontaktmail",
-        "RESPONSIBLE-PHONE-NUMBER": "Kontakttelefon",
-        "OPERATIONAL-NAME": "Driftsansvarlig",
-        "OPERATIONAL-EMAIL": "Kontaktmail - drift",
-        "TAGS": "Tags",
-        "CREATED-AT": "Oprettelsesdato"
+    "DETAILS": "Detaljer",
+    "METADATA-FIELD": {
+      "PERMISSIONS": "Brugergrupper",
+      "STATUS": "Status",
+      "START-DATE": "Startdato",
+      "END-DATE": "Slutdato",
+      "CATEGORY": "Kategori",
+      "OWNER": "Ejer",
+      "CONTACT-PERSON": "Kontaktperson",
+      "CONTACT-EMAIL": "Kontaktmail",
+      "CONTACT-PHONE": "Kontakttelefon",
+      "PERSONAL-DATA": "Persondata",
+      "HARDWARE": "Hardware",
+      "CONTROLLED-PROPERTY": "Data",
+      "DEVICE-TYPE": "Forbindelsesteknologi"
+    }
+  },
+  "GATEWAY": {
+    "DETAILS": "Detaljer",
+    "CREATED": "Oprettet",
+    "UPDATED": "Senest opdateret",
+    "DESCRIPTION": "LoRaWAN gateway beskrivelse",
+    "LONGITUDE": "Længdegrad",
+    "LATITUDE": "Breddegrad",
+    "ALTITUDE": "Højde",
+    "SAVE": "Gem gateway",
+    "ID": "Gateway id",
+    "LOCATION": "Placering",
+    "TAGS": "Tags",
+    "NAME": "Gatewayens navn",
+    "STATS": "Statistik",
+    "STATS-RXPACKETSRECEIVED": "Pakker modtaget",
+    "STATS-TXPACKETSEMITTED": "Pakker sendt",
+    "STATS-TIMESTAMP": "Tidspunkt",
+    "TABEL-TAB": "Listevisning",
+    "DROPDOWNFILTER": "Organisationsfilter",
+    "DROPDOWNDEFAULT": "Alle",
+    "MAP-TAB": "Kort",
+    "ORGANIZATION": "Organisation",
+    "ONLINE-STATUS": "Online status",
+    "DATA-PACKETS": "Datapakker",
+    "PLACEMENT-LABEL": "Placering",
+    "PLACEMENT": {
+      "NONE": "-",
+      "OUTDOORS": "Udendørs",
+      "INDOORS": "Indendørs",
+      "OTHER": "Andet"
     },
-    "LORA-GATEWAY-STATUS": {
-        "TITLE": "LoRaWAN online status historik",
-        "TIMESTAMP": "Tidspunkt",
-        "INTERVAL": {
-            "DAY": "Seneste døgn",
-            "WEEK": "Seneste uge",
-            "MONTH": "Seneste måned"
-        }
+    "STATUS-NAME": "Status",
+    "STATUS": {
+      "NONE": "-",
+      "IN-OPERATION": "I drift",
+      "PROJECT": "Projekt",
+      "PROTOTYPE": "Prototype",
+      "OTHER": "Andet"
+    }
+  },
+  "IOT-DEVICE": {
+    "CREATE": "Gem IoT enhed",
+    "SAVE": "Gem IoT enhed",
+    "DELETE": "Slet IoT enhed",
+    "RESTART": "Genstart IoT enhed"
+  },
+  "DATATARGET": {
+    "DETAILS": "Detaljer",
+    "SAVE": "Gem datatarget",
+    "CREATE": "Opret",
+    "READMORE": "Læs mere",
+    "DESCRIPTION": "Beskrivelse",
+    "URL": "URL",
+    "TIMEOUT": "Timeout",
+    "TYPE": "Type",
+    "NAME": "Datatarget navn",
+    "SHOW-OPTIONS": "Håndter datatarget",
+    "DELETE": "Slet",
+    "RELATIONS": "Tilknyttede IoT enheder og payload decoders",
+    "PAYLOADEDECODER": "Payload decoder",
+    "NO-PAYLOADDECODER": "Ingen payload decoder",
+    "IOTDEVICE": "IoT enhed(er)",
+    "NO-RELATIONS": "ingen tilknyttede relationer",
+    "TENANT": "Tenant",
+    "NO-TENANT": "Ingen Tenant angivet",
+    "CONTEXT": "Context",
+    "NO-CONTEXT": "Ingen Context angivet",
+    "AUTHORIZATIONHEADER": "Authorization header",
+    "TOKENENDPOINT": "Token endpoint URL",
+    "CLIENTID": "Client ID",
+    "CLIENTSECRET": "Client secret",
+    "NO-AUTHORIZATIONHEADER": "Ingen Authorization header angivet",
+    "NO-TOKENENDPOINT": "Ingen token endpoint URL",
+    "NO-CLIENTID": "Ingen client ID",
+    "NO-CLIENTSECRET": "Ingen client secret",
+    "LATEST_MESSAGE": "Seneste besked",
+    "24H_STATUS": "Status (24 timer)",
+    "ADD-TO-OPENDATADK": "Send data til OpenDataDK",
+    "OPENDATA-DK": {
+      "TYPE": "OpenDataDK",
+      "NAME": "Open Data DK",
+      "DESCRIPTION": "Offentliggør datasæt i Open Data DK's åbne dataportal."
     },
-    "DEVICE-MODEL": {
-        "DELETE-FAILED": "Slet Fejlede",
-        "HEADLINE": "Detaljer",
-        "CREATED": "Oprettet",
-        "UPDATED": "Senest opdateret",
-        "ID": "Unik identifikator",
-        "TABLE": {
-            "ID": "Id"
-        },
-        "NAME": "Navn",
-        "TYPE": "Type",
-        "BRANDNAME": "Mærke",
-        "MODELNAME": "Model",
-        "MANUFACTURERNAME": "Producentens navn",
-        "CONTROLLEDPROPERTY": "Kontrol egenskaber",
-        "CATEGORY": "Kategori",
-        "SUPPORTEDUNITS": "Måleenheder",
-        "FUNCTION": "Enhedsfunktioner",
-        "ENERGYLIMITATIONCLASS": "Energibegrænsningsklassen",
-        "SUPPORTEDPROTOCOL": "Understøttede protokoller",
-        "DETAIL-TITLE": "Device model detalje",
-        "DEVICE-MODEL": "Device model",
-        "SHOW-OPTIONS": "Håndter device model"
+    "NO-OPENDATA-DK": "Der er ikke oprettet nogen datadeling med Open Data DK endnu",
+    "HTTP_PUSH": {
+      "TYPE": "HTTP Push",
+      "NAME": "Generisk HTTP Push",
+      "DESCRIPTION": "Send data med HTTP POST requests til et HTTP URL endpoint"
     },
-    "LORA-GATEWAY-TABLE-ROW": {
-        "SHOW-OPTIONS": "Håndtér gateway"
+    "FIWARE": {
+      "TYPE": "FIWARE",
+      "NAME": "FIWARE connection",
+      "DESCRIPTION": "En integration til FIWARE Context Broker"
     },
-    "LORA-GATEWAY": {
-        "CREATE": "Opret LoRaWAN gateway"
+    "MQTT": {
+      "TYPE": "MQTT",
+      "NAME": "MQTT forbindelse",
+      "DESCRIPTION": "En integration til MQTT Broker",
+      "BROKER-URL": "Broker URL",
+      "PORT": "Port",
+      "TOPIC": "Topic",
+      "QOS": "QoS",
+      "USERNAME": "Brugernavn",
+      "PASSWORD": "Adgangskode"
     },
-    "DATATARGET-TABLE": {
-        "NAME": "Navn",
-        "TYPE": "Type"
+    "OPENDATADK": {
+      "TYPE": "OpenDataDK"
     },
-    "MULTICAST-TABLE": {
-        "NAME": "Gruppenavn",
-        "TYPE": "Gruppetype"
+    "RESPONSE_TYPE": {
+      "ERROR": "Fejl",
+      "OK": "Ok"
+    }
+  },
+  "MULTICAST": {
+    "SAVE": "Gem multicast",
+    "BASIC-DETAILS": "Basale detaljer",
+    "LORAWAN-DETAILS": "LoRaWAN detailjer",
+    "GROUPNAME": "Gruppe navn",
+    "ADDRESS": "Adresse",
+    "NETWORK-KEY": "Network session key",
+    "APPLICATION-KEY": "Network application key",
+    "FRAMECOUNTER": "Frame counter",
+    "DATARATE": "Data rate",
+    "FREQUENCY": "Frekvens (Hz)",
+    "GROUPTYPE": "Gruppe type",
+    "PERIODICITY": "Periodicitet",
+    "IOTDEVICE": "IoT enheder",
+    "DOWNLINK": {
+      "PORT": "Angiv den ønskede port",
+      "PAYLOAD": "Angiv det ønskede payload",
+      "START": "Sæt downlink i kø"
+    }
+  },
+  "OPENDATADK": {
+    "INTRO": {
+      "GUIDE_HEADER": "Guide til Open Data DK-data target",
+      "GUIDE1": "Det er nemt at sende data fra OS2iot til Open Data DK (ODDK). Første gange der oprettes et ODDK-data target, bliver det muligt for ODDK at høste oplysninger om jeres datasæt til opendata.dk. Når først høstningen er sat op, vil alle jeres ODDK-data targets automatisk blive oprettet og opdateret på opendata.dk.",
+      "GUIDE2": "Senest modtagede datapakke udstilles via OS2iots API og kan hentes via en URL angivet på det enkelte ODDK-data target og på jeres datasæt på opendata.dk. Der opsamles og udstilles altså ikke historisk data i hverken OS2iot eller på opendata.dk.",
+      "GUIDE3": "Nye ODDK-data targets høstes automatisk, og I behøver ikke gøre noget aktivt for at gøre dem tilgængelige på opendata.dk. Hvis I sletter et ODDK-data target forsvinder det af sig selv fra opendata.dk.",
+      "GUIDE4": "Datasæt fra OS2iot publiceres under licensen",
+      "GUIDE5": "Creative Commons CC0 1.0 Universel.",
+      "PROCEDURE_HEADER": "Procedure ved oprettelse af første data target",
+      "PROCEDURE1": "Bliv medlem af Open Data DK, hvis jeres myndighed ikke allerede er det:",
+      "PROCEDURE2": "Opret første ODDK-data target i OS2iot",
+      "PROCEDURE3": "Ved oprettelsen tilbyder OS2iot at sende en mail til Open Data DK's administrator, som sætter høstningen op. I må forvente op til 2-3 ugers behandlingstid.",
+      "PROCEDURE4": "Når høstningen er aktiv, kan datasæt findes og beriges på",
+      "PROCEDURE4_LINK": "ODDK administrationsmodulet"
     },
-    "IOT-DEVICE-TYPES": {
-        "GENERIC_HTTP": "Generisk HTTP",
-        "LORAWAN": "LoRaWAN",
-        "SIGFOX": "Sigfox",
-        "MQTT": "MQTT",
-        "MQTT_INTERNAL_BROKER": "MQTT intern broker",
-        "MQTT_EXTERNAL_BROKER": "MQTT ekstern broker",
-        "OTHER": "Andet"
+    "QUESTION": {
+      "GIVE-OPENDATADK-NAME": "Datasæt titel",
+      "GIVE-OPENDATADK-NAME-PLACEHOLDER": "Datasæt titel",
+      "GIVE-OPENDATADK-NAME-INFO": "Overordnet titel på datasættet på opendata.dk",
+      "GIVE-OPENDATADK-RESOURCETITLE": "Data ressource titel",
+      "GIVE-OPENDATADK-RESOURCETITLE-PLACEHOLDER": "Kloaksensorer - Aarhus kommune",
+      "GIVE-OPENDATADK-RESOURCETITLE-INFO": "Titel på den ressource, der vises i datasættet på opendata.dk",
+      "GIVE-OPENDATADK-DESCRIPTION": "Beskrivelse",
+      "GIVE-OPENDATADK-DESCRIPTION-PLACEHOLDER": "Beskrivelse",
+      "GIVE-OPENDATADK-KEYWORDS": "Angiv emneord",
+      "GIVE-OPENDATADK-KEYWORDS-PLACEHOLDER": "Vælg nøgleord fra drop-down",
+      "GIVE-OPENDATADK-AUTHORNAME": "Dataejer",
+      "GIVE-OPENDATADK-AUTHORNAME-PLACEHOLDER": "Jens Jensen",
+      "GIVE-OPENDATADK-AUTHORNAME-INFO": "Ansvarlig afdeling eller person",
+      "GIVE-OPENDATADK-AUTHOR-EMAIL": "Dataejers e-mail",
+      "GIVE-OPENDATADK-AUTHOR-EMAIL-PLACEHOLDER": "jens@jensen.dk",
+      "ACCEPT-TERMS-PART-ONE": "Jeg accepterer hermed, at datasættet udgives under en",
+      "TERMS-AND-CONDITIONS": "Creative Commons CC0 1.0 Universel (CC0 1.0) licens"
     },
-    "ACTIVITY": {
-        "NEVER": "Aldrig set"
+    "DETAILS": {
+      "NAME": "Datasæt titel",
+      "RESOURCETITLE": "Datakilde titel",
+      "DESCRIPTION": "Beskrivelse",
+      "KEYWORDS": "Emneord",
+      "LICENSE": "Licens",
+      "AUTHORNAME": "Forfatterens navn",
+      "AUTHOREMAIL": "Forfatterens email",
+      "URL": "Endpoint til hentning af data",
+      "NA": "Intet angivet"
     },
+    "MAIL": {
+      "DIALOG_TITLE": "Anmod Open Data DK om høstning af data",
+      "DIALOG_TEXT1": "For at få",
+      "DIALOG_TEXT2": "s ODDK datatargets gjort synlige på opendata.dk, skal Open Data DK have en anmodning om at begynde at høste jeres oplysninger fra OS2iot. Hvis du udfylder oplysningerne herunder, sender OS2iot automatisk en mail til Open Data DK",
+      "DIALOG_CONFIRM": "Send mail",
+      "GIVE-OPENDATADK-ORGNAME": "Organisation (i Open Data DK)",
+      "GIVE-OPENDATADK-ORGNAME-PLACEHOLDER": "Organisation",
+      "GIVE-OPENDATADK-COMMENT": "Eventuel kommentar",
+      "GIVE-OPENDATADK-COMMENT-PLACEHOLDER": "Kort kommentar",
+      "SELECTED_ORG_FALLBACK": "organisationen",
+      "WARNING": "Advarsel",
+      "WARNING-TEXT": "Hvis Open Data DK ikke får besked om integrationen, vises datasættet ikke på opendata.dk",
+      "NEVER-AGAIN": "Vis ikke igen. Open Data DK høster allerede denne organisation fra OS2iot."
+    }
+  },
+  "APPLICATION-TABLE": {
+    "NAME": "Navn",
+    "IOT-DEVICES": "IoT enheder",
+    "UPDATED": "Senest opdateret",
+    "DATA-TARGETS": "Datatargets",
+    "STATUS": "Status",
+    "START-DATE": "Startdato",
+    "END-DATE": "Slutdato",
+    "CATEGORY": "Kategori",
+    "OWNER": "Ejer",
+    "CONTACT-PERSON": "Kontaktperson",
+    "PERSONAL-DATA": "Persondata",
+    "CONTROLLED-PROPERTIES": "Data",
+    "DEVICE-TYPES": "Forbindelsesteknologi",
+    "OPEN-DATA-DK": "Open Data DK"
+  },
+  "IOT-TABLE": {
+    "APPLICATION": "Applikation",
+    "NETWORK-TECHNOLOGY": "Netværksteknologi",
+    "ALARM": "Alarm",
+    "BATTERY": "Batteri",
+    "ACTIVE": "Sidst aktiv",
+    "DATA": "Data(24 timer)",
+    "ORGANISATION": "Organisation",
+    "NAME": "Navn",
+    "RSSI": "RSSI (dBm)",
+    "SNR": "SNR (dB)",
+    "DEV-EUI": "DevEUI",
+    "APP-KEY": "AppKey (OTAA)"
+  },
+  "LORA-GATEWAY-TABLE": {
+    "NAME": "Navn",
+    "GATEWAYID": "Gateway ID",
+    "LOCATION": "Placering",
+    "LAST-SEEN-AT": "Seneste aktivitet",
+    "STATUS": "Status",
+    "ORGANIZATION": "Organisation",
+    "PACKETS-RECEIVED": "Pakker modtaget",
+    "PACKETS-SENT": "Pakker sendt",
+    "PLACEMENT": "Placering",
+    "MODEL-NAME": "Modelnavn",
+    "ANTENNA-TYPE": "Antennetype (dBi)",
+    "RESPONSIBLE-NAME": "Gateway-ansvarlig",
+    "RESPONSIBLE-EMAIL": "Kontaktmail",
+    "RESPONSIBLE-PHONE-NUMBER": "Kontakttelefon",
+    "OPERATIONAL-NAME": "Driftsansvarlig",
+    "OPERATIONAL-EMAIL": "Kontaktmail - drift",
+    "TAGS": "Tags",
+    "CREATED-AT": "Oprettelsesdato"
+  },
+  "LORA-GATEWAY-STATUS": {
+    "TITLE": "LoRaWAN online status historik",
+    "TIMESTAMP": "Tidspunkt",
+    "INTERVAL": {
+      "DAY": "Seneste døgn",
+      "WEEK": "Seneste uge",
+      "MONTH": "Seneste måned"
+    }
+  },
+  "DEVICE-MODEL": {
+    "DELETE-FAILED": "Slet Fejlede",
+    "HEADLINE": "Detaljer",
+    "CREATED": "Oprettet",
+    "UPDATED": "Senest opdateret",
+    "ID": "Unik identifikator",
     "TABLE": {
-        "PAGINATION": "Navigér tabel",
-        "COLUMNS": "Kolonner"
+      "ID": "Id"
     },
-    "APPLICATION-TABLE-ROW": {
-        "DELETE": "Slet",
-        "EDIT": "Redigér",
-        "SHOW-OPTIONS": "Håndter applikation"
+    "NAME": "Navn",
+    "TYPE": "Type",
+    "BRANDNAME": "Mærke",
+    "MODELNAME": "Model",
+    "MANUFACTURERNAME": "Producentens navn",
+    "CONTROLLEDPROPERTY": "Kontrol egenskaber",
+    "CATEGORY": "Kategori",
+    "SUPPORTEDUNITS": "Måleenheder",
+    "FUNCTION": "Enhedsfunktioner",
+    "ENERGYLIMITATIONCLASS": "Energibegrænsningsklassen",
+    "SUPPORTEDPROTOCOL": "Understøttede protokoller",
+    "DETAIL-TITLE": "Device model detalje",
+    "DEVICE-MODEL": "Device model",
+    "SHOW-OPTIONS": "Håndter device model"
+  },
+  "LORA-GATEWAY-TABLE-ROW": {
+    "SHOW-OPTIONS": "Håndtér gateway"
+  },
+  "LORA-GATEWAY": {
+    "CREATE": "Opret LoRaWAN gateway"
+  },
+  "DATATARGET-TABLE": {
+    "NAME": "Navn",
+    "TYPE": "Type"
+  },
+  "MULTICAST-TABLE": {
+    "NAME": "Gruppenavn",
+    "TYPE": "Gruppetype"
+  },
+  "IOT-DEVICE-TYPES": {
+    "GENERIC_HTTP": "Generisk HTTP",
+    "LORAWAN": "LoRaWAN",
+    "SIGFOX": "Sigfox",
+    "MQTT": "MQTT",
+    "MQTT_INTERNAL_BROKER": "MQTT intern broker",
+    "MQTT_EXTERNAL_BROKER": "MQTT ekstern broker",
+    "OTHER": "Andet"
+  },
+  "ACTIVITY": {
+    "NEVER": "Aldrig set"
+  },
+  "TABLE": {
+    "PAGINATION": "Navigér tabel",
+    "COLUMNS": "Kolonner"
+  },
+  "APPLICATION-TABLE-ROW": {
+    "DELETE": "Slet",
+    "EDIT": "Redigér",
+    "SHOW-OPTIONS": "Håndter applikation"
+  },
+  "IOTDEVICE-TABLE-ROW": {
+    "DELETE": "Slet",
+    "EDIT": "Redigér",
+    "SHOW-OPTIONS": "Håndter IoT enhed",
+    "BATTERY-ERROR-MESSAGE": "Den valgte teknologi understøtter ikke batteristatus",
+    "RESET-API-KEY": "Nulstil API nøgle",
+    "NOT-SUPPORTED": "Ikke understøttet",
+    "NOT-SUPPORTED-SHORT": "-",
+    "NOT-AVAILABLE": "N/A"
+  },
+  "DATATARGET-TABLE-ROW": {
+    "DELETE": "Slet datatarget",
+    "EDIT": "Redigér",
+    "SHOW-OPTIONS": "Håndter datatarget"
+  },
+  "MULTICAST-TABLE-ROW": {
+    "DELETE": "Slet multicast",
+    "EDIT": "Redigér",
+    "SHOW-OPTIONS": "Håndter multicast"
+  },
+  "PAYLOAD-DECODER": {
+    "DELETE-FAILED": "Slet fejlede",
+    "DETAILS": "Detaljer",
+    "CREATED": "Oprettet",
+    "UPDATED": "Senest opdateret",
+    "TITLE": "Payload decoder",
+    "SAVE": "Gem payload decoder",
+    "NAME": "Navn",
+    "ID": "Payload decoder id",
+    "ORGANIZATION": "Organisation",
+    "BELONGS-TO-ORGANIZATION": "Organisation",
+    "DECODINGFUNCTION": "Decoder funktion",
+    "DETAIL": {
+      "DROPDOWN": "Håndter payload decoder",
+      "EDIT": "Redigér",
+      "DELETE": "Slet"
     },
-    "IOTDEVICE-TABLE-ROW": {
-        "DELETE": "Slet",
-        "EDIT": "Redigér",
-        "SHOW-OPTIONS": "Håndter IoT enhed",
-        "BATTERY-ERROR-MESSAGE": "Den valgte teknologi understøtter ikke batteristatus",
-        "RESET-API-KEY": "Nulstil API nøgle",
-        "NOT-SUPPORTED": "Ikke understøttet",
-        "NOT-SUPPORTED-SHORT": "-",
-        "NOT-AVAILABLE": "N/A"
+    "IOT-DEVICES": "Tilknyttede IoT enheder",
+    "TEST-YOUR-DECODER": "Test din payload decoder"
+  },
+  "PAYLOAD-DECODER-TABLE-ROW": {
+    "EDIT": "Redigér",
+    "DELETE": "Slet"
+  },
+  "ORGANISATION": {
+    "HEADLINE": "Detaljer",
+    "CREATED": "Oprettet",
+    "UPDATED": "Senest opdateret",
+    "NAME": "Navn",
+    "APPLICATION-COUNT": "Applikationer",
+    "SAVE": "Gem organisation",
+    "EDIT": "Rediger organisation",
+    "DROPDOWN": "Håndter organisation",
+    "DETAIL": {
+      "APPLICATIONS": "Organisationens applikationer",
+      "PERMISSIONS": "Organisations brugergrupper",
+      "NAME": "Navn"
     },
-    "DATATARGET-TABLE-ROW": {
-        "DELETE": "Slet datatarget",
-        "EDIT": "Redigér",
-        "SHOW-OPTIONS": "Håndter datatarget"
+    "FORM": {
+      "NAME": "Indtast organisationens navn",
+      "NAME-PLACEHOLDER": "Indtast organisationens navn",
+      "CANCEL": "Annuller",
+      "SAVE": "Gem organisation",
+      "CREATE-NEW-ORGANISATION": "Opret organisation"
+    }
+  },
+  "ORGANISATION-TABLE-ROW": {
+    "EDIT": "Redigér",
+    "DELETE": "Slet"
+  },
+  "PERMISSION": {
+    "NAME": "Navn",
+    "ORGANISATION": "Organisation",
+    "NUMBER_OF_MEMBERS": "Antal medlemmer",
+    "TYPE": "Type af brugergruppe",
+    "NO_ORGANISATION": "N/A",
+    "SAVE": "Gem brugergruppe",
+    "DETAIL": {
+      "TYPE": "Adgangstype ",
+      "ORG": "Organisation ",
+      "DROPDOWN": "Håndter brugergruppe",
+      "EDIT": "Rediger",
+      "DELETE": "Slet",
+      "USERS": "Brugergruppens brugere",
+      "APPLICATIONS": "Brugergruppens applikationer",
+      "HEADLINE": "Detaljer",
+      "CREATED": "Oprettet",
+      "UPDATED": "Senest opdateret"
     },
-    "MULTICAST-TABLE-ROW": {
-        "DELETE": "Slet multicast",
-        "EDIT": "Redigér",
-        "SHOW-OPTIONS": "Håndter multicast"
+    "EDIT": {
+      "NAME": "Indtast brugergruppens navn",
+      "NAME-PLACEHOLDER": "Brugergruppens navn",
+      "TYPE": "Rettigheder",
+      "TYPE-PLACEHOLDER": "Adgangs rettigheder",
+      "USERS": "Vælg brugere",
+      "USERS-PLACEHOLDER": "Brugere",
+      "ORG": "Vælg en organisation",
+      "ORG-PLACEHOLDER": "Organisation",
+      "APPS": "Vælg en eller flere applikationer",
+      "APPS-PLACEHOLDER": "Applikationer",
+      "ADD-APPLICATION-ON-CREATE": "Skal nye applikationer automatisk tilføjes til brugergruppen",
+      "ADD-APPLICATION-AUTOMATIC": "Automatisk tilføjelse af applikationer til brugergruppen"
     },
-    "PAYLOAD-DECODER": {
-        "DELETE-FAILED": "Slet fejlede",
-        "DETAILS": "Detaljer",
-        "CREATED": "Oprettet",
-        "UPDATED": "Senest opdateret",
-        "TITLE": "Payload decoder",
-        "SAVE": "Gem payload decoder",
-        "NAME": "Navn",
-        "ID": "Payload decoder id",
-        "ORGANIZATION": "Organisation",
-        "BELONGS-TO-ORGANIZATION": "Organisation",
-        "DECODINGFUNCTION": "Decoder funktion",
-        "DETAIL": {
-            "DROPDOWN": "Håndter payload decoder",
-            "EDIT": "Redigér",
-            "DELETE": "Slet"
-        },
-        "IOT-DEVICES": "Tilknyttede IoT enheder",
-        "TEST-YOUR-DECODER": "Test din payload decoder"
+    "TABLE-ROW": {
+      "EDIT": "Rediger",
+      "DELETE": "Slet"
+    }
+  },
+  "PERMISSION-TYPE": {
+    "GlobalAdmin": "Global administrator",
+    "OrganizationUserAdmin": "Brugeradministrator",
+    "OrganizationGatewayAdmin": "Gateway administrator",
+    "OrganizationApplicationAdmin": "Applikationsadministrator",
+    "Read": "Læserettigheder"
+  },
+  "FORM": {
+    "CREATE-NEW-APPLICATION": "Opret ny applikation",
+    "CREATE-NEW-LORA-GATEWAY": "Opret ny LoRaWAN gateway",
+    "CREATE-NEW-DEVICE-MODEL": "Opret ny device model",
+    "CREATE-NEW-DATATARGET": "Opret nyt datatarget",
+    "CREATE-NEW-MULTICAST": "Opret nyt multicast",
+    "EDIT-DATATARGET": "Redigér datatarget",
+    "EDIT-MULTICAST": "Redigér multicast",
+    "CREATE-NEW-IOT-DEVICE": "Tilføj en IoT enhed",
+    "EDIT-NEW-GATEWAY": "Redigér LoRaWAN gateway",
+    "EDIT-NEW-APPLICATION": "Redigér applikation",
+    "TRANSMISSION_PROTOCOL_TEXT": "Vælg transmissionsprotokol",
+    "TRANSMISSION_PROTOCOL_DESCRIPTION": "Transmissions protokollen angiver måden IoT-enheden forbinder til OS2IoT",
+    "ALERT-NO-DELETE-DEVICES": "Du kan ikke slette denne applikation da den indeholder IOT enhed(er)",
+    "CREATE-NEW-PAYLOAD-DECODER": "Opret payload decoder",
+    "EDIT-PAYLOAD-DECODER": "Redigér payload decoder",
+    "EDIT-DEVICE-PREDIT-SIGFOX-GROUPSOFILE": "Redigér device profil",
+    "CREATE-NEW-ORGANISATION": "Opret organisation",
+    "EDIT-ORGANISATION": "Redigér organisation",
+    "CREATE-NEW-PERMISSION": "Opret ny brugergruppe",
+    "EDIT-PERMISSION": "Redigér brugergruppe",
+    "EDIT-SIGFOX-DEVICE-TYPE": "Redigér Sigfox enhedstype",
+    "EDIT-SIGFOX-GROUPS": "Redigér Sigfox grupper",
+    "EDIT-SIGFOX-GROUP": "Redigér Sigfox gruppe",
+    "EDIT-USERS": "Redigér bruger",
+    "EDIT-DEVICE-PROFILE": "Redigér device profil",
+    "EDIT-API-KEY": "Redigér API nøgle",
+    "ADD-METADATA-ROW": "Tilføj metadata række"
+  },
+  "QUESTION": {
+    "CREATE-IOT-DEVICE": "IoT-enhed",
+    "DEVICE-MODEL-SELECT": "Tilknyt en device model til enheden",
+    "DEVICE-MODEL-SELECT-NON": "Ingen device model valgt",
+    "TRANSMISSION-PROTOCOL": "Vælg transmissionsprotokol",
+    "ESTABLISH-CONNECTION-TO-DEVICE": "Opret forbindelse til din enhed",
+    "ADD-MORE-INFO-ABOUT-DEVICE": "Tilføj yderlige informationer om din enhed",
+    "REVIEW-AND-SUBMIT": "Gennemgå og godkend indstillinger for din IoT enhed",
+    "DEVICE-NAME-PLACEHOLDER": "Enhedsnavn",
+    "GIVE-DEVICE-NAME": "Navngiv enhed",
+    "EXTRA-COMMENT-PLACEHOLDER": "Anden relevant information",
+    "LOCATION-DESCRIPTION": "Beskrivelse af placering",
+    "LOCATION-DESCRIPTION-PLACEHOLDER": "F.eks. køleskab på 3. sal",
+    "RELATION-APPLICATION": "Tilknyttet applikation: ",
+    "GIVE-DATATARGET-NAME": "Navngiv datatarget",
+    "GIVE-DATATARGET-NAME-PLACEHOLDER": "Datatarget's navn",
+    "GIVE-DATATARGET-NAME-INFO": "Benyttes kun i OS2iot",
+    "GIVE-DATATARGET-TIMEOUT": "Timeout i millisekunder",
+    "GIVE-DATATARGET-AUTHORIZATIONHEADER": "Angiv authorization header",
+    "GIVE-DATATARGET-URL": "Angiv datatargets URL",
+    "GIVE-DATATARGET-URL-PLACEHOLDER": "https://datatarget.dk/data",
+    "GIVE-PAYLOADDECODER-NAME": "Navngiv payload decoder",
+    "GIVE-PAYLOADDECODER-NAME-PLACEHOLDER": "F.eks. kloak sensor decoder",
+    "GIVE-PAYLOADDECODER-DECODINGFUNCTION": "Payload decoder funktion",
+    "GIVE-PAYLOADDECODER-CHOOSE-APPLICATION": "Vælg applikation",
+    "GIVE-PAYLOADDECODER-CHOOSE-DEVICE": "Vælg enhed",
+    "GIVE-PAYLOADDECODER-PAYLOAD": "Test med den valgte enheds payload",
+    "GIVE-PAYLOADDECODER-METADATA": "Test med den valgte enheds metadata",
+    "GIVE-PAYLOADDECODER-TESTBUTTON": "Test din kode",
+    "GIVE-PAYLOADDECODER-OUTPUT": "Test preview af payload decoder Output",
+    "GIVE-PAYLOADDECODER-METADATA-PLACEHOLDER": "// Vælg applikation og enhed først for at \n// teste din decoder funktion med metadata",
+    "GIVE-PAYLOADDECODER-PAYLOAD-PLACEHOLDER": "// Vælg applikation og enhed først for at \n// teste din decoder funktion med payload data",
+    "GIVE-PAYLOADDECODER-METADATA-ERRORMESSAGE": "// Kan ikke finde noget metadata på den pågældende enhed. \n// Det kan enten skyldes at vi ikke har modtaget noget fra enheden eller der er ikke blevet tilknyttet en devicemodel til enheden",
+    "GIVE-PAYLOADDECODER-PAYLOAD-ERRORMESSAGE": "// Kan ikke finde noget payload på den pågældende enhed. \n// Det kan enten skyldes at vi ikke har modtaget noget fra enheden eller der er ikke blevet tilknyttet en devicemodel til enheden",
+    "GIVE-PAYLOADDECODER-OUTPUT-PLACEHOLDER": "// Tryk 'Test koden' for at decode payload og metadata",
+    "GIVE-PAYLOADDECODER-METADATA-INVALID-JSON": "Det angivne JSON var ikke gyldigt i feltet device metadata",
+    "GIVE-PAYLOADDECODER-PAYLOAD-INVALID-JSON": "Det angivne JSON var ikke gyldigt i feltet payload",
+    "GIVE-ORGANISATION-NAME": "Navngiv organisation",
+    "GIVE-ORGANISATION-NAME-PLACEHOLDER": "F.eks. 'Aarhus Kommune'",
+    "GIVE-MULTICAST-NAME": "Navngiv multicast",
+    "GIVE-MULTICAST-ADDRESS": "Angiv multicast adressen (mcAddr)",
+    "GIVE-MULTICAST-NETWORK-KEY": "Angiv multicast network session key (mcNwkSKey)",
+    "GIVE-MULTICAST-APPLICATION-KEY": "Angiv multicast application session key (mcAppSKey)",
+    "GIVE-MULTICAST-FRAMECOUNTER": "Angiv frame counter",
+    "GIVE-MULTICAST-DATARATE": "Angiv data rate",
+    "GIVE-MULTICAST-IOTDEVICES": "Angiv IoT-enheder",
+    "GIVE-MULTICAST-FREQUENCY": "Angiv frekvens (Hz)",
+    "GIVE-MULTICAST-GROUP-TYPE": "Angiv multicast gruppe type",
+    "GIVE-MULTICAST-PERIODICITY": "Angiv multicast ping-slot periodicitet",
+    "GIVE-MULTICAST-GROUPTYPE": "Angiv multicast gruppe typen",
+    "MULTICAST-NAME-PLACEHOLDER": "Multicastens navn",
+    "MULTICAST-ADDRESS-PLACEHOLDER": "Multicast adressen",
+    "MULTICAST-NETWORK-KEY-PLACEHOLDER": "Multicastens network session key",
+    "MULTICAST-APPLICATION-KEY-PLACEHOLDER": "Multicastens application session key",
+    "MULTICAST-GROUPTYPE-PLACEHOLDER": "Vælg multicast gruppe typen",
+    "MULTICAST-PERIODICITY-PLACEHOLDER": "Vælg Class-B ping periodiciteten",
+    "OTAAAPPLICATIONKEY": "OTAA application key (AppKey)",
+    "OTAAAPPLICATIONKEY-PLACEHOLDER": "Indtast OTAA application key",
+    "DEVADDR": "Device adress",
+    "DEVADDR-PLACEHOLDER": "Indtast device adress",
+    "NETWORKSESSIONKEY": "Networksessionkey",
+    "NETWORKSESSIONKEY-PLACEHOLDER": "Indtast network session key",
+    "APPLICATIONSESSIONKEY": "Applicationsessionkey",
+    "APPLICATIONSESSIONKEY-PLACEHOLDER": "Indtast application session key",
+    "FCNTUP": "fCntUp",
+    "FCNTUP-PLACEHOLDER": "Angiv upload framerate",
+    "NFCNTDOWN": "nfcntdown",
+    "NFCNTDOWN-PLACEHOLDER": "Angiv download framerate",
+    "DEVEUI": "Enheds EUI (DevEUI)",
+    "DEVEUI-PLACEHOLDER": "Angiv DevEUI (16 tegn)",
+    "SKIPFCNTCHECK": "SkipFCntCheck",
+    "SKIPFCNTCHECK-NO": "Nej",
+    "SKIPFCNTCHECK-YES": "Ja",
+    "OTAA": "Over The Air Activation",
+    "OTAA-ABP-CONFIG-HELP": "Du vælger din aktivation type via device profile",
+    "ABP": "Activation By Personalisation",
+    "CHOOSE-DEVICE": "Vælg device profile",
+    "OTAA-ACTIVATE": "Opret forbindelse vha. OTAA",
+    "ADD-RELATIONS": "Tilføj IoT enhed og payload decoder",
+    "METADATA": "Metadata",
+    "DATATARGET": {
+      "SELECT-PAYLOADDECODER": "Vælg payload decoder",
+      "NO-PAYLOAD-DECODER-SELECTED": "Ingen payload decoder valgt",
+      "SELECT-DEVICES": "Vælg enheder",
+      "SELECTALLDEVICES": "Vælg alle",
+      "DESELECTALLDEVICES": "Fravælg alle",
+      "RELATIONS": "*Efter oprettelse af dit data target parres dette med en/flere payload decoder(s) og IoT-devices",
+      "MQTT": {
+        "GIVE-URL": "Angiv datatargets broker URL",
+        "GIVE-URL-PLACEHOLDER": "https://min-mqtt-broker.dk",
+        "GIVE-PORT": "Angiv datatargets broker port",
+        "GIVE-PORT-PLACEHOLDER": "1883",
+        "GIVE-QOS": "Angiv hvilken QoS-niveau data skal sendes med",
+        "GIVE-QOS-PLACEHOLDER": "0, 1, 2",
+        "GIVE-QOS-INFO": "QoS (Quality of Service) fastlægger, hvor sikker leveringen af beskeden skal være. Der er tre muligheder: 0 (at most once), 1 (at least once) og 2 (exactly once)",
+        "GIVE-TOPIC": "Angiv hvilket topic på brokeren der skal sendes til",
+        "GIVE-TOPIC-PLACEHOLDER": "Topic på ekstern broker",
+        "GIVE-TOPIC-INFO": "Topic'et kan være givet af den udbyder, som data skal sendes til. Der kan ikke bruges wildcards",
+        "GIVE-AUTHENTICATION-METHOD": "Vælg autentificeringsmetode",
+        "USERNAME-PASSWORD": "Brugernavn og password",
+        "CERTIFICATE": "Certifikat",
+        "USERNAME": "Brugernavn",
+        "GIVE-USERNAME": "Angiv et brugernavn med adgang til brokeren og det valgte topic",
+        "PASSWORD": "Adgangskode",
+        "GIVE-PASSWORD": "Angiv adgangskoden"
+      }
     },
-    "PAYLOAD-DECODER-TABLE-ROW": {
-        "EDIT": "Redigér",
-        "DELETE": "Slet"
+    "MULTICAST": {
+      "SELECT-DEVICES": "Vælg enheder",
+      "SELECTALLDEVICES": "Vælg alle",
+      "DESELECTALLDEVICES": "Fravælg alle",
+      "NO-PORT-OR-PAYLOAD": "Angiv en port og en payload",
+      "ONLY-LORAWAN": "* På nuværende tidspunkt er det kun muligt at tilknytte LoRaWAN devices.",
+      "HINT-8-HEXA": "8-tegns hexadecimal værdi",
+      "HINT-32-HEXA": "32-tegns hexadecimal værdi",
+      "HINT-DATA-RATE": "Data rate, der skal bruges ved overførsel af multicast-frames. Se venligst LoRaWAN Regional Parameters specifikationen for gyldige værdier",
+      "HINT-FREQUENCY": "Frekvensen, der skal bruges ved transmission af multicast-frames. Se venligst LoRaWAN Regional Parameters specifikationen for gyldige værdier"
     },
-    "ORGANISATION": {
-        "HEADLINE": "Detaljer",
-        "CREATED": "Oprettet",
-        "UPDATED": "Senest opdateret",
-        "NAME": "Navn",
-        "APPLICATION-COUNT": "Applikationer",
-        "SAVE": "Gem organisation",
-        "EDIT": "Rediger organisation",
-        "DROPDOWN": "Håndter organisation",
-        "DETAIL": {
-            "APPLICATIONS": "Organisationens applikationer",
-            "PERMISSIONS": "Organisations brugergrupper",
-            "NAME": "Navn"
-        },
-        "FORM": {
-            "NAME": "Indtast organisationens navn",
-            "NAME-PLACEHOLDER": "Indtast organisationens navn",
-            "CANCEL": "Annuller",
-            "SAVE": "Gem organisation",
-            "CREATE-NEW-ORGANISATION": "Opret organisation"
-        }
+    "SIGFOX": {
+      "TITLE": "Sigfox specifikke felter",
+      "CONNECTTOEXISTINGDEVICEINBACKEND": "Er enheden allerede registreret i Sigfox backend?",
+      "GROUPID": "Vælg en Sigfox gruppe",
+      "DEVICEID": "Sigfox enhedsid",
+      "DEVICEID-PLACEHOLDER": "Enhedens unikke id",
+      "DEVICETYPEID": "Vælg en Sigfox enhedstype",
+      "DEVICETYPEID-PLACEHOLDER": "Enhedstype",
+      "PAC": "PAC",
+      "PAC-PLACEHOLDER": "Porting authorization code",
+      "ENDPRODUCTCERTIFICATE": "Produkt certifikat",
+      "ENDPRODUCTCERTIFICATE-PLACEHOLDER": "Produkt certifikat",
+      "ENDPRODUCTCERTIFICATE-HELP-TITLE": "Hjælp til at finde produkt certifikatet",
+      "ENDPRODUCTCERTIFICATE-HELP-TEXT": "Få hjælp til at finde produkt certifikatet ved at klikke her",
+      "DISCLAIMER": "Bemærk dit abonnement med Sigfox holdes ude af OS2iot og løber automatisk. Afmeld dit abonnement ved at registrere en unsubscribe date i Sigfox.",
+      "DISCLAIMER-CLICK": "Guide til unsubscripe",
+      "PROTOTYPE": "Aktiver som prototype",
+      "PROTOTYPE-TITLE": "Hvis enhedstypen endnu ikke har tildelt et produkt certifikat, kan enheden oprettes som en prototype",
+      "SELECTGROUPFIRST": "Du skal vælge en gruppe før du kan udfylde kontrakt og enhedstype",
+      "DEVICETYPE": {
+        "NAME": "Navngiv enhedstypen",
+        "NAME-PLACEHOLDER": "XC-123",
+        "ALERTEMAIL-PLACEHOLDER": "Jens@jensen.dk",
+        "ALERTEMAIL": "Angiv e-mail til brug i tilfælde af alarm fra Sigfox",
+        "DESCRIPTION": "Angiv beskrivelse",
+        "DESCRIPTION-PLACEHOLDER": "Lipsum larum",
+        "CHOOSE-GROUP": "Vælg en sigfoxgruppe",
+        "CHOOSE-CONTRACT": "Vælg en kontrakt"
+      }
     },
-    "ORGANISATION-TABLE-ROW": {
-        "EDIT": "Redigér",
-        "DELETE": "Slet"
+    "DEVICE-MODEL": {
+      "GIVE-NAME": "Angiv navn",
+      "GIVE-NAME-PLACEHOLDER": "F.eks. Elsys-tx3",
+      "GIVE-ID": "Angiv unik identifikator (id)",
+      "GIVE-ID-PLACEHOLDER": "Angiv id",
+      "GIVE-BRANDNAME": "Angiv mærket (brandName)",
+      "GIVE-BRANDNAME-PLACEHOLDER": "Angiv mærket",
+      "GIVE-MODELNAME": "Angiv model navnet (modelName)",
+      "GIVE-MODELNAME-PLACEHOLDER": "Angiv model navnet",
+      "GIVE-MANUFACTURERNAME": "Angiv producentens navn (manufacturerName)",
+      "GIVE-MANUFACTURERNAME-PLACEHOLDER": "Angiv producentens navn",
+      "SELECT-CONTROLLEDPROPERTY": "Vælg en eller flere kontrolegenskaber (controlledProperty)",
+      "SELECT-CATEGORY": "Vælg kategori (category)",
+      "SELECT-SUPPORTEDUNITS": "Vælg måleenheder (supportedUnits)",
+      "SELECT-DEVICEFUNCTIONS": "Vælg enhedsfunktioner (function)",
+      "SELECT-ENERGYLIMITATIONCLASS": "Vælg energibegrænsningsklassen (energyLimitationClass)",
+      "SELECT-SUPPORTEDPROTOCOL": "Vælg understøttede protokoller (supportedProtocol)",
+      "FIWARE-LINK-TEXT": "Denne data model er adopteret fra Fiware og følger ETSI standarden"
     },
     "PERMISSION": {
-        "NAME": "Navn",
-        "ORGANISATION": "Organisation",
-        "NUMBER_OF_MEMBERS": "Antal medlemmer",
-        "TYPE": "Type af brugergruppe",
-        "NO_ORGANISATION": "N/A",
-        "SAVE": "Gem brugergruppe",
-        "DETAIL": {
-            "TYPE": "Adgangstype ",
-            "ORG": "Organisation ",
-            "DROPDOWN": "Håndter brugergruppe",
-            "EDIT": "Rediger",
-            "DELETE": "Slet",
-            "USERS": "Brugergruppens brugere",
-            "APPLICATIONS": "Brugergruppens applikationer",
-            "HEADLINE": "Detaljer",
-            "CREATED": "Oprettet",
-            "UPDATED": "Senest opdateret"
-        },
-        "EDIT": {
-            "NAME": "Indtast brugergruppens navn",
-            "NAME-PLACEHOLDER": "Brugergruppens navn",
-            "TYPE": "Rettigheder",
-            "TYPE-PLACEHOLDER": "Adgangs rettigheder",
-            "USERS": "Vælg brugere",
-            "USERS-PLACEHOLDER": "Brugere",
-            "ORG": "Vælg en organisation",
-            "ORG-PLACEHOLDER": "Organisation",
-            "APPS": "Vælg en eller flere applikationer",
-            "APPS-PLACEHOLDER": "Applikationer",
-            "ADD-APPLICATION-ON-CREATE": "Skal nye applikationer automatisk tilføjes til brugergruppen",
-            "ADD-APPLICATION-AUTOMATIC": "Automatisk tilføjelse af applikationer til brugergruppen"
-        },
-        "TABLE-ROW": {
-            "EDIT": "Rediger",
-            "DELETE": "Slet"
-        }
-    },
-    "PERMISSION-TYPE": {
-        "GlobalAdmin": "Global administrator",
-        "OrganizationUserAdmin": "Brugeradministrator",
-        "OrganizationGatewayAdmin": "Gateway administrator",
-        "OrganizationApplicationAdmin": "Applikationsadministrator",
-        "Read": "Læserettigheder"
-    },
-    "FORM": {
-        "CREATE-NEW-APPLICATION": "Opret ny applikation",
-        "CREATE-NEW-LORA-GATEWAY": "Opret ny LoRaWAN gateway",
-        "CREATE-NEW-DEVICE-MODEL": "Opret ny device model",
-        "CREATE-NEW-DATATARGET": "Opret nyt datatarget",
-        "CREATE-NEW-MULTICAST": "Opret nyt multicast",
-        "EDIT-DATATARGET": "Redigér datatarget",
-        "EDIT-MULTICAST": "Redigér multicast",
-        "CREATE-NEW-IOT-DEVICE": "Tilføj en IoT enhed",
-        "EDIT-NEW-GATEWAY": "Redigér LoRaWAN gateway",
-        "EDIT-NEW-APPLICATION": "Redigér applikation",
-        "TRANSMISSION_PROTOCOL_TEXT": "Vælg transmissionsprotokol",
-        "TRANSMISSION_PROTOCOL_DESCRIPTION": "Transmissions protokollen angiver måden IoT-enheden forbinder til OS2IoT",
-        "ALERT-NO-DELETE-DEVICES": "Du kan ikke slette denne applikation da den indeholder IOT enhed(er)",
-        "CREATE-NEW-PAYLOAD-DECODER": "Opret payload decoder",
-        "EDIT-PAYLOAD-DECODER": "Redigér payload decoder",
-        "EDIT-DEVICE-PREDIT-SIGFOX-GROUPSOFILE": "Redigér device profil",
-        "CREATE-NEW-ORGANISATION": "Opret organisation",
-        "EDIT-ORGANISATION": "Redigér organisation",
-        "CREATE-NEW-PERMISSION": "Opret ny brugergruppe",
-        "EDIT-PERMISSION": "Redigér brugergruppe",
-        "EDIT-SIGFOX-DEVICE-TYPE": "Redigér Sigfox enhedstype",
-        "EDIT-SIGFOX-GROUPS": "Redigér Sigfox grupper",
-        "EDIT-SIGFOX-GROUP": "Redigér Sigfox gruppe",
-        "EDIT-USERS": "Redigér bruger",
-        "EDIT-DEVICE-PROFILE": "Redigér device profil",
-        "EDIT-API-KEY": "Redigér API nøgle",
-        "ADD-METADATA-ROW": "Tilføj metadata række"
-    },
-    "QUESTION": {
-        "CREATE-IOT-DEVICE": "IoT-enhed",
-        "DEVICE-MODEL-SELECT": "Tilknyt en device model til enheden",
-        "DEVICE-MODEL-SELECT-NON": "Ingen device model valgt",
-        "TRANSMISSION-PROTOCOL": "Vælg transmissionsprotokol",
-        "ESTABLISH-CONNECTION-TO-DEVICE": "Opret forbindelse til din enhed",
-        "ADD-MORE-INFO-ABOUT-DEVICE": "Tilføj yderlige informationer om din enhed",
-        "REVIEW-AND-SUBMIT": "Gennemgå og godkend indstillinger for din IoT enhed",
-        "DEVICE-NAME-PLACEHOLDER": "Enhedsnavn",
-        "GIVE-DEVICE-NAME": "Navngiv enhed",
-        "EXTRA-COMMENT-PLACEHOLDER": "Anden relevant information",
-        "LOCATION-DESCRIPTION": "Beskrivelse af placering",
-        "LOCATION-DESCRIPTION-PLACEHOLDER": "F.eks. køleskab på 3. sal",
-        "RELATION-APPLICATION": "Tilknyttet applikation: ",
-        "GIVE-DATATARGET-NAME": "Navngiv datatarget",
-        "GIVE-DATATARGET-NAME-PLACEHOLDER": "Datatarget's navn",
-        "GIVE-DATATARGET-NAME-INFO": "Benyttes kun i OS2iot",
-        "GIVE-DATATARGET-TIMEOUT": "Timeout i millisekunder",
-        "GIVE-DATATARGET-AUTHORIZATIONHEADER": "Angiv authorization header",
-        "GIVE-DATATARGET-URL": "Angiv datatargets URL",
-        "GIVE-DATATARGET-URL-PLACEHOLDER": "https://datatarget.dk/data",
-        "GIVE-PAYLOADDECODER-NAME": "Navngiv payload decoder",
-        "GIVE-PAYLOADDECODER-NAME-PLACEHOLDER": "F.eks. kloak sensor decoder",
-        "GIVE-PAYLOADDECODER-DECODINGFUNCTION": "Payload decoder funktion",
-        "GIVE-PAYLOADDECODER-CHOOSE-APPLICATION": "Vælg applikation",
-        "GIVE-PAYLOADDECODER-CHOOSE-DEVICE": "Vælg enhed",
-        "GIVE-PAYLOADDECODER-PAYLOAD": "Test med den valgte enheds payload",
-        "GIVE-PAYLOADDECODER-METADATA": "Test med den valgte enheds metadata",
-        "GIVE-PAYLOADDECODER-TESTBUTTON": "Test din kode",
-        "GIVE-PAYLOADDECODER-OUTPUT": "Test preview af payload decoder Output",
-        "GIVE-PAYLOADDECODER-METADATA-PLACEHOLDER": "// Vælg applikation og enhed først for at \n// teste din decoder funktion med metadata",
-        "GIVE-PAYLOADDECODER-PAYLOAD-PLACEHOLDER": "// Vælg applikation og enhed først for at \n// teste din decoder funktion med payload data",
-        "GIVE-PAYLOADDECODER-METADATA-ERRORMESSAGE": "// Kan ikke finde noget metadata på den pågældende enhed. \n// Det kan enten skyldes at vi ikke har modtaget noget fra enheden eller der er ikke blevet tilknyttet en devicemodel til enheden",
-        "GIVE-PAYLOADDECODER-PAYLOAD-ERRORMESSAGE": "// Kan ikke finde noget payload på den pågældende enhed. \n// Det kan enten skyldes at vi ikke har modtaget noget fra enheden eller der er ikke blevet tilknyttet en devicemodel til enheden",
-        "GIVE-PAYLOADDECODER-OUTPUT-PLACEHOLDER": "// Tryk 'Test koden' for at decode payload og metadata",
-        "GIVE-PAYLOADDECODER-METADATA-INVALID-JSON": "Det angivne JSON var ikke gyldigt i feltet device metadata",
-        "GIVE-PAYLOADDECODER-PAYLOAD-INVALID-JSON": "Det angivne JSON var ikke gyldigt i feltet payload",
-        "GIVE-ORGANISATION-NAME": "Navngiv organisation",
-        "GIVE-ORGANISATION-NAME-PLACEHOLDER": "F.eks. 'Aarhus Kommune'",
-        "GIVE-MULTICAST-NAME": "Navngiv multicast",
-        "GIVE-MULTICAST-ADDRESS": "Angiv multicast adressen (mcAddr)",
-        "GIVE-MULTICAST-NETWORK-KEY": "Angiv multicast network session key (mcNwkSKey)",
-        "GIVE-MULTICAST-APPLICATION-KEY": "Angiv multicast application session key (mcAppSKey)",
-        "GIVE-MULTICAST-FRAMECOUNTER": "Angiv frame counter",
-        "GIVE-MULTICAST-DATARATE": "Angiv data rate",
-        "GIVE-MULTICAST-IOTDEVICES": "Angiv IoT-enheder",
-        "GIVE-MULTICAST-FREQUENCY": "Angiv frekvens (Hz)",
-        "GIVE-MULTICAST-GROUP-TYPE": "Angiv multicast gruppe type",
-        "GIVE-MULTICAST-PERIODICITY": "Angiv multicast ping-slot periodicitet",
-        "GIVE-MULTICAST-GROUPTYPE": "Angiv multicast gruppe typen",
-        "MULTICAST-NAME-PLACEHOLDER": "Multicastens navn",
-        "MULTICAST-ADDRESS-PLACEHOLDER": "Multicast adressen",
-        "MULTICAST-NETWORK-KEY-PLACEHOLDER": "Multicastens network session key",
-        "MULTICAST-APPLICATION-KEY-PLACEHOLDER": "Multicastens application session key",
-        "MULTICAST-GROUPTYPE-PLACEHOLDER": "Vælg multicast gruppe typen",
-        "MULTICAST-PERIODICITY-PLACEHOLDER": "Vælg Class-B ping periodiciteten",
-        "OTAAAPPLICATIONKEY": "OTAA application key (AppKey)",
-        "OTAAAPPLICATIONKEY-PLACEHOLDER": "Indtast OTAA application key",
-        "DEVADDR": "Device adress",
-        "DEVADDR-PLACEHOLDER": "Indtast device adress",
-        "NETWORKSESSIONKEY": "Networksessionkey",
-        "NETWORKSESSIONKEY-PLACEHOLDER": "Indtast network session key",
-        "APPLICATIONSESSIONKEY": "Applicationsessionkey",
-        "APPLICATIONSESSIONKEY-PLACEHOLDER": "Indtast application session key",
-        "FCNTUP": "fCntUp",
-        "FCNTUP-PLACEHOLDER": "Angiv upload framerate",
-        "NFCNTDOWN": "nfcntdown",
-        "NFCNTDOWN-PLACEHOLDER": "Angiv download framerate",
-        "DEVEUI": "Enheds EUI (DevEUI)",
-        "DEVEUI-PLACEHOLDER": "Angiv DevEUI (16 tegn)",
-        "SKIPFCNTCHECK": "SkipFCntCheck",
-        "SKIPFCNTCHECK-NO": "Nej",
-        "SKIPFCNTCHECK-YES": "Ja",
-        "OTAA": "Over The Air Activation",
-        "OTAA-ABP-CONFIG-HELP": "Du vælger din aktivation type via device profile",
-        "ABP": "Activation By Personalisation",
-        "CHOOSE-DEVICE": "Vælg device profile",
-        "OTAA-ACTIVATE": "Opret forbindelse vha. OTAA",
-        "ADD-RELATIONS": "Tilføj IoT enhed og payload decoder",
-        "METADATA": "Metadata",
-        "DATATARGET": {
-            "SELECT-PAYLOADDECODER": "Vælg payload decoder",
-            "NO-PAYLOAD-DECODER-SELECTED": "Ingen payload decoder valgt",
-            "SELECT-DEVICES": "Vælg enheder",
-            "SELECTALLDEVICES": "Vælg alle",
-            "DESELECTALLDEVICES": "Fravælg alle",
-            "RELATIONS": "*Efter oprettelse af dit data target parres dette med en/flere payload decoder(s) og IoT-devices",
-            "MQTT": {
-                "GIVE-URL": "Angiv datatargets broker URL",
-                "GIVE-URL-PLACEHOLDER": "https://min-mqtt-broker.dk",
-                "GIVE-PORT": "Angiv datatargets broker port",
-                "GIVE-PORT-PLACEHOLDER": "1883",
-                "GIVE-QOS": "Angiv hvilken QoS-niveau data skal sendes med",
-                "GIVE-QOS-PLACEHOLDER": "0, 1, 2",
-                "GIVE-QOS-INFO": "QoS (Quality of Service) fastlægger, hvor sikker leveringen af beskeden skal være. Der er tre muligheder: 0 (at most once), 1 (at least once) og 2 (exactly once)",
-                "GIVE-TOPIC": "Angiv hvilket topic på brokeren der skal sendes til",
-                "GIVE-TOPIC-PLACEHOLDER": "Topic på ekstern broker",
-                "GIVE-TOPIC-INFO": "Topic'et kan være givet af den udbyder, som data skal sendes til. Der kan ikke bruges wildcards",
-                "GIVE-AUTHENTICATION-METHOD": "Vælg autentificeringsmetode",
-                "USERNAME-PASSWORD": "Brugernavn og password",
-                "CERTIFICATE": "Certifikat",
-                "USERNAME": "Brugernavn",
-                "GIVE-USERNAME": "Angiv et brugernavn med adgang til brokeren og det valgte topic",
-                "PASSWORD": "Adgangskode",
-                "GIVE-PASSWORD": "Angiv adgangskoden"
-            }
-        },
-        "MULTICAST": {
-            "SELECT-DEVICES": "Vælg enheder",
-            "SELECTALLDEVICES": "Vælg alle",
-            "DESELECTALLDEVICES": "Fravælg alle",
-            "NO-PORT-OR-PAYLOAD": "Angiv en port og en payload",
-            "ONLY-LORAWAN": "* På nuværende tidspunkt er det kun muligt at tilknytte LoRaWAN devices.",
-            "HINT-8-HEXA": "8-tegns hexadecimal værdi",
-            "HINT-32-HEXA": "32-tegns hexadecimal værdi",
-            "HINT-DATA-RATE": "Data rate, der skal bruges ved overførsel af multicast-frames. Se venligst LoRaWAN Regional Parameters specifikationen for gyldige værdier",
-            "HINT-FREQUENCY": "Frekvensen, der skal bruges ved transmission af multicast-frames. Se venligst LoRaWAN Regional Parameters specifikationen for gyldige værdier"
-        },
-        "SIGFOX": {
-            "TITLE": "Sigfox specifikke felter",
-            "CONNECTTOEXISTINGDEVICEINBACKEND": "Er enheden allerede registreret i Sigfox backend?",
-            "GROUPID": "Vælg en Sigfox gruppe",
-            "DEVICEID": "Sigfox enhedsid",
-            "DEVICEID-PLACEHOLDER": "Enhedens unikke id",
-            "DEVICETYPEID": "Vælg en Sigfox enhedstype",
-            "DEVICETYPEID-PLACEHOLDER": "Enhedstype",
-            "PAC": "PAC",
-            "PAC-PLACEHOLDER": "Porting authorization code",
-            "ENDPRODUCTCERTIFICATE": "Produkt certifikat",
-            "ENDPRODUCTCERTIFICATE-PLACEHOLDER": "Produkt certifikat",
-            "ENDPRODUCTCERTIFICATE-HELP-TITLE": "Hjælp til at finde produkt certifikatet",
-            "ENDPRODUCTCERTIFICATE-HELP-TEXT": "Få hjælp til at finde produkt certifikatet ved at klikke her",
-            "DISCLAIMER": "Bemærk dit abonnement med Sigfox holdes ude af OS2iot og løber automatisk. Afmeld dit abonnement ved at registrere en unsubscribe date i Sigfox.",
-            "DISCLAIMER-CLICK": "Guide til unsubscripe",
-            "PROTOTYPE": "Aktiver som prototype",
-            "PROTOTYPE-TITLE": "Hvis enhedstypen endnu ikke har tildelt et produkt certifikat, kan enheden oprettes som en prototype",
-            "SELECTGROUPFIRST": "Du skal vælge en gruppe før du kan udfylde kontrakt og enhedstype",
-            "DEVICETYPE": {
-                "NAME": "Navngiv enhedstypen",
-                "NAME-PLACEHOLDER": "XC-123",
-                "ALERTEMAIL-PLACEHOLDER": "Jens@jensen.dk",
-                "ALERTEMAIL": "Angiv e-mail til brug i tilfælde af alarm fra Sigfox",
-                "DESCRIPTION": "Angiv beskrivelse",
-                "DESCRIPTION-PLACEHOLDER": "Lipsum larum",
-                "CHOOSE-GROUP": "Vælg en sigfoxgruppe",
-                "CHOOSE-CONTRACT": "Vælg en kontrakt"
-            }
-        },
-        "DEVICE-MODEL": {
-            "GIVE-NAME": "Angiv navn",
-            "GIVE-NAME-PLACEHOLDER": "F.eks. Elsys-tx3",
-            "GIVE-ID": "Angiv unik identifikator (id)",
-            "GIVE-ID-PLACEHOLDER": "Angiv id",
-            "GIVE-BRANDNAME": "Angiv mærket (brandName)",
-            "GIVE-BRANDNAME-PLACEHOLDER": "Angiv mærket",
-            "GIVE-MODELNAME": "Angiv model navnet (modelName)",
-            "GIVE-MODELNAME-PLACEHOLDER": "Angiv model navnet",
-            "GIVE-MANUFACTURERNAME": "Angiv producentens navn (manufacturerName)",
-            "GIVE-MANUFACTURERNAME-PLACEHOLDER": "Angiv producentens navn",
-            "SELECT-CONTROLLEDPROPERTY": "Vælg en eller flere kontrolegenskaber (controlledProperty)",
-            "SELECT-CATEGORY": "Vælg kategori (category)",
-            "SELECT-SUPPORTEDUNITS": "Vælg måleenheder (supportedUnits)",
-            "SELECT-DEVICEFUNCTIONS": "Vælg enhedsfunktioner (function)",
-            "SELECT-ENERGYLIMITATIONCLASS": "Vælg energibegrænsningsklassen (energyLimitationClass)",
-            "SELECT-SUPPORTEDPROTOCOL": "Vælg understøttede protokoller (supportedProtocol)",
-            "FIWARE-LINK-TEXT": "Denne data model er adopteret fra Fiware og følger ETSI standarden"
-        },
-        "PERMISSION": {
-            "SELECT-PERMISSION": "Vælg brugergruppe"
-        },
-        "APPLICATION": {
-            "NAME-PLACEHOLDER": "Navngiv applikationen",
-            "DESCRIPTION-PLACEHOLDER": "Lav kort beskrivelse af applikationen",
-            "START-DATE-PLACEHOLDER": "Angiv en startdato for applikationen",
-            "END-DATE-PLACEHOLDER": "Angiv en slutdato for applikationen",
-            "DATE-HINT": "Dato berører ikke funktionalitet i OS2IoT",
-            "CATEGORY-PLACEHOLDER": "Angiv den/de kategorier applikationen tilhører. Fx indeklima eller tracking",
-            "OWNER-PLACEHOLDER": "Angiv afdeling eller lignende, der ejer data",
-            "CONTACT-PERSON-PLACEHOLDER": "Angiv navn og eventuel afdeling på ansvarlig medarbejder",
-            "CONTACT-EMAIL-PLACEHOLDER": "Angiv mailadresse på ansvarlig medarbejder",
-            "CONTACT-PHONE-PLACEHOLDER": "Angiv telefonnummer på ansvarlig medarbejder",
-            "PERSONAL-DATA-PLACEHOLDER": "Markér, hvis data i applikationen indeholder personoplysninger. Berører ikke funktionalitet i OS2iot",
-            "HARDWARE-PLACEHOLDER": "Angiv hvad der bruges af sensorer/hardware, samt model",
-            "CONTROLLED-PROPERTY-PLACEHOLDER": "Angiv hvilke datatyper der opsamles",
-            "DEVICE-TYPE-PLACEHOLDER": "Angiv hvilke forbindelsesteknologier, der benyttes",
-            "PERMISSION-HINT": "Husk at alle med adgang til brugergruppen vil kunne se applikationen",
-            "ADD-PERMISSION": "Tilføj til brugergruppe"
-        },
-        "MQTT": {
-            "TITLE": "MQTT specifik opsætning",
-            "SUBTYPE": "Enhedstype",
-            "SUBTYPE-HOVER": "Med en MQTT internal broker-enhed kan du sende data til OS2iots interne MQTT-broker. Med en MQTT extern broker-enhed kan du modtage data i OS2iot fra en ekstern MQTT-broker.",
-            "MQTT_INTERNAL_BROKER": "Intern broker",
-            "MQTT_EXTERNAL_BROKER": "Ekstern broker",
-            "AUTHENTICATIONTYPE": "Autentifikation",
-            "USERNAME-PLACEHOLDER": "EtBrugernavn",
-            "PASSWORD-PLACEHOLDER": "EtKodeord",
-            "CERTIFICATE": "Certifikat",
-            "CERTIFICATE-PLACEHOLDER": "-----BEGIN CERTIFICATE-----",
-            "PASSWORD": "Brugernavn & kodeord",
-            "USERNAME-LABEL": "Brugernavn",
-            "USERNAME-HOVER": "Brugernavn som enheden sender med sine beskeder",
-            "PASSWORD-LABEL": "Kodeord",
-            "PASSWORD-HOVER": "Kodeordet som enheden sender med sine beskeder",
-            "BROKER-URL": "MQTT broker URL",
-            "BROKER-URL-PLACEHOLDER": "mqtts://someUrl",
-            "BROKER-PORT": "MQTT broker port",
-            "BROKER-PORT-PLACEHOLDER": "1883",
-            "TOPIC-PATH": "MQTT Topic",
-            "TOPIC-PATH-PLACEHOLDER": "some/topic/path",
-            "CA-CERTIFICATE": "CA Certifikat",
-            "CA-CERTIFICATE-HOVER": "Certifikatet som enhedens certifikat er lavet med",
-            "DEVICE-CERTIFICATE": "Enhedens certifikat",
-            "DEVICE-CERTIFICATE-HOVER": "Certifikatet som enheden har fået via CA'en",
-            "DEVICE-CERTIFICATE-KEY": "Enhedens certifikat nøgle",
-            "DEVICE-CERTIFICATE-KEY-PLACEHOLDER": "-----BEGIN PRIVATE KEY-----",
-            "CONFIG-HELP": "MQTT-specifikke oplysninger genereres automatisk og vises efter oprettelse af enheden",
-            "CERTIFICATE-OBS": "Der oprettes automatisk et certifikat, som skal benyttes sammen med brugernavn og kodeord for sikre forbindelsen mellem enheden og OS2iot."
-        }
-    },
-    "QUESTION-LORA-GATEWAY": {
-        "NAME": "Navngiv LoRaWAN gateway",
-        "NAME-PLACEHOLDER": "Navn på LoRaWAN gateway",
-        "DESCRIPTION": "LoRaWAN gateway beskrivelse",
-        "DESCRIPTION-PLACEHOLDER": "Beskrivelse af LoRaWAN gateway",
-        "GATEWAYID": "Gateway id (EUI)",
-        "GATEWAYID-PLACEHOLDER": "0000000000000000",
-        "METADATA": "Gateway tags",
-        "METADATA-PLACEHOLDER": "Angiv JSON her: {\"tagName\": \"tagValue\"}",
-        "ALTITUDE": "Højde",
-        "ALTITUDE-PLACEHOLDER": "00",
-        "LONGITUDE": "Længdegrad",
-        "LONGITUDE-PLACEHOLDER": "00",
-        "LATITUDE": "Breddegrad",
-        "LATITUDE-PLACEHOLDER": "00",
-        "MODEL-NAME": "Modelnavn",
-        "MODEL-NAME-PLACEHOLDER": "Angiv gateway-modellens navn",
-        "ANTENNA-TYPE": "Antennetype (dBi)",
-        "ANTENNA-TYPE-PLACEHOLDER": "Angiv antennens dBi",
-        "GATEWAY-RESPONSIBLE": "Gateway-ansvarlig",
-        "GATEWAY-RESPONSIBLE-PLACEHOLDER": "Angiv navn på ansvarlig for gateways i organisationen",
-        "GATEWAY-RESPONSIBLE-CONTACT": "Kontaktmail",
-        "GATEWAY-RESPONSIBLE-CONTACT-PLACEHOLDER": "Angiv mailadresse på gateway-ansvarlig",
-        "GATEWAY-RESPONSIBLE-CONTACT-NUMBER": "Kontakttelefon",
-        "GATEWAY-RESPONSIBLE-CONTACT-NUMBER-PLACEHOLDER": "Angiv telefonnummer på gateway-ansvarlig",
-        "OPERATION-RESPONSIBLE": "Driftsansvarlig",
-        "OPERATION-RESPONSIBLE-PLACEHOLDER": "Angiv ansvarlig for den fysiske drift af gateway",
-        "OPERATION-RESPONSIBLE-CONTACT": "Kontaktmail - drift",
-        "OPERATION-RESPONSIBLE-CONTACT-PLACEHOLDER": "Angiv mailadresse på driftsansvarlig"
+      "SELECT-PERMISSION": "Vælg brugergruppe"
     },
-    "SORT": {
-        "SORT": "Sortér",
-        "UPDATED-ASCENDING": "Senest opdateret: stigende",
-        "UPDATED-DESCENDING": "Senest opdateret: faldende",
-        "CREATED-ASCENDING": "Oprettet: stigende",
-        "CREATED-DESCENDING": "Oprettet: faldende",
-        "NAME-ASCENDING": "Navn: stigende",
-        "NAME-DESCENDING": "Navn: faldende",
-        "APPLICATION-ASCENDING": "Applikation: stigende",
-        "APPLICATION-DESCENDING": "Applikation: faldende",
-        "BATTERY-ASCENDING": "Batteri: stigende",
-        "BATTERY-DESCENDING": "Batteri: faldende",
-        "ACTIVE-ASCENDING": "Aktiv: sigende",
-        "ACTIVE-DESCENDING": "Aktiv: faldende"
-    },
-    "IOTDEVICE": {
-        "HEADING": {
-            "PROTOCOL": "Transmission protokol",
-            "BASIC": "Basis info",
-            "OPTIONAL": "Yderligere info"
-        },
-        "DOWNLINK": {
-            "TITLE": "Downlink",
-            "PAYLOAD": "Angiv det ønskede payload",
-            "PAYLOAD-PLACEHOLDER": "ADF12345",
-            "PORT": "Angiv den ønskede port",
-            "START": "Sæt downlink i kø",
-            "ERROR-SIGFOX-LENGTH": "Fejl i payload længde - payload må ikke overskride 16 karaktere",
-            "ERROR-FORMAT": "Fejl i formatet. Downlink skal være på hexidecimal format: a-f 0-9",
-            "DESCRIPTION": "Her kan du starte et downlink til din enhed",
-            "CONFIRMEDDOWNLINK": "Bekræft downlink",
-            "DIALOG-TITLE": "Downlink",
-            "DIALOG-MESSAGE": "Der ligger allerede et downlink i kø, vil du overskrive?",
-            "DIALOG-DECLINE": "Annuller",
-            "DIALOG-CONFIRM": "Ja, overskriv",
-            "NOTIMPLEMENTED": "Denne feature er endnu ikke implementeret for den pågældende enhedstype",
-            "NO-PORT-OR-PAYLOAD": "Angiv en port og en payload",
-            "NO-PAYLOAD": "Angiv en payload",
-            "SIGFOX-PAYLOAD-LENGTH": "Downlink payload til Sigfox skal være præcis 16 tegn (Hexadecimal)",
-            "FORMAT-ERROR": "Payload skal angives som Hexadecimal"
-        },
-        "CREATED": "Oprettet",
-        "UPDATED": "Senest opdateret",
-        "DATA-PACKETS": "Datapakker",
-        "DEVICEMODEL": "Device model",
-        "DEVICEMODEL-ERROR": "Der er ikke tilknyttet nogen device model endnu",
-        "DETAIL": "Detaljer",
-        "DOWNLINK-TAB": "Downlink",
-        "NAME": "Navn",
-        "TYPE": "Enhedstype",
-        "APPLICATION": "Applikation",
-        "LOCATION": "Placering",
-        "LONGITUDE": "Længdegrad",
-        "LATITUDE": "Breddegrad",
-        "COMMENTONLOCATION": "Beskrivelse af placeringen",
-        "COMMENT": "Kommentar: ",
-        "NOCOMMENT": "Ingen kommentar er angivet",
-        "NOLOCATION": "Ingen placering er angivet",
-        "NOCOMMENTONLOCATION": "Ingen beskrivelse af placeringen er angivet",
-        "GENERIC_HTTP": {
-            "APIKEY": "API kald",
-            "INSTRUCTIONS": "Du kalder denne url:",
-            "RESET-API-KEY": {
-                "BODY": "Advarsel! Nulstilling vil stoppe modtagelse af data på den eksisterende API nøgle. Vil du fortsætte?",
-                "YESRESET": "Nulstil"
-            }
-        },
-        "LORAWANSETUP": "LoRaWAN specifik opsætning",
-        "LATEST-DATAPACKAGE": "Seneste datapakke sendt fra enheden:",
-        "LATEST-DATAPACKAGES": "Seneste modtagelser af datapakker (nyeste først):",
-        "NO-DATAPACKAGE": "Der er ikke modtaget nogle datapakker",
-        "DATAPACKAGE": "Datapakke",
-        "LORA": {
-            "DEVEUI": "Enheds EUI (DevEUI)",
-            "DEVICEPROFILE": "Device profil",
-            "ACTIVATIONTYPE": "Aktivations type",
-            "OTAA": "OTAA",
-            "DEVADDR": "devADDR",
-            "NETWORKSESSIONKEY": "Netværks session key",
-            "APPLICATIONSESSIONKEY": "Applikation session key",
-            "SKIPFCNTCHECK": "skipfcntcheck",
-            "OTAAAPPLICATIONKEY": "OTAA application key (AppKey)",
-            "NFCNTDOWN": "nfcntdown",
-            "FCNTUP": "fcntup"
-        },
-        "SIGFOX": {
-            "GROUP-NAME": "Sigfox gruppe navn",
-            "PROTOTYPE": "Prototype",
-            "PAC": "PAC",
-            "ENDPRODUCTCERTIFICATE": "Produkt certifikat",
-            "DEVICETYPE": "Enhedstypen",
-            "DEVICEID": "EnhedsId"
-        },
-        "HISTORY": "Historik",
-        "HISTORY-TAB": {
-            "DATA-RATE": "Data rate",
-            "SNR": "SNR",
-            "RSSI": "RSSI",
-            "HISTORY-NOT-SUPPORTED": "Understøttes ikke af denne teknologi"
-        },
-        "MQTT": {
-            "URL": "URL",
-            "PORT": "Port",
-            "TOPIC_NAME": "Topic navn",
-            "CERTIFICATE": "Certifikat værdi",
-            "COPY-TO-CLIPBOARD": "Kopier",
-            "DOWNLOAD": "Download",
-            "NOCONNECTION": "Denne enhed kunne ikke forbinde til den eksterne broker. Ret indstillingerne til eller slet enheden."
-        }
+    "APPLICATION": {
+      "NAME-PLACEHOLDER": "Navngiv applikationen",
+      "DESCRIPTION-PLACEHOLDER": "Lav kort beskrivelse af applikationen",
+      "START-DATE-PLACEHOLDER": "Angiv en startdato for applikationen",
+      "END-DATE-PLACEHOLDER": "Angiv en slutdato for applikationen",
+      "DATE-HINT": "Dato berører ikke funktionalitet i OS2IoT",
+      "CATEGORY-PLACEHOLDER": "Angiv den/de kategorier applikationen tilhører. Fx indeklima eller tracking",
+      "OWNER-PLACEHOLDER": "Angiv afdeling eller lignende, der ejer data",
+      "CONTACT-PERSON-PLACEHOLDER": "Angiv navn og eventuel afdeling på ansvarlig medarbejder",
+      "CONTACT-EMAIL-PLACEHOLDER": "Angiv mailadresse på ansvarlig medarbejder",
+      "CONTACT-PHONE-PLACEHOLDER": "Angiv telefonnummer på ansvarlig medarbejder",
+      "PERSONAL-DATA-PLACEHOLDER": "Markér, hvis data i applikationen indeholder personoplysninger. Berører ikke funktionalitet i OS2iot",
+      "HARDWARE-PLACEHOLDER": "Angiv hvad der bruges af sensorer/hardware, samt model",
+      "CONTROLLED-PROPERTY-PLACEHOLDER": "Angiv hvilke datatyper der opsamles",
+      "DEVICE-TYPE-PLACEHOLDER": "Angiv hvilke forbindelsesteknologier, der benyttes",
+      "PERMISSION-HINT": "Husk at alle med adgang til brugergruppen vil kunne se applikationen",
+      "ADD-PERMISSION": "Tilføj til brugergruppe"
     },
-    "MESSAGE": {
-        "NAME-INVALID-OR-ALREADY-IN-USE": "Dette navn er allerede i brug",
-        "ORGANIZATION-ALREADY-EXISTS": "Navnet er forkert eller en organisation med det navn eksistere allerede",
-        "PASSWORD-DOES-NOT-MEET-REQUIREMENTS": "Password lever ikke op til kravene. Password skal minimum være 6 tegn",
-        "GROUP-CAN-ONLY-BE-CREATED-ONCE-PR-ORGANIZATION": "Der er allerede oprette forbindelse til denne Sigfox gruppe",
-        "SIGFOX-BAD-LOGIN": "Login fejlet: Forkert Sigfox login eller kode",
-        "DOWNLINK-LENGTH-WRONG-FOR-SIGFOX": "Angiv korrekt payload længde",
-        "ONLY-ALLOWED-FOR-LORAWAN": "Handlinger er kun tilladt for LoRaWAN enheder",
-        "DEVICE-IS-NOT-ACTIVATED-IN-CHIRPSTACK": "Enheden er ikke aktiveret i Chirpstack",
-        "IS-USED": "Profilen kan ikke slettes da den er i brug.",
-        "USER-ALREADY-EXISTS": "Brugeren findes allerede",
-        "ID-INVALID-OR-ALREADY-IN-USE": "Id skal være unikt. Det pågældende Id er allerede brug",
-        "DELETE-NOT-ALLOWED-ITEM-IS-IN-USE": "Dette element er i brug og kan derfor ikke slettes",
-        "DELETE-NOT-ALLOWED-HAS-SIGFOX-DEVICE": "Applikation kan ikke blive slettet, da den indeholder en eller flere Sigfox enheder.",
-        "DELETE-NOT-ALLOWED-HAS-LORAWAN-DEVICE": "Device profilen kan ikke blive slettet, da den er i brug af en eller flere LoRaWAN enheder.",
-        "OTAA-INFO-MISSING": "OTAA nøgle mangler eller er ikke gyldig.",
-        "ABP-INFO-MISSING": "ABP nøgle mangler eller er ikke gyldig.",
-        "DIFFERENT-CREATION-SERVICE-PROFILE": "Dine devices har ved oprettelse haft forskellige service profiles. De skal have haft den samme service profile ved oprettelse!",
-        "WRONG-SERVICE-PROFILE": "Dine devices har forkert service profile. Vælg devices som har samme service profile som din multicast.",
-        "ID-DOES-NOT-EXIST": "Id'et findes ikke",
-        "APPLICATION-DOES-NOT-EXIST": "Den tilhørende applikation findes ikke",
-        "FAILED-TO-CREATE-OR-UPDATE-IOT-DEVICE": "Enheden kunne ikke oprettes eller opdateres",
-        "DEVICE-MODEL-ORGANIZATION-DOES-NOT-MATCH": "Organisationsid'et på device modellen matcher ikke den tilhørende applikation",
-        "DEVICE-MODEL-DOES-NOT-EXIST": "Device model findes ikke",
-        "DUPLICATE-PERMISSION-TYPES": "Den samme rettighed må ikke optræde flere gange",
-        "DUPLICATE-METADATA-KEY": "Metadata må ikke indeholde den samme nøgle flere gange",
-        "INVALID-KEY-IN-KEY-VALUE-PAIR": "En eller flere nøgler er ugyldige. Det skal være en gyldig tekstværdi",
-        "INVALID-VALUE-IN-KEY-VALUE-PAIR": "En eller flere værdier er ugyldige. Det skal være en gyldig tekstværdi",
-        "INVALID-DATE": "Datoen er ugyldig",
-        "USER-ALREADY-HAVE-MAIL": "Brugeren har allerede sat en email",
-        "EMAIL-ALREADY-IN-USE": "Den valgte email er allerede i brug. Kontakt din lokale administrator for hjælp."
+    "MQTT": {
+      "TITLE": "MQTT specifik opsætning",
+      "SUBTYPE": "Enhedstype",
+      "SUBTYPE-HOVER": "Med en MQTT internal broker-enhed kan du sende data til OS2iots interne MQTT-broker. Med en MQTT extern broker-enhed kan du modtage data i OS2iot fra en ekstern MQTT-broker.",
+      "MQTT_INTERNAL_BROKER": "Intern broker",
+      "MQTT_EXTERNAL_BROKER": "Ekstern broker",
+      "AUTHENTICATIONTYPE": "Autentifikation",
+      "USERNAME-PLACEHOLDER": "EtBrugernavn",
+      "PASSWORD-PLACEHOLDER": "EtKodeord",
+      "CERTIFICATE": "Certifikat",
+      "CERTIFICATE-PLACEHOLDER": "-----BEGIN CERTIFICATE-----",
+      "PASSWORD": "Brugernavn & kodeord",
+      "USERNAME-LABEL": "Brugernavn",
+      "USERNAME-HOVER": "Brugernavn som enheden sender med sine beskeder",
+      "PASSWORD-LABEL": "Kodeord",
+      "PASSWORD-HOVER": "Kodeordet som enheden sender med sine beskeder",
+      "BROKER-URL": "MQTT broker URL",
+      "BROKER-URL-PLACEHOLDER": "mqtts://someUrl",
+      "BROKER-PORT": "MQTT broker port",
+      "BROKER-PORT-PLACEHOLDER": "1883",
+      "TOPIC-PATH": "MQTT Topic",
+      "TOPIC-PATH-PLACEHOLDER": "some/topic/path",
+      "CA-CERTIFICATE": "CA Certifikat",
+      "CA-CERTIFICATE-HOVER": "Certifikatet som enhedens certifikat er lavet med",
+      "DEVICE-CERTIFICATE": "Enhedens certifikat",
+      "DEVICE-CERTIFICATE-HOVER": "Certifikatet som enheden har fået via CA'en",
+      "DEVICE-CERTIFICATE-KEY": "Enhedens certifikat nøgle",
+      "DEVICE-CERTIFICATE-KEY-PLACEHOLDER": "-----BEGIN PRIVATE KEY-----",
+      "CONFIG-HELP": "MQTT-specifikke oplysninger genereres automatisk og vises efter oprettelse af enheden",
+      "CERTIFICATE-OBS": "Der oprettes automatisk et certifikat, som skal benyttes sammen med brugernavn og kodeord for sikre forbindelsen mellem enheden og OS2iot."
+    }
+  },
+  "QUESTION-LORA-GATEWAY": {
+    "NAME": "Navngiv LoRaWAN gateway",
+    "NAME-PLACEHOLDER": "Navn på LoRaWAN gateway",
+    "DESCRIPTION": "LoRaWAN gateway beskrivelse",
+    "DESCRIPTION-PLACEHOLDER": "Beskrivelse af LoRaWAN gateway",
+    "GATEWAYID": "Gateway id (EUI)",
+    "GATEWAYID-PLACEHOLDER": "0000000000000000",
+    "METADATA": "Gateway tags",
+    "METADATA-PLACEHOLDER": "Angiv JSON her: {\"tagName\": \"tagValue\"}",
+    "ALTITUDE": "Højde",
+    "ALTITUDE-PLACEHOLDER": "00",
+    "LONGITUDE": "Længdegrad",
+    "LONGITUDE-PLACEHOLDER": "00",
+    "LATITUDE": "Breddegrad",
+    "LATITUDE-PLACEHOLDER": "00",
+    "MODEL-NAME": "Modelnavn",
+    "MODEL-NAME-PLACEHOLDER": "Angiv gateway-modellens navn",
+    "ANTENNA-TYPE": "Antennetype (dBi)",
+    "ANTENNA-TYPE-PLACEHOLDER": "Angiv antennens dBi",
+    "GATEWAY-RESPONSIBLE": "Gateway-ansvarlig",
+    "GATEWAY-RESPONSIBLE-PLACEHOLDER": "Angiv navn på ansvarlig for gateways i organisationen",
+    "GATEWAY-RESPONSIBLE-CONTACT": "Kontaktmail",
+    "GATEWAY-RESPONSIBLE-CONTACT-PLACEHOLDER": "Angiv mailadresse på gateway-ansvarlig",
+    "GATEWAY-RESPONSIBLE-CONTACT-NUMBER": "Kontakttelefon",
+    "GATEWAY-RESPONSIBLE-CONTACT-NUMBER-PLACEHOLDER": "Angiv telefonnummer på gateway-ansvarlig",
+    "OPERATION-RESPONSIBLE": "Driftsansvarlig",
+    "OPERATION-RESPONSIBLE-PLACEHOLDER": "Angiv ansvarlig for den fysiske drift af gateway",
+    "OPERATION-RESPONSIBLE-CONTACT": "Kontaktmail - drift",
+    "OPERATION-RESPONSIBLE-CONTACT-PLACEHOLDER": "Angiv mailadresse på driftsansvarlig"
+  },
+  "SORT": {
+    "SORT": "Sortér",
+    "UPDATED-ASCENDING": "Senest opdateret: stigende",
+    "UPDATED-DESCENDING": "Senest opdateret: faldende",
+    "CREATED-ASCENDING": "Oprettet: stigende",
+    "CREATED-DESCENDING": "Oprettet: faldende",
+    "NAME-ASCENDING": "Navn: stigende",
+    "NAME-DESCENDING": "Navn: faldende",
+    "APPLICATION-ASCENDING": "Applikation: stigende",
+    "APPLICATION-DESCENDING": "Applikation: faldende",
+    "BATTERY-ASCENDING": "Batteri: stigende",
+    "BATTERY-DESCENDING": "Batteri: faldende",
+    "ACTIVE-ASCENDING": "Aktiv: sigende",
+    "ACTIVE-DESCENDING": "Aktiv: faldende"
+  },
+  "IOTDEVICE": {
+    "HEADING": {
+      "PROTOCOL": "Transmission protokol",
+      "BASIC": "Basis info",
+      "OPTIONAL": "Yderligere info"
     },
-    "PROFILES": {
-        "NAME": "LoRaWAN profiler",
-        "DELETE-FAILED": "Slet fejlede",
-        "DEVICE_PROFILE": {
-            "CREATED": "Oprettet",
-            "UPDATED": "Senest opdateret",
-            "DETAILS": "Detaljer",
-            "DELETE-FROM-LIST": "Slet",
-            "HEADLINE": "Device profiler",
-            "DROPDOWN": "Håndter device profil",
-            "CREATE-NEW-DEVICE-PROFILE": "Opret device profile",
-            "EDIT": "Rediger profil",
-            "DELETE": "Slet profil",
-            "NAME": "Device profil navn",
-            "NAME_PLACEHOLDER": "Device profil navn",
-            "MACVERSION": "LoRaWAN MAC version ",
-            "ADRALGORITHM": "ADR algoritme ",
-            "DEVSTATUSREQFREQ": "Device-status request frequency (req/day)",
-            "REGPARAMSREVISION": "LoRaWAN regional parameters revision ",
-            "MAXEIRP": "Max EIRP ",
-            "GEOLOCBUFFERTTL": "Geolocation buffer TTL (seconds)",
-            "GEOLOCMINBUFFERSIZE": "Geolocation minimum buffer size",
-            "OTAA-ACTIVATE": "Device supports OTAA",
-            "RXDELAY1": "RX1 delay ",
-            "RXDROFFSET1": "RX1 data-rate offset",
-            "RXDATARATE2": "RX2 data-rate",
-            "RXFREQ2": "RX2 channel frequency (Hz)",
-            "FACTORYPRESETFREQS": "Factory-preset frequencies (Hz)",
-            "FACTORYPRESETFREQS_PLACEHOLDER": "Factory-preset frequencies (Hz)",
-            "SUPPORTSCLASSB_ACTIVATE": "Device supports Class-B",
-            "CLASSBTIMEOUT": "Class B confirmed downlink timeout",
-            "PINGSLOTPERIOD": "Class-B ping-slot periodicity",
-            "PINGSLOTDR": "Class-B ping-slot data-rate",
-            "PINGSLOTFREQ": "Class-B ping-slot frequency",
-            "SUPPORTSCLASSC_ACTIVATE": "Device supports Class-C",
-            "CLASSCTIMEOUT": "Class C confirmed downlink timeout",
-            "CANCEL": "Annuller",
-            "SAVE": "Gem",
-            "OTAA-ABP": "Join (OTAA / ABP)",
-            "MACVERSION_PLACEHOLDER": "1.0.0",
-            "MAXEIRP_PLACEHOLDER": "0",
-            "GEOLOCBUFFERTTL_PLACEHOLDER": "0",
-            "GEOLOCMINBUFFERSIZE_PLACEHOLDER": "0",
-            "DEVSTATUSREQFREQ_PLACEHOLDER": "1",
-            "RXDROFFSET1_PLACEHOLDER": "0",
-            "RXDATARATE2_PLACEHOLDER": "0",
-            "RXFREQ2_PLACEHOLDER": "0",
-            "CLASSBTIMEOUT_PLACEHOLDER": "0",
-            "PINGSLOTDR_PLACEHOLDER": "0",
-            "PINGSLOTFREQ_PLACEHOLDER": "0",
-            "CLASSCTIMEOUT_PLACEHOLDER": "0",
-            "ID": "Device profilens id",
-            "ORGANIZATION": "Organisation"
-        }
+    "DOWNLINK": {
+      "TITLE": "Downlink",
+      "PAYLOAD": "Angiv det ønskede payload",
+      "PAYLOAD-PLACEHOLDER": "ADF12345",
+      "PORT": "Angiv den ønskede port",
+      "START": "Sæt downlink i kø",
+      "ERROR-SIGFOX-LENGTH": "Fejl i payload længde - payload må ikke overskride 16 karaktere",
+      "ERROR-FORMAT": "Fejl i formatet. Downlink skal være på hexidecimal format: a-f 0-9",
+      "DESCRIPTION": "Her kan du starte et downlink til din enhed",
+      "CONFIRMEDDOWNLINK": "Bekræft downlink",
+      "DIALOG-TITLE": "Downlink",
+      "DIALOG-MESSAGE": "Der ligger allerede et downlink i kø, vil du overskrive?",
+      "DIALOG-DECLINE": "Annuller",
+      "DIALOG-CONFIRM": "Ja, overskriv",
+      "NOTIMPLEMENTED": "Denne feature er endnu ikke implementeret for den pågældende enhedstype",
+      "NO-PORT-OR-PAYLOAD": "Angiv en port og en payload",
+      "NO-PAYLOAD": "Angiv en payload",
+      "SIGFOX-PAYLOAD-LENGTH": "Downlink payload til Sigfox skal være præcis 16 tegn (Hexadecimal)",
+      "FORMAT-ERROR": "Payload skal angives som Hexadecimal"
     },
-    "USERS": {
-        "AWAITING-USERS": "Afventende brugere",
-        "EXISTING-USERS": "Tilknyttede brugere",
-        "SAVE": "Gem",
-        "NAME": "Navn",
-        "EMAIL": "Email",
-        "GLOBALADMIN": "Global administrator",
-        "STATUS": "Status",
-        "LASTLOG": "Sidste login",
-        "EDIT": "Redigér User",
-        "CREATE": "Opret ny bruger",
-        "LOGIN": "Sidst aktiv",
-        "DIALOG": {
-            "QUESTION-REJECT": "Er du sikker på, at du vil afvise brugeren?",
-            "HEAD-REJECT": "Afvis bruger"
-        },
-        "TABLE-ROW": {
-            "EDIT": "Redigér",
-            "DELETE": "Slet",
-            "APPROVE": "Godkend",
-            "REJECT": "Afvis"
-        },
-        "FORM": {
-            "NAME": "Indtast det fulde navn på brugeren",
-            "NAME-PLACEHOLDER": "Navn",
-            "EMAIL": "Indtast Email addressen til brugeren",
-            "EMAIL-PLACEHOLDER": "Email",
-            "PASSWORD": "Password",
-            "PASSWORD-PLACEHOLDER": "Indtast eller redigér password",
-            "ACTIVE": "Aktiveret",
-            "GLOBAL-ADMIN": "Skal den nye bruger være global administrator?",
-            "SAVE": "Gem Bruger"
-        },
-        "DETAIL": {
-            "DROPDOWN": "Håndter Bruger",
-            "LAST-LOGIN": "Sidste login ",
-            "NO-LOGIN": "Ikke logget på endnu",
-            "ADDED-DATE": "Oprettet den: ",
-            "GLOBALADMIN": "Global Administrator ",
-            "PERMISSIONS": "Medlem af disse brugergrupper",
-            "APPLICATIONS": "Rettigheder til disse applikationer",
-            "NAME-PLACEHOLDER": "Navn",
-            "EMAIL": "Email",
-            "CREATED": "Oprettet",
-            "UPDATED": "Senest opdateret",
-            "STATUS": "Status",
-            "HEADLINE": "Detaljer"
-        },
-        "GLOBAL_ADMIN": {
-            "TRUE": "Ja",
-            "FALSE": "Nej"
-        },
-        "ACCEPT-USER": {
-            "ACCEPT": "Godkend bruger",
-            "QUESTION-ACCEPT": "Vælg brugergruppe til ",
-            "IN-ORGANIZATION": "i organisationen "
-        }
+    "CREATED": "Oprettet",
+    "UPDATED": "Senest opdateret",
+    "DATA-PACKETS": "Datapakker",
+    "DEVICEMODEL": "Device model",
+    "DEVICEMODEL-ERROR": "Der er ikke tilknyttet nogen device model endnu",
+    "DETAIL": "Detaljer",
+    "DOWNLINK-TAB": "Downlink",
+    "NAME": "Navn",
+    "TYPE": "Enhedstype",
+    "APPLICATION": "Applikation",
+    "LOCATION": "Placering",
+    "LONGITUDE": "Længdegrad",
+    "LATITUDE": "Breddegrad",
+    "COMMENTONLOCATION": "Beskrivelse af placeringen",
+    "COMMENT": "Kommentar: ",
+    "NOCOMMENT": "Ingen kommentar er angivet",
+    "NOLOCATION": "Ingen placering er angivet",
+    "NOCOMMENTONLOCATION": "Ingen beskrivelse af placeringen er angivet",
+    "GENERIC_HTTP": {
+      "APIKEY": "API kald",
+      "INSTRUCTIONS": "Du kalder denne url:",
+      "RESET-API-KEY": {
+        "BODY": "Advarsel! Nulstilling vil stoppe modtagelse af data på den eksisterende API nøgle. Vil du fortsætte?",
+        "YESRESET": "Nulstil"
+      }
     },
-    "AUTH": {
-        "EMAIL": "Email",
-        "PASSWORD": "Adgangskode",
-        "KOMBIT-BUTTON": "Login med KOMBIT adgangsstyring"
+    "LORAWANSETUP": "LoRaWAN specifik opsætning",
+    "LATEST-DATAPACKAGE": "Seneste datapakke sendt fra enheden:",
+    "LATEST-DATAPACKAGES": "Seneste modtagelser af datapakker (nyeste først):",
+    "NO-DATAPACKAGE": "Der er ikke modtaget nogle datapakker",
+    "DATAPACKAGE": "Datapakke",
+    "LORA": {
+      "DEVEUI": "Enheds EUI (DevEUI)",
+      "DEVICEPROFILE": "Device profil",
+      "ACTIVATIONTYPE": "Aktivations type",
+      "OTAA": "OTAA",
+      "DEVADDR": "devADDR",
+      "NETWORKSESSIONKEY": "Netværks session key",
+      "APPLICATIONSESSIONKEY": "Applikation session key",
+      "SKIPFCNTCHECK": "skipfcntcheck",
+      "OTAAAPPLICATIONKEY": "OTAA application key (AppKey)",
+      "NFCNTDOWN": "nfcntdown",
+      "FCNTUP": "fcntup"
     },
-    "WELCOME-DIALOG": {
-        "WELCOME": "VELKOMMEN TIL OS2iot",
-        "WELCOME-SUB": " Din indgang til administration af IoT enheder",
-        "LINK-1": "OS2iot's brugerforum",
-        "LINK-2": "produktsiden",
-        "LINK-3": "Github",
-        "SUB-HEADER-1": "Brugerforum",
-        "SUB-HEADER-2": "Om OS2iot",
-        "WELCOME-MESSAGE": "Bliv en aktiv del af ",
-        "WELCOME-MESSAGE-2": ". Her kan du stille spørgsmål, indrapportere fejl og dele dine udviklingsønsker. Ved fælles hjælp bliver løsningen bedre.",
-        "WELCOME-MESSAGE-3": "OS2iot er en open source løsning organiseret igennem OS2-fællesskabet. Du kan finde mere information om OS2iot på ",
-        "WELCOME-MESSAGE-4": " og følge udviklingen på ",
-        "NO-ACCESS": "Du har endnu ikke de fornødne rettigheder i OS2iot. Anmod om adgang til en organisation for at få tildelt rettigheder af din administrator.",
-        "NO-JOB-ACCESS": "Du har ikke passende jobfunktionsrolle, og har derfor ikke adgang til OS2IoT.",
-        "KOMBIT-LOGIN-ERROR": "Der skete en fejl ved login via KOMBIT adgangsstyring. Prøv igen senere.",
-        "USER-INACTIVE": "Login successfuldt, men din bruger er deaktiveret i OS2IoT. Kontakt din administrator for at få tildelt rettigheder"
+    "SIGFOX": {
+      "GROUP-NAME": "Sigfox gruppe navn",
+      "PROTOTYPE": "Prototype",
+      "PAC": "PAC",
+      "ENDPRODUCTCERTIFICATE": "Produkt certifikat",
+      "DEVICETYPE": "Enhedstypen",
+      "DEVICEID": "EnhedsId"
     },
-    "ERROR": {
-        "SEMANTIC": "Semantisk fejl, verificer at navn og værdier er på det rigtige format"
+    "HISTORY": "Historik",
+    "HISTORY-TAB": {
+      "DATA-RATE": "Data rate",
+      "SNR": "SNR",
+      "RSSI": "RSSI",
+      "HISTORY-NOT-SUPPORTED": "Understøttes ikke af denne teknologi"
     },
+    "MQTT": {
+      "URL": "URL",
+      "PORT": "Port",
+      "TOPIC_NAME": "Topic navn",
+      "CERTIFICATE": "Certifikat værdi",
+      "COPY-TO-CLIPBOARD": "Kopier",
+      "DOWNLOAD": "Download",
+      "NOCONNECTION": "Denne enhed kunne ikke forbinde til den eksterne broker. Ret indstillingerne til eller slet enheden."
+    }
+  },
+  "MESSAGE": {
+    "NAME-INVALID-OR-ALREADY-IN-USE": "Dette navn er allerede i brug",
+    "ORGANIZATION-ALREADY-EXISTS": "Navnet er forkert eller en organisation med det navn eksistere allerede",
+    "PASSWORD-DOES-NOT-MEET-REQUIREMENTS": "Password lever ikke op til kravene. Password skal minimum være 6 tegn",
+    "GROUP-CAN-ONLY-BE-CREATED-ONCE-PR-ORGANIZATION": "Der er allerede oprette forbindelse til denne Sigfox gruppe",
+    "SIGFOX-BAD-LOGIN": "Login fejlet: Forkert Sigfox login eller kode",
+    "DOWNLINK-LENGTH-WRONG-FOR-SIGFOX": "Angiv korrekt payload længde",
+    "ONLY-ALLOWED-FOR-LORAWAN": "Handlinger er kun tilladt for LoRaWAN enheder",
+    "DEVICE-IS-NOT-ACTIVATED-IN-CHIRPSTACK": "Enheden er ikke aktiveret i Chirpstack",
+    "IS-USED": "Profilen kan ikke slettes da den er i brug.",
+    "USER-ALREADY-EXISTS": "Brugeren findes allerede",
+    "ID-INVALID-OR-ALREADY-IN-USE": "Id skal være unikt. Det pågældende Id er allerede brug",
+    "DELETE-NOT-ALLOWED-ITEM-IS-IN-USE": "Dette element er i brug og kan derfor ikke slettes",
+    "DELETE-NOT-ALLOWED-HAS-SIGFOX-DEVICE": "Applikation kan ikke blive slettet, da den indeholder en eller flere Sigfox enheder.",
+    "DELETE-NOT-ALLOWED-HAS-LORAWAN-DEVICE": "Device profilen kan ikke blive slettet, da den er i brug af en eller flere LoRaWAN enheder.",
+    "OTAA-INFO-MISSING": "OTAA nøgle mangler eller er ikke gyldig.",
+    "ABP-INFO-MISSING": "ABP nøgle mangler eller er ikke gyldig.",
+    "DIFFERENT-CREATION-SERVICE-PROFILE": "Dine devices har ved oprettelse haft forskellige service profiles. De skal have haft den samme service profile ved oprettelse!",
+    "WRONG-SERVICE-PROFILE": "Dine devices har forkert service profile. Vælg devices som har samme service profile som din multicast.",
+    "ID-DOES-NOT-EXIST": "Id'et findes ikke",
+    "APPLICATION-DOES-NOT-EXIST": "Den tilhørende applikation findes ikke",
+    "FAILED-TO-CREATE-OR-UPDATE-IOT-DEVICE": "Enheden kunne ikke oprettes eller opdateres",
+    "DEVICE-MODEL-ORGANIZATION-DOES-NOT-MATCH": "Organisationsid'et på device modellen matcher ikke den tilhørende applikation",
+    "DEVICE-MODEL-DOES-NOT-EXIST": "Device model findes ikke",
+    "DUPLICATE-PERMISSION-TYPES": "Den samme rettighed må ikke optræde flere gange",
+    "DUPLICATE-METADATA-KEY": "Metadata må ikke indeholde den samme nøgle flere gange",
+    "INVALID-KEY-IN-KEY-VALUE-PAIR": "En eller flere nøgler er ugyldige. Det skal være en gyldig tekstværdi",
+    "INVALID-VALUE-IN-KEY-VALUE-PAIR": "En eller flere værdier er ugyldige. Det skal være en gyldig tekstværdi",
+    "INVALID-DATE": "Datoen er ugyldig",
+    "USER-ALREADY-HAVE-MAIL": "Brugeren har allerede sat en email",
+    "EMAIL-ALREADY-IN-USE": "Den valgte email er allerede i brug. Kontakt din lokale administrator for hjælp."
+  },
+  "PROFILES": {
+    "NAME": "LoRaWAN profiler",
+    "DELETE-FAILED": "Slet fejlede",
+    "DEVICE_PROFILE": {
+      "CREATED": "Oprettet",
+      "UPDATED": "Senest opdateret",
+      "DETAILS": "Detaljer",
+      "DELETE-FROM-LIST": "Slet",
+      "HEADLINE": "Device profiler",
+      "DROPDOWN": "Håndter device profil",
+      "CREATE-NEW-DEVICE-PROFILE": "Opret device profile",
+      "EDIT": "Rediger profil",
+      "DELETE": "Slet profil",
+      "NAME": "Device profil navn",
+      "NAME_PLACEHOLDER": "Device profil navn",
+      "MACVERSION": "LoRaWAN MAC version ",
+      "ADRALGORITHM": "ADR algoritme ",
+      "DEVSTATUSREQFREQ": "Device-status request frequency (req/day)",
+      "REGPARAMSREVISION": "LoRaWAN regional parameters revision ",
+      "MAXEIRP": "Max EIRP ",
+      "GEOLOCBUFFERTTL": "Geolocation buffer TTL (seconds)",
+      "GEOLOCMINBUFFERSIZE": "Geolocation minimum buffer size",
+      "OTAA-ACTIVATE": "Device supports OTAA",
+      "RXDELAY1": "RX1 delay ",
+      "RXDROFFSET1": "RX1 data-rate offset",
+      "RXDATARATE2": "RX2 data-rate",
+      "RXFREQ2": "RX2 channel frequency (Hz)",
+      "FACTORYPRESETFREQS": "Factory-preset frequencies (Hz)",
+      "FACTORYPRESETFREQS_PLACEHOLDER": "Factory-preset frequencies (Hz)",
+      "SUPPORTSCLASSB_ACTIVATE": "Device supports Class-B",
+      "CLASSBTIMEOUT": "Class B confirmed downlink timeout",
+      "PINGSLOTPERIOD": "Class-B ping-slot periodicity",
+      "PINGSLOTDR": "Class-B ping-slot data-rate",
+      "PINGSLOTFREQ": "Class-B ping-slot frequency",
+      "SUPPORTSCLASSC_ACTIVATE": "Device supports Class-C",
+      "CLASSCTIMEOUT": "Class C confirmed downlink timeout",
+      "CANCEL": "Annuller",
+      "SAVE": "Gem",
+      "OTAA-ABP": "Join (OTAA / ABP)",
+      "MACVERSION_PLACEHOLDER": "1.0.0",
+      "MAXEIRP_PLACEHOLDER": "0",
+      "GEOLOCBUFFERTTL_PLACEHOLDER": "0",
+      "GEOLOCMINBUFFERSIZE_PLACEHOLDER": "0",
+      "DEVSTATUSREQFREQ_PLACEHOLDER": "1",
+      "RXDROFFSET1_PLACEHOLDER": "0",
+      "RXDATARATE2_PLACEHOLDER": "0",
+      "RXFREQ2_PLACEHOLDER": "0",
+      "CLASSBTIMEOUT_PLACEHOLDER": "0",
+      "PINGSLOTDR_PLACEHOLDER": "0",
+      "PINGSLOTFREQ_PLACEHOLDER": "0",
+      "CLASSCTIMEOUT_PLACEHOLDER": "0",
+      "ID": "Device profilens id",
+      "ORGANIZATION": "Organisation"
+    }
+  },
+  "USERS": {
+    "AWAITING-USERS": "Afventende brugere",
+    "EXISTING-USERS": "Tilknyttede brugere",
+    "SAVE": "Gem",
+    "NAME": "Navn",
+    "EMAIL": "Email",
+    "GLOBALADMIN": "Global administrator",
+    "STATUS": "Status",
+    "LASTLOG": "Sidste login",
+    "EDIT": "Redigér User",
+    "CREATE": "Opret ny bruger",
+    "LOGIN": "Sidst aktiv",
     "DIALOG": {
-        "SAVE.TITLE": "Slet",
-        "DELETE.MESSAGE": "Vil du slette?",
-        "DELETE.ARE-YOU-SURE": "Er du sikker på, at du vil slette?",
-        "CLOSE": "Annuller",
-        "OK": "Ok",
-        "DIALOG-CONFIRM": "Ja, slet",
-        "DIALOG-REJECT": "Ja, afvis",
-        "OPENDATADK": {
-            "OK": "Send mail til OpenDataDk",
-            "CLOSE": "Nej, tak",
-            "TITLE": "Vil du sende data til OpenDataDK?",
-            "MESSAGE": "Send en mail til OpendataDK så opretter de dit datasæt"
-        },
-        "WELCOME": {
-            "DONT-SHOW-AGAIN": "Vis ikke igen"
-        },
-        "EXPORT-CSV": {
-            "TITLE": "Eksportér metadata",
-            "BODY": "Igangsæt eksport af metadata om alle IoT-enheder i denne applikation i en CSV-fil?"
-        }
+      "QUESTION-REJECT": "Er du sikker på, at du vil afvise brugeren?",
+      "HEAD-REJECT": "Afvis bruger"
     },
-    "BATTERY": {
-        "NOT_AVAILABLE": "N/A"
+    "TABLE-ROW": {
+      "EDIT": "Redigér",
+      "DELETE": "Slet",
+      "APPROVE": "Godkend",
+      "REJECT": "Afvis"
     },
-    "TITLE": {
-        "APPLICATION": "OS2IoT - Applikationer",
-        "SIGFOX": "OS2IoT - Sigfox administration",
-        "DEVICEMODEL": "OS2IoT - Device model",
-        "LORAWAN-GATEWAY": "OS2IoT - LoRaWAN gateways",
-        "LORAWAN-PROFILE": "OS2IoT - LoRaWAN profiler",
-        "PAYLOADDECODER": "OS2IoT - Payload decoder",
-        "USER": "OS2IoT - Brugere",
-        "PERMISSION": "OS2IoT - Brugergrupper",
-        "ORGANIZATION": "OS2IoT - Organisationer",
-        "DATATARGET": "OS2IoT - Datatarget",
-        "MULTICAST": "OS2IoT - Multicast",
-        "BULKIMPORT": "OS2IoT - Bulk import",
-        "IOTDEVICE": "OS2IoT - IoT enhed",
-        "FRONTPAGE": "OS2IoT - Forside",
-        "API-KEY": "OS2IoT - API nøgler"
+    "FORM": {
+      "NAME": "Indtast det fulde navn på brugeren",
+      "NAME-PLACEHOLDER": "Navn",
+      "EMAIL": "Indtast Email addressen til brugeren",
+      "EMAIL-PLACEHOLDER": "Email",
+      "PASSWORD": "Password",
+      "PASSWORD-PLACEHOLDER": "Indtast eller redigér password",
+      "ACTIVE": "Aktiveret",
+      "GLOBAL-ADMIN": "Skal den nye bruger være global administrator?",
+      "SAVE": "Gem Bruger"
     },
-    "PAGINATOR": {
-        "ITEM_PER_PAGE": "Antal pr. side",
-        "NEXT_PAGE": "Næste side",
-        "PREVIOUS_PAGE": "Forrige side",
-        "FIRST_PAGE": "Første side",
-        "LAST_PAGE": "Sidste side",
-        "OF": "af"
+    "DETAIL": {
+      "DROPDOWN": "Håndter Bruger",
+      "LAST-LOGIN": "Sidste login ",
+      "NO-LOGIN": "Ikke logget på endnu",
+      "ADDED-DATE": "Oprettet den: ",
+      "GLOBALADMIN": "Global Administrator ",
+      "PERMISSIONS": "Medlem af disse brugergrupper",
+      "APPLICATIONS": "Rettigheder til disse applikationer",
+      "NAME-PLACEHOLDER": "Navn",
+      "EMAIL": "Email",
+      "CREATED": "Oprettet",
+      "UPDATED": "Senest opdateret",
+      "STATUS": "Status",
+      "HEADLINE": "Detaljer"
     },
-    "NEW_USER": {
-        "FIRST_LOGIN": "Siden dette er dit første login, bedes du udfylde din mail og de organisationer du ønsker at være medlem af."
+    "GLOBAL_ADMIN": {
+      "TRUE": "Ja",
+      "FALSE": "Nej"
     },
-    "USER_PAGE": {
-        "AWAITING_CONFIRMATION": "Din bruger er oprettet og afventer bekræftelse fra administratorer på de organisationer du har søgt tilknytning.",
-        "APPLY_ORGANISATIONS": "Søg tilknytning til andre organisationer",
-        "APPLIED_ORGANISATIONS": "Der er pt. søgt eller allerede eksisterende tilknytning til følgende organisationer:",
-        "QUESTION_APPLY_ORGANISATIONS": "Ønsker du at søge tilknytning til andre organisationer?",
-        "USER_PAGE": "Organisationstilknytning",
-        "NO_APPLIED_ORGS": "Du har ikke søgt tilknytning til nogle organisationer.",
-        "NO_ORGS": "Der findes ikke yderligere organisationer."
+    "ACCEPT-USER": {
+      "ACCEPT": "Godkend bruger",
+      "QUESTION-ACCEPT": "Vælg brugergruppe til ",
+      "IN-ORGANIZATION": "i organisationen "
+    }
+  },
+  "AUTH": {
+    "EMAIL": "Email",
+    "PASSWORD": "Adgangskode",
+    "KOMBIT-BUTTON": "Login med KOMBIT adgangsstyring"
+  },
+  "WELCOME-DIALOG": {
+    "WELCOME": "VELKOMMEN TIL OS2iot",
+    "WELCOME-SUB": " Din indgang til administration af IoT enheder",
+    "LINK-1": "OS2iot's brugerforum",
+    "LINK-2": "produktsiden",
+    "LINK-3": "Github",
+    "SUB-HEADER-1": "Brugerforum",
+    "SUB-HEADER-2": "Om OS2iot",
+    "WELCOME-MESSAGE": "Bliv en aktiv del af ",
+    "WELCOME-MESSAGE-2": ". Her kan du stille spørgsmål, indrapportere fejl og dele dine udviklingsønsker. Ved fælles hjælp bliver løsningen bedre.",
+    "WELCOME-MESSAGE-3": "OS2iot er en open source løsning organiseret igennem OS2-fællesskabet. Du kan finde mere information om OS2iot på ",
+    "WELCOME-MESSAGE-4": " og følge udviklingen på ",
+    "NO-ACCESS": "Du har endnu ikke de fornødne rettigheder i OS2iot. Anmod om adgang til en organisation for at få tildelt rettigheder af din administrator.",
+    "NO-JOB-ACCESS": "Du har ikke passende jobfunktionsrolle, og har derfor ikke adgang til OS2IoT.",
+    "KOMBIT-LOGIN-ERROR": "Der skete en fejl ved login via KOMBIT adgangsstyring. Prøv igen senere.",
+    "USER-INACTIVE": "Login successfuldt, men din bruger er deaktiveret i OS2IoT. Kontakt din administrator for at få tildelt rettigheder"
+  },
+  "ERROR": {
+    "SEMANTIC": "Semantisk fejl, verificer at navn og værdier er på det rigtige format"
+  },
+  "DIALOG": {
+    "SAVE.TITLE": "Slet",
+    "DELETE.MESSAGE": "Vil du slette?",
+    "DELETE.ARE-YOU-SURE": "Er du sikker på, at du vil slette?",
+    "CLOSE": "Annuller",
+    "OK": "Ok",
+    "DIALOG-CONFIRM": "Ja, slet",
+    "DIALOG-REJECT": "Ja, afvis",
+    "OPENDATADK": {
+      "OK": "Send mail til OpenDataDk",
+      "CLOSE": "Nej, tak",
+      "TITLE": "Vil du sende data til OpenDataDK?",
+      "MESSAGE": "Send en mail til OpendataDK så opretter de dit datasæt"
     },
-    "false": "Nej",
-    "true": "Ja",
-    "GUIDE": "Guide",
-    "HTTP_PUSH": "HTTP Push",
-    "Forbidden": "Du har ikke rettigheder til at foretage denne handling",
-    "Forbidden resource": "Du har ikke rettigheder til at foretage denne handling",
-    "GENERIC_HTTP": "Generisk HTTP",
-    "LORAWAN": "LoRaWAN",
-    "SIGFOX": "Sigfox",
-    "API-KEY": {
-        "NAME": "Navn",
-        "ORGANIZATION": "Organisation",
-        "PERMISSIONS": "Brugergrupper",
-        "KEY": "Nøgle",
-        "CREATE-NEW-API-KEY": "Opret ny nøgle",
-        "DETAIL": {},
-        "EDIT": {
-            "NAME": "Indtast nøglens navn",
-            "NAME-PLACEHOLDER": "Indtast nøglens navn",
-            "CANCEL": "Annuller",
-            "SAVE": "Gem nøgle",
-            "CREATE-API-KEY": "Opret nøgle"
-        },
-        "TABLE-ROW": {
-            "EDIT": "Redigér",
-            "DELETE": "Slet"
-        }
+    "WELCOME": {
+      "DONT-SHOW-AGAIN": "Vis ikke igen"
     },
-    "NoUsersAdded": "Ingen brugergrupper er tilføjet",
-    "FIWARE": {
-        "QUESTION": {
-            "GIVE-DATATARGET-CONTEXTBROKER-URL": "Angiv datatargets 'context broker' URL",
-            "GIVE-DATATARGET-CONTEXTBROKER-URL-PLACEHOLDER": "https://contextBroker.dk/",
-            "GIVE-DATATARGET-TENANT": "Angiv 'tenant'",
-            "GIVE-DATATARGET-TENANT-INFO": "hvis tom, vil default tenant blive brugt",
-            "GIVE-DATATARGET-TENANT-PLACEHOLDER": "Tenant's navn",
-            "GIVE-DATATARGET-CONTEXT": "Angiv 'context'",
-            "GIVE-DATATARGET-CONTEXT-INFO": "hvis tom, skal den angives i 'payload'",
-            "GIVE-DATATARGET-CONTEXT-PLACEHOLDER": "https://os2iot/context-file.json",
-            "GIVE-DATATARGET-TOKENENDPOINT": "Angiv token endpoint URL",
-            "GIVE-DATATARGET-TOKENENDPOINT-PLACEHOLDER": "https://os2iot/connect/token",
-            "GIVE-DATATARGET-CLIENTID": "Angiv client ID",
-            "GIVE-DATATARGET-CLIENTID-PLACEHOLDER": "Client's navn",
-            "GIVE-DATATARGET-CLIENTSECRET": "Angiv client secret",
-            "GIVE-DATATARGET-CLIENTSECRET-PLACEHOLDER": "Client's kode"
-        }
+    "EXPORT-CSV": {
+      "TITLE": "Eksportér metadata",
+      "BODY": "Igangsæt eksport af metadata om alle IoT-enheder i denne applikation i en CSV-fil?"
+    }
+  },
+  "BATTERY": {
+    "NOT_AVAILABLE": "N/A"
+  },
+  "TITLE": {
+    "APPLICATION": "OS2IoT - Applikationer",
+    "SIGFOX": "OS2IoT - Sigfox administration",
+    "DEVICEMODEL": "OS2IoT - Device model",
+    "LORAWAN-GATEWAY": "OS2IoT - LoRaWAN gateways",
+    "LORAWAN-PROFILE": "OS2IoT - LoRaWAN profiler",
+    "PAYLOADDECODER": "OS2IoT - Payload decoder",
+    "USER": "OS2IoT - Brugere",
+    "PERMISSION": "OS2IoT - Brugergrupper",
+    "ORGANIZATION": "OS2IoT - Organisationer",
+    "DATATARGET": "OS2IoT - Datatarget",
+    "MULTICAST": "OS2IoT - Multicast",
+    "BULKIMPORT": "OS2IoT - Bulk import",
+    "IOTDEVICE": "OS2IoT - IoT enhed",
+    "FRONTPAGE": "OS2IoT - Forside",
+    "API-KEY": "OS2IoT - API nøgler"
+  },
+  "PAGINATOR": {
+    "ITEM_PER_PAGE": "Antal pr. side",
+    "NEXT_PAGE": "Næste side",
+    "PREVIOUS_PAGE": "Forrige side",
+    "FIRST_PAGE": "Første side",
+    "LAST_PAGE": "Sidste side",
+    "OF": "af"
+  },
+  "NEW_USER": {
+    "FIRST_LOGIN": "Siden dette er dit første login, bedes du udfylde din mail og de organisationer du ønsker at være medlem af."
+  },
+  "USER_PAGE": {
+    "AWAITING_CONFIRMATION": "Din bruger er oprettet og afventer bekræftelse fra administratorer på de organisationer du har søgt tilknytning.",
+    "APPLY_ORGANISATIONS": "Søg tilknytning til andre organisationer",
+    "APPLIED_ORGANISATIONS": "Der er pt. søgt eller allerede eksisterende tilknytning til følgende organisationer:",
+    "QUESTION_APPLY_ORGANISATIONS": "Ønsker du at søge tilknytning til andre organisationer?",
+    "USER_PAGE": "Organisationstilknytning",
+    "NO_APPLIED_ORGS": "Du har ikke søgt tilknytning til nogle organisationer.",
+    "NO_ORGS": "Der findes ikke yderligere organisationer."
+  },
+  "false": "Nej",
+  "true": "Ja",
+  "GUIDE": "Guide",
+  "HTTP_PUSH": "HTTP Push",
+  "Forbidden": "Du har ikke rettigheder til at foretage denne handling",
+  "Forbidden resource": "Du har ikke rettigheder til at foretage denne handling",
+  "GENERIC_HTTP": "Generisk HTTP",
+  "LORAWAN": "LoRaWAN",
+  "SIGFOX": "Sigfox",
+  "API-KEY": {
+    "NAME": "Navn",
+    "ORGANIZATION": "Organisation",
+    "PERMISSIONS": "Brugergrupper",
+    "KEY": "Nøgle",
+    "CREATE-NEW-API-KEY": "Opret ny nøgle",
+    "DETAIL": {},
+    "EDIT": {
+      "NAME": "Indtast nøglens navn",
+      "NAME-PLACEHOLDER": "Indtast nøglens navn",
+      "CANCEL": "Annuller",
+      "SAVE": "Gem nøgle",
+      "CREATE-API-KEY": "Opret nøgle"
     },
-    "DBLCLICKINFO": "Dobbeltklik på kortet eller træk i markøren for at placere markøren",
-    "HEIGHTCURVESINFO": "Aktiverede højdekurver vises kun på de inderste zoomniveauer",
-    "HEIGHTCURVES": "Højdekurver (0,5 m)",
-    "SATELLITEDENMARK": "Satellit Danmark"
+    "TABLE-ROW": {
+      "EDIT": "Redigér",
+      "DELETE": "Slet"
+    }
+  },
+  "NoUsersAdded": "Ingen brugergrupper er tilføjet",
+  "FIWARE": {
+    "QUESTION": {
+      "GIVE-DATATARGET-CONTEXTBROKER-URL": "Angiv datatargets 'context broker' URL",
+      "GIVE-DATATARGET-CONTEXTBROKER-URL-PLACEHOLDER": "https://contextBroker.dk/",
+      "GIVE-DATATARGET-TENANT": "Angiv 'tenant'",
+      "GIVE-DATATARGET-TENANT-INFO": "hvis tom, vil default tenant blive brugt",
+      "GIVE-DATATARGET-TENANT-PLACEHOLDER": "Tenant's navn",
+      "GIVE-DATATARGET-CONTEXT": "Angiv 'context'",
+      "GIVE-DATATARGET-CONTEXT-INFO": "hvis tom, skal den angives i 'payload'",
+      "GIVE-DATATARGET-CONTEXT-PLACEHOLDER": "https://os2iot/context-file.json",
+      "GIVE-DATATARGET-TOKENENDPOINT": "Angiv token endpoint URL",
+      "GIVE-DATATARGET-TOKENENDPOINT-PLACEHOLDER": "https://os2iot/connect/token",
+      "GIVE-DATATARGET-CLIENTID": "Angiv client ID",
+      "GIVE-DATATARGET-CLIENTID-PLACEHOLDER": "Client's navn",
+      "GIVE-DATATARGET-CLIENTSECRET": "Angiv client secret",
+      "GIVE-DATATARGET-CLIENTSECRET-PLACEHOLDER": "Client's kode"
+    }
+  },
+  "DBLCLICKINFO": "Dobbeltklik på kortet eller træk i markøren for at placere markøren",
+  "HEIGHTCURVESINFO": "Aktiverede højdekurver vises kun på de inderste zoomniveauer",
+  "HEIGHTCURVES": "Højdekurver (0,5 m)",
+  "SATELLITEDENMARK": "Satellit Danmark"
 }
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 933776391..00c3608b2 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -1,59 +1,59 @@
 {
-    "GEN": {
-        "CANCEL": "Cancel",
-        "SHOW": "Show",
-        "LOG": "Log",
-        "MESSAGE": "Message",
-        "DEVICE": "Device",
-        "PER-PAGE": "Per page"
-    },
-    "NAV": {
-        "DASHBOARD": "Dashboard",
-        "APPLICATIONS": "Applications",
-        "ALL-IOT-DEVICES": "All IoT Devices"
-    },
-    "APPLICATION": {
-        "CREATE": "Create application",
-        "SAVE": "Save application"
-    },
-    "APPLICATION-TABLE": {
-        "NAME": "NAME",
-        "IOT-DEVICES": "IOT DEVICES",
-        "UPDATED": "LAST UPDATED"
-    },
-    "APPLICATION-TABLE-ROW": {
-        "DELETE": "Delete",
-        "EDIT": "Edit",
-        "SHOW-OPTIONS": "Show options"
-    },
-    "DATATARGET": {
-        "LATEST_MESSAGE": "Latest message",
-        "24H_STATUS": "Status (24 hours)",
-        "RESPONSE_TYPE": {
-            "ERROR": "Fejl",
-            "OK": "Ok"
-        }
-    },
-    "FORM": {
-        "CREATE-NEW-APPLICATION": "Create new application",
-        "EDIT-NEW-APPLICATION": "Edit application",
-        "CREATE-NEW-IOT-DEVICE": "Add IoT unit"
-    },
-    "QUESTION": {
-        "APPLICATION-NAME-PLACEHOLDER": "Name of the application",
-        "APPLICATION-DESCRIPTION-PLACEHOLDER": "Short description of the application"
-    },
-    "SORT": {
-        "SORT": "Sort by",
-        "UPDATED-ASCENDING": "Last updated: acsending",
-        "UPDATED-DESCENDING": "Last updated: faldende",
-        "CREATED-ASCENDING": "Created: acsending",
-        "CREATED-DESCENDING": "Created: faldende",
-        "NAME-ASCENDING": "Name: acsending",
-        "NAME-DESCENDING": "Name: faldende"
-    },
-    "DBLCLICKINFO": "Doubleclick on the map or drag the marker to place the marker",
-    "HEIGHTCURVESINFO": "The activated contour lines are only displayed at the innermost zoom levels.",
-    "HEIGHTCURVES": "Height curves (0,5 m)",
-    "SATELLITEDENMARK": "Satellite Denmark"
+  "GEN": {
+    "CANCEL": "Cancel",
+    "SHOW": "Show",
+    "LOG": "Log",
+    "MESSAGE": "Message",
+    "DEVICE": "Device",
+    "PER-PAGE": "Per page"
+  },
+  "NAV": {
+    "DASHBOARD": "Dashboard",
+    "APPLICATIONS": "Applications",
+    "ALL-IOT-DEVICES": "All IoT Devices"
+  },
+  "APPLICATION": {
+    "CREATE": "Create application",
+    "SAVE": "Save application"
+  },
+  "APPLICATION-TABLE": {
+    "NAME": "NAME",
+    "IOT-DEVICES": "IOT DEVICES",
+    "UPDATED": "LAST UPDATED"
+  },
+  "APPLICATION-TABLE-ROW": {
+    "DELETE": "Delete",
+    "EDIT": "Edit",
+    "SHOW-OPTIONS": "Show options"
+  },
+  "DATATARGET": {
+    "LATEST_MESSAGE": "Latest message",
+    "24H_STATUS": "Status (24 hours)",
+    "RESPONSE_TYPE": {
+      "ERROR": "Fejl",
+      "OK": "Ok"
+    }
+  },
+  "FORM": {
+    "CREATE-NEW-APPLICATION": "Create new application",
+    "EDIT-NEW-APPLICATION": "Edit application",
+    "CREATE-NEW-IOT-DEVICE": "Add IoT unit"
+  },
+  "QUESTION": {
+    "APPLICATION-NAME-PLACEHOLDER": "Name of the application",
+    "APPLICATION-DESCRIPTION-PLACEHOLDER": "Short description of the application"
+  },
+  "SORT": {
+    "SORT": "Sort by",
+    "UPDATED-ASCENDING": "Last updated: acsending",
+    "UPDATED-DESCENDING": "Last updated: faldende",
+    "CREATED-ASCENDING": "Created: acsending",
+    "CREATED-DESCENDING": "Created: faldende",
+    "NAME-ASCENDING": "Name: acsending",
+    "NAME-DESCENDING": "Name: faldende"
+  },
+  "DBLCLICKINFO": "Doubleclick on the map or drag the marker to place the marker",
+  "HEIGHTCURVESINFO": "The activated contour lines are only displayed at the innermost zoom levels.",
+  "HEIGHTCURVES": "Height curves (0,5 m)",
+  "SATELLITEDENMARK": "Satellite Denmark"
 }

From 865c5a2345976d0743b5867d941908fa5e7c117a Mon Sep 17 00:00:00 2001
From: Chris Dons Johansen <cdj@iterator-it.dk>
Date: Tue, 24 Sep 2024 11:11:44 +0200
Subject: [PATCH 9/9] Add Datatarget as allowed type in top-bar...

---
 .../components/top-bar/top-bar.component.ts   | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/app/shared/components/top-bar/top-bar.component.ts b/src/app/shared/components/top-bar/top-bar.component.ts
index 96e77fee8..94c96cbd7 100644
--- a/src/app/shared/components/top-bar/top-bar.component.ts
+++ b/src/app/shared/components/top-bar/top-bar.component.ts
@@ -1,24 +1,25 @@
-import { Component, OnInit, Input, Output, EventEmitter } from "@angular/core";
-import { TranslateService } from "@ngx-translate/core";
 import { Location } from "@angular/common";
-import { Sort } from "@shared/models/sort.model";
+import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
 import { Router } from "@angular/router";
-import { faSearch, faChevronLeft, faUser, faQuestionCircle } from "@fortawesome/free-solid-svg-icons";
-import { Application } from "@applications/application.model";
-import { IotDevice } from "@applications/iot-devices/iot-device.model";
-import { BackButton } from "@shared/models/back-button.model";
-import { QuickActionButton } from "@shared/models/quick-action-button.model";
 import { OrganisationResponse } from "@app/admin/organisation/organisation.model";
+import { PermissionResponse } from "@app/admin/permission/permission.model";
+import { UserResponse } from "@app/admin/users/user.model";
 import { Gateway } from "@app/gateway/gateway.model";
+import { Application } from "@applications/application.model";
 import { DatatargetResponse } from "@applications/datatarget/datatarget-response.model";
+import { Datatarget } from "@applications/datatarget/datatarget.model";
+import { IotDevice } from "@applications/iot-devices/iot-device.model";
+import { AuthService } from "@auth/auth.service";
+import { environment } from "@environments/environment";
+import { faChevronLeft, faQuestionCircle, faSearch, faUser } from "@fortawesome/free-solid-svg-icons";
+import { TranslateService } from "@ngx-translate/core";
 import { PayloadDecoder } from "@payload-decoder/payload-decoder.model";
-import { PermissionResponse } from "@app/admin/permission/permission.model";
-import { UserResponse } from "@app/admin/users/user.model";
+import { BackButton } from "@shared/models/back-button.model";
 import { DropdownButton } from "@shared/models/dropdown-button.model";
-import { SharedVariableService } from "@shared/shared-variable/shared-variable.service";
-import { AuthService } from "@auth/auth.service";
+import { QuickActionButton } from "@shared/models/quick-action-button.model";
+import { Sort } from "@shared/models/sort.model";
 import { LoggedInService } from "@shared/services/loggedin.service";
-import { environment } from "@environments/environment";
+import { SharedVariableService } from "@shared/shared-variable/shared-variable.service";
 
 @Component({
   selector: "app-top-bar",
@@ -30,6 +31,7 @@ export class TopBarComponent implements OnInit {
     | Application
     | IotDevice
     | DatatargetResponse
+    | Datatarget
     | PayloadDecoder
     | Gateway
     | PermissionResponse