feat:add notification model of slicing business page

Change-Id: I5637f1f5bc5aee23518b6b92f4f7f53071866301
Issue-ID: USECASEUI-369
Signed-off-by: cyuamber <xuranyjy@chinamobile.com>

diff --git a/usecaseui-portal/src/app/mock/routes.js b/usecaseui-portal/src/app/mock/routes.js
index 3cf8262..4bb883c 100644 (file)
--- a/usecaseui-portal/src/app/mock/routes.js
+++ b/usecaseui-portal/src/app/mock/routes.js
@@ -97,7 +97,7 @@ module.exports =
         "/uui-slicing/nsmf/task/:taskId/auditInfo": "/slicing_task_auditInfo",
         "/uui-slicing/nsmf/resource/nsi/instances/pageNo/:pageNo/pageSize/:pageSize": "/slicing_nsi_list",
         "/uui-slicing/nsmf/resource/nsi/:nsiId/nssiInstances": "/slicing_subnet_instance",
-        "/uui-slicing/nsmf/resource/nssi/:environmentContext/instances/pageNo/:pageNo/pageSize/:pageSize": "/slicing_subnet_context",
+        "/uui-slicing/nsmf//resource//nssi/environmentContext/:environmentContext/instances/pageNo/:pageNo/pageSize/:pageSize": "/slicing_subnet_context",
         "/uui-slicing/nsmf/task/:taskId/taskCreationInfo": "/slicing_taskCreationInfo",
         "/uui-slicing/nsmf/task/:taskId/taskCreationProgress": "/slicing_taskCreationProgress",
         "/PUT/uui-slicing/nsmf/task/auditInfo": "/PUT_task_auditInfo",
@@ -115,7 +115,7 @@ module.exports =
         "/uui-slicing/nsmf/resource/nsi/:nsiId/details":"/getSlicingNsiDetail",
         ///////<-------------slicing_nssi--------->/////
         "/uui-slicing/nsmf/resource/nssi/instances/pageNo/:pageNo/pageSize/:pageSize": "/slicing_nssi_list",
-        "/uui-slicing/nsmf/resource/nssi/:instanceStatus/instances/pageNo/:pageNo/pageSize/:pageSize": "/slicing_nssi_list_activated",
+        "/uui-slicing/nsmf/resource/nssi/instanceStatus/:instanceStatus/instances/pageNo/:pageNo/pageSize/:pageSize": "/slicing_nssi_list_activated",
         "/uui-slicing/nsmf/resource/nssi/:nssiId/details":"/getSlicingNssiDetail",
         ///////<-------------monitor 5G--------->/////
         "/POST/uui-slicing/nsmf/monitoring/queryTimestamp/:queryTimestamp/trafficData": "/fetchTrafficData",

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 80fcc76..a8d2407 100644 (file)
--- 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
@@ -74,4 +74,5 @@
             </tbody>
         </nz-table>
     </div>
-</div>
\ No newline at end of file
+</div>
+<app-notification #notification [isServicesList]="false" [parentComponent]="'slicing'"></app-notification>
\ No newline at end of file

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 a524b8b..bb04c8f 100644 (file)
--- 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
@@ -1,4 +1,4 @@
-import {Component, OnInit} from '@angular/core';
+import {Component, OnInit, ViewChild} from '@angular/core';
 import {SlicingTaskServices} from '.././../../../../../core/services/slicingTaskServices';
 import {BUSINESS_STATUS} from '../../../../../../../constants/constants';
 import { NzModalService } from 'ng-zorro-antd';
@@ -33,7 +33,7 @@ export class SlicingBusinessTableComponent implements OnInit {
     isSelect: boolean = false;
     statusOptions: any[] = BUSINESS_STATUS;
     progressingTimer :any[] = [];
-
+    @ViewChild('notification') notification1: any;
 
     getBusinessList (): void{
         this.loading = true;
@@ -80,8 +80,9 @@ export class SlicingBusinessTableComponent implements OnInit {
     switchChange(slicing,i){
         this.modalService.confirm({
             nzTitle: '<i>Do you Want to'+(slicing.orchestration_status === 'activated'?'deactivated':'activated')+ 'slicing business?</i>',
-            nzContent: '<b>service_instance_id:'+slicing.service_instance_id+'</b>',
+            nzContent: '<b>Name:'+slicing.service_instance_name+'</b>',
             nzOnOk: () => {
+                this.notification1.notificationStart('slicing business', slicing.orchestration_status === 'activated'?'deactivate':'activated', slicing.service_instance_id);
                 let paramsObj = {
                     serviceId:slicing.service_instance_id
                 };
@@ -108,25 +109,28 @@ export class SlicingBusinessTableComponent implements OnInit {
                 console.log(operation_id,"operation_id");
                 let obj = {
                     serviceId: slicing.service_instance_id
-                }
+                };
                 let updata = (prodata) => {
                     slicing.last_operation_progress = prodata.progress;
                     slicing.orchestration_status = prodata.operation_type;
                     this.queryProgress(obj, updata).then(() => {
                         slicing.last_operation_progress = 100;
                         slicing.orchestration_status = finished;
+                        this.notification1.notificationSuccess('slicing business', finished, slicing.service_instance_id);
                     })
-                }
+                };
             }else {
-                console.error(result_message)
+                this.notification1.notificationFailed('slicing business', finished, slicing.service_instance_id);
+                console.error(result_message);
             }
         })
     }
     terminate(slicing){
         this.modalService.confirm({
             nzTitle: 'Do you Want to Terminate slicing business?',
-            nzContent: '<b>service_instance_id:&nbsp;</b>'+slicing.service_instance_id,
+            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
                 };
@@ -145,9 +149,11 @@ export class SlicingBusinessTableComponent implements OnInit {
                             this.queryProgress(obj, updata).then(() => {
                                 slicing.last_operation_progress = 100;
                                 slicing.orchestration_status = "terminated";
+                                this.notification1.notificationSuccess('slicing business', 'terminate', slicing.service_instance_id);
                             })
-                        }
+                        };
                     }else {
+                        this.notification1.notificationFailed('slicing business', 'terminate', slicing.service_instance_id);
                         console.error(result_message)
                     }
                 })