From 58372d3b8c3f99cbd199ea2c717388bb6b2eed16 Mon Sep 17 00:00:00 2001 From: cyuamber Date: Tue, 15 Oct 2019 15:45:40 +0800 Subject: feat:add scaleModel component of services-list page Change-Id: I713eeb7a038a2c959740ff08f8c5d677f2d7152f Issue-ID: USECASEUI-307 Signed-off-by: cyuamber --- usecaseui-portal/src/app/app.module.ts | 4 +- .../scale-model/scale-model.component.html | 40 +++++++ .../scale-model/scale-model.component.less | 0 .../scale-model/scale-model.component.spec.ts | 25 +++++ .../scale-model/scale-model.component.ts | 53 ++++++++++ .../services-list/services-list.component.html | 115 ++++++++------------- .../services-list/services-list.component.ts | 31 +----- 7 files changed, 168 insertions(+), 100 deletions(-) create mode 100644 usecaseui-portal/src/app/views/services/services-list/scale-model/scale-model.component.html create mode 100644 usecaseui-portal/src/app/views/services/services-list/scale-model/scale-model.component.less create mode 100644 usecaseui-portal/src/app/views/services/services-list/scale-model/scale-model.component.spec.ts create mode 100644 usecaseui-portal/src/app/views/services/services-list/scale-model/scale-model.component.ts (limited to 'usecaseui-portal') diff --git a/usecaseui-portal/src/app/app.module.ts b/usecaseui-portal/src/app/app.module.ts index cbc95de9..04651d01 100644 --- a/usecaseui-portal/src/app/app.module.ts +++ b/usecaseui-portal/src/app/app.module.ts @@ -77,6 +77,7 @@ import { TopCardComponent } from './views/services/services-list/top-card/top-ca import { CreateModelComponent } from './views/services/services-list/create-model/create-model.component'; import { DeleteModelComponent } from './views/services/services-list/delete-model/delete-model.component'; import { NotificationComponent } from './shared/components/notification/notification.component'; +import { ScaleModelComponent } from './views/services/services-list/scale-model/scale-model.component'; @NgModule({ providers: [ @@ -120,7 +121,8 @@ import { NotificationComponent } from './shared/components/notification/notifica TopCardComponent, CreateModelComponent, DeleteModelComponent, - NotificationComponent + NotificationComponent, + ScaleModelComponent, ], imports: [ BrowserModule, diff --git a/usecaseui-portal/src/app/views/services/services-list/scale-model/scale-model.component.html b/usecaseui-portal/src/app/views/services/services-list/scale-model/scale-model.component.html new file mode 100644 index 00000000..cb873149 --- /dev/null +++ b/usecaseui-portal/src/app/views/services/services-list/scale-model/scale-model.component.html @@ -0,0 +1,40 @@ + +

*  {{"i18nTextDefine_SureScale" | translate}}

+
+

{{"i18nTextDefine_InstanceID" | translate}} :

+
{{ thisService["service-instance-id"] || + thisService["nsInstanceId"] || + thisService["vnfInstanceId"]}} +
+
+
+

{{ item.netWorkServiceName }}

+
+ {{"i18nTextDefine_ScaleType" | translate}} : + + + + +
+
+ {{"i18nTextDefine_AspectId" | translate}} : + +
+
+ {{"i18nTextDefine_Number_Of_Steps" | translate}} : + +
+
+ {{"i18nTextDefine_ScalingDirection" | translate}} : + + + + +
+
+ + \ No newline at end of file diff --git a/usecaseui-portal/src/app/views/services/services-list/scale-model/scale-model.component.less b/usecaseui-portal/src/app/views/services/services-list/scale-model/scale-model.component.less new file mode 100644 index 00000000..e69de29b diff --git a/usecaseui-portal/src/app/views/services/services-list/scale-model/scale-model.component.spec.ts b/usecaseui-portal/src/app/views/services/services-list/scale-model/scale-model.component.spec.ts new file mode 100644 index 00000000..5d069ee4 --- /dev/null +++ b/usecaseui-portal/src/app/views/services/services-list/scale-model/scale-model.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ScaleModelComponent } from './scale-model.component'; + +describe('ScaleModelComponent', () => { + let component: ScaleModelComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ScaleModelComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ScaleModelComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/usecaseui-portal/src/app/views/services/services-list/scale-model/scale-model.component.ts b/usecaseui-portal/src/app/views/services/services-list/scale-model/scale-model.component.ts new file mode 100644 index 00000000..c1b9a86e --- /dev/null +++ b/usecaseui-portal/src/app/views/services/services-list/scale-model/scale-model.component.ts @@ -0,0 +1,53 @@ +import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; + +@Component({ + selector: 'app-scale-model', + templateUrl: './scale-model.component.html', + styleUrls: ['./scale-model.component.less'] +}) +export class ScaleModelComponent implements OnInit { + @Input()scaleModelVisible: boolean; + @Input()templatescalestarting; + @Input()templateScaleSuccessFaild; + @Input()thisService; + @Input()e2e_nsData; + @Input()customerSelected; + @Input()serviceTypeSelected; + + @Output() cancel = new EventEmitter(); + @Output() scaleModalOK = new EventEmitter(); + constructor() { } + + ngOnInit() { + } + + scaleOk() { + this.scaleModelVisible = false; + let requestBody = { + "service": { + "serviceInstanceName": this.thisService["service-instance-name"], + "serviceType": this.serviceTypeSelected.name, + "globalSubscriberId": this.customerSelected.id, + "resources": this.e2e_nsData.map((item) => { + return { + "resourceInstanceId": item["netWorkServiceId"], + "scaleType": item["scaleType"], + "scaleNsData": { + "scaleNsByStepsData": { + "aspectId": item["aspectId"], + "numberOfSteps": item["numberOfSteps"], + "scalingDirection": item["scalingDirection"] + } + } + } + }) + } + }; + this.scaleModalOK.emit(requestBody) + } + + scaleCancel() { + this.scaleModelVisible = false; + } + +} diff --git a/usecaseui-portal/src/app/views/services/services-list/services-list.component.html b/usecaseui-portal/src/app/views/services/services-list/services-list.component.html index ce3844c1..ff1924fb 100644 --- a/usecaseui-portal/src/app/views/services/services-list/services-list.component.html +++ b/usecaseui-portal/src/app/views/services/services-list/services-list.component.html @@ -153,76 +153,8 @@ - -

*  {{"i18nTextDefine_SureScale" | translate}}

-
-

{{"i18nTextDefine_InstanceID" | translate}} :

-
{{ thisService["service-instance-id"] || - thisService["nsInstanceId"] || - thisService["vnfInstanceId"]}} -
-
-
-

{{ item.netWorkServiceName }}

-
- {{"i18nTextDefine_ScaleType" | translate}} : - - - - -
-
- {{"i18nTextDefine_AspectId" | translate}} : - -
-
- {{"i18nTextDefine_Number_Of_Steps" | translate}} : - -
-
- {{"i18nTextDefine_ScalingDirection" | translate}} : - - - - -
-
- -
-
- - instance temination is starting - -
E2E   - {{"i18nTextDefine_InstanceTeminationStarting" | translate}} -
-
-
-

{{"i18nTextDefine_InstanceName" | translate}} :

- {{ thisService["service-instance-name"] || - thisService["nsInstanceName"] }} - -
-
-

{{"i18nTextDefine_Customer" | translate}} :

- {{ customerSelected.name }} -
-
-

{{"i18nTextDefine_UseCase" | translate}} :

- {{ thisService["serviceDomain"] }} -
-
-
{{"i18nTextDefine_Close" | translate}}
-
-
- - - - - + + +
@@ -490,6 +434,35 @@
+ +
+
+ + instance temination is starting + +
E2E   + {{"i18nTextDefine_InstanceTeminationStarting" | translate}} +
+
+
+

{{"i18nTextDefine_InstanceName" | translate}} :

+ {{ thisService["service-instance-name"] || + thisService["nsInstanceName"] }} + +
+
+

{{"i18nTextDefine_Customer" | translate}} :

+ {{ customerSelected.name }} +
+
+

{{"i18nTextDefine_UseCase" | translate}} :

+ {{ thisService["serviceDomain"] }} +
+
+
{{"i18nTextDefine_Close" | translate}}
+
+
+
diff --git a/usecaseui-portal/src/app/views/services/services-list/services-list.component.ts b/usecaseui-portal/src/app/views/services/services-list/services-list.component.ts index 96b4310c..47ba6f9d 100644 --- a/usecaseui-portal/src/app/views/services/services-list/services-list.component.ts +++ b/usecaseui-portal/src/app/views/services/services-list/services-list.component.ts @@ -365,43 +365,18 @@ export class ServicesListComponent implements OnInit { customerId: this.customerSelected.id, serviceType: this.serviceTypeSelected.name, serviceId: service["service-instance-id"] - } + }; this.myhttp.getE2e_nsData(paramsObj) .subscribe((data) => { this.e2e_nsData = data; }) } - scaleOk(templatescalestarting, templateScaleSuccessFaild) { - this.scaleModelVisible = false; - let requestBody = { - "service": { - "serviceInstanceName": this.thisService["service-instance-name"], - "serviceType": this.serviceTypeSelected.name, - "globalSubscriberId": this.customerSelected.id, - "resources": this.e2e_nsData.map((item) => { - return { - "resourceInstanceId": item["netWorkServiceId"], - "scaleType": item["scaleType"], - "scaleNsData": { - "scaleNsByStepsData": { - "aspectId": item["aspectId"], - "numberOfSteps": item["numberOfSteps"], - "scalingDirection": item["scalingDirection"] - } - } - } - }) - } - } - this.scaleE2eService(this.thisService, requestBody, templateScaleSuccessFaild); + scaleModalOK(obj: any,templatescalestarting,templateScaleSuccessFaild) :void{ + this.scaleE2eService(this.thisService, obj, templateScaleSuccessFaild); this.scaleNotification(templatescalestarting); } - scaleCancel() { - this.scaleModelVisible = false; - } - scaleNotification(template: TemplateRef<{}>): void { this.notification.template(template); } -- cgit 1.2.3-korg