diff options
Diffstat (limited to 'sdc-workflow-designer-ui/src/app/components/property/rest-task')
4 files changed, 7 insertions, 105 deletions
diff --git a/sdc-workflow-designer-ui/src/app/components/property/rest-task/rest-task-parameters/rest-task-parameters.component.html b/sdc-workflow-designer-ui/src/app/components/property/rest-task/rest-task-parameters/rest-task-parameters.component.html deleted file mode 100644 index d13a2623..00000000 --- a/sdc-workflow-designer-ui/src/app/components/property/rest-task/rest-task-parameters/rest-task-parameters.component.html +++ /dev/null @@ -1,18 +0,0 @@ -<!-- -/******************************************************************************* - * Copyright (c) 2017 ZTE Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html - * and http://www.apache.org/licenses/LICENSE-2.0 - * - * Contributors: - * ZTE - initial API and implementation and/or initial documentation - *******************************************************************************/ ---> -<b4t-parameter *ngFor="let param of requestParameters" [param]="param" [valueSource]= "inputSources" [planItems]="planItems"></b4t-parameter> - -<!-- body parameter --> -<b4t-parameter-tree [task]="task" [parameters]="bodyParameter" [valueSource]="inputSources" - [planItems]="planItems" [defaultValueSource]="valueSource[valueSource.String]"></b4t-parameter-tree> 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 deleted file mode 100644 index 8e8cc94f..00000000 --- a/sdc-workflow-designer-ui/src/app/components/property/rest-task/rest-task-parameters/rest-task-parameters.component.ts +++ /dev/null @@ -1,79 +0,0 @@ -/** - * Copyright (c) 2017 ZTE Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html - * and http://www.apache.org/licenses/LICENSE-2.0 - * - * Contributors: - * ZTE - initial API and implementation and/or initial documentation - */ - -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { TreeNode } from 'primeng/primeng'; - -import { Swagger } from '../../../../model/swagger'; -import { RestTask } from '../../../../model/workflow/rest-task'; -import { BroadcastService } from '../../../../services/broadcast.service'; -import { RestParameter } from "../../../../model/workflow/rest-parameter"; -import { ValueSource } from "../../../../model/value-source.enum"; -import { SwaggerTreeConverterService } from "../../../../services/swagger-tree-converter.service"; -import { PlanTreeviewItem } from "../../../../model/plan-treeview-item"; -import { WorkflowConfigService } from "../../../../services/workflow-config.service"; -import { RestService } from '../../../../services/rest.service'; - -/** - * property component presents information of a workflow node. - * the presented information can be edit in this component. - * it may load information dynamically. the content may be different for different node type. - */ -@Component({ - selector: 'b4t-rest-task-parameters', - templateUrl: 'rest-task-parameters.component.html', -}) -export class RestTaskParametersComponent implements OnInit { - @Input() public task: RestTask; - @Input() public planItems: PlanTreeviewItem[]; - - public inputSources: ValueSource[] = [ValueSource.String, ValueSource.Variable, ValueSource.Plan]; - public requestParameters: RestParameter[] = []; // not include body parameter - public bodyParameter: TreeNode[] = []; - public responseParameter: TreeNode[] = []; - public valueSource = ValueSource; - - private index = 1; - - constructor(private broadcastService: BroadcastService, - private restService: RestService, - private swaggerTreeConverterService: SwaggerTreeConverterService) { - } - - public ngOnInit() { - this.broadcastService.nodeTaskChange$.subscribe(() => { - this.resetRequestParams(); - this.resetResponseParams(); - }); - } - - public resetRequestParams() { - this.requestParameters = []; - this.bodyParameter = []; - - this.task.parameters.forEach(param => { - if (param.position === 'body') { - const requestTreeNode = this.swaggerTreeConverterService - .schema2TreeNode(this.restService.getSwaggerInfo(this.task.restConfigId), 'Request Param', param.schema, param.value); - param.value = requestTreeNode.value; - param.value = param.schema.value; - this.bodyParameter.push(requestTreeNode); - } else { - this.requestParameters.push(param); - } - }); - } - - public resetResponseParams() { - // TODO add response body handler - } -} diff --git a/sdc-workflow-designer-ui/src/app/components/property/rest-task/rest-task.component.html b/sdc-workflow-designer-ui/src/app/components/property/rest-task/rest-task.component.html index 332811b5..99b8a0f4 100644 --- a/sdc-workflow-designer-ui/src/app/components/property/rest-task/rest-task.component.html +++ b/sdc-workflow-designer-ui/src/app/components/property/rest-task/rest-task.component.html @@ -15,9 +15,8 @@ <div class="form-group row"> <label class="col-md-3 form-control-label text-md-right">Service</label> <div class="col-md-9"> - <select class="form-control" [ngModel]="selectedMicroservice" - (ngModelChange)="serviceChanged($event)"> - <option *ngFor="let microservice of microservices" [ngValue]=microservice>{{getText4Microservice(microservice)}}</option> + <select class="form-control" [ngModel]="node.restConfigId" (ngModelChange)="serviceChanged($event)"> + <option *ngFor="let restConfig of restService.getRestConfigs()" value="{{restConfig.id}}">{{restConfig.id}}</option> </select> </div> </div> @@ -25,8 +24,7 @@ <div class="form-group row"> <label class="col-md-3 form-control-label text-md-right">Path</label> <div class="col-md-9"> - <select class="form-control" [ngModel]="node.url" - (ngModelChange)="urlChanged($event)"> + <select class="form-control" [ngModel]="node.path" (ngModelChange)="pathChanged($event)"> <option *ngFor="let interface of restInterfaces" value="{{interface}}">{{interface}}</option> </select> </div> @@ -35,8 +33,7 @@ <div class="form-group row"> <label class="col-md-3 form-control-label text-md-right">Method</label> <div class="col-md-9"> - <select class="form-control" [ngModel]="node.method" - (ngModelChange)="methodChanged($event)"> + <select class="form-control" [ngModel]="node.method" (ngModelChange)="methodChanged($event)"> <option *ngFor="let operation of restOperations" value="{{operation}}">{{operation}}</option> </select> </div> @@ -44,5 +41,5 @@ <hr> <div class="ui-fluid"> - <b4t-rest-task-parameters [task]="node" [planItems]="planItems"></b4t-rest-task-parameters> + <b4t-node-parameters [restConfigId]="this.node.restConfigId" [swaggerInput]="this.node.parameters" [swaggerOutput]="this.node.responses" [planItems]="planItems"></b4t-node-parameters> </div> diff --git a/sdc-workflow-designer-ui/src/app/components/property/rest-task/rest-task.component.ts b/sdc-workflow-designer-ui/src/app/components/property/rest-task/rest-task.component.ts index eb1c81bd..dfb2f0f3 100644 --- a/sdc-workflow-designer-ui/src/app/components/property/rest-task/rest-task.component.ts +++ b/sdc-workflow-designer-ui/src/app/components/property/rest-task/rest-task.component.ts @@ -71,6 +71,8 @@ export class RestTaskComponent implements OnInit { this.restInterfaces.push(key); } this.loadOperations(); + } else { + console.log('swagger not exist'); } } } |