From 95e9e9166a1d907532584d85e9147e8137f97d24 Mon Sep 17 00:00:00 2001 From: Art Lowel Date: Wed, 16 Jan 2019 16:34:10 +0100 Subject: [PATCH] rename ItemSearchResultComponent to prevent confusion with ItemSearchResultListElementComponent --- .../journal-issue-list-element.component.ts | 4 ++-- .../journal-volume-list-element.component.ts | 4 ++-- .../journal/journal-list-element.component.ts | 4 ++-- .../orgunit/orgunit-list-element.component.ts | 4 ++-- .../person/person-list-element.component.ts | 4 ++-- .../project/project-list-element.component.ts | 4 ++-- .../publication-list-element.component.ts | 4 ++-- ...arch-result-list-element.component.spec.ts} | 18 +++++++++--------- ...em-search-result-list-element.component.ts} | 2 +- src/app/shared/shared.module.ts | 4 ++-- 10 files changed, 26 insertions(+), 26 deletions(-) rename src/app/shared/object-list/item-list-element/item-types/{item-search-result.component.spec.ts => typed-item-search-result-list-element.component.spec.ts} (78%) rename src/app/shared/object-list/item-list-element/item-types/{item-search-result-component.ts => typed-item-search-result-list-element.component.ts} (90%) diff --git a/src/app/shared/object-list/item-list-element/item-types/journal-issue/journal-issue-list-element.component.ts b/src/app/shared/object-list/item-list-element/item-types/journal-issue/journal-issue-list-element.component.ts index 3b47d1ab51..4f18822773 100644 --- a/src/app/shared/object-list/item-list-element/item-types/journal-issue/journal-issue-list-element.component.ts +++ b/src/app/shared/object-list/item-list-element/item-types/journal-issue/journal-issue-list-element.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; import { rendersItemType } from '../../../../items/item-type-decorator'; import { ElementViewMode } from '../../../../view-mode'; -import { ItemSearchResultComponent } from '../item-search-result-component'; +import { TypedItemSearchResultListElementComponent } from '../typed-item-search-result-list-element.component'; @rendersItemType('JournalIssue', ElementViewMode.SetElement) @Component({ @@ -12,5 +12,5 @@ import { ItemSearchResultComponent } from '../item-search-result-component'; /** * The component for displaying a list element for an item of the type Journal Issue */ -export class JournalIssueListElementComponent extends ItemSearchResultComponent { +export class JournalIssueListElementComponent extends TypedItemSearchResultListElementComponent { } diff --git a/src/app/shared/object-list/item-list-element/item-types/journal-volume/journal-volume-list-element.component.ts b/src/app/shared/object-list/item-list-element/item-types/journal-volume/journal-volume-list-element.component.ts index 39595122e1..a95dca88f9 100644 --- a/src/app/shared/object-list/item-list-element/item-types/journal-volume/journal-volume-list-element.component.ts +++ b/src/app/shared/object-list/item-list-element/item-types/journal-volume/journal-volume-list-element.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; import { rendersItemType } from '../../../../items/item-type-decorator'; import { ElementViewMode } from '../../../../view-mode'; -import { ItemSearchResultComponent } from '../item-search-result-component'; +import { TypedItemSearchResultListElementComponent } from '../typed-item-search-result-list-element.component'; @rendersItemType('JournalVolume', ElementViewMode.SetElement) @Component({ @@ -12,5 +12,5 @@ import { ItemSearchResultComponent } from '../item-search-result-component'; /** * The component for displaying a list element for an item of the type Journal Volume */ -export class JournalVolumeListElementComponent extends ItemSearchResultComponent { +export class JournalVolumeListElementComponent extends TypedItemSearchResultListElementComponent { } diff --git a/src/app/shared/object-list/item-list-element/item-types/journal/journal-list-element.component.ts b/src/app/shared/object-list/item-list-element/item-types/journal/journal-list-element.component.ts index 113594630e..28be0d8149 100644 --- a/src/app/shared/object-list/item-list-element/item-types/journal/journal-list-element.component.ts +++ b/src/app/shared/object-list/item-list-element/item-types/journal/journal-list-element.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; import { rendersItemType } from '../../../../items/item-type-decorator'; import { ElementViewMode } from '../../../../view-mode'; -import { ItemSearchResultComponent } from '../item-search-result-component'; +import { TypedItemSearchResultListElementComponent } from '../typed-item-search-result-list-element.component'; @rendersItemType('Journal', ElementViewMode.SetElement) @Component({ @@ -12,5 +12,5 @@ import { ItemSearchResultComponent } from '../item-search-result-component'; /** * The component for displaying a list element for an item of the type Journal */ -export class JournalListElementComponent extends ItemSearchResultComponent { +export class JournalListElementComponent extends TypedItemSearchResultListElementComponent { } diff --git a/src/app/shared/object-list/item-list-element/item-types/orgunit/orgunit-list-element.component.ts b/src/app/shared/object-list/item-list-element/item-types/orgunit/orgunit-list-element.component.ts index 6fe95e6917..e3433f7e76 100644 --- a/src/app/shared/object-list/item-list-element/item-types/orgunit/orgunit-list-element.component.ts +++ b/src/app/shared/object-list/item-list-element/item-types/orgunit/orgunit-list-element.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; import { rendersItemType } from '../../../../items/item-type-decorator'; import { ElementViewMode } from '../../../../view-mode'; -import { ItemSearchResultComponent } from '../item-search-result-component'; +import { TypedItemSearchResultListElementComponent } from '../typed-item-search-result-list-element.component'; @rendersItemType('OrgUnit', ElementViewMode.SetElement) @Component({ @@ -12,5 +12,5 @@ import { ItemSearchResultComponent } from '../item-search-result-component'; /** * The component for displaying a list element for an item of the type Organisation Unit */ -export class OrgUnitListElementComponent extends ItemSearchResultComponent { +export class OrgUnitListElementComponent extends TypedItemSearchResultListElementComponent { } diff --git a/src/app/shared/object-list/item-list-element/item-types/person/person-list-element.component.ts b/src/app/shared/object-list/item-list-element/item-types/person/person-list-element.component.ts index 5fd3c63f27..b0369458f9 100644 --- a/src/app/shared/object-list/item-list-element/item-types/person/person-list-element.component.ts +++ b/src/app/shared/object-list/item-list-element/item-types/person/person-list-element.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; import { rendersItemType } from '../../../../items/item-type-decorator'; import { ElementViewMode } from '../../../../view-mode'; -import { ItemSearchResultComponent } from '../item-search-result-component'; +import { TypedItemSearchResultListElementComponent } from '../typed-item-search-result-list-element.component'; @rendersItemType('Person', ElementViewMode.SetElement) @Component({ @@ -12,5 +12,5 @@ import { ItemSearchResultComponent } from '../item-search-result-component'; /** * The component for displaying a list element for an item of the type Person */ -export class PersonListElementComponent extends ItemSearchResultComponent { +export class PersonListElementComponent extends TypedItemSearchResultListElementComponent { } diff --git a/src/app/shared/object-list/item-list-element/item-types/project/project-list-element.component.ts b/src/app/shared/object-list/item-list-element/item-types/project/project-list-element.component.ts index ad3cb824ea..6b130e4786 100644 --- a/src/app/shared/object-list/item-list-element/item-types/project/project-list-element.component.ts +++ b/src/app/shared/object-list/item-list-element/item-types/project/project-list-element.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; import { rendersItemType } from '../../../../items/item-type-decorator'; import { ElementViewMode } from '../../../../view-mode'; -import { ItemSearchResultComponent } from '../item-search-result-component'; +import { TypedItemSearchResultListElementComponent } from '../typed-item-search-result-list-element.component'; @rendersItemType('Project', ElementViewMode.SetElement) @Component({ @@ -12,5 +12,5 @@ import { ItemSearchResultComponent } from '../item-search-result-component'; /** * The component for displaying a list element for an item of the type Project */ -export class ProjectListElementComponent extends ItemSearchResultComponent { +export class ProjectListElementComponent extends TypedItemSearchResultListElementComponent { } diff --git a/src/app/shared/object-list/item-list-element/item-types/publication/publication-list-element.component.ts b/src/app/shared/object-list/item-list-element/item-types/publication/publication-list-element.component.ts index 777cfc6013..4575ab5cca 100644 --- a/src/app/shared/object-list/item-list-element/item-types/publication/publication-list-element.component.ts +++ b/src/app/shared/object-list/item-list-element/item-types/publication/publication-list-element.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; import { DEFAULT_ITEM_TYPE, rendersItemType } from '../../../../items/item-type-decorator'; import { ElementViewMode } from '../../../../view-mode'; -import { ItemSearchResultComponent } from '../item-search-result-component'; +import { TypedItemSearchResultListElementComponent } from '../typed-item-search-result-list-element.component'; @rendersItemType('Publication', ElementViewMode.SetElement) @rendersItemType(DEFAULT_ITEM_TYPE, ElementViewMode.SetElement) @@ -13,5 +13,5 @@ import { ItemSearchResultComponent } from '../item-search-result-component'; /** * The component for displaying a list element for an item of the type Publication */ -export class PublicationListElementComponent extends ItemSearchResultComponent { +export class PublicationListElementComponent extends TypedItemSearchResultListElementComponent { } diff --git a/src/app/shared/object-list/item-list-element/item-types/item-search-result.component.spec.ts b/src/app/shared/object-list/item-list-element/item-types/typed-item-search-result-list-element.component.spec.ts similarity index 78% rename from src/app/shared/object-list/item-list-element/item-types/item-search-result.component.spec.ts rename to src/app/shared/object-list/item-list-element/item-types/typed-item-search-result-list-element.component.spec.ts index be163f7a6c..e97f632033 100644 --- a/src/app/shared/object-list/item-list-element/item-types/item-search-result.component.spec.ts +++ b/src/app/shared/object-list/item-list-element/item-types/typed-item-search-result-list-element.component.spec.ts @@ -2,7 +2,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { TruncatePipe } from '../../../utils/truncate.pipe'; import { TruncatableService } from '../../../truncatable/truncatable.service'; import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core'; -import { ItemSearchResultComponent } from './item-search-result-component'; +import { TypedItemSearchResultListElementComponent } from './typed-item-search-result-list-element.component'; import { Item } from '../../../../core/shared/item.model'; import { RemoteData } from '../../../../core/data/remote-data'; import { PaginatedList } from '../../../../core/data/paginated-list'; @@ -23,26 +23,26 @@ const mockSearchResult = { } as ItemSearchResult; describe('ItemSearchResultComponent', () => { - let comp: ItemSearchResultComponent; - let fixture: ComponentFixture; + let comp: TypedItemSearchResultListElementComponent; + let fixture: ComponentFixture; describe('when injecting an Item', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ItemSearchResultComponent, TruncatePipe], + declarations: [TypedItemSearchResultListElementComponent, TruncatePipe], providers: [ {provide: TruncatableService, useValue: {}}, {provide: ITEM, useValue: mockItem} ], schemas: [NO_ERRORS_SCHEMA] - }).overrideComponent(ItemSearchResultComponent, { + }).overrideComponent(TypedItemSearchResultListElementComponent, { set: {changeDetection: ChangeDetectionStrategy.Default} }).compileComponents(); })); beforeEach(async(() => { - fixture = TestBed.createComponent(ItemSearchResultComponent); + fixture = TestBed.createComponent(TypedItemSearchResultListElementComponent); comp = fixture.componentInstance; })); @@ -56,20 +56,20 @@ describe('ItemSearchResultComponent', () => { describe('when injecting an ItemSearchResult', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ItemSearchResultComponent, TruncatePipe], + declarations: [TypedItemSearchResultListElementComponent, TruncatePipe], providers: [ {provide: TruncatableService, useValue: {}}, {provide: ITEM, useValue: mockSearchResult} ], schemas: [NO_ERRORS_SCHEMA] - }).overrideComponent(ItemSearchResultComponent, { + }).overrideComponent(TypedItemSearchResultListElementComponent, { set: {changeDetection: ChangeDetectionStrategy.Default} }).compileComponents(); })); beforeEach(async(() => { - fixture = TestBed.createComponent(ItemSearchResultComponent); + fixture = TestBed.createComponent(TypedItemSearchResultListElementComponent); comp = fixture.componentInstance; })); diff --git a/src/app/shared/object-list/item-list-element/item-types/item-search-result-component.ts b/src/app/shared/object-list/item-list-element/item-types/typed-item-search-result-list-element.component.ts similarity index 90% rename from src/app/shared/object-list/item-list-element/item-types/item-search-result-component.ts rename to src/app/shared/object-list/item-list-element/item-types/typed-item-search-result-list-element.component.ts index 17e7b7f173..57b339da53 100644 --- a/src/app/shared/object-list/item-list-element/item-types/item-search-result-component.ts +++ b/src/app/shared/object-list/item-list-element/item-types/typed-item-search-result-list-element.component.ts @@ -13,7 +13,7 @@ import { SearchResultListElementComponent } from '../../search-result-list-eleme selector: 'ds-item-search-result', template: '' }) -export class ItemSearchResultComponent extends SearchResultListElementComponent { +export class TypedItemSearchResultListElementComponent extends SearchResultListElementComponent { item: Item; constructor( diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 410425b865..e467839b57 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -14,7 +14,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { NgxPaginationModule } from 'ngx-pagination'; import { ItemTypeSwitcherComponent } from './items/switcher/item-type-switcher.component'; -import { ItemSearchResultComponent } from './object-list/item-list-element/item-types/item-search-result-component'; +import { TypedItemSearchResultListElementComponent } from './object-list/item-list-element/item-types/typed-item-search-result-list-element.component'; import { PublicationListElementComponent } from './object-list/item-list-element/item-types/publication/publication-list-element.component'; import { OrgUnitListElementComponent } from './object-list/item-list-element/item-types/orgunit/orgunit-list-element.component'; import { PersonListElementComponent } from './object-list/item-list-element/item-types/person/person-list-element.component'; @@ -167,7 +167,7 @@ const COMPONENTS = [ TruncatableComponent, TruncatablePartComponent, InputSuggestionsComponent, - ItemSearchResultComponent, + TypedItemSearchResultListElementComponent, ItemTypeSwitcherComponent, BrowseByComponent ];