aboutsummaryrefslogtreecommitdiffstats
path: root/sdc-workflow-designer-ui/src/app/components/menus
diff options
context:
space:
mode:
authorLvbo163 <lv.bo163@zte.com.cn>2018-01-11 14:18:25 +0800
committerLvbo163 <lv.bo163@zte.com.cn>2018-01-11 14:18:25 +0800
commit761b385b2a0a6dbec10717e6d94f1cd1e04bb2ef (patch)
tree43dc6ade00676d38bbf1831c5f18335a1eb8b858 /sdc-workflow-designer-ui/src/app/components/menus
parentc825e1c7a6fa1aa8f1c430384620ffd0addf25f8 (diff)
support exclusive-gateway
add exclusive gateway definition Issue-ID: SDC-902 Change-Id: Id7ff89d30735fa16169c2a78b743e1565eb90410 Signed-off-by: Lvbo163 <lv.bo163@zte.com.cn>
Diffstat (limited to 'sdc-workflow-designer-ui/src/app/components/menus')
-rw-r--r--sdc-workflow-designer-ui/src/app/components/menus/menus.component.ts2
-rw-r--r--sdc-workflow-designer-ui/src/app/components/menus/microservice/microservice-detail/microservice-detail.component.ts8
-rw-r--r--sdc-workflow-designer-ui/src/app/components/menus/microservice/microservice-list/microservice-list.component.ts3
-rw-r--r--sdc-workflow-designer-ui/src/app/components/menus/microservice/microservice.component.ts4
-rw-r--r--sdc-workflow-designer-ui/src/app/components/menus/workflows/workflows.component.ts2
5 files changed, 7 insertions, 12 deletions
diff --git a/sdc-workflow-designer-ui/src/app/components/menus/menus.component.ts b/sdc-workflow-designer-ui/src/app/components/menus/menus.component.ts
index e5f68ad1..c60e3b25 100644
--- a/sdc-workflow-designer-ui/src/app/components/menus/menus.component.ts
+++ b/sdc-workflow-designer-ui/src/app/components/menus/menus.component.ts
@@ -15,7 +15,7 @@ import { WorkflowService } from '../../services/workflow.service';
import { MicroserviceComponent } from "./microservice/microservice.component";
import { WorkflowsComponent } from "./workflows/workflows.component";
import { BroadcastService } from "../../services/broadcast.service";
-import { PlanModel } from "../../model/workflow/plan-model";
+import { PlanModel } from "../../model/plan-model";
@Component({
selector: 'menus',
diff --git a/sdc-workflow-designer-ui/src/app/components/menus/microservice/microservice-detail/microservice-detail.component.ts b/sdc-workflow-designer-ui/src/app/components/menus/microservice/microservice-detail/microservice-detail.component.ts
index bffaef42..c4c9649b 100644
--- a/sdc-workflow-designer-ui/src/app/components/menus/microservice/microservice-detail/microservice-detail.component.ts
+++ b/sdc-workflow-designer-ui/src/app/components/menus/microservice/microservice-detail/microservice-detail.component.ts
@@ -13,10 +13,9 @@
import { Component, Input, OnChanges, ViewChild } from '@angular/core';
import { ModalDirective } from 'ngx-bootstrap/modal';
-import { Microservice } from '../../../../model/workflow/microservice';
-import { WorkflowConfigService } from '../../../../services/workflow-config.service';
import { Swagger } from "../../../../model/swagger";
import { RestConfig } from '../../../../model/rest-config';
+import { RestService } from '../../../../services/rest.service';
/**
* toolbar component contains some basic operations(save) and all of the supported workflow nodes.
@@ -32,7 +31,7 @@ export class MicroserviceDetailComponent implements OnChanges {
public detail: string;
public dynamic = false;
- constructor(private configService: WorkflowConfigService) {
+ constructor(private configService: RestService) {
}
public ngOnChanges() {
@@ -85,10 +84,9 @@ export class MicroserviceDetailComponent implements OnChanges {
}
private loadDynamicInfo() {
- this.configService.loadDynamicInfo(this.microservice.url)
+ this.configService.getDynamicSwaggerInfo(this.microservice.url)
.subscribe(response => {
try {
-
this.microservice.swagger = response;
this.parseSwagger2String();
} catch (e) {
diff --git a/sdc-workflow-designer-ui/src/app/components/menus/microservice/microservice-list/microservice-list.component.ts b/sdc-workflow-designer-ui/src/app/components/menus/microservice/microservice-list/microservice-list.component.ts
index b44d423f..6b17f8b7 100644
--- a/sdc-workflow-designer-ui/src/app/components/menus/microservice/microservice-list/microservice-list.component.ts
+++ b/sdc-workflow-designer-ui/src/app/components/menus/microservice/microservice-list/microservice-list.component.ts
@@ -13,7 +13,6 @@
import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core';
import { ModalDirective } from 'ngx-bootstrap/modal';
-import { Microservice } from '../../../../model/workflow/microservice';
import { RestConfig } from '../../../../model/rest-config';
/**
@@ -39,7 +38,7 @@ export class MicroserviceListComponent {
this.onMicroserviceSelected(microservice);
}
- public deleteMicroservice(index: number, microservice: Microservice) {
+ public deleteMicroservice(index: number, microservice: RestConfig) {
this.deleteMicroService(microservice.name, microservice.version);
// set the next microservice selected
diff --git a/sdc-workflow-designer-ui/src/app/components/menus/microservice/microservice.component.ts b/sdc-workflow-designer-ui/src/app/components/menus/microservice/microservice.component.ts
index eeedac47..5c659313 100644
--- a/sdc-workflow-designer-ui/src/app/components/menus/microservice/microservice.component.ts
+++ b/sdc-workflow-designer-ui/src/app/components/menus/microservice/microservice.component.ts
@@ -14,8 +14,6 @@ import { AfterViewInit, Component, ViewChild } from '@angular/core';
import { ModalDirective } from 'ngx-bootstrap/modal';
import { MicroserviceListComponent } from './microservice-list/microservice-list.component';
-import { Microservice } from "../../../model/workflow/microservice";
-import { WorkflowConfigService } from "../../../services/workflow-config.service";
import { RestService } from '../../../services/rest.service';
import { RestConfig } from '../../../model/rest-config';
@@ -31,7 +29,7 @@ export class MicroserviceComponent {
@ViewChild('microserviceModal') public microserviceModal: ModalDirective;
public microservices: RestConfig[];
- public currentMicroservice: Microservice;
+ public currentMicroservice: RestConfig;
constructor(private restService: RestService) {
}
diff --git a/sdc-workflow-designer-ui/src/app/components/menus/workflows/workflows.component.ts b/sdc-workflow-designer-ui/src/app/components/menus/workflows/workflows.component.ts
index bf884983..c771b535 100644
--- a/sdc-workflow-designer-ui/src/app/components/menus/workflows/workflows.component.ts
+++ b/sdc-workflow-designer-ui/src/app/components/menus/workflows/workflows.component.ts
@@ -14,7 +14,7 @@ import { AfterViewInit, Component, ViewChild } from '@angular/core';
import { ModalDirective } from 'ngx-bootstrap/modal';
import { WorkflowService } from "../../../services/workflow.service";
-import { PlanModel } from "../../../model/workflow/plan-model";
+import { PlanModel } from "../../../model/plan-model";
/**
* workflows component