From: Sunder Tattavarada <statta@research.att.com>
Date: Mon, 6 Apr 2020 19:17:48 +0000 (+0000)
Subject: Merge "Portal-BE remove from pom.xml"
X-Git-Tag: 3.4.0~120
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=3cf023833be095472e708ad8c9c470b077a17d20;hp=f5e19c09d050a04c681ce862756ccfa2bd4cd71e;p=portal.git

Merge "Portal-BE remove from pom.xml"
---

diff --git a/portal-FE-common/src/app/layout/components/userbar/userbar.component.html b/portal-FE-common/src/app/layout/components/userbar/userbar.component.html
index 0ff5a554..898a8fb4 100644
--- a/portal-FE-common/src/app/layout/components/userbar/userbar.component.html
+++ b/portal-FE-common/src/app/layout/components/userbar/userbar.component.html
@@ -45,7 +45,10 @@
 <nav [ngStyle]="{'right': isOpen ? '18px' : '-75px' }" class="usb-item usb-item-vertical usb-item-right" id="usb-item-s2">
   <h3>Online Users</h3>
   <div *ngFor="let user of userList" style="font-size: 10px;">
-    <a [href]="user.linkQ"><img class="activeUserIcon" [src]="user.linkPic" alt="User Link"></a>
+    <a [href]="user.linkQ" *ngIf="(user.linkPicURL !='')">
+      <img class="activeUserIcon" [src]="user.linkPic" alt="User Link">
+    </a>
+    <a [href]="user.linkQ"><i *ngIf="(user.linkPicURL == '')" class="activeUserIcon default-user-icon icon ion-md-person"></i></a>
     <div class="userId-txt">{{user.userId}}</div>
   </div>
 </nav>
\ No newline at end of file
diff --git a/portal-FE-common/src/app/layout/components/userbar/userbar.component.scss b/portal-FE-common/src/app/layout/components/userbar/userbar.component.scss
index 81801104..451adfc7 100644
--- a/portal-FE-common/src/app/layout/components/userbar/userbar.component.scss
+++ b/portal-FE-common/src/app/layout/components/userbar/userbar.component.scss
@@ -112,3 +112,9 @@ button {
   width: 55px;
   border-radius: 50%;
 }
+
+.default-user-icon{
+  font-size: 45px;
+  display: block;
+  color: black;
+}
\ No newline at end of file
diff --git a/portal-FE-common/src/app/layout/components/userbar/userbar.component.ts b/portal-FE-common/src/app/layout/components/userbar/userbar.component.ts
index 661317bf..2136abb2 100644
--- a/portal-FE-common/src/app/layout/components/userbar/userbar.component.ts
+++ b/portal-FE-common/src/app/layout/components/userbar/userbar.component.ts
@@ -88,8 +88,9 @@ export class UserbarComponent implements OnInit {
         for (var i = 0; i < maxItems; i++) {
           var data = {
             userId: _res[i],
-            linkQ: this.api.linkQ,
-            linkPic: this.api.linkPic
+            linkQ: this.sanitizer.bypassSecurityTrustResourceUrl(this.api.linkQ + _res[i]),
+            linkPic: this.api.linkPic + _res[i],
+            linkPicURL:this.api.linkPic
           }
           this.userList.push(data);
         }
diff --git a/portal-FE-common/src/app/pages/dashboard-application-catalog/dashboard-application-catalog.component.ts b/portal-FE-common/src/app/pages/dashboard-application-catalog/dashboard-application-catalog.component.ts
index ce373392..be4c09e2 100644
--- a/portal-FE-common/src/app/pages/dashboard-application-catalog/dashboard-application-catalog.component.ts
+++ b/portal-FE-common/src/app/pages/dashboard-application-catalog/dashboard-application-catalog.component.ts
@@ -119,16 +119,15 @@ export class DashboardApplicationCatalogComponent implements OnInit {
         } else {
           resJson.index = 3;
 
-        }
-
-        
+        } 
+	  this.selectedSortType = this.sortOptions[resJson.index];
+        //console.log(this.selectedSortType);
+      this.getAppCatalogService(data);		
       }
 	  else {
-		  resJson.index = 0;
+		  this.sortTypeChanged('N');
 	  }
-	  this.selectedSortType = this.sortOptions[resJson.index];
-        //console.log(this.selectedSortType);
-      this.getAppCatalogService(data);
+	  
 		  
     }, error => {
       console.log('getUserAppsSortTypePreference Error Object' + error.message);