diff --git a/src/app/admin/users/users.component.html b/src/app/admin/users/users.component.html
index fe06938..47d9ed0 100644
--- a/src/app/admin/users/users.component.html
+++ b/src/app/admin/users/users.component.html
@@ -3,7 +3,7 @@
-
diff --git a/src/app/admin/users/users.component.ts b/src/app/admin/users/users.component.ts
index 17cf979..05a19d4 100644
--- a/src/app/admin/users/users.component.ts
+++ b/src/app/admin/users/users.component.ts
@@ -1,7 +1,7 @@
import {Component} from "@angular/core";
import {StakeholderBaseComponent} from "../../openaireLibrary/monitor-admin/utils/stakeholder-base.component";
import {Stakeholder} from "../../openaireLibrary/monitor/entities/stakeholder";
-import {User} from "../../openaireLibrary/login/utils/helper.class";
+import {Role, User} from "../../openaireLibrary/login/utils/helper.class";
import {Email} from "../../openaireLibrary/utils/email/email";
import {Composer} from "../../openaireLibrary/utils/email/composer";
import {StakeholderService} from "../../openaireLibrary/monitor/services/stakeholder.service";
@@ -25,6 +25,7 @@ export class UsersComponent extends StakeholderBaseComponent {
public messages: Map = new Map();
public tab: Tab = 'manager';
public user: User;
+ public type: string;
public emailComposer: Function = (name, recipient, role): Email => {
return Composer.composeMessageForIrishDashboard(name, recipient, role);
}
@@ -53,6 +54,7 @@ export class UsersComponent extends StakeholderBaseComponent {
this.subscriptions.push(this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
if (stakeholder) {
this.stakeholder = stakeholder;
+ this.type = Role.mapType(stakeholder.type);
this.setProperties(this.stakeholder.alias, this.stakeholder.type, this.configurationService);
this.title = this.stakeholder.name + " | " + this.users;
this.setMetadata();
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index ad6ecea..11e6de5 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -31,6 +31,7 @@ import {ConnectHelper} from "./openaireLibrary/connect/connectHelper";
+
@@ -83,7 +84,6 @@ import {ConnectHelper} from "./openaireLibrary/connect/connectHelper";
-
`
})
export class AppComponent extends ResearcherBaseComponent implements OnInit, AfterViewInit {
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index b0c69be..622459c 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit b0c69be6ef3e55089d7032f0d1457c874652974f
+Subproject commit 622459c26c5db0c832e9b159d0558b15b86800c8
diff --git a/src/app/rpo/rpo.component.ts b/src/app/rpo/rpo.component.ts
index f1524b9..9b164f2 100644
--- a/src/app/rpo/rpo.component.ts
+++ b/src/app/rpo/rpo.component.ts
@@ -13,6 +13,7 @@ import {LayoutService} from "../openaireLibrary/dashboard/sharedComponents/sideb
import {OpenaireEntities} from "../openaireLibrary/utils/properties/searchFields";
import {ConfigurationService} from "../openaireLibrary/utils/configuration/configuration.service";
import {Irish} from "../shared/irish";
+import {Role} from "../openaireLibrary/login/utils/helper.class";
@Component({
selector: 'rpo',
@@ -63,7 +64,7 @@ import {Irish} from "../shared/irish";
-
+
`
})
export class RpoComponent extends StakeholderBaseComponent implements OnInit {
@@ -72,6 +73,7 @@ export class RpoComponent extends StakeholderBaseComponent implements OnInit {
isSearch: boolean = false;
loading: boolean = false;
openaireEntities = OpenaireEntities;
+ type: string;
constructor(private stakeholderService: StakeholderService,
private _customFilterService: CustomFilterService,
@@ -104,6 +106,7 @@ export class RpoComponent extends StakeholderBaseComponent implements OnInit {
this.subscriptions.push(this.stakeholderService.getStakeholder(this.alias, true).subscribe(stakeholder => {
this.stakeholder = stakeholder;
if (this.stakeholder && this.stakeholder.type === 'organization') {
+ this.type = Role.mapType(this.stakeholder.type);
this.setProperties(this.stakeholder.alias, this.stakeholder.type, this.configurationService);
LinksResolver.resetProperties();
LinksResolver.setSearchAndResultLanding("rpo/" + this.stakeholder.alias);