diff options
Diffstat (limited to 'portal-FE-common/src/app/pages')
2 files changed, 8 insertions, 4 deletions
diff --git a/portal-FE-common/src/app/pages/application-catalog/application-catalog.component.ts b/portal-FE-common/src/app/pages/application-catalog/application-catalog.component.ts index f571dcaa..4d919b44 100644 --- a/portal-FE-common/src/app/pages/application-catalog/application-catalog.component.ts +++ b/portal-FE-common/src/app/pages/application-catalog/application-catalog.component.ts @@ -101,6 +101,7 @@ export class ApplicationCatalogComponent implements OnInit { this.appCatalogData = data; for (let entry of this.appCatalogData) { //console.log("Check the URL" + environment.api.appThumbnail); + if(entry.applicationType != "3"){ var appCatalog = { x: -1, y: -1, @@ -108,7 +109,7 @@ export class ApplicationCatalogComponent implements OnInit { name: entry.name, mlAppName: entry.mlAppName, imageLink: environment.api.appThumbnail.replace(':appId', <string><any>entry.id), - restricted: entry.restricted, + applicationType: entry.applicationType, select: entry.select, access: entry.access, pending: entry.pending, @@ -116,6 +117,7 @@ export class ApplicationCatalogComponent implements OnInit { }; this.applicationCatalogService.addItem(appCatalog); } + } }, error => { console.log('getAppCatalogServices Error Object' + error); }); @@ -148,7 +150,7 @@ export class ApplicationCatalogComponent implements OnInit { }; openAddRoleModal(item: any) { //console.log("OpenModal check" + item.id); - if ((!item.restricted) && (item.mlproperty)) { + if ((item.applicationType == "1") && (item.mlproperty)) { this.modal.open(CatalogModalComponent); } } 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 be4c09e2..f8a80bb0 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 @@ -169,6 +169,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, @@ -176,7 +177,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, @@ -186,6 +187,7 @@ export class DashboardApplicationCatalogComponent implements OnInit { }; this.applicationCatalogService.addItem(appCatalog); } + } } }, error => { console.log('getAppCatalogServices Error Object' + error); @@ -199,7 +201,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{ |