From 78133079927f9052535f10706f0ea1f2af74ef00 Mon Sep 17 00:00:00 2001 From: Konstantinos Triantafyllou Date: Mon, 23 Dec 2019 15:10:27 +0000 Subject: [PATCH] [Monitor Dashboard | Trunk]: Remove url from getUserInfo. git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57940 d315682c-612b-4755-9ff5-7f18f6832af3 --- src/app/app.component.ts | 3 ++- src/app/monitor/monitor.component.ts | 4 ++-- src/app/utils/subscribe/subscribe.component.ts | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 5371e81..bcd2af1 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -71,9 +71,10 @@ export class AppComponent implements OnInit, OnDestroy { } } else { this.stakeholderService.setStakeholder(null); + this.layoutService.setOpen(true); } })); - this.subscriptions.push(this.userManagementService.getUserInfo(this.properties.userInfoUrl).subscribe(user => { + this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => { this.user = user; this.buildMenu(); }, error => { diff --git a/src/app/monitor/monitor.component.ts b/src/app/monitor/monitor.component.ts index 8558b8b..ef63787 100644 --- a/src/app/monitor/monitor.component.ts +++ b/src/app/monitor/monitor.component.ts @@ -141,7 +141,7 @@ export class MonitorComponent implements OnInit, OnDestroy, IDeactivateComponent } else { this.setView(params); } - this.subscriptions.push(this.userManagementService.getUserInfo(this.properties.userInfoUrl).subscribe(user => { + this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => { this.user = user; this.buildMenu(); }, error => { @@ -208,7 +208,7 @@ export class MonitorComponent implements OnInit, OnDestroy, IDeactivateComponent } else { this.setView(params); } - this.subscriptions.push(this.userManagementService.getUserInfo(this.properties.userInfoUrl).subscribe(user => { + this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => { this.user = user; this.buildMenu(); }, error => { diff --git a/src/app/utils/subscribe/subscribe.component.ts b/src/app/utils/subscribe/subscribe.component.ts index aa10a26..b41ec31 100644 --- a/src/app/utils/subscribe/subscribe.component.ts +++ b/src/app/utils/subscribe/subscribe.component.ts @@ -69,7 +69,7 @@ export class SubscribeComponent { this.route.data .subscribe((data: { envSpecific: EnvProperties }) => { this.properties = data.envSpecific; - this.userManagementService.getUserInfo(this.properties.userInfoUrl).subscribe( user => { + this.userManagementService.getUserInfo().subscribe(user => { this.user = user; if (!this.showNumbers) { let email = (this.user)?this.user.email:null;