diff --git a/resources/i18n/en.json5 b/resources/i18n/en.json5 index 7e250490fc..4a47434f21 100644 --- a/resources/i18n/en.json5 +++ b/resources/i18n/en.json5 @@ -822,9 +822,9 @@ "item.page.relationships.isJournalOfPublication": "Publications", - "item.page.relationships.isOrgUnitOfPerson": "Persons", + "item.page.relationships.isOrgUnitOfPerson": "Authors", - "item.page.relationships.isOrgUnitOfProject": "Projects", + "item.page.relationships.isOrgUnitOfProject": "Research Projects", "item.page.subject": "Keywords", diff --git a/src/app/+item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html b/src/app/+item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html index d3690c74be..f9642d2c01 100644 --- a/src/app/+item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html +++ b/src/app/+item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html @@ -1,4 +1,4 @@ - +
diff --git a/src/app/+item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.spec.ts b/src/app/+item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.spec.ts index bc767476e1..2d2e682196 100644 --- a/src/app/+item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.spec.ts +++ b/src/app/+item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.spec.ts @@ -8,6 +8,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { MockRouter } from '../../../../shared/mocks/mock-router'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { VarDirective } from '../../../../shared/utils/var.directive'; +import { of as observableOf } from 'rxjs'; describe('TabbedRelatedEntitiesSearchComponent', () => { let comp: TabbedRelatedEntitiesSearchComponent; @@ -34,11 +35,7 @@ describe('TabbedRelatedEntitiesSearchComponent', () => { { provide: ActivatedRoute, useValue: { - snapshot: { - queryParams: { - tab: mockRelationType - } - } + queryParams: observableOf({ tab: mockRelationType }) }, }, { provide: Router, useValue: router } @@ -56,7 +53,9 @@ describe('TabbedRelatedEntitiesSearchComponent', () => { }); it('should initialize the activeTab depending on the current query parameters', () => { - expect(comp.activeTab).toEqual(mockRelationType); + comp.activeTab$.subscribe((activeTab) => { + expect(activeTab).toEqual(mockRelationType); + }); }); describe('onTabChange', () => { diff --git a/src/app/+item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts b/src/app/+item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts index 9fc4e7ec34..b01eb70720 100644 --- a/src/app/+item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts +++ b/src/app/+item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts @@ -1,6 +1,8 @@ import { Component, Input, OnInit } from '@angular/core'; import { Item } from '../../../../core/shared/item.model'; import { ActivatedRoute, Router } from '@angular/router'; +import { Observable } from 'rxjs/internal/Observable'; +import { map } from 'rxjs/operators'; @Component({ selector: 'ds-tabbed-related-entities-search', @@ -42,7 +44,7 @@ export class TabbedRelatedEntitiesSearchComponent implements OnInit { /** * The active tab */ - activeTab: string; + activeTab$: Observable; constructor(private route: ActivatedRoute, private router: Router) { @@ -52,7 +54,9 @@ export class TabbedRelatedEntitiesSearchComponent implements OnInit { * If the url contains a "tab" query parameter, set this tab to be the active tab */ ngOnInit(): void { - this.activeTab = this.route.snapshot.queryParams.tab; + this.activeTab$ = this.route.queryParams.pipe( + map((params) => params.tab) + ); } /** diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html index c9227338eb..1b23d567f5 100644 --- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html +++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html @@ -24,16 +24,6 @@
- - - -
- - - -