Display Extend Activities on WF Designer UI.

Display Extend Activities on WF Designer UI.
Use Extend Activities to Design Workflow and Save

Issue-ID: SDC-1130,SDC-1131

Change-Id: Iea62eb0edafb2270deaac89b458015e78d961cd0
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>

2 files changed, 7 insertions, 10 deletions

diff --git a/sdc-workflow-designer-ui/src/app/components/container/container.component.html b/sdc-workflow-designer-ui/src/app/components/container/container.component.html
index c40fbcda..40cdf7fa 100644
--- a/sdc-workflow-designer-ui/src/app/components/container/container.component.html
+++ b/sdc-workflow-designer-ui/src/app/components/container/container.component.html
@@ -14,9 +14,9 @@
 
 <div #mainContainer id="canvas" class="canvas" (mousedown)="canvasMouseDown($event)">
     <div id="node-selector" #nodeSelector></div>
-    <b4t-node *ngFor="let node of modelService.getNodes()" [node]="node" [rank]="10"></b4t-node>
+    <wfm-node *ngFor="let node of modelService.getNodes()" [node]="node" [rank]="10"></wfm-node>
 </div>
 
-<b4t-properties></b4t-properties>
+<wfm-properties></wfm-properties>
 
-<b4t-sequence-flow></b4t-sequence-flow>
\ No newline at end of file
+<wfm-sequence-flow></wfm-sequence-flow>
\ No newline at end of file
diff --git a/sdc-workflow-designer-ui/src/app/components/container/container.component.ts b/sdc-workflow-designer-ui/src/app/components/container/container.component.ts
index 63ea84d9..5f317cb8 100644
--- a/sdc-workflow-designer-ui/src/app/components/container/container.component.ts
+++ b/sdc-workflow-designer-ui/src/app/components/container/container.component.ts
@@ -16,7 +16,7 @@ import { SequenceFlow } from '../../model/workflow/sequence-flow';
 import { WorkflowElement } from '../../model/workflow/workflow-element';
 import { WorkflowNode } from '../../model/workflow/workflow-node';
 import { BroadcastService } from '../../services/broadcast.service';
-import { DataService } from '../../services/data/data.service';
+import { InterfaceService } from '../../services/interface.service';
 import { JsPlumbService } from '../../services/jsplumb.service';
 import { ModelService } from '../../services/model.service';
 
@@ -25,7 +25,7 @@ import { ModelService } from '../../services/model.service';
  * bpmn task nodes can be dropped into this canvas, and then the workflow can be edit
  */
 @Component({
-    selector: 'b4t-container',
+    selector: 'wfm-container',
     templateUrl: 'container.component.html',
     styleUrls: ['./container.component.css']
 })
@@ -40,7 +40,7 @@ export class ContainerComponent implements AfterViewChecked, AfterViewInit, OnIn
     private needInitSequence = false;
 
     constructor(private broadcastService: BroadcastService, private jsPlumbService: JsPlumbService,
-        private dataService: DataService, public modelService: ModelService) {
+        private interfaceService: InterfaceService, public modelService: ModelService) {
     }
 
     @HostListener('window:keyup.delete', ['$event']) ondelete(event: KeyboardEvent) {
@@ -74,10 +74,7 @@ export class ContainerComponent implements AfterViewChecked, AfterViewInit, OnIn
 
     public ngOnInit() {
         this.jsPlumbService.initJsPlumbInstance(this.modelService.rootNodeId);
-        this.broadcastService.backendServiceReady$.subscribe(() => {
-            this.dataService.initData();
-        });
-        this.broadcastService.planModel$.subscribe(() => {
+        this.broadcastService.initModel$.subscribe(() => {
             this.needInitSequence = true;
         });
         this.broadcastService.showProperty$.subscribe(element=>{