Code Review
/
portal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
common changes for application-onboarding, application-catalog
[portal.git]
/
portal-FE-common
/
src
/
app
/
pages
/
dashboard-application-catalog
/
dashboard-application-catalog.component.ts
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
..
f8a80bb
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
@@
-119,12
+119,16
@@
export class DashboardApplicationCatalogComponent implements OnInit {
} else {
resJson.index = 3;
} else {
resJson.index = 3;
- }
-
- this.selectedSortType = this.sortOptions[resJson.index];
+ }
+ this.selectedSortType = this.sortOptions[resJson.index];
//console.log(this.selectedSortType);
//console.log(this.selectedSortType);
- this.getAppCatalogService(data);
+ this.getAppCatalogService(data);
}
}
+ else {
+ this.sortTypeChanged('N');
+ }
+
+
}, error => {
console.log('getUserAppsSortTypePreference Error Object' + error.message);
});
}, error => {
console.log('getUserAppsSortTypePreference Error Object' + error.message);
});
@@
-152,6
+156,12
@@
export class DashboardApplicationCatalogComponent implements OnInit {
getAppCatalogService(userAppSortTypePref: string) {
//console.log("getAppCatalogServices called");
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.getAppsOrderBySortPref(userAppSortTypePref).subscribe(data => {
//console.log("Response data" + data);
this.appCatalogData = data;
@@
-159,6
+169,7
@@
export class DashboardApplicationCatalogComponent implements OnInit {
this.applicationCatalogService.layout = [];
for (let entry of data) {
//console.log("Check the URL" + environment.api.appThumbnail);
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,
var appCatalog = {
x: -1,
y: -1,
@@
-166,7
+177,7
@@
export class DashboardApplicationCatalogComponent implements OnInit {
name: entry.name,
subHeaderText: entry.notes,
imageLink: environment.api.appThumbnail.replace(':appId', <string><any>entry.id),
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,
select: entry.select,
access: entry.access,
pending: entry.pending,
@@
-176,6
+187,7
@@
export class DashboardApplicationCatalogComponent implements OnInit {
};
this.applicationCatalogService.addItem(appCatalog);
}
};
this.applicationCatalogService.addItem(appCatalog);
}
+ }
}
}, error => {
console.log('getAppCatalogServices Error Object' + error);
}
}, error => {
console.log('getAppCatalogServices Error Object' + error);
@@
-189,7
+201,7
@@
export class DashboardApplicationCatalogComponent implements OnInit {
openAddRoleModal(item: any) {
//console.log("OpenModal check" + item.id+" "+item.url);
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{
// Link-based apps open in their own browser tab
window.open(item.url, '_blank');
} else{