From 831a305ed9f1bf0027f3450dd41e901eafcb7dc4 Mon Sep 17 00:00:00 2001 From: cyuamber Date: Sun, 29 Sep 2019 10:29:19 +0800 Subject: feat: optimize the code for the onboard page Change-Id: Ib217e75b81c47281be3cea97f91e52f42338cf15 Issue-ID: USECASEUI-307 Signed-off-by: cyuamber --- .../onboard-vnf-vm/onboard-vnf-vm.component.html | 346 +++++---------- .../onboard-vnf-vm/onboard-vnf-vm.component.ts | 478 +++++++-------------- 2 files changed, 268 insertions(+), 556 deletions(-) (limited to 'usecaseui-portal/src/app') diff --git a/usecaseui-portal/src/app/views/services/onboard-vnf-vm/onboard-vnf-vm.component.html b/usecaseui-portal/src/app/views/services/onboard-vnf-vm/onboard-vnf-vm.component.html index 9ff2d9a8..d4429c0b 100644 --- a/usecaseui-portal/src/app/views/services/onboard-vnf-vm/onboard-vnf-vm.component.html +++ b/usecaseui-portal/src/app/views/services/onboard-vnf-vm/onboard-vnf-vm.component.html @@ -13,243 +13,131 @@ See the License for the specific language governing permissions and limitations under the License. --> + + - - -
-
-
- -

- -

-

{{"i18nTextDefine_Click_CSAR_File" | translate}}

-

- - + + +
+ +
+
+ +

+ +

+

{{"i18nTextDefine_Click_CSAR_File" | translate}}

+

+ + +
+
+
+
{{"i18nTextDefine_Uploaded_files" | translate}}
+
{{"i18nTextDefine_Nofileuploading" | translate}}
+
+ +
{{file.name}}
+
+
-
-
-
{{"i18nTextDefine_Uploaded_files" | translate}}
-
{{"i18nTextDefine_Nofileuploading" | translate}}
-
- -
{{nsfile.name}}
-
- -
-
- {{"i18nTextDefine_File_upload_completed" | translate}} - {{"i18nTextDefine_File_upload_failed" | translate}} -
-
- - -
-
+
+ {{"i18nTextDefine_File_upload_completed" | translate}} + {{"i18nTextDefine_File_upload_failed" | translate}}
-
- -
- - - - {{"i18nTextDefine_NO" | translate}} - {{"i18nTextDefine_Name" | translate}} - {{"i18nTextDefine_Version" | translate}} - {{"i18nTextDefine_OnboardingState" | translate}} - {{"i18nTextDefine_OperationalState" | translate}} - {{"i18nTextDefine_UsageState" | translate}} - {{"i18nTextDefine_Operationbutton" | translate}} - - - - - {{i+1}} - {{item.nsdName || item.name }} - {{item.nsdVersion || item.version}} - {{item.nsdOnboardingState ? item.nsdOnboardingState : status}} - {{item.nsdOperationalState}} - {{item.nsdUsageState}} - - - - - - - - - - -
- -
-
-
- -

- -

-

Click or drag CSAR File here

-

- - -
-
-
-
{{"i18nTextDefine_Uploaded_files" | translate}}
-
{{"i18nTextDefine_Nofileuploading" | translate}}
-
- -
{{vnffile.name}}
-
- -
-
- {{"i18nTextDefine_File_upload_completed" | translate}} - {{"i18nTextDefine_File_upload_failed" | translate}} -
-
- - -
+
+ +
-
- -
- - - - {{"i18nTextDefine_NO" | translate}} - {{"i18nTextDefine_Name" | translate}} - {{"i18nTextDefine_Version" | translate}} - {{"i18nTextDefine_OnboardingState" | translate}} - {{"i18nTextDefine_OperationalState" | translate}} - {{"i18nTextDefine_UsageState" | translate}} - {{"i18nTextDefine_Operationbutton" | translate}} - - - - - {{i+1}} - {{item.vnfProductName || item.name }} - {{item.vnfdVersion || item.version}} - {{item.onboardingState}} - {{item.operationalState}} - {{item.usageState}} - - - - - - - - -
- -
-
-
- -

- -

-

Click or drag CSAR File here

