Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions config/config.example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,8 @@ item:
iconPosition: IdentifierSubtypesIconPositionEnum.LEFT
link: https://ror.org

# Enable authority based relations in item page
showAuthorityRelations: false
# Community Page Config
community:
# Default tab to be shown when browsing a Community. Valid values are: comcols, search, or browse_<field>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,19 @@
</div>
</div>
<div class="mt-5 w-100 px-0">
<ds-tabbed-related-entities-search [item]="object"
[relationTypes]="[{
@if (areAuthorityRelationsEnabled) {
<ds-authority-related-entities-search
[item]="object"
[configurations]="[
'RELATION.OrgUnit.rpprojects',
'RELATION.OrgUnit.rppublications',
'RELATION.OrgUnit.people',
'RELATION.OrgUnit.projects',
]"
></ds-authority-related-entities-search>
} @else {
<ds-tabbed-related-entities-search [item]="object"
[relationTypes]="[{
label: 'isOrgUnitOfPerson',
filter: 'isOrgUnitOfPerson',
configuration: 'person-relationships'
Expand All @@ -73,6 +84,7 @@
filter: 'isOrgUnitOfProject',
configuration: 'project-relationships'
}]">
</ds-tabbed-related-entities-search>
</ds-tabbed-related-entities-search>
}
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { GenericItemPageFieldComponent } from '../../../../item-page/simple/fiel
import { ItemPageImgFieldComponent } from '../../../../item-page/simple/field-components/specific-field/img/item-page-img-field.component';
import { ThemedItemPageTitleFieldComponent } from '../../../../item-page/simple/field-components/specific-field/title/themed-item-page-field.component';
import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
import { AuthorityRelatedEntitiesSearchComponent } from '../../../../item-page/simple/related-entities/authority-related-entities-search/authority-related-entities-search.component';
import { TabbedRelatedEntitiesSearchComponent } from '../../../../item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component';
import { RelatedItemsComponent } from '../../../../item-page/simple/related-items/related-items-component';
import { DsoEditMenuComponent } from '../../../../shared/dso-page/dso-edit-menu/dso-edit-menu.component';
Expand All @@ -23,6 +24,7 @@ import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail
templateUrl: './org-unit.component.html',
imports: [
AsyncPipe,
AuthorityRelatedEntitiesSearchComponent,
DsoEditMenuComponent,
GenericItemPageFieldComponent,
ItemPageImgFieldComponent,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,19 @@
</div>
</div>
<div class="mt-5 w-100 px-0">
<ds-tabbed-related-entities-search [item]="object"
[relationTypes]="[{
@if (areAuthorityRelationsEnabled) {
<ds-authority-related-entities-search
[item]="object"
[configurations]="['RELATION.Person.researchoutputs', 'RELATION.Person.projects']"
></ds-authority-related-entities-search>
} @else {
<ds-tabbed-related-entities-search [item]="object"
[relationTypes]="[{
label: 'isAuthorOfPublication',
filter: 'isAuthorOfPublication',
configuration: 'default-relationships'
}]">
</ds-tabbed-related-entities-search>
</ds-tabbed-related-entities-search>
}
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { TranslateModule } from '@ngx-translate/core';
import { GenericItemPageFieldComponent } from '../../../../item-page/simple/field-components/specific-field/generic/generic-item-page-field.component';
import { ThemedItemPageTitleFieldComponent } from '../../../../item-page/simple/field-components/specific-field/title/themed-item-page-field.component';
import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
import { AuthorityRelatedEntitiesSearchComponent } from '../../../../item-page/simple/related-entities/authority-related-entities-search/authority-related-entities-search.component';
import { TabbedRelatedEntitiesSearchComponent } from '../../../../item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component';
import { RelatedItemsComponent } from '../../../../item-page/simple/related-items/related-items-component';
import { DsoEditMenuComponent } from '../../../../shared/dso-page/dso-edit-menu/dso-edit-menu.component';
Expand All @@ -22,6 +23,7 @@ import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail
templateUrl: './person.component.html',
imports: [
AsyncPipe,
AuthorityRelatedEntitiesSearchComponent,
DsoEditMenuComponent,
GenericItemPageFieldComponent,
MetadataFieldWrapperComponent,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,54 +19,54 @@
<!--<ds-generic-item-page-field [item]="object"-->
<!--[fields]="['project.identifier.status']"-->
<!--[label]="'project.page.status'">-->
<!--</ds-generic-item-page-field>-->
<ds-metadata-representation-list
[parentItem]="object"
[itemType]="'OrgUnit'"
[metadataFields]="['project.contributor.other']"
[label]="'project.page.contributor' | translate">
</ds-metadata-representation-list>
<ds-generic-item-page-field [item]="object"
[fields]="['project.identifier.funder']"
[label]="'project.page.funder'">
</ds-generic-item-page-field>
<ds-generic-item-page-field [item]="object"
[fields]="['dc.identifier']"
[label]="'project.page.id'">
</ds-generic-item-page-field>
<!--<ds-generic-item-page-field [item]="object"-->
<!--[fields]="['project.identifier.expectedcompletion']"-->
<!--[label]="'project.page.expectedcompletion'">-->
<!--</ds-generic-item-page-field>-->
<ds-metadata-representation-list
[parentItem]="object"
[itemType]="'OrgUnit'"
[metadataFields]="['project.contributor.other']"
[label]="'project.page.contributor' | translate">
</ds-metadata-representation-list>
<ds-generic-item-page-field [item]="object"
[fields]="['project.identifier.funder']"
[label]="'project.page.funder'">
</ds-generic-item-page-field>
<ds-generic-item-page-field [item]="object"
[fields]="['dc.identifier']"
[label]="'project.page.id'">
</ds-generic-item-page-field>
<!--<ds-generic-item-page-field [item]="object"-->
<!--[fields]="['project.identifier.expectedcompletion']"-->
<!--[label]="'project.page.expectedcompletion'">-->
<!--</ds-generic-item-page-field>-->
</div>
<div class="col-12 col-md-7">
<ds-related-items
[parentItem]="object"
[relationType]="'isPersonOfProject'"
[label]="'item.page.authors' | translate">
</ds-related-items>
<ds-related-items
[parentItem]="object"
[relationType]="'isPublicationOfProject'"
[label]="'item.page.publications' | translate">
</ds-related-items>
<ds-related-items
[parentItem]="object"
[relationType]="'isOrgUnitOfProject'"
[label]="'item.page.org-units' | translate">
</ds-related-items>
<ds-generic-item-page-field [item]="object"
[fields]="['dc.description']"
[label]="'project.page.description'">
</ds-generic-item-page-field>
<ds-generic-item-page-field [item]="object"
[fields]="['dc.subject']"
[label]="'project.page.keyword'">
</ds-generic-item-page-field>
<div>
<a class="btn btn-outline-primary" [routerLink]="[itemPageRoute + '/full']" role="button" tabindex="0">
{{"item.page.link.full" | translate}}
</a>
</div>
</div>
<div class="col-12 col-md-7">
<ds-related-items
[parentItem]="object"
[relationType]="'isPersonOfProject'"
[label]="'item.page.authors' | translate">
</ds-related-items>
<ds-related-items
[parentItem]="object"
[relationType]="'isPublicationOfProject'"
[label]="'item.page.publications' | translate">
</ds-related-items>
<ds-related-items
[parentItem]="object"
[relationType]="'isOrgUnitOfProject'"
[label]="'item.page.org-units' | translate">
</ds-related-items>
<ds-generic-item-page-field [item]="object"
[fields]="['dc.description']"
[label]="'project.page.description'">
</ds-generic-item-page-field>
<ds-generic-item-page-field [item]="object"
[fields]="['dc.subject']"
[label]="'project.page.keyword'">
</ds-generic-item-page-field>
<div>
<a class="btn btn-outline-primary" [routerLink]="[itemPageRoute + '/full']" role="button" tabindex="0">
{{"item.page.link.full" | translate}}
</a>
</div>
</div>
</div>
6 changes: 6 additions & 0 deletions src/app/item-page/simple/item-types/shared/item.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,18 @@ export class ItemComponent implements OnInit {
*/
geospatialItemPageFieldsEnabled = false;

/**
* Flag to check whether to use the default relations or the authority based ones
*/
areAuthorityRelationsEnabled: boolean;

showDownloadLinkAsAttachment: boolean;

constructor(protected routeService: RouteService,
protected router: Router) {
this.mediaViewer = environment.mediaViewer;
this.geospatialItemPageFieldsEnabled = environment.geospatialMapViewer.enableItemPageFields;
this.areAuthorityRelationsEnabled = environment.item.showAuthorityRelations;
this.showDownloadLinkAsAttachment = environment.layout.showDownloadLinkAsAttachment;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
@if (configurations.length > 1) {
<ul ngbNav #tabs="ngbNav"
[destroyOnHide]="true"
[activeId]="activeTab$ | async"
(navChange)="onTabChange($event)"
class="nav-tabs">

@for (config of configurations; track config) {
<li [ngbNavItem]="config">
<a ngbNavLink>
{{('item.page.relationships.' + config) | translate}}
</a>

<ng-template ngbNavContent>
<div class="mt-4">
<ds-configuration-search-page
class="w-100"
[fixedFilterQuery]="searchFilter"
[configuration]="config"
[searchEnabled]="searchEnabled"
[showScopeSelector]="false">
</ds-configuration-search-page>
</div>
</ng-template>
</li>
}
</ul>

<div [ngbNavOutlet]="tabs"></div>
}


@if (configurations.length === 1) {
<ds-configuration-search-page
class="w-100"
[fixedFilterQuery]="searchFilter"
[configuration]="configurations[0]"
[searchEnabled]="searchEnabled"
[showScopeSelector]="false">
</ds-configuration-search-page>
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
import { NO_ERRORS_SCHEMA } from '@angular/core';
import {
ComponentFixture,
TestBed,
waitForAsync,
} from '@angular/core/testing';
import {
ActivatedRoute,
Router,
} from '@angular/router';
import { Item } from '@dspace/core/shared/item.model';
import { RouterMock } from '@dspace/core/testing/router.mock';
import { TranslateModule } from '@ngx-translate/core';
import { of } from 'rxjs';

import { ThemedConfigurationSearchPageComponent } from '../../../../search-page/themed-configuration-search-page.component';
import { AuthorityRelatedEntitiesSearchComponent } from './authority-related-entities-search.component';


describe('AuthorityRelatedEntitiesSearchComponent', () => {
let component: AuthorityRelatedEntitiesSearchComponent;
let fixture: ComponentFixture<AuthorityRelatedEntitiesSearchComponent>;

const mockItem = {
id: 'test-id-123',
} as Item;
const router = new RouterMock();


beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [TranslateModule.forRoot(), AuthorityRelatedEntitiesSearchComponent],
providers: [
{
provide: ActivatedRoute,
useValue: {
queryParams: of({ tab: 'relations-configuration' }),
snapshot: {
queryParams: {
scope: 'collection-uuid',
query: 'test',
},
},
},
},
{ provide: Router, useValue: router },
],
schemas: [NO_ERRORS_SCHEMA],
})
.overrideComponent(AuthorityRelatedEntitiesSearchComponent, {
remove: {
imports: [
ThemedConfigurationSearchPageComponent,
],
},
})
.compileComponents();
}));

beforeEach(() => {
fixture = TestBed.createComponent(AuthorityRelatedEntitiesSearchComponent);
component = fixture.componentInstance;
component.item = mockItem;
component.configurations = ['relations-configuration'];
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});

it('should set searchFilter on init', () => {
component.item = mockItem;
component.ngOnInit();

expect(component.searchFilter).toBe('scope=test-id-123');
});

it('should render configuration search page when configuration is provided', () => {
component.item = mockItem;
component.configurations = ['test-config'];

fixture.detectChanges();

const searchPage = fixture.nativeElement.querySelector('ds-configuration-search-page');
expect(searchPage).toBeTruthy();
});

it('should NOT render configuration search page when configuration is missing', () => {
component.item = mockItem;
component.configurations = [];

fixture.detectChanges();

const searchPage = fixture.nativeElement.querySelector('ds-configuration-search-page');
expect(searchPage).toBeFalsy();
});

});
Loading
Loading