fixing delete button and cancel button

Author: paxtonhare

quick-start/src/main/ui/app/flows/flows.component.html

@@ -39,7 +39,7 @@
                         <i class="mdi" [ngClass]="{'mdi-import': type === 'Input', 'mdi-looks' : type === 'Harmonize'}"></i>
                         {{ flow.flowName }}
                         <span class="mdl-layout-spacer"></span>
-                        <i class="fa fa-trash" (click)="deleteFlow(flow, type.toUpperCase())"></i>
+                        <i class="fa fa-trash" (click)="deleteFlow($event, flow, type.toUpperCase())"></i>
                         <i class="fa fa-bug" *ngIf="flowHasError(entity.name, flow.flowName)"></i>
                       </span>
                     </div>

quick-start/src/main/ui/app/flows/flows.component.ts

@@ -214,7 +214,14 @@ export class FlowsComponent implements OnInit, OnDestroy {
     this.setCollapsed(entity, !collapsed);
   }
 
-  deleteFlow(flow: Flow, flowType: string): void {
+  deleteFlow(event: MouseEvent, flow: Flow, flowType: string): void {
+    if (event.stopPropagation) {
+      event.stopPropagation();
+    }
+    if (event.preventDefault) {
+      event.preventDefault();
+    }
+    event.cancelBubble = true;
     this.dialogService.confirm(`Really delete ${flow.flowName}`, 'Cancel', 'Delete').subscribe(() => {
       this.entitiesService.deleteFlow(flow, flowType).subscribe(() => {
         this.router.navigate(['/flows']);
@@ -363,6 +370,9 @@ export class FlowsComponent implements OnInit, OnDestroy {
       this.snackbar.showSnackbar({
         message: flow.entityName + ': ' + flow.flowName + ' starting...',
       });
+    },
+    () => {
+      this.router.navigate(['/flows']);
     });
   }
 

quick-start/src/main/ui/app/harmonize-flow-options/harmonize-flow-options.component.ts

@@ -43,7 +43,6 @@ export class HarmonizeFlowOptionsComponent implements OnInit {
   }
 
   cancel(): void {
-    this.hide();
     this.finishedEvent.error(false);
   }