diff options
author | Lvbo163 <lv.bo163@zte.com.cn> | 2018-01-09 19:31:52 +0800 |
---|---|---|
committer | Lvbo163 <lv.bo163@zte.com.cn> | 2018-01-09 20:03:06 +0800 |
commit | eb2d1c385e5c3d96e770b776f74ddbde9f2b133f (patch) | |
tree | 18c655f6dd331c7752f13d7f79a04ea20e774d59 /sdc-workflow-designer-ui/src/app/components | |
parent | 2356116cdf19843ba11bc0e781577b5a539ba712 (diff) |
fix error while workflow is empty
workflow select list error while workflow list is empty
Issue-ID: SDC-891
Change-Id: I3c92891efe4b323fcc6130b3ead6dcc7ff61af48
Signed-off-by: Lvbo163 <lv.bo163@zte.com.cn>
Diffstat (limited to 'sdc-workflow-designer-ui/src/app/components')
5 files changed, 19 insertions, 8 deletions
diff --git a/sdc-workflow-designer-ui/src/app/components/canvas/canvas.component.ts b/sdc-workflow-designer-ui/src/app/components/canvas/canvas.component.ts index 453e6d55..1cf197df 100644 --- a/sdc-workflow-designer-ui/src/app/components/canvas/canvas.component.ts +++ b/sdc-workflow-designer-ui/src/app/components/canvas/canvas.component.ts @@ -18,7 +18,7 @@ import { ActivatedRoute } from "@angular/router"; import { DataAccessService } from "../../services/data-access/data-access.service"; import { WorkflowService } from "../../services/workflow.service"; import { PlanModel } from "../../model/workflow/plan-model"; -import { WorkflowProcessService } from "../../services/workflow-process.service"; +import { ModelService } from "../../services/model.service"; import { SequenceFlow } from "../../model/workflow/sequence-flow"; import { WorkflowNode } from "../../model/workflow/workflow-node"; @@ -42,7 +42,7 @@ export class CanvasComponent implements AfterViewInit { private jsPlumbService: JsPlumbService, private route: ActivatedRoute, private workflowService: WorkflowService, - private processService: WorkflowProcessService) { + private processService: ModelService) { } ngOnInit(): void { diff --git a/sdc-workflow-designer-ui/src/app/components/menu/menu.component.ts b/sdc-workflow-designer-ui/src/app/components/menu/menu.component.ts index b3954911..adad16c1 100644 --- a/sdc-workflow-designer-ui/src/app/components/menu/menu.component.ts +++ b/sdc-workflow-designer-ui/src/app/components/menu/menu.component.ts @@ -26,8 +26,19 @@ export class MenuComponent { @ViewChild(MicroserviceComponent) public microserviceComponent: MicroserviceComponent; @ViewChild(WorkflowsComponent) public workflowsComponent: WorkflowsComponent; public currentWorkflow = 'Workflows'; + public workflows = []; constructor(private broadcastService: BroadcastService, private workflowService: WorkflowService) { + this.broadcastService.workflows.subscribe(wfs => { + this.workflows.splice(0, this.workflows.length); + if(wfs) { + wfs.forEach((value, key, map) => { + this.workflows.push({label: value.planName, command: () => { + this.workflowSelected(value.planName, value.plan); + }}); + }); + } + }); } public save(): void { @@ -45,7 +56,7 @@ export class MenuComponent { this.workflowsComponent.show(); } - public getWorkflows(planId: number) { + public getWorkflows() { const workflows = this.workflowService.getWorkflows(); if(workflows) { const options = []; diff --git a/sdc-workflow-designer-ui/src/app/components/menu/workflows/workflows.component.html b/sdc-workflow-designer-ui/src/app/components/menu/workflows/workflows.component.html index 5568ba60..0f6c7ff2 100644 --- a/sdc-workflow-designer-ui/src/app/components/menu/workflows/workflows.component.html +++ b/sdc-workflow-designer-ui/src/app/components/menu/workflows/workflows.component.html @@ -24,7 +24,7 @@ tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="tru <div class="modal-body">
<ul class="list-group">
<li class="list-group-item d-flex justify-content-between align-items-center"
- *ngFor="let key of workflows.keys()">
+ *ngFor="let key of workflows?.keys()">
<div style="width:380px"><input class="form-control" [(ngModel)]="workflows.get(key).planName"></div>
<div class="badge badge-danger badge-pill" (click)="deleteWorkflow(key)">
<i class="fa fa-minus"></i>
diff --git a/sdc-workflow-designer-ui/src/app/components/property/properties.component.ts b/sdc-workflow-designer-ui/src/app/components/property/properties.component.ts index 2aa552ed..2091d83c 100644 --- a/sdc-workflow-designer-ui/src/app/components/property/properties.component.ts +++ b/sdc-workflow-designer-ui/src/app/components/property/properties.component.ts @@ -16,7 +16,7 @@ import { WorkflowNode } from '../../model/workflow/workflow-node'; import { BroadcastService } from '../../services/broadcast.service'; import { JsPlumbService } from '../../services/jsplumb.service'; import { PlanTreeviewItem } from "../../model/plan-treeview-item"; -import { WorkflowProcessService } from "../../services/workflow-process.service"; +import { ModelService } from "../../services/model.service"; /** * property component presents information of a workflow node. @@ -36,7 +36,7 @@ export class PropertiesComponent implements AfterViewInit { constructor(private broadcastService: BroadcastService, private jsPlumnService: JsPlumbService, - private processService: WorkflowProcessService) { + private processService: ModelService) { } diff --git a/sdc-workflow-designer-ui/src/app/components/sequence-flow/sequence-flow.component.ts b/sdc-workflow-designer-ui/src/app/components/sequence-flow/sequence-flow.component.ts index 0109e273..c4a70ec9 100644 --- a/sdc-workflow-designer-ui/src/app/components/sequence-flow/sequence-flow.component.ts +++ b/sdc-workflow-designer-ui/src/app/components/sequence-flow/sequence-flow.component.ts @@ -16,7 +16,7 @@ import { TreeNode } from 'primeng/primeng'; import { SequenceFlow } from '../../model/workflow/sequence-flow'; import { BroadcastService } from '../../services/broadcast.service'; import { JsPlumbService } from '../../services/jsplumb.service'; -import { WorkflowProcessService } from '../../services/workflow-process.service'; +import { ModelService } from '../../services/model.service'; /** * property component presents information of a workflow node. @@ -33,7 +33,7 @@ export class SequenceFlowComponent implements AfterViewInit { public show = false; constructor(private broadcastService: BroadcastService, - private processService: WorkflowProcessService, + private processService: ModelService, private jsPlumbService: JsPlumbService) { } |