diff --git a/src/app/admin/admin.component.ts b/src/app/admin/admin.component.ts index 650fdc6..5f3a57f 100644 --- a/src/app/admin/admin.component.ts +++ b/src/app/admin/admin.component.ts @@ -9,6 +9,7 @@ import {Session, User} from "../openaireLibrary/login/utils/helper.class"; import {UserManagementService} from "../openaireLibrary/services/user-management.service"; import {ConnectHelper} from "../openaireLibrary/connect/connectHelper"; import {ConfigurationService} from "../openaireLibrary/utils/configuration/configuration.service"; +import {Irish} from "../shared/irish"; @Component({ selector: 'admin', @@ -68,6 +69,7 @@ export class AdminComponent extends SidebarBaseComponent implements OnInit { this.loading = false; })); } else { + this.setProperties(Irish.irishAdminToolsCommunity, Irish.irishAdminToolsPortalType); this.stakeholderService.setStakeholder(null); this.layoutService.setRootClass(null); this.hasSidebar = false; @@ -80,6 +82,7 @@ export class AdminComponent extends SidebarBaseComponent implements OnInit { ngOnDestroy() { super.ngOnDestroy(); this.layoutService.setRootClass(null); + this.setProperties(Irish.irishAdminToolsCommunity, Irish.irishAdminToolsPortalType); } setProperties(id, type = null) { diff --git a/src/app/admin/users/users.component.ts b/src/app/admin/users/users.component.ts index 24d0f6f..0162167 100644 --- a/src/app/admin/users/users.component.ts +++ b/src/app/admin/users/users.component.ts @@ -10,6 +10,7 @@ import {ActivatedRoute} from "@angular/router"; import {Title} from "@angular/platform-browser"; import {StringUtils} from "../../openaireLibrary/utils/string-utils.class"; import {ConfigurationService} from "../../openaireLibrary/utils/configuration/configuration.service"; +import {Irish} from "../../shared/irish"; type Tab = 'member' | 'manager'; @@ -67,7 +68,12 @@ export class UsersComponent extends StakeholderBaseComponent { this.user = user; })); } - + + ngOnDestroy() { + super.ngOnDestroy(); + this.setProperties(Irish.irishAdminToolsCommunity, Irish.irishAdminToolsPortalType, this.configurationService); + } + get users(): string { return StringUtils.capitalize(this.tab) + 's'; } diff --git a/src/app/repository/repository.component.ts b/src/app/repository/repository.component.ts index 442a926..d1a61d9 100644 --- a/src/app/repository/repository.component.ts +++ b/src/app/repository/repository.component.ts @@ -14,6 +14,7 @@ import {OpenaireEntities} from "../openaireLibrary/utils/properties/searchFields import {SearchDataprovidersService} from "../openaireLibrary/services/searchDataproviders.service"; import {UserManagementService} from "../openaireLibrary/services/user-management.service"; import {ConfigurationService} from "../openaireLibrary/utils/configuration/configuration.service"; +import {Irish} from "../shared/irish"; @Component({ selector: 'repository', @@ -172,5 +173,6 @@ export class RepositoryComponent extends StakeholderBaseComponent implements OnI ngOnDestroy() { super.ngOnDestroy(); this.layoutService.setRootClass(null); + this.setProperties(Irish.irishAdminToolsCommunity, Irish.irishAdminToolsPortalType, this.configurationService); } } diff --git a/src/app/rfo/rfo.component.ts b/src/app/rfo/rfo.component.ts index 27d3840..1dfce14 100644 --- a/src/app/rfo/rfo.component.ts +++ b/src/app/rfo/rfo.component.ts @@ -12,6 +12,7 @@ import {StakeholderBaseComponent} from "../openaireLibrary/monitor-admin/utils/s import {LayoutService} from "../openaireLibrary/dashboard/sharedComponents/sidebar/layout.service"; import {OpenaireEntities} from "../openaireLibrary/utils/properties/searchFields"; import {ConfigurationService} from "../openaireLibrary/utils/configuration/configuration.service"; +import {Irish} from "../shared/irish"; @Component({ selector: 'rfo', @@ -124,5 +125,6 @@ export class RfoComponent extends StakeholderBaseComponent implements OnInit { ngOnDestroy() { super.ngOnDestroy(); this.layoutService.setRootClass(null); + this.setProperties(Irish.irishAdminToolsCommunity, Irish.irishAdminToolsPortalType, this.configurationService); } } diff --git a/src/app/rpo/rpo.component.ts b/src/app/rpo/rpo.component.ts index 60557c8..b11e397 100644 --- a/src/app/rpo/rpo.component.ts +++ b/src/app/rpo/rpo.component.ts @@ -14,6 +14,7 @@ import {OpenaireEntities} from "../openaireLibrary/utils/properties/searchFields import {RouterHelper} from "../openaireLibrary/utils/routerHelper.class"; import {StringUtils} from "../openaireLibrary/utils/string-utils.class"; import {ConfigurationService} from "../openaireLibrary/utils/configuration/configuration.service"; +import {Irish} from "../shared/irish"; @Component({ selector: 'rpo', @@ -126,6 +127,7 @@ export class RpoComponent extends StakeholderBaseComponent implements OnInit { ngOnDestroy() { super.ngOnDestroy(); this.layoutService.setRootClass(null); + this.setProperties(Irish.irishAdminToolsCommunity, Irish.irishAdminToolsPortalType, this.configurationService); } } diff --git a/src/app/shared/irish.ts b/src/app/shared/irish.ts index a077d84..ce8dbbd 100644 --- a/src/app/shared/irish.ts +++ b/src/app/shared/irish.ts @@ -4,6 +4,8 @@ import {LayoutService} from "../openaireLibrary/dashboard/sharedComponents/sideb import {Role} from "../openaireLibrary/login/utils/helper.class"; export class Irish { + public static irishAdminToolsPortalType = "country"; + public static irishAdminToolsCommunity = "irish"; public static METADATA_PREFIX = ''; public portal: Portal = Portal.getMockCommunityInfo("noami", "Noami",['service'],['/search/advanced/services', '/search/find/services']);