DHFPROD-1879 & DHFPROD-1821 bug fixes

Improper copying of settings between flows fixed + trash icon delete fix

Author: clockworked247

quick-start/src/main/ui/app/entities/entities.service.ts

@@ -37,16 +37,20 @@ export class EntitiesService {
   ) {}
 
   getEntities() {
-    this.http.get(this.url('/entities/')).map((res: Response) => {
+    let resp = this.http.get(this.url('/entities/')).map((res: Response) => {
       const entities: Array<any> = res.json();
       return entities.map((entity) => {
         return new Entity().fromJSON(entity);
       });
-    }).subscribe((entities: Array<Entity>) => {
+    }).share();
+    
+    resp.subscribe((entities: Array<Entity>) => {
       this.entities = entities;
       this.entitiesChange.emit(this.entities);
       this.extractTypes();
     });
+
+    return resp;
   }
 
   // getEntity(entityName: string) {

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

@@ -224,8 +224,8 @@ export class FlowsComponent implements OnInit, OnDestroy {
     localStorage.setItem(entity.name + '-collapsed', collapsed.toString());
   }
 
-  getEntities(): void {
-    this.entitiesService.getEntities();
+  getEntities(): Observable<Entity[]> {
+    return this.entitiesService.getEntities();
   }
 
   toggleEntity(entity: Entity): void {
@@ -327,12 +327,9 @@ export class FlowsComponent implements OnInit, OnDestroy {
     const actions = {
       save: (newFlow: Flow) => {
         this.entitiesService.createFlow(entity, flowType.toUpperCase(), newFlow).subscribe((flow: Flow) => {
-          if (flowType.toUpperCase() === 'INPUT') {
-            entity.inputFlows.push(flow);
-          } else if (flowType.toUpperCase() === 'HARMONIZE') {
-            entity.harmonizeFlows.push(flow);
-          }
-          this.setFlow(flow, flowType.toUpperCase());
+          this.getEntities().subscribe(() => {
+            this.setFlow(flow, flowType.toUpperCase());
+          });
         });
       }
     };

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

@@ -537,7 +537,9 @@ export class MlcpComponent implements OnChanges {
 
   updateSetting(): void {
     // use setTimeout to solve ExpressionChangedAfterItHasBeenCheckedError
-    setTimeout(this.updateMlcpCommand(), 0);
+    setTimeout(() => {
+      this.updateMlcpCommand()
+    }, 0);
   }
 
   updateMlcpCommand(): string {

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

@@ -46,7 +46,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($event, flow, type.toUpperCase())"></i>
+                        <i class="fa fa-trash" (click)="deleteFlow(flow, type.toUpperCase())"></i>
                         <i class="fa fa-bug" *ngIf="flowHasError(entity.name, flow.flowName)"></i>
                       </span>
                     </div>