Merge "Service instance topology front-end development"2.0.1

2 files changed, 22 insertions, 11 deletions

diff --git a/usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.html b/usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.html
index 8a3a73a1..b8d0ce3a 100644
--- a/usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.html
+++ b/usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.html
@@ -30,7 +30,7 @@
     <div id="detailChart">
       <svg width="100%" height="100%" style="position: relative">
         <!--local domain-->
-        <g class="clouds">
+        <g class="clouds" *ngIf="vpns[0].domain!=''">
           <image xlink:href="./assets/images/domain1.png"
                  id="domain1"
                  width="14%"
@@ -51,7 +51,7 @@
           </text>
         </g>
         <!--domain1 tp-->
-        <g class="clouds">
+        <g class="clouds" *ngIf="vpns[0].sitetpname!=''">
           <image xlink:href="./assets/images/tp.png"
                  class="tp"
                  id="tp1"
@@ -62,7 +62,7 @@
             {{vpns[0].sitetpname}}
           </text>
         </g>
-        <g class="clouds">
+        <g class="clouds" *ngIf="vpns[0].othertpname!=''">
           <image xlink:href="./assets/images/tp.png"
                  class="tp"
                  id="tp2"
@@ -108,7 +108,7 @@
           </text>
         </g>
         <!--local site-->
-        <g class="clouds">
+        <g class="clouds" *ngIf="localSite.length>0">
           <image xlink:href="./assets/images/site.png"
                  id="site1"
                  height="59" width="100"
@@ -118,7 +118,7 @@
             {{localSite[0] && localSite[0]["service-instance-name"]}}
           </text>
         </g>
-        <g *ngIf="!detailSites" class="clouds">
+        <g *ngIf="!detailSites && localSite.length>0" class="clouds">
           <image xlink:href="./assets/images/site.png"
                  id="site2"
                  height="59" width="100"
@@ -139,24 +139,24 @@
           </text>
         </g>
         <!--cloud site-->
-        <g *ngIf="!detailSites" class="clouds">
+        <g *ngIf="!detailSites && outerSite.length>0" class="clouds">
           <image xlink:href="./assets/images/site.png"
                  id="site3"
                  height="59" width="100"
                  x="89%" y="10%"
           ></image>
           <text dx="90%" dy="7%" style="font-size: 14px; fill: #666;width: 20px;">
-            {{outerSite[1]["service-instance-name"]}}
+            {{outerSite[1] && outerSite[1]["service-instance-name"]}}
           </text>
         </g>
-        <g class="clouds">
+        <g class="clouds" *ngIf="outerSite.length>0">
           <image xlink:href="./assets/images/site.png"
                  id="site4"
                  height="59" width="100"
                  x="89%" y="40%"
           ></image>
           <text dx="90%" dy="37%" style="font-size: 14px; fill: #666;width: 20px;">
-            {{outerSite[0]["service-instance-name"]}}
+            {{outerSite[0] && outerSite[0]["service-instance-name"]}}
           </text>
         </g>
         <!--tp,site,domain---line -->
diff --git a/usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.ts b/usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.ts
index c11b159e..d0ef7d1b 100644
--- a/usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.ts
+++ b/usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.ts
@@ -87,7 +87,11 @@ export class CcvpnDetailComponent implements OnInit {
         console.log(this.detailParams)
         console.log(this.upDateShow)
         // this.input_parameters = JSON.stringify(this.detailParams['input-parameters'])
-        this.input_parameters = JSON.parse(this.detailParams['input-parameters']);
+        if(this.detailParams['input-parameters']){
+            this.input_parameters = JSON.parse(this.detailParams['input-parameters']);
+        }else {
+            return false;
+        }
         console.log(this.input_parameters);
         this.templateParameters.service = {
             name:  this.input_parameters.service.name,
@@ -557,6 +561,8 @@ export class CcvpnDetailComponent implements OnInit {
             console.log(this.localSite);
             console.log(this.outerSite);
 
+           if(this.localSite.length>0){
+               this.detailLines = [].concat(this.detailLiness);
             this.localSite.forEach((site)=>{
                 let obj = {
                     customerId: this.detailParams.customer.id,
@@ -571,6 +577,10 @@ export class CcvpnDetailComponent implements OnInit {
                         res("sites-domain");
                     })
             })
+           }else {
+               console.log("localSite []");
+               return false;
+           }
         })
     }
 
@@ -707,7 +717,8 @@ export class CcvpnDetailComponent implements OnInit {
     }
 
     detailSites = false;
-    detailLines = [ //Details of the topology map connection coordinates
+    detailLines = [];
+    detailLiness = [ //Details of the topology map connection coordinates
         {
             "x1": "9%", "y1": "40%", "x2": "21%", "y2": "40%"//site1--tp1
         },