From 008518dc35ded3bb6dc3e6352472b5816271f583 Mon Sep 17 00:00:00 2001 From: Lvbo163 Date: Thu, 11 Jan 2018 10:22:16 +0800 Subject: [PATCH] adjust folder change fold menu to menus Issue-ID: SDC-900 Change-Id: Ifce180badf4f468a3291b118bfd4f631483541ec Signed-off-by: Lvbo163 --- sdc-workflow-designer-ui/src/app/app.component.css | 2 +- sdc-workflow-designer-ui/src/app/app.module.ts | 40 ++++++++++++---------- .../components/{menu => menus}/menus.component.css | 0 .../{menu => menus}/menus.component.html | 0 .../{menu => menus}/menus.component.spec.ts | 0 .../components/{menu => menus}/menus.component.ts | 0 .../microservice-detail.component.html | 0 .../microservice-detail.component.ts | 0 .../microservice-list.component.css | 0 .../microservice-list.component.html | 0 .../microservice-list.component.ts | 0 .../microservice/microservice.component.html | 0 .../microservice/microservice.component.ts | 0 .../workflows/workflows.component.html | 0 .../workflows/workflows.component.ts | 0 .../resizable.directive.ts | 2 +- .../src/app/util/http.service.ts | 33 +++++++++++------- .../src/app/util/rxjs-operators.ts | 1 + 18 files changed, 46 insertions(+), 32 deletions(-) rename sdc-workflow-designer-ui/src/app/components/{menu => menus}/menus.component.css (100%) rename sdc-workflow-designer-ui/src/app/components/{menu => menus}/menus.component.html (100%) rename sdc-workflow-designer-ui/src/app/components/{menu => menus}/menus.component.spec.ts (100%) rename sdc-workflow-designer-ui/src/app/components/{menu => menus}/menus.component.ts (100%) rename sdc-workflow-designer-ui/src/app/components/{menu => menus}/microservice/microservice-detail/microservice-detail.component.html (100%) rename sdc-workflow-designer-ui/src/app/components/{menu => menus}/microservice/microservice-detail/microservice-detail.component.ts (100%) rename sdc-workflow-designer-ui/src/app/components/{menu => menus}/microservice/microservice-list/microservice-list.component.css (100%) rename sdc-workflow-designer-ui/src/app/components/{menu => menus}/microservice/microservice-list/microservice-list.component.html (100%) rename sdc-workflow-designer-ui/src/app/components/{menu => menus}/microservice/microservice-list/microservice-list.component.ts (100%) rename sdc-workflow-designer-ui/src/app/components/{menu => menus}/microservice/microservice.component.html (100%) rename sdc-workflow-designer-ui/src/app/components/{menu => menus}/microservice/microservice.component.ts (100%) rename sdc-workflow-designer-ui/src/app/components/{menu => menus}/workflows/workflows.component.html (100%) rename sdc-workflow-designer-ui/src/app/components/{menu => menus}/workflows/workflows.component.ts (100%) rename sdc-workflow-designer-ui/src/app/directive/{resizeable => resizable}/resizable.directive.ts (97%) diff --git a/sdc-workflow-designer-ui/src/app/app.component.css b/sdc-workflow-designer-ui/src/app/app.component.css index 95166937..5ad27fed 100644 --- a/sdc-workflow-designer-ui/src/app/app.component.css +++ b/sdc-workflow-designer-ui/src/app/app.component.css @@ -9,7 +9,7 @@ * Contributors: * ZTE - initial API and implementation and/or initial documentation */ - .loading-div{ +.loading-div{ position: absolute; top: 0; width: 100%; diff --git a/sdc-workflow-designer-ui/src/app/app.module.ts b/sdc-workflow-designer-ui/src/app/app.module.ts index 3d5aa778..9785a69e 100644 --- a/sdc-workflow-designer-ui/src/app/app.module.ts +++ b/sdc-workflow-designer-ui/src/app/app.module.ts @@ -33,10 +33,10 @@ import { BroadcastService } from "./services/broadcast.service"; import { PropertiesComponent } from "./components/property/properties.component"; import { StartEventParametersComponent } from "./components/property/start-event-parameters/start-event-parameters.component"; import { ParameterComponent } from "./components/parameter/parameter.component"; -import { MenusComponent } from "./components/menu/menus.component"; -import { MicroserviceDetailComponent } from "./components/menu/microservice/microservice-detail/microservice-detail.component"; -import { MicroserviceComponent } from "./components/menu/microservice/microservice.component"; -import { MicroserviceListComponent } from "./components/menu/microservice/microservice-list/microservice-list.component"; +import { MenusComponent } from "./components/menus/menus.component"; +import { MicroserviceDetailComponent } from "./components/menus/microservice/microservice-detail/microservice-detail.component"; +import { MicroserviceComponent } from "./components/menus/microservice/microservice.component"; +import { MicroserviceListComponent } from "./components/menus/microservice/microservice-list/microservice-list.component"; import { ModalModule } from "ngx-bootstrap/modal"; import { WorkflowConfigService } from "./services/workflow-config.service"; import { RestTaskComponent } from "./components/property/rest-task/rest-task.component"; @@ -45,11 +45,11 @@ import { SwaggerTreeConverterService } from "./services/swagger-tree-converter.s import { IntermediateCatchEventComponent } from "./components/property/intermediate-catch-event/intermediate-catch-event.component"; import { SequenceFlowComponent } from "./components/sequence-flow/sequence-flow.component"; import { ScriptTaskComponent } from "./components/property/script-task/script-task.component"; -import { WorkflowsComponent } from "./components/menu/workflows/workflows.component"; +import { WorkflowsComponent } from "./components/menus/workflows/workflows.component"; import { ModelService } from './services/model.service'; import { ContainerComponent } from './components/container/container.component'; import { RestService } from './services/rest.service'; -import { ResizableDirective } from './directive/resizeable/resizable.directive'; +import { ResizableDirective } from './directive/resizable/resizable.directive'; import { StartEventComponent } from './components/property/start-event/start-event.component'; import { NodeParametersComponent } from './components/node-parameters/node-parameters.component'; import { ParameterTreeComponent } from './components/node-parameters/parameter-tree/parameter-tree.component'; @@ -78,6 +78,18 @@ import { ParameterTreeComponent } from './components/node-parameters/parameter-t ToolbarComponent, WorkflowsComponent, ], + providers: [ + BroadcastService, + DataAccessService, + HttpService, + JsPlumbService, + ModelService, + RestService, + SwaggerTreeConverterService, + WorkflowConfigService, + + WorkflowService + ], imports: [ AccordionModule.forRoot(), BrowserAnimationsModule, @@ -97,17 +109,9 @@ import { ParameterTreeComponent } from './components/node-parameters/parameter-t allowParentSelection: false }) ], - providers: [ - BroadcastService, - DataAccessService, - HttpService, - JsPlumbService, - RestService, - SwaggerTreeConverterService, - WorkflowConfigService, - ModelService, - WorkflowService + bootstrap: [ + AppComponent, ], - bootstrap: [AppComponent] }) -export class AppModule { } +export class AppModule { +} diff --git a/sdc-workflow-designer-ui/src/app/components/menu/menus.component.css b/sdc-workflow-designer-ui/src/app/components/menus/menus.component.css similarity index 100% rename from sdc-workflow-designer-ui/src/app/components/menu/menus.component.css rename to sdc-workflow-designer-ui/src/app/components/menus/menus.component.css diff --git a/sdc-workflow-designer-ui/src/app/components/menu/menus.component.html b/sdc-workflow-designer-ui/src/app/components/menus/menus.component.html similarity index 100% rename from sdc-workflow-designer-ui/src/app/components/menu/menus.component.html rename to sdc-workflow-designer-ui/src/app/components/menus/menus.component.html diff --git a/sdc-workflow-designer-ui/src/app/components/menu/menus.component.spec.ts b/sdc-workflow-designer-ui/src/app/components/menus/menus.component.spec.ts similarity index 100% rename from sdc-workflow-designer-ui/src/app/components/menu/menus.component.spec.ts rename to sdc-workflow-designer-ui/src/app/components/menus/menus.component.spec.ts diff --git a/sdc-workflow-designer-ui/src/app/components/menu/menus.component.ts b/sdc-workflow-designer-ui/src/app/components/menus/menus.component.ts similarity index 100% rename from sdc-workflow-designer-ui/src/app/components/menu/menus.component.ts rename to sdc-workflow-designer-ui/src/app/components/menus/menus.component.ts diff --git a/sdc-workflow-designer-ui/src/app/components/menu/microservice/microservice-detail/microservice-detail.component.html b/sdc-workflow-designer-ui/src/app/components/menus/microservice/microservice-detail/microservice-detail.component.html similarity index 100% rename from sdc-workflow-designer-ui/src/app/components/menu/microservice/microservice-detail/microservice-detail.component.html rename to sdc-workflow-designer-ui/src/app/components/menus/microservice/microservice-detail/microservice-detail.component.html diff --git a/sdc-workflow-designer-ui/src/app/components/menu/microservice/microservice-detail/microservice-detail.component.ts b/sdc-workflow-designer-ui/src/app/components/menus/microservice/microservice-detail/microservice-detail.component.ts similarity index 100% rename from sdc-workflow-designer-ui/src/app/components/menu/microservice/microservice-detail/microservice-detail.component.ts rename to sdc-workflow-designer-ui/src/app/components/menus/microservice/microservice-detail/microservice-detail.component.ts diff --git a/sdc-workflow-designer-ui/src/app/components/menu/microservice/microservice-list/microservice-list.component.css b/sdc-workflow-designer-ui/src/app/components/menus/microservice/microservice-list/microservice-list.component.css similarity index 100% rename from sdc-workflow-designer-ui/src/app/components/menu/microservice/microservice-list/microservice-list.component.css rename to sdc-workflow-designer-ui/src/app/components/menus/microservice/microservice-list/microservice-list.component.css diff --git a/sdc-workflow-designer-ui/src/app/components/menu/microservice/microservice-list/microservice-list.component.html b/sdc-workflow-designer-ui/src/app/components/menus/microservice/microservice-list/microservice-list.component.html similarity index 100% rename from sdc-workflow-designer-ui/src/app/components/menu/microservice/microservice-list/microservice-list.component.html rename to sdc-workflow-designer-ui/src/app/components/menus/microservice/microservice-list/microservice-list.component.html diff --git a/sdc-workflow-designer-ui/src/app/components/menu/microservice/microservice-list/microservice-list.component.ts b/sdc-workflow-designer-ui/src/app/components/menus/microservice/microservice-list/microservice-list.component.ts similarity index 100% rename from sdc-workflow-designer-ui/src/app/components/menu/microservice/microservice-list/microservice-list.component.ts rename to sdc-workflow-designer-ui/src/app/components/menus/microservice/microservice-list/microservice-list.component.ts diff --git a/sdc-workflow-designer-ui/src/app/components/menu/microservice/microservice.component.html b/sdc-workflow-designer-ui/src/app/components/menus/microservice/microservice.component.html similarity index 100% rename from sdc-workflow-designer-ui/src/app/components/menu/microservice/microservice.component.html rename to sdc-workflow-designer-ui/src/app/components/menus/microservice/microservice.component.html diff --git a/sdc-workflow-designer-ui/src/app/components/menu/microservice/microservice.component.ts b/sdc-workflow-designer-ui/src/app/components/menus/microservice/microservice.component.ts similarity index 100% rename from sdc-workflow-designer-ui/src/app/components/menu/microservice/microservice.component.ts rename to sdc-workflow-designer-ui/src/app/components/menus/microservice/microservice.component.ts diff --git a/sdc-workflow-designer-ui/src/app/components/menu/workflows/workflows.component.html b/sdc-workflow-designer-ui/src/app/components/menus/workflows/workflows.component.html similarity index 100% rename from sdc-workflow-designer-ui/src/app/components/menu/workflows/workflows.component.html rename to sdc-workflow-designer-ui/src/app/components/menus/workflows/workflows.component.html diff --git a/sdc-workflow-designer-ui/src/app/components/menu/workflows/workflows.component.ts b/sdc-workflow-designer-ui/src/app/components/menus/workflows/workflows.component.ts similarity index 100% rename from sdc-workflow-designer-ui/src/app/components/menu/workflows/workflows.component.ts rename to sdc-workflow-designer-ui/src/app/components/menus/workflows/workflows.component.ts diff --git a/sdc-workflow-designer-ui/src/app/directive/resizeable/resizable.directive.ts b/sdc-workflow-designer-ui/src/app/directive/resizable/resizable.directive.ts similarity index 97% rename from sdc-workflow-designer-ui/src/app/directive/resizeable/resizable.directive.ts rename to sdc-workflow-designer-ui/src/app/directive/resizable/resizable.directive.ts index f591fe6f..b285b595 100644 --- a/sdc-workflow-designer-ui/src/app/directive/resizeable/resizable.directive.ts +++ b/sdc-workflow-designer-ui/src/app/directive/resizable/resizable.directive.ts @@ -26,7 +26,7 @@ export class ResizableDirective implements AfterViewInit { public ngAfterViewInit() { console.log('init resizble.'); - + $(this.el.nativeElement).resizable({ handles: 'all', resize: (event, ui) => { diff --git a/sdc-workflow-designer-ui/src/app/util/http.service.ts b/sdc-workflow-designer-ui/src/app/util/http.service.ts index 32669555..f754d38e 100644 --- a/sdc-workflow-designer-ui/src/app/util/http.service.ts +++ b/sdc-workflow-designer-ui/src/app/util/http.service.ts @@ -16,13 +16,13 @@ import './rxjs-operators'; @Injectable() export class HttpService { - constructor(private http: Http) {} + constructor(private http: Http) { } - public get(uri: string): Observable { - return this.getHttp('get', uri); + public get(uri: string, options?: RequestOptionsArgs): Observable { + return this.getHttp('get', uri, options); } - public post(uri: string, data: any): Observable { + public post(uri: string, data: any, options?: RequestOptionsArgs): Observable { return this.getHttp('post', uri, data); } @@ -37,22 +37,31 @@ export class HttpService { public getHttp(type: string, uri: string, data?: any, options?: RequestOptionsArgs): Observable { if (data) { return this.http[type](uri, data, options) - .map(response => - response.json() - ) + .map(response => { + if (response.text() === '') { + return {}; + } + + return response.json(); + }) .catch(this.handleError); } else { return this.http[type](uri, options) - .map(response => - response.json() - ) + .map(response => response.json()) .catch(this.handleError); } } private handleError(error: any) { - const errMsg = (error.message) ? error.message : - error.status ? `${error.status}-${error.statusText}` : 'Server error'; + let errMsg = ''; + try { + errMsg = error.json().message; + if (!errMsg) { + errMsg = error.json().msg; + } + } catch (e) { + errMsg = error.status ? `${error.status}-${error.statusText}` : 'Server error'; + } return Observable.throw(errMsg); } } diff --git a/sdc-workflow-designer-ui/src/app/util/rxjs-operators.ts b/sdc-workflow-designer-ui/src/app/util/rxjs-operators.ts index 00fa50b8..1a8f11c0 100644 --- a/sdc-workflow-designer-ui/src/app/util/rxjs-operators.ts +++ b/sdc-workflow-designer-ui/src/app/util/rxjs-operators.ts @@ -9,6 +9,7 @@ * Contributors: * ZTE - initial API and implementation and/or initial documentation */ +import 'rxjs/add/observable/forkJoin'; import 'rxjs/add/observable/throw'; import 'rxjs/add/operator/catch'; import 'rxjs/add/operator/debounceTime'; -- 2.16.6