[Monitor|Dashboard]
-update logout properties -fix menu animation - setting of sitebar items git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59933 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
parent
870662cc78
commit
6fa87ac067
|
@ -73,7 +73,7 @@ export class AppComponent implements OnInit, OnDestroy {
|
|||
}
|
||||
|
||||
ngOnInit() {
|
||||
if (window) {
|
||||
if (typeof document !== 'undefined' && window) {
|
||||
this.innerWidth = window.innerWidth;
|
||||
}
|
||||
this.subscriptions.push(this.layoutService.hasSidebar.subscribe(hasSidebar => {
|
||||
|
@ -110,13 +110,12 @@ export class AppComponent implements OnInit, OnDestroy {
|
|||
this.layoutService.setOpen(!(this.innerWidth && this.innerWidth < 1219));
|
||||
let isSearch = this.router.url.includes('search');
|
||||
if (params && params['stakeholder']) {
|
||||
this.stakeholder = this.stakeholderService.stakeholder;
|
||||
if (!this.stakeholder || this.stakeholderService.stakeholder.alias !== params['stakeholder']) {
|
||||
// this.stakeholder = this.stakeholderService.stakeholder;
|
||||
if (!this.stakeholder || this.stakeholder.alias !== params['stakeholder']) {
|
||||
this.subscriptions.push(this.stakeholderService.getStakeholder(params['stakeholder']).subscribe(stakeholder => {
|
||||
if (stakeholder) {
|
||||
this.stakeholder = stakeholder;
|
||||
LinksResolver.setProperties(this.stakeholder.alias);
|
||||
this.buildMenu();
|
||||
if (isSearch) {
|
||||
this.activeTopic = null;
|
||||
} else if (params && params['topic'] && !this.activeTopic) {
|
||||
|
@ -125,6 +124,7 @@ export class AppComponent implements OnInit, OnDestroy {
|
|||
this.activeTopic = this.stakeholder.topics.find(topic => this.isPublicOrIsMember(topic.visibility));
|
||||
}
|
||||
this.setSideBar();
|
||||
this.buildMenu();
|
||||
this.loading = false;
|
||||
} else {
|
||||
LinksResolver.resetProperties();
|
||||
|
@ -147,7 +147,6 @@ export class AppComponent implements OnInit, OnDestroy {
|
|||
} else {
|
||||
this.activeTopic = this.stakeholder.topics.find(topic => this.isPublicOrIsMember(topic.visibility));
|
||||
}
|
||||
this.setSideBar();
|
||||
this.loading = false;
|
||||
}
|
||||
} else {
|
||||
|
|
|
@ -49,8 +49,7 @@ export let properties: EnvProperties = {
|
|||
loginUrl: "https://beta.services.openaire.eu/monitor-dashboard-login/openid_connect_login",
|
||||
registryUrl: 'https://beta.services.openaire.eu/uoa-user-management/api/registry/',
|
||||
userInfoUrl : "https://beta.services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=",
|
||||
/*logoutUrl: "https://beta.services.openaire.eu/monitor-dashboard-login/openid_connect_logout",*/
|
||||
logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
|
||||
logoutUrl: "https://beta.services.openaire.eu/monitor-dashboard-login/openid_logout",
|
||||
cookieDomain: ".openaire.eu",
|
||||
|
||||
feedbackmail: "feedback@openaire.eu",
|
||||
|
|
|
@ -49,8 +49,7 @@ export let properties: EnvProperties = {
|
|||
loginUrl: "https://services.openaire.eu/monitor-dashboard-login/openid_connect_login",
|
||||
registryUrl: 'https://services.openaire.eu/uoa-user-management/api/registry/',
|
||||
userInfoUrl: " https://services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=",
|
||||
/*logoutUrl: "https://services.openaire.eu/monitor-dashboard-login/openid_connect_logout",*/
|
||||
logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
|
||||
logoutUrl: "https://services.openaire.eu/monitor-dashboard-login/openid_logout",
|
||||
cookieDomain: ".openaire.eu",
|
||||
|
||||
feedbackmail: "feedback@openaire.eu",
|
||||
|
|
Loading…
Reference in New Issue