} 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);
});
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;
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,
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,
};
this.applicationCatalogService.addItem(appCatalog);
}
+ }
}
}, error => {
console.log('getAppCatalogServices Error Object' + error);
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{