fix: Fix the bug of termination operation 56/103656/1
authorcyuamber <xuranyjy@chinamobile.com>
Fri, 13 Mar 2020 06:53:21 +0000 (14:53 +0800)
committercyuamber <xuranyjy@chinamobile.com>
Fri, 13 Mar 2020 06:53:24 +0000 (14:53 +0800)
Change-Id: I1b841b8898cdd1facd055acb96bbf4f8cdd56b53
Issue-ID: USECASEUI-369
Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
usecaseui-portal/package-lock.json
usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.html
usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.html
usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.ts

index 4263998..2ae3b21 100644 (file)
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
index 936338d..6b43a8a 100644 (file)
@@ -54,7 +54,7 @@
             </td>
             <td>
               <div class="action-icon">
-                <i [ngClass]="{'cannotclick':data.order_status === 'processing' || data.order_status === 'error' || ( data.last_operation_progress && data.last_operation_progress !== '100' && (data.last_operation_type === 'DELETE' || data.last_operation_type === 'activated'))}"
+                <i [ngClass]="{'cannotclick':data.order_status !== 'deactivated' || ( data.last_operation_progress && data.last_operation_progress !== '100' && (data.last_operation_type === 'DELETE' || data.last_operation_type === 'activated'))}"
                   nz-icon nzType="poweroff" nzTheme="outline" class="anticon anticon-poweroff"
                   (click)="terminate(data,i)"></i>
                 <nz-progress
index eef3575..640ba3b 100644 (file)
@@ -51,7 +51,7 @@
                                 </nz-progress>
                             </div>
                             <div class="action-icon">
-                                <i [ngClass]="{'cannotclick': data.orchestration_status === 'processing' || (data.last_operation_type && data.last_operation_progress && data.last_operation_progress !== '100' && (data.last_operation_type !== 'DELETE' || data.orchestration_status==='activated'))}"
+                                <i [ngClass]="{'cannotclick': data.orchestration_status !== 'deactivated' || (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)"></i>
                                 <nz-progress
index af7e2d6..d5cda96 100644 (file)
@@ -149,6 +149,7 @@ export class SlicingTaskManagementComponent implements OnInit {
       if (this.selectedValue && this.selectedValue !== 'all') {
         this.getListOfProcessingStatus();
       } else {
+          this.loading = true;
           setTimeout(() => {
               this.getTaskList()
           }, 5000);