MaDgIK
/
monitor-dashboard
13
0
Fork 0
Code Issues Pull Requests Projects Releases 21 Wiki Activity

[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:
Argiro Kokogiannaki 2020-11-20 17:15:30 +00:00
parent 870662cc78
commit 6fa87ac067
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/app.component.ts
View File

@ -73,7 +73,7 @@ export class AppComponent implements OnInit, OnDestroy {
} }
ngOnInit() { ngOnInit() {
if (window) { if (typeof document !== 'undefined' && window) {
this.innerWidth = window.innerWidth; this.innerWidth = window.innerWidth;
} }
this.subscriptions.push(this.layoutService.hasSidebar.subscribe(hasSidebar => { 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)); this.layoutService.setOpen(!(this.innerWidth && this.innerWidth < 1219));
let isSearch = this.router.url.includes('search'); let isSearch = this.router.url.includes('search');
if (params && params['stakeholder']) { if (params && params['stakeholder']) {
this.stakeholder = this.stakeholderService.stakeholder; // this.stakeholder = this.stakeholderService.stakeholder;
if (!this.stakeholder || this.stakeholderService.stakeholder.alias !== params['stakeholder']) { if (!this.stakeholder || this.stakeholder.alias !== params['stakeholder']) {
this.subscriptions.push(this.stakeholderService.getStakeholder(params['stakeholder']).subscribe(stakeholder => { this.subscriptions.push(this.stakeholderService.getStakeholder(params['stakeholder']).subscribe(stakeholder => {
if (stakeholder) { if (stakeholder) {
this.stakeholder = stakeholder; this.stakeholder = stakeholder;
LinksResolver.setProperties(this.stakeholder.alias); LinksResolver.setProperties(this.stakeholder.alias);
this.buildMenu();
if (isSearch) { if (isSearch) {
this.activeTopic = null; this.activeTopic = null;
} else if (params && params['topic'] && !this.activeTopic) { } 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.activeTopic = this.stakeholder.topics.find(topic => this.isPublicOrIsMember(topic.visibility));
} }
this.setSideBar(); this.setSideBar();
this.buildMenu();
this.loading = false; this.loading = false;
} else { } else {
LinksResolver.resetProperties(); LinksResolver.resetProperties();
@ -147,7 +147,6 @@ export class AppComponent implements OnInit, OnDestroy {
} else { } else {
this.activeTopic = this.stakeholder.topics.find(topic => this.isPublicOrIsMember(topic.visibility)); this.activeTopic = this.stakeholder.topics.find(topic => this.isPublicOrIsMember(topic.visibility));
} }
this.setSideBar();
this.loading = false; this.loading = false;
} }
} else { } else {

3
src/environments/environment.beta.ts
View File

@ -49,8 +49,7 @@ export let properties: EnvProperties = {
loginUrl: "https://beta.services.openaire.eu/monitor-dashboard-login/openid_connect_login", loginUrl: "https://beta.services.openaire.eu/monitor-dashboard-login/openid_connect_login",
registryUrl: 'https://beta.services.openaire.eu/uoa-user-management/api/registry/', registryUrl: 'https://beta.services.openaire.eu/uoa-user-management/api/registry/',
userInfoUrl : "https://beta.services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=", 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://beta.services.openaire.eu/monitor-dashboard-login/openid_logout",
logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
cookieDomain: ".openaire.eu", cookieDomain: ".openaire.eu",
feedbackmail: "feedback@openaire.eu", feedbackmail: "feedback@openaire.eu",

3
src/environments/environment.prod.ts
View File

@ -49,8 +49,7 @@ export let properties: EnvProperties = {
loginUrl: "https://services.openaire.eu/monitor-dashboard-login/openid_connect_login", loginUrl: "https://services.openaire.eu/monitor-dashboard-login/openid_connect_login",
registryUrl: 'https://services.openaire.eu/uoa-user-management/api/registry/', registryUrl: 'https://services.openaire.eu/uoa-user-management/api/registry/',
userInfoUrl: " https://services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=", 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://services.openaire.eu/monitor-dashboard-login/openid_logout",
logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
cookieDomain: ".openaire.eu", cookieDomain: ".openaire.eu",
feedbackmail: "feedback@openaire.eu", feedbackmail: "feedback@openaire.eu",