diff options
author | cyuamber <xuranyjy@chinamobile.com> | 2020-04-28 11:01:42 +0800 |
---|---|---|
committer | cyuamber <xuranyjy@chinamobile.com> | 2020-04-28 11:02:01 +0800 |
commit | 9f2baeca378ab8f465e07a1a09be2dba8f2a15aa (patch) | |
tree | 812d629afeafcceef366db57b85cd3dc9befa979 /usecaseui-portal/src/app/views/management/customer | |
parent | 46c4844ebb561c9f879c8fe74ce4d8a688eef486 (diff) |
fix: Fix bugs reported after deleting all customers of management page
Change-Id: I6182cab33998860e4b53ace8b394655457f82170
Issue-ID: USECASEUI-305
Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
Diffstat (limited to 'usecaseui-portal/src/app/views/management/customer')
-rw-r--r-- | usecaseui-portal/src/app/views/management/customer/customer.component.ts | 45 |
1 files changed, 29 insertions, 16 deletions
diff --git a/usecaseui-portal/src/app/views/management/customer/customer.component.ts b/usecaseui-portal/src/app/views/management/customer/customer.component.ts index 78d4f145..6858987f 100644 --- a/usecaseui-portal/src/app/views/management/customer/customer.component.ts +++ b/usecaseui-portal/src/app/views/management/customer/customer.component.ts @@ -13,9 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Component, OnInit, ViewChild } from '@angular/core' -import { ManagemencsService } from '../../../core/services/managemencs.service' -import { Observable } from 'rxjs' +import {Component, EventEmitter, Input, OnInit, Output, ViewChild} from '@angular/core'; +import { ManagemencsService } from '../../../core/services/managemencs.service'; +import { Observable } from 'rxjs'; +import {NzMessageService} from "ng-zorro-antd"; @Component({ selector: 'app-customer', @@ -29,8 +30,12 @@ export class CustomerComponent implements OnInit { public chose = '' resizeMark - constructor (private managemencs: ManagemencsService) {} - + constructor( + private managemencs: ManagemencsService, + private message: NzMessageService, + ) { + } + @Output() closeCustomer = new EventEmitter(); ngOnInit () { this.getAllCustomers() this.resizeMark = Observable.fromEvent(window, 'resize').subscribe( @@ -47,7 +52,7 @@ export class CustomerComponent implements OnInit { ngOnDestroy () { this.resizeMark.unsubscribe() } - + isCustomerEmpty = false; AllCustomersdata = [] AllServiceTypes = [] customerber = [] @@ -61,16 +66,24 @@ export class CustomerComponent implements OnInit { deleteCustomerModelVisible = false deleteServiceTypeModelVisible = false getAllCustomers () { - this.managemencs.getAllCustomers().subscribe(data => { - this.AllCustomersdata = data.map(item => { - return { name: item['subscriber-name'], id: item['global-customer-id'] } - }) - this.selectCustomer = this.AllCustomersdata[0] - this.serviceInit['customer'] = this.AllCustomersdata[0].name - this.getCustomersPie() - this.getServiceTypes(this.selectCustomer) - this.getCustomersColumn(this.selectCustomer) - }) + this.managemencs.getAllCustomers().subscribe((data) => { + if(data.length!==0){ + this.AllCustomersdata = data.map((item) => { + return { name: item["subscriber-name"], id: item["global-customer-id"] } + }); + this.selectCustomer = this.AllCustomersdata[0]; + this.serviceInit["customer"] = this.AllCustomersdata[0].name; + this.getCustomersPie(); + this.getServiceTypes(this.selectCustomer); + this.getCustomersColumn(this.selectCustomer); + }else { + this.message.info('Customer has not been created in ONAP.' + + 'Please create customer and its service type!'); + setTimeout(()=>{ + this.closeCustomer.emit(this.isCustomerEmpty = true); + },1000) + } + }) } // Get all servicetype |