TTOOLS-500 - additional tweaks to fix unit test

teiid · Oct 23, 2018 · 493fb58 · 493fb58
1 parent e839ce8
commit 493fb58
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 40 deletions.
diff --git a/ngapp/src/app/dataservices/virtualization/view-editor/view-canvas/view-canvas.component.ts b/ngapp/src/app/dataservices/virtualization/view-editor/view-canvas/view-canvas.component.ts
@@ -46,7 +46,7 @@ import { Composition } from "@dataservices/shared/composition.model";
   templateUrl: "./view-canvas.component.html",
   styleUrls: ["./view-canvas.component.css"]
 })
-export class ViewCanvasComponent implements OnInit, AfterViewInit, OnDestroy {
+export class ViewCanvasComponent implements OnInit, OnDestroy {
 
   // used by html
   public readonly noSourcesAlert = ViewEditorI18n.noSourcesAlert;
@@ -197,40 +197,6 @@ export class ViewCanvasComponent implements OnInit, AfterViewInit, OnDestroy {
     this.canvasSubscription = this.canvasService.canvasEvent.subscribe((event) => this.handleCanvasEvent(event));
   }
 
-  public ngAfterViewInit(): void {
-    // const labels:string[] = ['Employee', 'Admin', 'Payroll', 'EmployeeAdmin', 'EmployeePayDay'];
-    // const type:string[] = [
-    //   CanvasConstants.SOURCE_TYPE,
-    //   CanvasConstants.SOURCE_TYPE,
-    //   CanvasConstants.SOURCE_TYPE,
-    //   CanvasConstants.COMPOSITION_TYPE,
-    //   CanvasConstants.COMPOSITION_TYPE
-    // ];
-    //
-    // /** constructing the nodes array */
-    // const nodeIds: string[] = [];
-    // for (let i = 0; i < 5; i++) {
-    //   const id = this.canvasService.createNode(type[i], labels[i]);
-    //   nodeIds.push(id);
-    // }
-    //
-    // this.canvasService.createLink(nodeIds[0], nodeIds[3]);
-    // this.canvasService.createLink(nodeIds[1], nodeIds[3]);
-    // this.canvasService.createLink(nodeIds[2], nodeIds[4]);
-    // this.canvasService.createLink(nodeIds[3], nodeIds[4], true);
-
-    this.canvasService.canvasEvent.subscribe((nodes) => {
-      if (_.isEmpty(nodes)) {
-        console.log("No nodes selected");
-        return;
-      }
-
-      for (const node of nodes) {
-        console.log("Node " + node.label + " selected");
-      }
-    });
-  }
-
   /**
    * @returns {boolean} `true` if view being edited is readonly
    */

diff --git a/...taservices/virtualization/view-editor/view-canvas/visuals/graph/graph-visual.component.ts b/...taservices/virtualization/view-editor/view-canvas/visuals/graph/graph-visual.component.ts
@@ -87,6 +87,7 @@ export class GraphVisualComponent implements OnInit {
   constructor(canvasService: CanvasService, ref: ChangeDetectorRef) {
     this.canvasService = canvasService;
     this.ref = ref;
+    this.canvasGraph = this.canvasService.newCanvasGraph(this.options, this.ref);
   }
 
   public get nodes(): CanvasNode[] {
@@ -99,9 +100,6 @@ export class GraphVisualComponent implements OnInit {
 
   public ngOnInit(): void {
     console.log("graph-visual: ngOnInit");
-
-    /** Receiving an initialized simulated graph from our custom canvas.service */
-    this.canvasGraph = this.canvasService.newCanvasGraph(this.options, this.ref);
   }
 
   // TODO: Need to discuss how all the layout sizes affect each other.

diff --git a/ngapp/src/app/dataservices/virtualization/view-editor/views-list/views-list.component.ts b/ngapp/src/app/dataservices/virtualization/view-editor/views-list/views-list.component.ts
@@ -34,6 +34,7 @@ import {ConfirmDialogComponent} from "@shared/confirm-dialog/confirm-dialog.comp
 import {CommandFactory} from "@dataservices/virtualization/view-editor/command/command-factory";
 import {Command} from "@dataservices/virtualization/view-editor/command/command";
 import {CreateViewDialogComponent} from "@dataservices/virtualization/view-editor/create-view-dialog/create-view-dialog.component";
+import {ChangeDetectorRef} from "@angular/core";
 
 @Component({
   encapsulation: ViewEncapsulation.None,
@@ -62,17 +63,20 @@ export class ViewsListComponent implements OnInit, OnDestroy, AfterViewInit {
   private viewsLoadingState: LoadingState = LoadingState.LOADING;
   private selectedVirtualization: Dataservice;
   private viewSavedUponCompletion: ViewDefinition;
+  private cdRef: ChangeDetectorRef;
 
   constructor( editorService: ViewEditorService,
                dataserviceService: DataserviceService,
                selectionService: SelectionService,
                logger: LoggerService,
-               modalService: BsModalService) {
+               modalService: BsModalService,
+               cdRef: ChangeDetectorRef) {
     this.editorService = editorService;
     this.dataserviceService = dataserviceService;
     this.selectionService = selectionService;
     this.logger = logger;
     this.modalService = modalService;
+    this.cdRef = cdRef;
   }
 
   /**
@@ -136,12 +140,12 @@ export class ViewsListComponent implements OnInit, OnDestroy, AfterViewInit {
       emptyStateConfig: this.emptyStateConfig
     } as TableConfig;
 
-
   }
 
   public ngAfterViewInit(): void {
     // init the available views
     this.initViews();
+    this.cdRef.detectChanges();
   }
 
   /*