support workflow variable as input parameter

rest task can reference workflow variable to be input parameter

Issue-ID: SDC-336

Change-Id: Idbab11e95195f659ba429489b2725b2fde8fdbec
Signed-off-by: Lvbo163 <lv.bo163@zte.com.cn>

diff --git a/sdc-workflow-designer-ui/src/app/components/parameter/parameter.component.html b/sdc-workflow-designer-ui/src/app/components/parameter/parameter.component.html
index 229c5af..e6a7ff4 100644 (file)
--- a/sdc-workflow-designer-ui/src/app/components/parameter/parameter.component.html
+++ b/sdc-workflow-designer-ui/src/app/components/parameter/parameter.component.html
@@ -21,6 +21,8 @@
         <div [ngSwitch]="param.valueSource">\r
             <input *ngSwitchCase="sourceEnum[sourceEnum.String]" [ngClass]="valueClass" class="form-control"\r
                 type="text" [ngModel]="param.value" (ngModelChange)="valueChange($event)">\r
+            <input *ngSwitchCase="sourceEnum[sourceEnum.Variable]" [ngClass]="valueClass" class="form-control"\r
+                type="text" [ngModel]="param.value" (ngModelChange)="valueChange($event)">\r
             <!-- TODO add plan and Top parameters -->\r
             <tree-select *ngSwitchCase="sourceEnum[sourceEnum.Plan]" name="simpleSelect" [items]="planOptions"\r
                 childrenField="children" #simpleSelect="ngModel" [ngClass]="valueClass" class="tree-select-class"\r

diff --git a/sdc-workflow-designer-ui/src/app/components/property/rest-task/rest-task-parameters/rest-task-parameters.component.ts b/sdc-workflow-designer-ui/src/app/components/property/rest-task/rest-task-parameters/rest-task-parameters.component.ts
index 31b2fd8..8790357 100644 (file)
--- a/sdc-workflow-designer-ui/src/app/components/property/rest-task/rest-task-parameters/rest-task-parameters.component.ts
+++ b/sdc-workflow-designer-ui/src/app/components/property/rest-task/rest-task-parameters/rest-task-parameters.component.ts
@@ -34,7 +34,7 @@ export class RestTaskParametersComponent implements OnInit {
     @Input() public task: RestTask;
     @Input() public planItems: PlanTreeviewItem[];
 
-    public inputSources: ValueSource[] = [ValueSource.String, ValueSource.Plan];
+    public inputSources: ValueSource[] = [ValueSource.String, ValueSource.Variable, ValueSource.Plan];
     public requestParameters: RestParameter[] = []; // not include body parameter
     public bodyParameter: TreeNode[] = [];
     public responseParameter: TreeNode[] = [];

diff --git a/sdc-workflow-designer-ui/src/app/model/value-source.enum.ts b/sdc-workflow-designer-ui/src/app/model/value-source.enum.ts
index 4a9ca78..eeeb528 100644 (file)
--- a/sdc-workflow-designer-ui/src/app/model/value-source.enum.ts
+++ b/sdc-workflow-designer-ui/src/app/model/value-source.enum.ts
@@ -13,5 +13,6 @@
 export enum ValueSource {
     String,
     Plan,
+    Variable,
     // Topology, // TODO implement Topology properties in R2
 }