PR Changes. Also made the check for sigfox devices in detail page, which i missed before.

Author: AugustHA-Iterator

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

@@ -5,6 +5,7 @@ import { Application } from '@applications/application.model';
 import { ApplicationService } from '@applications/application.service';
 import { TranslateService } from '@ngx-translate/core';
 import { DeleteDialogService } from '@shared/components/delete-dialog/delete-dialog.service';
+import { DeviceType } from '@shared/enums/device-type';
 import { BackButton } from '@shared/models/back-button.model';
 import { DropdownButton } from '@shared/models/dropdown-button.model';
 import { MeService } from '@shared/services/me.service';
@@ -59,12 +60,22 @@ export class ApplicationDetailComponent implements OnInit, OnDestroy {
     }
 
     onDeleteApplication() {
+        
         let message: string;
-        if (this.applicationHasDevices()) {
-            message = this.translate.instant('APPLICATION.DELETE-HAS-DEVICES-PROMPT');
+        let showAccept: boolean = true;
+        const hasSigfoxDevices: boolean = this.applicationHasSigFoxDevices();
+
+        if (hasSigfoxDevices) {
+        message = this.translate.instant(
+            'APPLICATION.DELETE-HAS-SIGFOX-DEVICES-PROMPT'
+        );
+        showAccept = false;
+
+        } else if (this.applicationHasDevices()) {
+        message = this.translate.instant('APPLICATION.DELETE-HAS-DEVICES-PROMPT');
         }
 
-        this.deleteDialogSubscription = this.deleteDialogService.showSimpleDialog(message).subscribe(
+        this.deleteDialogSubscription = this.deleteDialogService.showSimpleDialog(message, showAccept).subscribe(
             (response) => {
                 if (response) {
                     this.applicationService.deleteApplication(this.application.id).subscribe((response) => {
@@ -86,6 +97,13 @@ export class ApplicationDetailComponent implements OnInit, OnDestroy {
         return this.application.iotDevices?.length > 0;
     }
 
+    applicationHasSigFoxDevices(): boolean {
+        const sigfoxDevice = this.application.iotDevices.find((device) => {
+          return device.type === DeviceType.SIGFOX;
+        });
+        return sigfoxDevice !== undefined;
+    }
+
     bindApplication(id: number): void {
         this.applicationsSubscription = this.applicationService.getApplication(id).subscribe((application) => {
             this.application = application;

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

@@ -95,30 +95,37 @@ export class ApplicationsTableComponent implements AfterViewInit, OnInit {
 
   deleteApplication(id: number) {
     let message: string;
+    let showAccept: boolean = true;
+    const hasSigfoxDevices: boolean = this.applicationHasSigFoxDevices(id);
 
-    if (this.canBeDeleted(id)) {
-      return;
-    }
-
-    if (this.applicationHasDevices(id)) {
+    if (hasSigfoxDevices) {
+      message = this.translate.instant(
+        'APPLICATION.DELETE-HAS-SIGFOX-DEVICES-PROMPT'
+      );
+      showAccept = false;
+    } else if (this.applicationHasDevices(id)) {
       message = this.translate.instant('APPLICATION.DELETE-HAS-DEVICES-PROMPT');
     }
 
-    this.deleteDialogService.showSimpleDialog(message).subscribe((response) => {
-      if (response) {
-        this.applicationService.deleteApplication(id).subscribe((response) => {
-          if (response.ok && response.body.affected > 0) {
-            this.paginator.page.emit({
-              pageIndex: this.paginator.pageIndex,
-              pageSize: this.paginator.pageSize,
-              length: this.resultsLength,
+    this.deleteDialogService
+      .showSimpleDialog(message, showAccept)
+      .subscribe((response) => {
+        if (response) {
+          this.applicationService
+            .deleteApplication(id)
+            .subscribe((response) => {
+              if (response.ok && response.body.affected > 0) {
+                this.paginator.page.emit({
+                  pageIndex: this.paginator.pageIndex,
+                  pageSize: this.paginator.pageSize,
+                  length: this.resultsLength,
+                });
+              } else {
+                this.errorMessage = response?.error?.message;
+              }
             });
-          } else {
-            this.errorMessage = response?.error?.message;
-          }
-        });
-      }
-    });
+        }
+      });
   }
 
   applicationHasDevices(id: number): boolean {
@@ -128,34 +135,10 @@ export class ApplicationsTableComponent implements AfterViewInit, OnInit {
 
   applicationHasSigFoxDevices(id: number): boolean {
     const applicationToDelete = this.data?.find((app) => app.id === id);
-    const checkForSigfox = applicationToDelete.iotDevices.find((device) => {
+    const sigfoxDevice = applicationToDelete.iotDevices.find((device) => {
       return device.type === DeviceType.SIGFOX;
     });
-    if (checkForSigfox) {
-      return true;
-    } else return false;
-  }
-
-  canBeDeleted(id: number): boolean {
-    let message: string;
-
-    if (this.applicationHasSigFoxDevices(id)) {
-      message = this.translate.instant(
-        'APPLICATION.DELETE-HAS-SIGFOX-DEVICES-PROMPT'
-      );
-      this.deleteDialogService
-        .showSimpleDialog(
-          message,
-          false,
-          true,
-          false,
-          this.translate.instant('APPLICATION.DELETE')
-        )
-        .subscribe();
-      return true;
-    } else {
-      return false;
-    }
+    return sigfoxDevice !== undefined;
   }
 
   navigateToEditPage(applicationId: string) {