Merge changes Ia6e96c72,If0cf112c,I3060de8b,I58fe7429

* changes:
  Migrate Dockerfile.widgetms to unprivileged user
  Migrate Dockerfile.sdk to unprivileged user
  Migrate Dockerfile.portal to unprivileged user
  Migrate Dockerfile.be to unprivileged user

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 baaa4c4..ce37339 100644 (file)
--- 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
@@ -121,10 +121,15 @@ export class DashboardApplicationCatalogComponent implements OnInit {
 
         }
 
-        this.selectedSortType = this.sortOptions[resJson.index];
-        //console.log(this.selectedSortType);
-        this.getAppCatalogService(data);
+        
       }
+         else {
+                 resJson.index = 0;
+         }
+         this.selectedSortType = this.sortOptions[resJson.index];
+        //console.log(this.selectedSortType);
+      this.getAppCatalogService(data);
+                 
     }, error => {
       console.log('getUserAppsSortTypePreference Error Object' + error.message);
     });
@@ -152,6 +157,12 @@ export class DashboardApplicationCatalogComponent implements OnInit {
 
   getAppCatalogService(userAppSortTypePref: string) {
     //console.log("getAppCatalogServices called");
+       if(!userAppSortTypePref)
+    {
+      userAppSortTypePref = "N";
+         this.selectedSortType = this.sortOptions[0];
+      //console.log("userAppSortTypePref"+userAppSortTypePref);
+    }
     this.applicationCatalogService.getAppsOrderBySortPref(userAppSortTypePref).subscribe(data => {
       //console.log("Response data" + data);
       this.appCatalogData = data;