summaryrefslogtreecommitdiffstats
path: root/usecaseui-portal/src/app/views
diff options
context:
space:
mode:
authorcyuamber <xuranyjy@chinamobile.com>2020-02-13 20:44:33 +0800
committercyuamber <xuranyjy@chinamobile.com>2020-02-13 20:44:39 +0800
commitc63489b9bb2071abc8180af4e53c2dcb143c127d (patch)
treebb7730cb155f693e3f5b719adeec72c708ac685d /usecaseui-portal/src/app/views
parent3db71a09cb73e24eda6d36f39df2e35f123f290b (diff)
feat:Optimize code for slice ordering and business code of csmf slicing
Change-Id: I62a00ed407796434239c2089788ac47330e1c0d8 Issue-ID: USECASEUI-368 Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
Diffstat (limited to 'usecaseui-portal/src/app/views')
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.html9
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.less6
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.ts66
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.html4
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.ts15
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-management.component.html4
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-management.component.ts2
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.ts2
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-table/nssi-table.component.ts2
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.html2
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts15
11 files changed, 99 insertions, 28 deletions
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.html b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.html
index 0ad676a0..7b31b077 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.html
+++ b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.html
@@ -3,14 +3,14 @@
(nzOnOk)="handleOk()"
nzWidth="900px">
<div class="subnet_params_container">
- <form nz-form>
- <nz-form-item *ngFor="let item of comunicationFormItems">
+ <form nz-form >
+ <nz-form-item *ngFor="let item of comunicationFormItems; let i = index">
<nz-form-label [nzSpan]="6" nzRequired [nzFor]="item.key">
{{ item.title }}
</nz-form-label>
<nz-form-control [nzSpan]="15">
- <input nz-input [id]="item.key" [name]="item.key" [(ngModel)]="slicing_order_info[item.key]"
- *ngIf=" item.title !== 'Resource Sharing Level' && item.title !== 'Mobility' && item.title !== 'Area' "/>
+ <input nz-input [id]="item.key" [name]="item.key" [(ngModel)]="slicing_order_info[item.key]" [ngClass]="{'error-input-border':validateRules[i] === true}"
+ *ngIf=" item.title !== 'Resource Sharing Level' && item.title !== 'Mobility' && item.title !== 'Area' " (blur)="validator(item.key,slicing_order_info[item.key],i)"/>
<nz-radio-group [name]="item.key" [(ngModel)]="slicing_order_info[item.key]"
*ngIf="item.title === 'Resource Sharing Level'">
<label nz-radio [nzValue]="option.key" *ngFor="let option of item.options">
@@ -22,6 +22,7 @@
<nz-option [nzValue]="option.key" [nzLabel]="option.title" *ngFor="let option of item.options">
</nz-option>
</nz-select>
+ <nz-form-explain *ngIf=" item.title !== 'Resource Sharing Level' && item.title !== 'Mobility' && item.title !== 'Area' && validateRules[i]" class="validateRules">{{rulesText[i]}}</nz-form-explain>
</nz-form-control>
<div *ngIf="item.key === 'coverageArea'">
<div *ngFor="let area of areaList; let i = index">
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.less b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.less
index 3871a5fa..2840bbed 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.less
+++ b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.less
@@ -16,4 +16,10 @@
}
.ant-form-item-label {
text-align: left;
+}
+.validateRules{
+ color: red;
+}
+.error-input-border{
+ border-color: red!important;
} \ No newline at end of file
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.ts
index f31f4dd1..7fc95e41 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.ts
+++ b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.ts
@@ -2,7 +2,6 @@ import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
import {COMMUNICATION_FORM_ITEMS, COMMUNICATION_FORM_ADDRESS} from "../../../../../../constants/constants";
import {SlicingTaskServices} from "../../../../../core/services/slicingTaskServices";
import {NzMessageService} from "ng-zorro-antd";
-
@Component({
selector: 'app-business-order',
templateUrl: './business-order.component.html',
@@ -31,12 +30,14 @@ export class BusinessOrderComponent implements OnInit {
latency: null,
expDataRateUL: null,
resourceSharingLevel: "shared",
- uEMobilityLevel: null,
+ uEMobilityLevel: "stationary",
useInterval: null,
coverageArea: ''
};
areaList: any[] = [];
isSpinning: boolean = false;
+ validateRules: any[] = [];
+ rulesText: any[] = [];
AreaFormatting() {
let areaList = ['Beijing;Beijing;Haidian District;Wanshoulu Street'];
this.areaList = areaList.map((item: any) => {
@@ -148,7 +149,68 @@ export class BusinessOrderComponent implements OnInit {
this.cancel.emit(this.showModel)
}
+ getRulesText = (words,title,val,index) => {
+ return this.rulesText[index] = words + title
+ };
+
+ validator(key,val,i){
+ if(val === null || val.replace(/\s*/g,'').length<=0){
+ this.validateRules[i] = true;
+ this.getRulesText('Please enter',key,val,i);
+ return false
+ }else {
+ this.validateRules[i] = false;
+ }if(key === 'maxNumberofUEs' && !/^([1-9]\d{0,4}|100000)$/.test(val) && isNaN(val)){
+ this.validateRules[i] = true;
+ this.getRulesText('Only numbers can be entered','','',i);
+ return false
+ }else if(key === 'maxNumberofUEs' && !/^([1-9]\d{0,4}|100000)$/.test(val) && !isNaN(val)){
+ console.log("-----maxNumberofUEs")
+ this.validateRules[i] = true;
+ this.getRulesText('Scope: 1-100000','','',i);
+ return false
+ }else {
+ this.validateRules[i] = false;
+ }if((key === 'expDataRateDL' || key === 'expDataRateUL') && !/^([1-9]\d{2}|[1-3]\d{3}|3000)$/.test(val) && isNaN(val)){
+ this.validateRules[i] = true;
+ this.getRulesText('Only numbers can be entered','','',i);
+ return false
+ }else if((key === 'expDataRateDL' || key === 'expDataRateUL') && !/^([1-9]\d{2}|[1-3]\d{3}|3000)$/.test(val) && !isNaN(val)){
+ this.validateRules[i] = true;
+ this.getRulesText('Scope: 100-3000','','',i);
+ return false
+ }else {
+ this.validateRules[i] = false;
+ }if(key === 'latency' && !/^1[0-9]$|^[2-9]\d$|^1\d{2}$|^200$/.test(val) && isNaN(val)){
+ this.validateRules[i] = true;
+ this.getRulesText('Only numbers can be entered','','',i);
+ return false
+ }else if(key === 'latency' && !/^1[0-9]$|^[2-9]\d$|^1\d{2}$|^200$/.test(val) && !isNaN(val)){
+ this.validateRules[i] = true;
+ this.getRulesText('Scope: 10-200','','',i);
+ return false
+ }else {
+ this.validateRules[i] = false;
+ }if(key === 'useInterval' && !/^[1-9]\d*$/.test(val) && isNaN(val)){
+ this.validateRules[i] = true;
+ this.getRulesText('Only numbers can be entered','','',i);
+ return false
+ }else if(key === 'useInterval' && !/^[1-9]\d*$/.test(val) && !isNaN(val)){
+ this.validateRules[i] = true;
+ this.getRulesText('Scope: >=1','','',i);
+ return false
+ }else {
+ this.validateRules[i] = false;
+ }
+ }
+
handleOk(): void {
+ Object.keys(this.slicing_order_info).forEach((item,index)=>{
+ this.validator(item,this.slicing_order_info[item],index)
+ });
+ if(this.validateRules.indexOf(true)>-1){
+ return
+ };
const coverage_list: string[] = [];
this.areaList.forEach( item => {
let str: string = '';
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.html b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.html
index 9c039c6d..8d7e13b3 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.html
+++ b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.html
@@ -57,9 +57,9 @@
<div class="action-icon">
<i [ngClass]="{'cannotclick': data.last_operation_type && data.last_operation_progress && data.last_operation_progress !== '100' && (data.last_operation_type !== 'DELETE' || data.order_status==='activated')}"
nz-icon nzType="poweroff" nzTheme="outline" class="anticon anticon-poweroff"
- (click)="terminate(data)"></i>
+ (click)="terminate(data,i)"></i>
<nz-progress
- *ngIf="data.last_operation_type && data.last_operation_progress && data.last_operation_progress !== '100' && terminateStart"
+ *ngIf="data.last_operation_type && data.last_operation_progress && data.last_operation_progress !== '100' && terminateStart[i]"
[nzPercent]="data.last_operation_progress" [nzShowInfo]="false" nzStatus="active">
</nz-progress>
</div>
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.ts
index 76f0bcdf..766f9ed6 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.ts
+++ b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.ts
@@ -36,14 +36,14 @@ export class CsmfSlicingBusinessManagementComponent implements OnInit {
statusOptions: any[] = BUSINESS_STATUS;
// isSelect: boolean = false;
progressingTimer: any[] = [];
- terminateStart: boolean = false;
+ terminateStart: any[] = [];
businessOrderShow: boolean = false;
getCSMFBusinessList() {
this.loading = true;
// this.isSelect = false;
this.listOfData = [];
let paramsObj = {
- status: this.selectedValue,
+ status: this.selectedValue.toLocaleLowerCase(),
pageNo: this.pageIndex,
pageSize: this.pageSize
};
@@ -66,7 +66,8 @@ export class CsmfSlicingBusinessManagementComponent implements OnInit {
let obj = {
serviceId: item.order_id
};
- if (item.last_operation_type === 'DELETE') this.terminateStart = true;
+ if (item.last_operation_type === 'DELETE') this.terminateStart[index] = true
+ else this.terminateStart[index] = false;
this.queryProgress(obj, index, updata).then((res) => {
item.last_operation_progress = '100';
this.getCSMFBusinessList();
@@ -143,14 +144,14 @@ export class CsmfSlicingBusinessManagementComponent implements OnInit {
})
}
- terminate(slicing) {
+ terminate(slicing,index) {
console.log(slicing, "slicing");
this.modalService.confirm({
nzTitle: 'Are you sure you want to terminate this task?',
nzContent: '<b>Name:&nbsp;</b>' + slicing.order_name,
nzOnOk: () => {
let paramsObj = { serviceId: slicing.order_id };
- this.terminateStart = true;
+ this.terminateStart[index] = true;
this.loading = true;
this.myhttp.terminateSlicingService(paramsObj).subscribe(res => {
const { result_header: { result_code, result_message }, result_body: { operation_id } } = res;
@@ -158,11 +159,11 @@ export class CsmfSlicingBusinessManagementComponent implements OnInit {
if (+result_code === 200) {
this.getCSMFBusinessList();
} else {
- this.terminateStart = false;
+ this.terminateStart[index] = false;
}
}, () => {
this.loading = false;
- this.terminateStart = false;
+ this.terminateStart[index] = false;
})
},
nzCancelText: 'No',
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-management.component.html b/usecaseui-portal/src/app/views/services/slicing-management/slicing-management.component.html
index 1de13788..6d55ea1c 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-management.component.html
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-management.component.html
@@ -1,7 +1,7 @@
<nz-tabset (nzSelectChange)="handleTabChange($event)" class="slicing">
- <nz-tab nzTitle="communication Service">
+ <nz-tab nzTitle="Communication Service">
<app-csmf-slicing-business-management
- *ngIf="currentTab ==='communication Service'"
+ *ngIf="currentTab ==='Communication Service'"
></app-csmf-slicing-business-management>
</nz-tab>
<nz-tab nzTitle="Slicing Task Management">
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-management.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-management.component.ts
index 597e4ee9..0520824c 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-management.component.ts
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-management.component.ts
@@ -15,7 +15,7 @@ export class SlicingManagementComponent implements OnInit {
ngOnInit() {
}
- currentTab = 'communication Service';
+ currentTab = 'Communication Service';
handleTabChange($event): void {
console.log($event,"$event");
this.currentTab = $event.tab._title;
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.ts
index 203df8a6..6ac29417 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.ts
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.ts
@@ -37,7 +37,7 @@ export class NsiTableComponent implements OnInit {
pageSize: this.pageSize
};
if(this.selectedValue !== BUSINESS_STATUS[0]){
- paramsObj["instanceStatus"] = this.selectedValue;
+ paramsObj["instanceStatus"] = this.selectedValue.toLocaleLowerCase();
this.isSelect = true;
}
this.myhttp.getSlicingNsiList(paramsObj,this.isSelect).subscribe (res => {
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-table/nssi-table.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-table/nssi-table.component.ts
index a6e00b43..5e90bcee 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-table/nssi-table.component.ts
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-table/nssi-table.component.ts
@@ -37,7 +37,7 @@ export class NssiTableComponent implements OnInit {
pageSize: this.pageSize
};
if(this.selectedValue !== BUSINESS_STATUS[0]){
- paramsObj["instanceStatus"] = this.selectedValue;
+ paramsObj["instanceStatus"] = this.selectedValue.toLocaleLowerCase();
this.isSelect = true;
}
this.myhttp.getSlicingNssiList(paramsObj,this.isSelect).subscribe (res => {
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.html b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.html
index 8bce1cdf..14c51f19 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.html
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.html
@@ -53,7 +53,7 @@
<div class="action-icon">
<i [ngClass]="{'cannotclick': data.last_operation_type && data.last_operation_progress && data.last_operation_progress !== '100' && (data.last_operation_type !== 'DELETE' || data.orchestration_status==='activated')}"
nz-icon nzType="poweroff" nzTheme="outline" class="anticon anticon-poweroff"
- (click)="terminate(data)"></i>
+ (click)="terminate(data,i)"></i>
<nz-progress
*ngIf="data.last_operation_type && data.last_operation_progress && data.last_operation_progress !== '100' && terminateStart"
[nzPercent]="data.last_operation_progress" [nzShowInfo]="false" nzStatus="active">
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts
index 23b8360b..fc07efc9 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts
@@ -35,7 +35,7 @@ export class SlicingBusinessTableComponent implements OnInit {
isSelect: boolean = false;
statusOptions: any[] = BUSINESS_STATUS;
progressingTimer: any[] = [];
- terminateStart: boolean = false;
+ terminateStart: any[] = [];
@ViewChild('notification') notification1: any;
getBusinessList(): void {
@@ -47,7 +47,7 @@ export class SlicingBusinessTableComponent implements OnInit {
pageSize: this.pageSize
};
if (this.selectedValue !== BUSINESS_STATUS[0]) {
- paramsObj["businessStatus"] = this.selectedValue;
+ paramsObj["businessStatus"] = this.selectedValue.toLocaleLowerCase();
this.isSelect = true;
}
this.myhttp.getSlicingBusinessList(paramsObj, this.isSelect).subscribe(res => {
@@ -64,7 +64,8 @@ export class SlicingBusinessTableComponent implements OnInit {
let obj = {
serviceId: item.service_instance_id
};
- if (item.last_operation_type === 'DELETE') this.terminateStart = true;
+ if (item.last_operation_type === 'DELETE') this.terminateStart[index] = true
+ else this.terminateStart[index] = false;
this.queryProgress(obj, item.orchestration_status, index, updata).then((res) => {
item.last_operation_progress = '100';
this.getBusinessList();
@@ -140,14 +141,14 @@ export class SlicingBusinessTableComponent implements OnInit {
this.getBusinessList();
})
}
- terminate(slicing) {
+ terminate(slicing,index) {
this.modalService.confirm({
nzTitle: 'Do you Want to terminate slicing business?',
nzContent: '<b>Name:&nbsp;</b>' + slicing.service_instance_name,
nzOnOk: () => {
this.notification1.notificationStart('slicing business', 'terminate', slicing.service_instance_id);
let paramsObj = { serviceId: slicing.service_instance_id };
- this.terminateStart = true;
+ this.terminateStart[index] = true;
this.loading = true;
this.myhttp.terminateSlicingService(paramsObj).subscribe(res => {
const { result_header: { result_code, result_message }, result_body: { operation_id } } = res;
@@ -157,12 +158,12 @@ export class SlicingBusinessTableComponent implements OnInit {
this.getBusinessList();
} else {
this.notification1.notificationFailed('slicing business', 'terminate', slicing.service_instance_id);
- this.terminateStart = false;
+ this.terminateStart[index] = false;
}
}, () => {
this.loading = false;
this.notification1.notificationFailed('slicing business', 'terminate', slicing.service_instance_id);
- this.terminateStart = false;
+ this.terminateStart[index] = false;
})
},
nzCancelText: 'No',