PR Changes

Author: AugustHA-Iterator

src/app/applications/multicast/multicast-detail/multicast-detail.component.ts

@@ -1,4 +1,4 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import { DeleteDialogService } from '@shared/components/delete-dialog/delete-dialog.service';
@@ -15,18 +15,19 @@ import { ErrorMessageService } from '@shared/error-message.service';
 import { MatDialog } from '@angular/material/dialog';
 import { DownlinkDialogComponent } from '@applications/iot-devices/iot-device-detail/downlink/downlink-dialog/downlink-dialog.component';
 import { keyPressedHex } from '@shared/constants/regex-constants';
+import { DownlinkService } from '@shared/services/downlink.service';
 
 @Component({
   selector: 'app-multicast-detail',
   templateUrl: './multicast-detail.component.html',
   styleUrls: ['./multicast-detail.component.scss'],
 })
-export class MulticastDetailComponent implements OnInit {
+export class MulticastDetailComponent implements OnInit, OnDestroy {
   public multicast: Multicast;
   public backButton: BackButton = { label: '', routerLink: '/multicast-list' };
   private deleteDialogSubscription: Subscription;
   public dropdownButton: DropdownButton;
-  public formFailedSubmit: boolean = false;
+  public formFailedSubmit = false;
   private applicationId: number;
   public downlink = new Downlink();
   @Input() errorMessages: string[];
@@ -39,7 +40,8 @@ export class MulticastDetailComponent implements OnInit {
     private multicastService: MulticastService,
     private translate: TranslateService,
     private snackService: SnackService,
-    private errorMessageService: ErrorMessageService
+    private errorMessageService: ErrorMessageService,
+    private downlinkService: DownlinkService
   ) {}
 
   ngOnInit(): void {
@@ -75,7 +77,7 @@ export class MulticastDetailComponent implements OnInit {
   }
 
   // Class-B:
-  //only if classB can be used
+  // only if classB can be used
   // canShowPeriodicity(): boolean {
   //   if (this.multicast.groupType === MulticastType.ClassB) {
   //     return true;
@@ -127,7 +129,7 @@ export class MulticastDetailComponent implements OnInit {
           });
       }
     } else {
-      this.snackService.showSendDownlinkFailNoDevices();
+      this.downlinkService.showSendDownlinkFailNoDevices();
     }
   }
   openDownlinkDialog() {

src/app/applications/multicast/multicast-edit/multicast-edit.component.ts

@@ -1,5 +1,5 @@
 import { HttpErrorResponse } from '@angular/common/http';
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import { MulticastType } from '@shared/enums/multicast-type';
@@ -20,10 +20,10 @@ import { takeUntil } from 'rxjs/operators';
   templateUrl: './multicast-edit.component.html',
   styleUrls: ['./multicast-edit.component.scss'],
 })
