diff options
Diffstat (limited to 'sdc-workflow-designer-ui/src/app/components/menus/microservice')
3 files changed, 5 insertions, 10 deletions
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) { } |