From 03d4bf6a3fe3f5259abb915b7e120bf38ca17d0c Mon Sep 17 00:00:00 2001
From: cyuamber <xuranyjy@chinamobile.com>
Date: Fri, 10 Apr 2020 12:04:39 +0800
Subject: 1ifix: Fix service-list page bug

Change-Id: Ie61afcb2a9e07ba58416af5ef3f5ad2f07e37402
Issue-ID: USECASEUI-369
Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
---
 .../services/services-list/services-list.component.ts     | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'usecaseui-portal/src/app/views/services/services-list/services-list.component.ts')

diff --git a/usecaseui-portal/src/app/views/services/services-list/services-list.component.ts b/usecaseui-portal/src/app/views/services/services-list/services-list.component.ts
index adac12d1..96d19cfe 100644
--- a/usecaseui-portal/src/app/views/services/services-list/services-list.component.ts
+++ b/usecaseui-portal/src/app/views/services/services-list/services-list.component.ts
@@ -210,7 +210,6 @@ export class ServicesListComponent implements OnInit {
                     if (typeof item == "string") {
                         item = JSON.parse(item);
                     }
-
                     item["iconMore"] = this.iconMore;
                     if (item["serviceDomain"] === "Network Service") {
                         if (item["vnfInfo"]) {
@@ -283,6 +282,7 @@ export class ServicesListComponent implements OnInit {
                                     item["tips"] = this.listSortMasters["operationTypes"].find((its) => {
                                         return its["sortCode"] == item["operationType"] && its["language"] == this.language
                                     })["sortValue"] + '\xa0\xa0\xa0' + item["status"];
+                                    this.getTableData();
                                 }
                             }
                             let id = item["nsInstanceId"] || item["service-instance-id"];
@@ -296,11 +296,15 @@ export class ServicesListComponent implements OnInit {
                                 item["tips"] = this.listSortMasters["operationTypes"].find((its) => {
                                     return its["sortCode"] == item["operationType"] && its["language"] == this.language
                                 })["sortValue"] + '\xa0\xa0\xa0' + item["status"];
+                                this.getTableData();
                             })
                         } else {
                             let updata = (prodata) => {
                                 item["rate"] = prodata.progress || 0;
-                                if(item["rate"] > 100) item["status"] = prodata.status;
+                                if(item["rate"] > 100) {
+                                    item["status"] = prodata.status;
+                                    this.getTableData();
+                                }
                                 item["tips"] = this.listSortMasters["operationTypes"].find((its) => {
                                     return its["sortCode"] === item["operationType"] && its["language"] === this.language
                                 })["sortValue"] + '\xa0\xa0\xa0' + (item["rate"] > 100? item["status"] : prodata.progress + '%');
@@ -318,6 +322,7 @@ export class ServicesListComponent implements OnInit {
                                 item["tips"] = this.listSortMasters["operationTypes"].find((its) => {
                                     return its["sortCode"] == item["operationType"] && its["language"] == this.language
                                 })["sortValue"] + '\xa0\xa0\xa0' + item["status"];
+                                this.getTableData();
                             })
                         }
                     }
@@ -361,7 +366,6 @@ export class ServicesListComponent implements OnInit {
                         }
                     }
                 })
-                console.log(this.tableData)
                 this.loading = false;
             }, (err) => {
                 console.log(err);
@@ -567,6 +571,7 @@ export class ServicesListComponent implements OnInit {
                     newData.tips = this.listSortMasters["operationTypes"].find((its) => {
                         return its["sortCode"] == newData["statusClass"] && its["language"] == this.language
                     })["sortValue"] + '\xa0\xa0\xa0' + newData["status"];
+                    this.getTableData();
                 }
             };
             let queryParams = { serviceId: data["serviceId"], operationId: data["operationId"], operationType: "1001" };
@@ -648,6 +653,7 @@ export class ServicesListComponent implements OnInit {
                     newData.tips = this.listSortMasters["operationTypes"].find((its) => {
                         return its["sortCode"] == newData["statusClass"] && its["language"] == this.language
                     })["sortValue"] + '\xa0\xa0\xa0' + newData["status"];
+                    this.getTableData();
                 }
             }
             let queryParams = { serviceId: data["serviceId"], operationId: data["operationId"], operationType: "1001" };
@@ -720,6 +726,7 @@ export class ServicesListComponent implements OnInit {
                     newData.tips = this.listSortMasters["operationTypes"].find((its) => {
                         return its["sortCode"] == newData["statusClass"] && its["language"] == this.language
                     })["sortValue"] + '\xa0\xa0\xa0' + newData["status"];
+                    this.getTableData();
                 }
             }
             let queryParams = { serviceId: data["serviceId"], operationId: data["operationId"], operationType: "1001" };
@@ -812,6 +819,7 @@ export class ServicesListComponent implements OnInit {
                             newData.tips = this.listSortMasters["operationTypes"].find((its) => {
                                 return its["sortCode"] == newData["statusClass"] && its["language"] == this.language
                             })["sortValue"] + '\xa0\xa0\xa0' + newData["status"];
+                            this.getTableData();
                         }
                     }
 
@@ -831,6 +839,7 @@ export class ServicesListComponent implements OnInit {
                     let hasUndone = this.tableData.some((item) => {
                         return item.rate < 100;
                     })
+                    console.log(hasUndone,"------ hasUndone")
                     if (!hasUndone) {
                         setTimeout(() => {
                             this.getTableData();
-- 
cgit 1.2.3-korg