-export class MulticastEditComponent implements OnInit {
+export class MulticastEditComponent implements OnInit, OnDestroy {
   public title: string;
   public multicastId: number;
-  public errorMessages: any;
+  public errorMessages: unknown;
   private multicastSubscription: Subscription;
   public searchDevices: FormControl = new FormControl();
   public errorFields: string[];
@@ -32,7 +32,8 @@ export class MulticastEditComponent implements OnInit {
   public backButtonTitle: string;
   public multicast: Multicast = new Multicast();
   private applicationId: number;
-  public formFailedSubmit: boolean = false;
+  private onDestroy = new Subject<void>();
+  public formFailedSubmit = false;
   public multicastTypes: string[] = Object.values(MulticastType);
   // Class-B: { public periodicities: number[] = [2, 4, 8, 16, 32, 64, 128]; // used for classB if it has to be used in the future }
   public deviceFilterCtrl: FormControl = new FormControl();
@@ -81,7 +82,7 @@ export class MulticastEditComponent implements OnInit {
     }
 
     this.deviceFilterCtrl.valueChanges
-      .pipe(takeUntil(this._onDestroy))
+      .pipe(takeUntil(this.onDestroy))
       .subscribe(() => {
         this.filterDevicesMulti();
       });
@@ -130,7 +131,7 @@ export class MulticastEditComponent implements OnInit {
     });
   }
 
-  //only if classB can be used
+  // only if classB can be used
   // showPeriodicity(): boolean {
   //   if (this.multicast.groupType === MulticastType.ClassB) {
   //     return true;
@@ -203,5 +204,4 @@ export class MulticastEditComponent implements OnInit {
   ngOnDestroy(): void {
     this.multicastSubscription?.unsubscribe();
   }
-  private _onDestroy = new Subject<void>();
 }

src/app/applications/multicast/multicast-table/multicast-table.component.ts

@@ -32,7 +32,7 @@ export class MulticastTableComponent
   multicasts: Multicast[] = [];
   resultsLength = 0;
   public canEdit = false;
-  @Input() isLoadingResults: boolean = true;
+  @Input() isLoadingResults = true;
   public pageSize = environment.tablePageSize;
   public pageOffset = 0;
   public applicationId: number;
@@ -127,10 +127,7 @@ export class MulticastTableComponent
       });
   }
   ngOnDestroy() {
-    // prevent memory leak by unsubscribing
-
     this.multicastSubscription?.unsubscribe();
-
     this.deleteDialogSubscription?.unsubscribe();
   }
 }

src/app/applications/multicast/multicast.service.ts

@@ -85,7 +85,7 @@ export class MulticastService {
     return model;
   }
 
-  public multicastGet(multicastId: number, params = {}): Observable<any> {
+  public multicastGet(multicastId: number, params = {}): Observable<unknown> {
     const url =
       this.multicastDownlinkURL + multicastId + '/' + this.DOWNLINKMULTICASTURL;
     return this.restService.get(url, params);
@@ -94,7 +94,7 @@ export class MulticastService {
     downlink: Downlink,
     multicastId: number,
     params = {}
-  ): Observable<any> {
+  ): Observable<unknown> {
     const url =
       this.multicastDownlinkURL + multicastId + '/' + this.DOWNLINKMULTICASTURL;
     return this.restService.post(url, downlink, params);

src/app/shared/services/downlink.service.ts

@@ -2,6 +2,8 @@ import { Injectable } from '@angular/core';
 import { RestService } from './rest.service';
 import { Observable } from 'rxjs';
 import { Downlink } from '@applications/iot-devices/downlink.model';
+import { MatSnackBar } from '@angular/material/snack-bar';
+import { TranslateService } from '@ngx-translate/core';
 
 @Injectable({
   providedIn: 'root',
@@ -10,7 +12,11 @@ export class DownlinkService {
   private IOTDEVICEURL = 'iot-device/';
   private DOWNLINKURL = 'downlink';
 
-  constructor(private restService: RestService) {}
+  constructor(
+    private restService: RestService,
+    private snackBar: MatSnackBar,
+    public translate: TranslateService
+  ) {}
 
   public get(deviceId: number, params = {}): Observable<any> {
     const url = this.IOTDEVICEURL + deviceId + '/' + this.DOWNLINKURL;
@@ -25,4 +31,13 @@ export class DownlinkService {
     const url = this.IOTDEVICEURL + deviceId + '/' + this.DOWNLINKURL;
     return this.restService.post(url, downlink, params);
   }
+  public showSendDownlinkFailNoDevices() {
+    this.snackBar.open(
+      this.translate.instant('SNACK.NODEVICES'),
+      this.translate.instant('SNACK.CLOSE'),
+      {
+        duration: 10000,
+      }
+    );
+  }
 }

src/app/shared/services/snack.service.ts

@@ -41,9 +41,4 @@ export class SnackService {
       duration: 10000,
     });
   }
-  public showSendDownlinkFailNoDevices(){
-    this.snackBar.open(this.translate.instant('SNACK.NODEVICES'), this.translate.instant('SNACK.CLOSE'), {
-      duration: 10000,
-    });
-  }
 }