From: Dario Faccin <dario.faccin@canonical.com>
Date: Wed, 24 May 2023 14:56:33 +0000 (+0200)
Subject: Update from master
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fpaas;p=osm%2FNG-UI.git

Update from master

Squashed commit of the following:

commit 40cc37ef2bbc4aac5debc9dea0baeb6dbd87a2d7
Author: SANDHYA.JS <sandhya.j@tataelxsi.co.in>
Date:   Tue Mar 7 11:01:46 2023 +0530

    Fix Bug 2219 - NG-UI remains stuck when showing a VIM created from the CLI

    	- For Info part in VIM, UI will check for location value mandatorily.
    	  Fixed this by adding condition to check null or undefined values before going inside location values loop.

    Change-Id: I8ff265aa364b41131b3e99d3712e964b94f05aa8
    Signed-off-by: SANDHYA.JS <sandhya.j@tataelxsi.co.in>

Change-Id: I9ed23326656f3fc42408dea4869d70616efe6a6f
Signed-off-by: Dario Faccin <dario.faccin@canonical.com>
---

diff --git a/src/app/vim-accounts/info-vim/InfoVimComponent.ts b/src/app/vim-accounts/info-vim/InfoVimComponent.ts
index c82e9b6..952c1dc 100644
--- a/src/app/vim-accounts/info-vim/InfoVimComponent.ts
+++ b/src/app/vim-accounts/info-vim/InfoVimComponent.ts
@@ -116,6 +116,7 @@ export class InfoVimComponent implements OnInit {
     this.restService.getResource(environment.VIMACCOUNTS_URL + '/' + this.paramsID)
       .subscribe((vimAccountsData: VimAccountDetails) => {
         this.showDetails(vimAccountsData);
+        if (!isNullOrUndefined(vimAccountsData.config)) {
         if (vimAccountsData.config.location !== undefined) {
           const locationArr: string[] = vimAccountsData.config.location.split(',');
           if (Array.isArray(locationArr)) {
@@ -133,6 +134,7 @@ export class InfoVimComponent implements OnInit {
           }
         });
         this.configParams = vimAccountsData.config;
+      }
         this.isLoadingResults = false;
       }, (error: ERRORDATA) => {
         this.isLoadingResults = false;