-

- - -
-
-
-
{{"i18nTextDefine_Uploaded_files" | translate}}
-
{{"i18nTextDefine_Nofileuploading" | translate}}
-
- -
{{pnffile.name}}
-
- -
-
- {{"i18nTextDefine_File_upload_completed" | translate}} - {{"i18nTextDefine_File_upload_failed" | translate}} -
-
- - -
-
-
+
+ + +
+ + + + {{"i18nTextDefine_NO" | translate}} + {{"i18nTextDefine_Name" | translate}} + {{"i18nTextDefine_Version" | translate}} + {{"i18nTextDefine_OnboardingState" | translate}} + {{"i18nTextDefine_OperationalState" | translate}} + {{"i18nTextDefine_UsageState" | translate}} + {{"i18nTextDefine_Operationbutton" | translate}} + + + + + {{i+1}} + {{item.nsdName || item.name }} + {{item.nsdVersion || item.version}} + {{item.nsdOnboardingState ? item.nsdOnboardingState : status}} + {{item.nsdOperationalState}} + {{item.nsdUsageState}} + + + + + + + + + {{i+1}} + {{item.vnfProductName || item.name }} + {{item.vnfdVersion || item.version}} + {{item.onboardingState}} + {{item.operationalState}} + {{item.usageState}} + + + + + + + + + {{i+1}} + {{item.pnfdName}} + {{item.pnfdVersion}} + {{item.pnfdOnboardingState}} + {{item.pnfdUsageState}} + + + + + + + +
+ +
+
+ + {{notificationAttributes.status}} + +
+ {{notificationAttributes.title}}  + {{"i18nTextDefine_"+notificationAttributes.action | translate}}  {{"i18nTextDefine_"+notificationAttributes.status | translate}}
- -
- - - - {{"i18nTextDefine_NO" | translate}} - {{"i18nTextDefine_Name" | translate}} - {{"i18nTextDefine_Version" | translate}} - {{"i18nTextDefine_OnboardingState" | translate}} - {{"i18nTextDefine_UsageState" | translate}} - {{"i18nTextDefine_Operationbutton" | translate}} - - - - - {{i+1}} - {{item.pnfdName}} - {{item.pnfdVersion}} - {{item.pnfdOnboardingState}} - {{item.pnfdUsageState}} - - - - - - - - -
- - - -
-
- - {{notificationAttributes.status}} - -
- {{notificationAttributes.title}}  - {{"i18nTextDefine_"+notificationAttributes.action | translate}}  {{"i18nTextDefine_"+notificationAttributes.status | translate}} +
+
+

{{notificationAttributes.title}} id: 

+ {{ notificationAttributes.id }}
-
-
-

{{notificationAttributes.title}} id: 

