diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.spec.ts index a271273a1b..ab8e1b8363 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.spec.ts @@ -8,6 +8,11 @@ const object = Object.assign(new ItemSearchResult(), { indexableObject: Object.assign(new Item(), { id: 'test-item', metadata: { + 'dspace.entity.type': [ + { + value: 'OrgUnit' + } + ], 'organization.legalName': [ { value: 'title' diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.spec.ts index e93dd78636..f49ec452c9 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.spec.ts @@ -3,12 +3,16 @@ import { Collection } from '../../../../../core/shared/collection.model'; import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec'; import { PersonSidebarSearchListElementComponent } from './person-sidebar-search-list-element.component'; -import { TranslateService } from '@ngx-translate/core'; const object = Object.assign(new ItemSearchResult(), { indexableObject: Object.assign(new Item(), { id: 'test-item', metadata: { + 'dspace.entity.type': [ + { + value: 'Person', + } + ], 'person.familyName': [ { value: 'family name' @@ -40,6 +44,5 @@ const parent = Object.assign(new Collection(), { describe('PersonSidebarSearchListElementComponent', createSidebarSearchListElementTests(PersonSidebarSearchListElementComponent, object, parent, 'parent title', 'family name, given name', 'job title', [ - { provide: TranslateService, useValue: jasmine.createSpyObj('translate', { instant: '' }) } ]) ); diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts index ca6614efbc..e83a53437d 100644 --- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts +++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts @@ -24,6 +24,7 @@ import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils import { TruncatableService } from '../../../../truncatable/truncatable.service'; import { TruncatePipe } from '../../../../utils/truncate.pipe'; import { ItemSearchResultGridElementComponent } from './item-search-result-grid-element.component'; +import { TranslateModule } from '@ngx-translate/core'; const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult(); mockItemWithMetadata.hitHighlights = {}; @@ -99,7 +100,10 @@ export function getEntityGridElementTestComponent(component, searchResultWithMet beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [NoopAnimationsModule], + imports: [ + NoopAnimationsModule, + TranslateModule.forRoot(), + ], declarations: [component, TruncatePipe], providers: [ { provide: TruncatableService, useValue: truncatableServiceStub }, diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html index 3f93caa278..e5008f0264 100644 --- a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html +++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html @@ -2,10 +2,10 @@
- +
+ [innerHTML]="dsoTitle">
{ - expect(component.title).toEqual(expectedTitle); + expect(component.dsoTitle).toEqual(expectedTitle); }); it('should contain the correct description', () => { diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts index 29abf40252..c7ef169dca 100644 --- a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts +++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts @@ -28,11 +28,6 @@ export class SidebarSearchListElementComponent, K exte */ parentTitle$: Observable; - /** - * The title for the object to display - */ - title: string; - /** * A description to display below the title */ @@ -52,7 +47,6 @@ export class SidebarSearchListElementComponent, K exte super.ngOnInit(); if (hasValue(this.dso)) { this.parentTitle$ = this.getParentTitle(); - this.title = this.getTitle(); this.description = this.getDescription(); } } @@ -89,14 +83,6 @@ export class SidebarSearchListElementComponent, K exte return observableOf(undefined); } - /** - * Get the title of the object - * Default: defined by {@link DSONameService} - */ - getTitle(): string { - return this.dsoNameService.getName(this.dso); - } - /** * Get the description of the object * Default: "(dc.publisher, dc.date.issued) authors"