Merge branch 'IOT-262' into develop

Author: Jeppe Elkjær Jørgensen

src/app/admin/permission/permission-edit/permission-edit.component.html

@@ -39,15 +39,6 @@
             </select>
         </div>
     </div>
-    <!-- <div class="form-group mt-3 col-12">
-        <mat-form-field appearance="outline">
-            <mat-label class="form-label" for="name">{{'PERMISSION.EDIT.USERS' | translate}}</mat-label>
-            <mat-select id="userIds" name="userIds" class="custom-select" multiple [(ngModel)]="permission.userIds"
-                [placeholder]="'PERMISSION.EDIT.USERS-PLACEHOLDER' | translate" multiple>
-                <mat-option *ngFor="let user of users" [value]="user.id">{{user.name}}</mat-option>
-            </mat-select>
-        </mat-form-field>
-    </div> -->
 
     <div *ngIf="permission.level != 'GlobalAdmin'">
         <div class="form-group mt-3 col-12">

src/app/models/payload-device-data.ts

@@ -0,0 +1,21 @@
+import { PayloadDecoder } from '@app/payload-decoder/payload-decoder.model';
+import { IotDevice } from '@my-applications/iot-devices/iot-device.model';
+import { Datatarget } from './datatarget';
+
+export class PayloadDeviceDatatarget {
+    id: number;
+    iotDeviceIds: number[];
+    payloadDecoderId: number;
+    dataTargetId: number;
+}
+
+export interface PayloadDeviceDatatargetGetByDataTargetResponse {
+    data: PayloadDeviceDatatargetGetByDataTarget[]
+}
+
+export interface PayloadDeviceDatatargetGetByDataTarget {
+    id: number;
+    iotDevices: IotDevice[];
+    payloadDecoder: PayloadDecoder;
+    dataTarget: Datatarget;
+}

src/app/my-applications/iot-devices/iot-devices-table/iot-devices-table.component.ts

@@ -20,7 +20,7 @@ export class IotDevicesTableComponent implements OnInit, OnChanges, OnDestroy {
     @Input() application: Application;
     private applicationSubscription: Subscription;
     public iotDevices: IotDevice[];
-    public pageOffset: number = 0;
+    public pageOffset = 0;
     public pageTotal: number;
 
     constructor(

src/app/payload-decoder/payload-decoder-resolver.service.ts

@@ -36,4 +36,4 @@ export class PayloadDecoder {
 export interface PayloadDecoderResponse {
     data: PayloadDecoder[];
     count: number;
-}
+}

src/app/payload-decoder/payload-decoder.model.ts

@@ -1,6 +1,4 @@
 import { Component, OnInit } from '@angular/core';
-import * as PayloadDecoderAction from '../store/payload-decoder.actions';
-import { Store } from '@ngrx/store';
 
 @Component({
   selector: 'app-payload-decoder',

src/app/payload-decoder/payload-decoder/payload-decoder.component.ts

@@ -14,7 +14,6 @@ export class DeviceProfilesItemComponent implements OnInit {
   @Input() index: number;
   @Output() deleteDeviceProfile = new EventEmitter();
   deviceId: number;
-  faPen = faPen;
   faTimesCircle = faTimesCircle;
 
   constructor(