- {{ notificationAttributes.id }} -
-
-
{{"i18nTextDefine_Close" | translate}}
+
{{"i18nTextDefine_Close" | translate}}
- - +
+ diff --git a/usecaseui-portal/src/app/views/services/onboard-vnf-vm/onboard-vnf-vm.component.ts b/usecaseui-portal/src/app/views/services/onboard-vnf-vm/onboard-vnf-vm.component.ts index b2b8cbb3..ed6f0d74 100644 --- a/usecaseui-portal/src/app/views/services/onboard-vnf-vm/onboard-vnf-vm.component.ts +++ b/usecaseui-portal/src/app/views/services/onboard-vnf-vm/onboard-vnf-vm.component.ts @@ -15,11 +15,12 @@ */ import { HttpClient, HttpRequest, HttpResponse } from '@angular/common/http'; import { Component, OnInit, HostBinding, TemplateRef } from '@angular/core'; -import { NzNotificationService, NzCollapseModule } from 'ng-zorro-antd'; +import { NzNotificationService } from 'ng-zorro-antd'; import { onboardService } from '../../../core/services/onboard.service'; import { slideToRight } from '../../../shared/utils/animates'; import { NzMessageService, UploadFile, NzModalRef, NzModalService } from 'ng-zorro-antd'; import { filter } from 'rxjs/operators'; +import { Title } from '@angular/platform-browser'; @Component({ selector: 'app-onboard-vnf-vm', @@ -30,27 +31,42 @@ import { filter } from 'rxjs/operators'; export class OnboardVnfVmComponent implements OnInit { @HostBinding('@routerAnimate') routerAnimateState; - // delete Modal - confirmModal: NzModalRef; - nsdInfoId: string; - vnfPkgId: string; - pnfdInfoId: string; - nsuploading:boolean = false; - vnfuploading:boolean = false; - pnfloading: boolean = false; - fileListNS: UploadFile[] = []; - fileListVNF: UploadFile[] = []; - fileListPNF: UploadFile[] = []; - // onboard initial value + // upload + tabs: string[] = ['NS', 'VNF', 'PNF']; + currentTab: string = 'NS' + fileList: UploadFile[] = []; + uploading:boolean = false; + infoId: string; + display: string = 'block'; + + // table + isSpinning: boolean = false; + nsTableData: any[]; + vnfTableData: any[]; + pnfTableData: any[]; status: string = "Onboard Available"; + pageIndex: number = 1; + pageSize: number = 10; + + // update or delete + isUpdate: boolean = false; jobId: string; + //url url = { - // line up ns: '/api/nsd/v1/ns_descriptors/*_*/nsd_content', vnf: '/api/vnfpkgm/v1/vnf_packages/*_*/package_content', pnf: '/api/nsd/v1/pnf_descriptors/*_*/pnfd_content' }; + + file: { + name: string, + uid: string, + progress: number, + status: boolean, + success: number + }; + constructor( private myhttp: onboardService, private http: HttpClient, @@ -58,28 +74,12 @@ export class OnboardVnfVmComponent implements OnInit { private modalService: NzModalService, private notification: NzNotificationService ) { } + //default Call ns data by default ngOnInit() { this.getTableData(); } - //Tabular data - nstableData: any; - vnftableData: any; - pnftableData: any; - nspageIndex: number = 1; - nspageSize: number = 10; - vnfpageIndex: number = 1; - vnfpageSize: number = 10; - pnfpageIndex: number = 1; - pnfpageSize: number = 10; - - nsloading: boolean = false; - tabs: string[] = ['NS', 'VNF', 'PNF']; - isSpinning: boolean = false; - isNone: string = 'block'; - - //2019.08.14 add notificationAttributes: { title: string, imgPath: string, @@ -87,39 +87,37 @@ export class OnboardVnfVmComponent implements OnInit { status: string, id: string } - setNotification({ title, imgPath, action, status, id }):void{ - this.notificationAttributes = { title, imgPath, action, status, id } + setNotification({ imgPath, action, status, id }):void{ + this.notificationAttributes = { title: this.currentTab, imgPath, action, status, id } } - notificationSuccess(notificationModel,title,action,id) { - this.setNotification({ title, imgPath:"assets/images/execute-success.png", action, status:"Success", id }) + notificationSuccess(notificationModel: TemplateRef<{}>, action: string, id: string): void { + this.setNotification({ imgPath:"assets/images/execute-success.png", action, status:"Success", id }) this.notification.template(notificationModel); } - notificationFailed(notificationModel,title,action,id) { - this.setNotification({ title, imgPath:"assets/images/execute-faild.png", action, status:"Failed", id }) + notificationFailed(notificationModel: TemplateRef<{}>, action: string ,id: string): void{ + this.setNotification({ imgPath:"assets/images/execute-faild.png", action, status:"Failed", id }) this.notification.template(notificationModel); } - // Handling tab switching request data - handleTabChange(tab) { + handleTabChange(tab: string): void { + this.currentTab = tab; + this.fileList = []; + delete this.file; switch (tab) { case 'NS': - this.nstableData = []; this.getTableData(); break case 'VNF': - this.vnftableData = []; this.getTableVnfData() break case 'PNF': - this.pnftableData = []; this.getTablePnfData() break } } - //before put create--Drag and drop files to the page before uploading requestBody = { "userDefinedData": { @@ -129,239 +127,108 @@ export class OnboardVnfVmComponent implements OnInit { } } - - // ns beforeUpload - beforeUploadNS = (file: UploadFile): boolean => { - this.fileListNS.splice(0,1,file); - this.myhttp.getCreatensData("createNetworkServiceData", this.requestBody)//on-line - .subscribe((data) => { - console.log(data) - this.nsdInfoId = data["id"]; - }, (err) => { - console.log(err); - }) - return false; - } - - //vnf beforeUpload - beforeUploadVNF = (file: UploadFile): boolean => { - this.fileListVNF.splice(0,1,file); - this.myhttp.getCreatensData("createVnfData", this.requestBody)//on-line - .subscribe((data) => { - this.vnfPkgId = data["id"]; - }, (err) => { - console.log(err); - }) - return false; - } - - // //pnf eforeUpload - beforeUploadPNF = (file: UploadFile): boolean => { - this.fileListPNF.splice(0,1,file) - this.myhttp.getCreatensData("createPnfData", this.requestBody) //on-line + beforeUpload = (file: UploadFile): boolean => { + this.fileList.splice(0,1,file); + let API: string; + if(this.currentTab === 'NS'){ + API = 'createNetworkServiceData'; + }else if(this.currentTab === 'VNF'){ + API = 'createVnfData'; + }else { + API = 'createPnfData'; + } + this.myhttp.getCreatensData(API, this.requestBody)//on-line .subscribe((data) => { - this.pnfdInfoId = data["id"]; + this.infoId = data["id"]; }, (err) => { console.log(err); }) return false; } - //Drag and drop and click the upload button - onClick(tab) { - this.isNone = 'none'; - switch (tab) { + // Drag and drop and click the upload button + onClick(): void { + this.display = 'none'; + switch (this.currentTab) { case 'NS': - this.handleUpload(this.url.ns.replace("*_*", this.nsdInfoId), tab); + this.handleUpload(this.url.ns.replace("*_*", this.infoId)); this.getTableData(); break case 'VNF': - this.handleUpload(this.url.vnf.replace("*_*", this.vnfPkgId), tab); + this.handleUpload(this.url.vnf.replace("*_*", this.infoId)); this.getTableVnfData() break case 'PNF': - this.handleUpload(this.url.pnf.replace("*_*", this.pnfdInfoId), tab); + this.handleUpload(this.url.pnf.replace("*_*", this.infoId)); this.getTablePnfData(); break } } - nsfile: { - name: string, - uid: string, - progress: number, - status: boolean, - success: number - }; - vnffile: { - name: string, - uid: string, - progress: number, - status: boolean, - success: number - }; - pnffile:{ - name: string, - uid: string, - progress: number, - status: boolean, - success: number - } - //put Upload Upload - handleUpload(url, tab): void { + handleUpload(url: string): void { const formData = new FormData(); // tslint:disable-next-line:no-any - switch (tab) { - case "NS": - this.fileListNS.forEach((file: any) => { - formData.set('file', file); - }); - this.nsuploading = true; - this.nsfile = { - name: this.fileListNS[0].name, - uid: this.fileListNS[0].uid, - progress: 0, - status: true, - success: 0 - }; - let requeryNS = (nsfile) => { - nsfile.progress += 3; - setTimeout(() => { - if (nsfile.progress < 100) { - requeryNS(nsfile) - } - }, 100) - }; - requeryNS(this.nsfile); - break - case "VNF": - this.fileListVNF.forEach((file: any) => { - formData.set('file', file); - }); - this.vnfuploading = true; - this.vnffile = { - name: this.fileListVNF[0].name, - uid: this.fileListVNF[0].uid, - progress: 0, - status: true, - success: 0 - }; - let requeryVnf = (vnffile) => { - setTimeout(() => { - vnffile.progress += 3; - if (vnffile.progress < 100) { - requeryVnf(vnffile) - } - }, 100) - }; - requeryVnf(this.vnffile); - break - case "PNF": - this.fileListPNF.forEach((file: any) => { - formData.set('file', file); - }); - this.pnfloading = true; - this.pnffile = { - name: this.fileListPNF[0].name, - uid: this.fileListPNF[0].uid, - progress: 0, - status: true, - success: 0 - }; - let requeryPnf = (pnffile) => { - setTimeout(() => { - pnffile.progress += 3; - if (pnffile.progress < 100) { - requeryPnf(pnffile) - } - }, 100) - }; - requeryPnf(this.pnffile); - break - } - // line PUT + this.fileList.forEach((file: any) => { + formData.set('file', file); + }); + this.uploading = true; + this.file = { + name: this.fileList[0].name, + uid: this.fileList[0].uid, + progress: 0, + status: true, + success: 0 + }; + let requery = (file) => { + file.progress += 3; + setTimeout(() => { + if (file.progress < 100) { + requery(file) + } + }, 100) + }; + requery(this.file); const req = new HttpRequest('PUT', url, formData, { reportProgress: true, withCredentials: true }); //Upload pre-empty array - this.fileListNS = []; - this.fileListVNF = []; - this.fileListPNF = []; + this.fileList = []; this.http.request(req) .pipe(filter(e => e instanceof HttpResponse)) .subscribe( (event: {}) => { - if (tab == "NS") { - this.nsfile.progress = 100; - this.nsfile.status = false; - } - if (tab == "VNF") { - this.vnffile.progress = 100; - this.vnffile.status = false; - } - if (tab == "PNF") { - this.pnffile.progress = 100; - this.pnffile.status = false; - } - this.changeUploadingSta(tab); - this.isNone = 'block'; + this.file.progress = 100; + this.file.status = false; + this.display = 'block'; + this.uploading = false; this.msg.success('upload successfully.'); }, err => { - if (tab == "NS") { - this.nsfile.progress = 100; - this.nsfile.status = false; - this.nsfile.success = 1; - } - if (tab == "VNF") { - this.vnffile.progress = 100; - this.vnffile.status = false; - this.vnffile.success = 1; - } - if (tab == "PNF") { - this.pnffile.progress = 100; - this.pnffile.status = false; - this.pnffile.success = 1; - } - this.changeUploadingSta(tab); - this.isNone = 'block'; + this.file.progress = 100; + this.file.status = false; + this.file.success = 1; + this.uploading = false; this.msg.error('upload failed.'); } ); } - // Control the status of uploading - changeUploadingSta(tab) { - switch (tab) { - case "NS": - this.nsuploading = false; - break - case "VNF": - this.vnfuploading = false; - break - case "PNF": - this.pnfloading = false; - } - } - - //---------------------------------------------------------------------------------------------- - // Get the NS list - getTableData() { + getTableData(): void{ this.isSpinning = true; //ns vfc lists this.myhttp.getOnboardTableData() .subscribe((data) => { - this.nstableData = data; + this.nsTableData = data; //ns sdc list this.myhttp.getSDC_NSTableData() .subscribe((data) => { this.isSpinning = false; //loading hide - let nssdcData = data; - this.nstableData.map((nsvfc) => { nsvfc.sameid = nssdcData.find((nssdc) => { return nsvfc.id == nssdc.uuid }) && nsvfc.id; return nsvfc; }); - let sameData = nssdcData.filter((nssdc) => { return !this.nstableData.find((nsvfc) => { return nsvfc.id == nssdc.uuid }) }); - this.nstableData = this.nstableData.concat(sameData); + let nsData = data; + // this.NSTableData.map((nsvfc) => { nsvfc.sameid = nsData.find((nssdc) => { return nsvfc.id == nssdc.uuid }) && nsvfc.id; return nsvfc; }); + let sameData = nsData.filter((nssdc) => { return !this.nsTableData.find((nsvfc) => { return nsvfc.id == nssdc.uuid }) }); + this.nsTableData = this.nsTableData.concat(sameData); }, (err) => { console.error(err); this.isSpinning = false; @@ -370,29 +237,27 @@ export class OnboardVnfVmComponent implements OnInit { console.error(err); this.isSpinning = false; }) - } // Get the vnf list - getTableVnfData() { + getTableVnfData(): void{ this.isSpinning = true; //vnf vfc lists this.myhttp.getOnboardTableVnfData() .subscribe((data) => { - this.vnftableData = data; + this.vnfTableData = data; //vnf sdc lists this.myhttp.getSDC_VNFTableData() .subscribe((data) => { this.isSpinning = false; //loading hide - let vnfsdcData = data; - this.vnftableData.map((vnfvfc) => { vnfvfc.sameid = vnfsdcData.find((nssdc) => { return vnfvfc.id == nssdc.uuid }) && vnfvfc.id; return vnfvfc; }); - let sameData = vnfsdcData.filter((vnfsdc) => { return !this.vnftableData.find((vnfvfc) => { return vnfvfc.id == vnfsdc.uuid }) }); - this.vnftableData = this.vnftableData.concat(sameData); + let vnfData = data; + // this.VNFTableData.map((vnfvfc) => { vnfvfc.sameid = this.vnfData.find((nssdc) => { return vnfvfc.id == nssdc.uuid }) && vnfvfc.id; return vnfvfc; }); + let sameData = vnfData.filter((vnfsdc) => { return !this.vnfTableData.find((vnfvfc) => { return vnfvfc.id == vnfsdc.uuid }) }); + this.vnfTableData = this.vnfTableData.concat(sameData); }, (err) => { console.error(err); this.isSpinning = false; }) - }, (err) => { console.error(err); this.isSpinning = false; @@ -404,7 +269,7 @@ export class OnboardVnfVmComponent implements OnInit { this.isSpinning = true; this.myhttp.getOnboardTablePnfData() .subscribe((data) => { - this.pnftableData = data; + this.pnfTableData = data; this.isSpinning = false; //loading hide }, (err) => { console.error(err); @@ -412,21 +277,18 @@ export class OnboardVnfVmComponent implements OnInit { }) } - //----------------------------------------------------------------------------------- - - // modal - showConfirm(requestBody, notificationModel, id, type): void{ - let API = type === 'NS'? 'getNsonboard' : 'getVnfonboard'; + // confirm + showConfirm(requestBody: object, notificationModel: TemplateRef<{}>, id: string): void{ + let API = this.currentTab === 'NS'? 'getNsonboard' : 'getVnfonboard'; this.modalService.confirm({ nzTitle: '

Are you sure you want to do this?

', - nzContent: 'Some descriptions', nzOnOk: () => { this.myhttp[API](requestBody) .subscribe((data) => { if (data.status == "success") { - if(type === 'NS'){ - this.onboardData.status = "onboarded"; - this.notificationSuccess(notificationModel, this.tabs[0],"OnboardingState",id); + if(this.currentTab === 'NS'){ + this.isUpdate = false; + this.notificationSuccess(notificationModel, "OnboardingState", id); this.getTableData(); }else{ this.jobId = data.jobId; @@ -434,8 +296,8 @@ export class OnboardVnfVmComponent implements OnInit { this.getTableVnfData(); } } else { - this.onboardData.status = "Failed"; - this.notificationFailed(notificationModel,this.tabs[0],"OnboardingState",id); + this.isUpdate = false; + this.notificationFailed(notificationModel, "OnboardingState", id); return false } }, (err) => { @@ -445,54 +307,38 @@ export class OnboardVnfVmComponent implements OnInit { }) } - //onboard status - onboardData = { - status: "onboard", - progress: 0, - } - currentIndex = 0; - // ns onboard Upload button - updataNsService(id, index, notificationModel) { - this.currentIndex = index; - this.onboardData.status = "onboarding"; //Disabled - this.onboardData.progress = 0; - let requestBody = { "csarId": id }; - this.showConfirm(requestBody,notificationModel,id,'NS') - } - // vnf onboard Upload button - updataVnfService(id, index, notificationModel) { - this.currentIndex = index; - this.onboardData.status = "onboarding"; //Disabled button - this.onboardData.progress = 0; + // ns onboard Upload button + updataService(id: string, notificationModel: TemplateRef<{}>) { + this.isUpdate = true; let requestBody = { "csarId": id }; - this.showConfirm(requestBody,notificationModel,id,'VNF') - } + this.showConfirm(requestBody, notificationModel, id) + } //Progress Progress inquiry - queryProgress(jobId, notificationModel,id) { + queryProgress(jobId: string, notificationModel: TemplateRef<{}>, id: string): any{ let mypromise = new Promise((res) => { this.myhttp.getProgress(jobId, 0) .subscribe((data) => { - if (data.responseDescriptor === null ||data.responseDescriptor === "null" || data.responseDescriptor.progress == undefined || data.responseDescriptor.progress === null) { - this.onboardData.status = "onboarding"; + if (data.responseDescriptor == null || data.responseDescriptor == "null" || data.responseDescriptor.progress == undefined || data.responseDescriptor.progress == null) { + this.isUpdate = true; setTimeout(() => { - this.queryProgress(this.jobId, notificationModel,id); + this.queryProgress(this.jobId, notificationModel, id); }, 10000) return false } if (data.responseDescriptor.progress > 100) { - this.onboardData.status = "Failed"; - this.notificationFailed(notificationModel,'VNS','OnboardingState',id); + this.isUpdate = false; + this.notificationFailed(notificationModel, 'OnboardingState', id); }else if (data.responseDescriptor.progress < 100) { - this.onboardData.status = "onboarding"; + this.isUpdate = true; setTimeout(() => { this.queryProgress(this.jobId, notificationModel,id); }, 5000) } else { res(data); - this.onboardData.status = "onboarded"; - this.notificationSuccess(notificationModel,'VNS','OnboardingState',id); + this.isUpdate = false; + this.notificationSuccess(notificationModel, 'OnboardingState', id); } return false }) @@ -500,70 +346,48 @@ export class OnboardVnfVmComponent implements OnInit { return mypromise; } - //-------------------------------------------------------------------------------- /* delete button */ - showDeleteConfirm(pkgid, tab, notificationModel): void { - this.confirmModal = this.modalService.confirm({ + showDeleteConfirm(pkgid: string, notificationModel: TemplateRef<{}>): void { + this.modalService.confirm({ nzTitle: 'Do you Want to delete these items?', nzContent: 'Do you Want to delete these items?', nzOkText: 'Yes', nzCancelText: 'No', nzOnOk: () => new Promise((resolve) => { - switch (tab) { - case 'NS': - this.deleteNsService(pkgid, notificationModel,resolve); - break - case 'VNF': - this.deleteVnfService(pkgid, notificationModel,resolve); - break - case 'PNF': - this.deletePnfService(pkgid, notificationModel,resolve); - break - } + this.deleteService(pkgid, notificationModel,resolve); }).catch(() => console.log('Oops errors!')) }); } //delete nsItem - deleteNsService(pkgid, notificationModel,resolve) { - this.myhttp.deleteNsIdData(pkgid) - .subscribe((data) => { - this.notificationSuccess(notificationModel,'NS','OnboardingState',pkgid); - resolve() - //refresh list after successful deletion - this.getTableData(); - }, (err) => { - console.log(err); - this.notificationFailed(notificationModel,'NS','OnboardingState',pkgid); - }) - } - - //delete vnfItem - deleteVnfService(pkgid, notificationModel,resolve) { - this.myhttp.deleteVnfIdData(pkgid) - .subscribe((data) => { - this.notificationSuccess(notificationModel,'VNF','OnboardingState',pkgid); - resolve() - //refresh list after successful deletion - this.getTableVnfData() - }, (err) => { - console.log(err); - this.notificationFailed(notificationModel,'VNF','OnboardingState',pkgid); - }) - } - - //delete PnfItem - deletePnfService(pkgid, notificationModel,resolve) { - this.myhttp.deletePnfIdData(pkgid) + deleteService(pkgid, notificationModel,resolve) { + let API: string; + if(this.currentTab === 'NS'){ + API = 'deleteNsIdData'; + }else if(this.currentTab === 'VNF'){ + API = 'deleteVnfIdData'; + }else{ + API = 'deletePnfIdData'; + } + this.myhttp[API](pkgid) .subscribe((data) => { - this.notificationSuccess(notificationModel,'PNF','OnboardingState',pkgid); + this.notificationSuccess(notificationModel, 'OnboardingState', pkgid); resolve() //refresh list after successful deletion - this.getTablePnfData() + switch(this.currentTab){ + case 'NS': + this.getTableData(); + break + case 'VNF': + this.getTableVnfData(); + break + case 'PNF': + this.getTablePnfData(); + break + } }, (err) => { console.log(err); - this.notificationFailed(notificationModel,'PNF','OnboardingState',pkgid); + this.notificationFailed(notificationModel, 'OnboardingState', pkgid); }) } - } -- cgit 1.2.3-korg