X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=portal-FE-common%2Fsrc%2Fapp%2Fpages%2Fdashboard-application-catalog%2Fdashboard-application-catalog.component.ts;h=bd6500bd964aa1c1767a8328ad58e5dc60e8b1fc;hb=0964afff41ff186eb0bb2bd679a34513e90d1015;hp=baaa4c492aae9cc5a721b27ab65f1289404940ca;hpb=a5aa8126eeaf5a2f84df510f3208eafed483ab52;p=portal.git

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 baaa4c49..bd6500bd 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
@@ -46,6 +46,7 @@ import { CatalogModalComponent } from '../catalog-modal/catalog-modal.component'
 import { ExternalRequestAccessService } from 'src/app/shared/services/external-request-access-service/external-request-access.service';
 import { UsersService } from 'src/app/shared/services/users/users.service';
 import { AddTabFunctionService } from 'src/app/shared/services/tab/add-tab-function.service';
+import { AuditLogService } from 'src/app/shared/services/auditLog/audit-log.service';
 
 @Component({
   selector: 'app-dashboard-application-catalog',
@@ -67,7 +68,7 @@ export class DashboardApplicationCatalogComponent implements OnInit {
     return this.applicationCatalogService.options;
   } get layout(): GridsterItem[] {
     return this.applicationCatalogService.layout;
-  } constructor(private applicationCatalogService: ApplicationCatalogService, private externalRequestAccessService: ExternalRequestAccessService, private userService: UsersService,private addTabFuntionService: AddTabFunctionService) {
+  } constructor(private applicationCatalogService: ApplicationCatalogService, private externalRequestAccessService: ExternalRequestAccessService, private userService: UsersService,private addTabFuntionService: AddTabFunctionService, private auditLogService: AuditLogService) {
     this.sortOptions = [{
       index: 0,
       value: 'N',
@@ -119,12 +120,16 @@ export class DashboardApplicationCatalogComponent implements OnInit {
         } else {
           resJson.index = 3;
 
-        }
-
-        this.selectedSortType = this.sortOptions[resJson.index];
+        } 
+	  this.selectedSortType = this.sortOptions[resJson.index];
         //console.log(this.selectedSortType);
-        this.getAppCatalogService(data);
+      this.getAppCatalogService(data);		
       }
+	  else {
+		  this.sortTypeChanged('N');
+	  }
+	  
+		  
     }, 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;
@@ -159,6 +170,7 @@ export class DashboardApplicationCatalogComponent implements OnInit {
         this.applicationCatalogService.layout = [];
         for (let entry of data) {
           //console.log("Check the URL" + environment.api.appThumbnail);
+		  if(entry.applicationType != '3'){
           var appCatalog = {
             x: -1,
             y: -1,
@@ -166,7 +178,7 @@ export class DashboardApplicationCatalogComponent implements OnInit {
             name: entry.name,
             subHeaderText: entry.notes,
             imageLink: environment.api.appThumbnail.replace(':appId', <string><any>entry.id),
-            restrictedApp: entry.restrictedApp,
+            applicationType: entry.applicationType,
             select: entry.select,
             access: entry.access,
             pending: entry.pending,
@@ -176,6 +188,7 @@ export class DashboardApplicationCatalogComponent implements OnInit {
           };
           this.applicationCatalogService.addItem(appCatalog);
         }
+		}
       }
     }, error => {
       console.log('getAppCatalogServices Error Object' + error);
@@ -189,7 +202,7 @@ export class DashboardApplicationCatalogComponent implements OnInit {
 
   openAddRoleModal(item: any) {
     //console.log("OpenModal check" + item.id+" "+item.url);
-    if (item.restrictedApp) {
+    if (item.applicationType =='2') {
       // Link-based apps open in their own browser tab
       window.open(item.url, '_blank');
     } else{
@@ -202,4 +215,12 @@ export class DashboardApplicationCatalogComponent implements OnInit {
       this.addTabFuntionService.filter(tabContent);
     }
   }
+
+  auditLog(app:any) {
+    this.auditLogService.storeAudit(app.appId, 'app', app.url).subscribe(data => {
+      console.log('App action Saved');
+    }, error => {
+      console.log('auditLog Save Error' + error);
+    });
+  }
 }
\ No newline at end of file