Updated Chirpstack from V3 to V4 (#152)

* Fixed routing of gateway list + fixed memory leak by unsubscribing properly from gateway fetches * Fixed routing errors in gateway list * Changed mqtt datatarget topic placeholder + added tooltip * Added additional text changes from Product Owner * Removed maxLenght from device AND gateway EUI, now removes non-hex digits on submit * Gateway upgrades to get data from v4. * Added sticky to name column on gateway status table * Implemented application table column selection * Removed unused controller name from select * Moved column selector to own component + implemented column selection on iot-device table * Changed datastructure of gateway to match database + Column administration on gateway-status-table * Changed column selector for a cog icon button * Chirpstack updates. * small fixes after merge * Spinner for device profiles * changed printhWidth to match backend * fresh package-lock * updated to node-version 18 on github * First set of pr changes * some PR changes before merge * PR changes and added prettier from backend so it can match with frontend (both are nodejs, so shouldn't it be the same?) * Updated package-lock and bumped monaco-editor down to 0.33 * Fixes * da.json addition --------- Co-authored-by: Frederik Christ Vestergaard <[email protected]> Co-authored-by: August Andersen <[email protected]>
OS2iot · Dec 15, 2023 · c4cafb1 · c4cafb1
1 parent a9603f3
commit c4cafb1
Show file tree

Hide file tree

Showing 58 changed files with 1,398 additions and 1,984 deletions.
diff --git a/.github/workflows/on-push-pr.action.yml b/.github/workflows/on-push-pr.action.yml
@@ -32,7 +32,7 @@ jobs:
       - uses: actions/setup-node@v3
         name: Set NodeJS version
         with:
-          node-version: 14
+          node-version: 18
       - name: Install packages
         run: "npm ci"
       - name: Build source

diff --git a/.prettierrc b/.prettierrc
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -0,0 +1,11 @@
+module.exports = {
+  trailingComma: "es5",
+  tabWidth: 4,
+  printWidth: 120,
+  semi: true,
+  singleQuote: false,
+  useTabs: false,
+  bracketSpacing: true,
+  arrowParens: "avoid",
+  endOfLine: "auto",
+};
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -41,7 +41,7 @@
     "jwt-decode": "^3.1.2",
     "leaflet": "^1.7.1",
     "moment": "^2.29.4",
-    "monaco-editor": "^0.44.0",
+    "monaco-editor": "^0.33.0",
     "ng": "0.0.0",
     "ng-inline-svg": "^11.0.0",
     "ngx-monaco-editor-v2": "^14.0.4",

diff --git a/src/app/applications/applications-list/applications-table/applications-table.component.html b/src/app/applications/applications-list/applications-table/applications-table.component.html
@@ -16,7 +16,6 @@
     <table mat-table [dataSource]="data" class="example-table" matSort matSortActive="name" matSortDisableClear
            matSortDirection="asc">
 
-      <!-- Name Column -->
       <ng-container matColumnDef="name">
         <th mat-header-cell *matHeaderCellDef mat-sort-header class="col-2">
           {{ 'APPLICATION-TABLE.NAME' | translate }}
@@ -45,7 +44,6 @@
         </td>
       </ng-container>
 
-      <!-- Devices Column -->
       <ng-container matColumnDef="devices">
         <th mat-header-cell *matHeaderCellDef mat-sort-header class="col-2">
           {{ 'APPLICATION-TABLE.IOT-DEVICES' | translate }}</th>
@@ -136,7 +134,6 @@
         </td>
       </ng-container>
 
-      <!-- Menu Column -->
       <ng-container matColumnDef="menu">
         <th mat-header-cell *matHeaderCellDef class="col-1"></th>
         <td mat-cell *matCellDef="let element">

diff --git a/src/app/applications/bulk-import/bulk-mapping.ts b/src/app/applications/bulk-import/bulk-mapping.ts
@@ -36,9 +36,6 @@ export class BulkMapping {
       applicationSessionKey: data.applicationSessionKey
         ? data.applicationSessionKey
         : undefined,
-      serviceProfileID: data.serviceProfileID
-        ? data.serviceProfileID
-        : undefined,
       deviceProfileID: data.deviceProfileID ? data.deviceProfileID : undefined,
       fCntUp: data.fCntUp ? +data.fCntUp : undefined,
       nFCntDown: data.nFCntDown ? +data.nFCntDown : undefined,

diff --git a/src/app/applications/iot-devices/iot-device-detail/downlink/downlink.component.ts b/src/app/applications/iot-devices/iot-device-detail/downlink/downlink.component.ts
@@ -55,7 +55,7 @@ export class DownlinkComponent implements OnInit {
     if (error?.error?.chirpstackError?.error == "f_port must be > 0") {
       this.errorMessages = ["port must be > 0"]
       return;
-    } 
+    }
     this.errorMessages = this.errorMessageService.handleErrorMessage(error);
   }
 

diff --git a/...ices/iot-device-detail/iot-device-detail-lorawan/iot-device-detail-lorawan.component.html b/...ices/iot-device-detail/iot-device-detail-lorawan/iot-device-detail-lorawan.component.html
@@ -1,5 +1,4 @@
 <p><strong>{{ 'IOTDEVICE.LORA.DEVEUI' | translate }}</strong>{{device.lorawanSettings.devEUI}}</p>
-<p><strong>{{ 'IOTDEVICE.LORA.SERVICEPROFILE' | translate }}</strong>{{serviceProfileName}}</p>
 <p><strong>{{ 'IOTDEVICE.LORA.DEVICEPROFILE' | translate }}</strong>{{deviceProfileName}}</p>
 <ng-container *ngIf="OTAA">
     <p><strong>{{ 'IOTDEVICE.LORA.OTAAAPPLICATIONKEY' | translate }}</strong>{{device.lorawanSettings?.OTAAapplicationKey}}
@@ -15,4 +14,4 @@
     <p><strong>{{ 'IOTDEVICE.LORA.NFCNTDOWN' | translate }}</strong>{{device.lorawanSettings?.nFCntDown }}</p>
 </ng-container>
 <p><strong>{{ 'IOTDEVICE.LORA.SKIPFCNTCHECK' | translate }}</strong>{{device.lorawanSettings?.skipFCntCheck | yesNo}}
-</p>
+</p>
diff --git a/...evices/iot-device-detail/iot-device-detail-lorawan/iot-device-detail-lorawan.component.ts b/...evices/iot-device-detail/iot-device-detail-lorawan/iot-device-detail-lorawan.component.ts
@@ -1,9 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { IotDevice } from '@applications/iot-devices/iot-device.model';
 import { DeviceProfileService } from '@profiles/device-profiles/device-profile.service';
-import { ServiceProfileResponseOne } from '@profiles/service-profiles/service-profile.model';
-import { ServiceProfileService } from '@profiles/service-profiles/service-profile.service';
-import { Subscribable, Subscription } from 'rxjs';
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'app-iot-device-detail-lorawan',
@@ -16,16 +14,13 @@ export class IotDeviceDetailLorawanComponent implements OnInit {
   deviceProfileSubscription: Subscription;
   public OTAA: boolean;
   public deviceProfileName: string;
-  public serviceProfileName: string;
 
   constructor(
     private deviceProfileService: DeviceProfileService,
-    private serviceProfileService: ServiceProfileService
   ) { }
 
   ngOnInit(): void {
     this.getDeviceProfil();
-    this.getServiceProfil();
   }
 
   getDeviceProfil() {
@@ -35,12 +30,4 @@ export class IotDeviceDetailLorawanComponent implements OnInit {
             this.deviceProfileName = response.deviceProfile.name;
         });
   }
-
-  getServiceProfil() {
-    this.deviceProfileSubscription = this.serviceProfileService.getOne(this.device.lorawanSettings?.serviceProfileID)
-        .subscribe((response: ServiceProfileResponseOne) => {
-            this.serviceProfileName = response.serviceProfile.name;
-        });
-  }
-
 }
diff --git a/src/app/applications/iot-devices/iot-device-edit/iot-device-edit.component.html b/src/app/applications/iot-devices/iot-device-edit/iot-device-edit.component.html
@@ -129,20 +129,6 @@ <h3>{{'IOTDEVICE.LORAWANSETUP' | translate}}</h3>
              [ngClass]="{'is-invalid' : formFailedSubmit && errorFields.includes('devEUI'), 'is-valid' : formFailedSubmit && !errorFields.includes('devEUI')}">
     </div>
 
-    <ng-container *ngIf="iotDevice.lorawanSettings.serviceProfileID || serviceProfiles">
-      <div class="form-group mt-3 col-12">
-        <label class="form-label" for="serviceProfileID">{{'QUESTION.CHOOSE-SERVICEPROFILE' | translate}}</label>*
-        <select id="serviceProfileID" class="form-select" name="serviceProfileID"
-                [(ngModel)]="iotDevice.lorawanSettings.serviceProfileID" required
-                [value]="iotDevice.lorawanSettings.serviceProfileID" [disabled]="editmode"
-                [ngClass]="{'is-invalid' : formFailedSubmit && errorFields.includes('serviceProfileID'), 'is-valid' : formFailedSubmit && !errorFields.includes('serviceProfileID')}">
-          <option *ngFor="let serviceProfile of serviceProfiles" [value]="serviceProfile.id"
-                  [selected]="serviceProfile.id === iotDevice.lorawanSettings.serviceProfileID">
-            {{serviceProfile.name}}
-          </option>
-        </select>
-      </div>
-    </ng-container>
     <ng-container *ngIf="iotDevice.lorawanSettings.deviceProfileID || deviceProfiles">
       <div class="form-group mt-3 col-12">
         <label class="form-label" for="deviceProfileID">{{'QUESTION.CHOOSE-DEVICE' | translate}}</label>*

diff --git a/src/app/applications/iot-devices/iot-device-edit/iot-device-edit.component.ts b/src/app/applications/iot-devices/iot-device-edit/iot-device-edit.component.ts
@@ -10,11 +10,6 @@ import { DeviceModel } from '@app/device-model/device.model';
 import { TranslateService } from '@ngx-translate/core';
 import { DeviceProfile } from '@profiles/device-profiles/device-profile.model';
 import { DeviceProfileService } from '@profiles/device-profiles/device-profile.service';
-import {
-  ServiceProfile,
-  ServiceProfileResponseMany,
-} from '@profiles/service-profiles/service-profile.model';
-import { ServiceProfileService } from '@profiles/service-profiles/service-profile.service';
 import { ActivationType } from '@shared/enums/activation-type';
 import { DeviceType } from '@shared/enums/device-type';
 import { ErrorMessageService } from '@shared/error-message.service';
@@ -42,7 +37,6 @@ export class IotDeviceEditComponent implements OnInit, OnDestroy {
   public disableChoseApplication = true;
   public loraDevice = DeviceType.LORAWAN;
   public sigfoxDevice = DeviceType.SIGFOX;
-  public serviceProfiles: ServiceProfile[];
   public deviceProfiles: DeviceProfile[];
   public deviceModels: DeviceModel[];
   iotDevice = new IotDevice();
@@ -52,7 +46,6 @@ export class IotDeviceEditComponent implements OnInit, OnDestroy {
   errorMetadataFieldId: string | undefined;
   public deviceSubscription: Subscription;
   private applicationsSubscription: Subscription;
-  private serviceProfilesSubscription: Subscription;
   private deviceProfileSubscription: Subscription;
   private devicesProfileSubscription: Subscription;
   canEdit: boolean;
@@ -61,7 +54,6 @@ export class IotDeviceEditComponent implements OnInit, OnDestroy {
     private route: ActivatedRoute,
     public translate: TranslateService,
     private router: Router,
-    private serviceProfileService: ServiceProfileService,
     private deviceProfileService: DeviceProfileService,
     private applicationService: ApplicationService,
     private iotDeviceService: IoTDeviceService,
@@ -90,7 +82,6 @@ export class IotDeviceEditComponent implements OnInit, OnDestroy {
     });
 
     this.getApplication();
-    this.getServiceProfiles();
     this.getDeviceProfiles();
     this.getDeviceModels();
     this.canEdit = this.meService.hasAccessToTargetOrganization(
@@ -177,16 +168,6 @@ export class IotDeviceEditComponent implements OnInit, OnDestroy {
       });
   }
 
-  getServiceProfiles() {
-    this.serviceProfilesSubscription = this.serviceProfileService
-      .getMultiple()
-      .subscribe((result: ServiceProfileResponseMany) => {
-        this.serviceProfiles = result.result.sort((a, b) =>
-          a.name.localeCompare(b.name, 'en', { numeric: true })
-        );
-      });
-  }
-
   getDeviceProfiles() {
     this.devicesProfileSubscription = this.deviceProfileService
       .getMultiple()
@@ -403,8 +384,5 @@ export class IotDeviceEditComponent implements OnInit, OnDestroy {
     if (this.devicesProfileSubscription) {
       this.devicesProfileSubscription.unsubscribe();
     }
-    if (this.serviceProfilesSubscription) {
-      this.serviceProfilesSubscription.unsubscribe();
-    }
   }
 }
diff --git a/src/app/applications/multicast/multicast-detail/multicast-detail.component.ts b/src/app/applications/multicast/multicast-detail/multicast-detail.component.ts
@@ -116,7 +116,7 @@ export class MulticastDetailComponent implements OnInit, OnDestroy {
         this.multicastService
           .multicastGet(this.multicast.id)
           .subscribe((response: any) => {
-            if (response.totalCount > 0) {
+            if (response.deviceQueueItems.length > 0) {
               this.openDownlinkDialog();
             } else {
               this.startDownlink();

diff --git a/src/app/gateway/gateway-detail/gateway-detail.component.html b/src/app/gateway/gateway-detail/gateway-detail.component.html
@@ -6,8 +6,8 @@
       <div class="col-md-6 d-flex align-items-stretch">
         <div class="jumbotron jumbotron--m-right jumbotron--full-width">
           <h3>{{ 'GATEWAY.DETAILS' | translate }}</h3>
-          <p><strong>{{ 'GATEWAY.ID' | translate }}</strong>{{gateway.id}}</p>
-          <p><strong>{{ 'GATEWAY.ORGANIZATION' | translate }}</strong>{{gateway.internalOrganizationName}}</p>
+          <p><strong>{{ 'GATEWAY.ID' | translate }}</strong>{{gateway.gatewayId}}</p>
+          <p><strong>{{ 'GATEWAY.ORGANIZATION' | translate }}</strong>{{gateway.organizationName}}</p>
           <app-general-details [data]="gateway"></app-general-details>
           <p><strong>{{ 'GATEWAY.TAGS' | translate }}</strong>{{gateway.tagsString}}</p>
           <p *ngIf="gateway.description">
@@ -50,7 +50,7 @@ <h3>{{ 'GATEWAY.LOCATION' | translate }}</h3>
   <div class="row">
     <div class="col-12">
       <div class="jumbotron">
-        <app-gateway-status [isVisibleSubject]="isGatewayStatusVisibleSubject" [gatewayId]="id" paginatorClass="d-none"
+        <app-gateway-status [isVisibleSubject]="isGatewayStatusVisibleSubject" [gatewayId]="gatewayId" paginatorClass="d-none"
           [shouldLinkToDetails]="false" [title]="'GATEWAY.ONLINE-STATUS' | translate">
         </app-gateway-status>
       </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,7 +55,7 @@ export class DownlinkComponent implements OnInit { @@
         if (error?.error?.chirpstackError?.error == "f_port must be > 0") {
           this.errorMessages = ["port must be > 0"]
           return;
-        }
+        }
         this.errorMessages = this.errorMessageService.handleErrorMessage(error);
       }
@@ Expand Down @@