From 2166e0633cbcfa860e7635a59c4d29e9c3b7080d Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Thu, 9 May 2019 17:51:11 +0200 Subject: [PATCH 1/4] 62264: Grouped logical entity types together into separate modules --- .../edit-item-page.routing.module.ts | 1 + src/app/+item-page/item-page.module.ts | 28 ++++--------- src/app/app.module.ts | 10 ++++- .../journal-issue-list-element.component.html | 0 .../journal-issue-list-element.component.scss | 0 ...urnal-issue-list-element.component.spec.ts | 0 .../journal-issue-list-element.component.ts | 4 +- ...journal-volume-list-element.component.html | 0 ...journal-volume-list-element.component.scss | 0 ...rnal-volume-list-element.component.spec.ts | 0 .../journal-volume-list-element.component.ts | 4 +- .../journal-list-element.component.html | 0 .../journal-list-element.component.scss | 0 .../journal-list-element.component.spec.ts | 0 .../journal/journal-list-element.component.ts | 4 +- .../journal-issue.component.html | 0 .../journal-issue.component.scss | 0 .../journal-issue.component.spec.ts | 0 .../journal-issue/journal-issue.component.ts | 7 +++- .../journal-volume.component.html | 0 .../journal-volume.component.scss | 0 .../journal-volume.component.spec.ts | 0 .../journal-volume.component.ts | 7 +++- .../journal/journal.component.html | 0 .../journal/journal.component.scss | 0 .../journal/journal.component.spec.ts | 0 .../item-pages}/journal/journal.component.ts | 7 +++- .../journal-entities.module.ts | 38 +++++++++++++++++ .../orgunit-list-element.component.html | 0 .../orgunit-list-element.component.scss | 1 + .../orgunit-list-element.component.spec.ts | 0 .../orgunit/orgunit-list-element.component.ts | 4 +- ...gunit-metadata-list-element.component.html | 0 ...orgunit-metadata-list-element.component.ts | 6 +-- .../person/person-list-element.component.html | 0 .../person/person-list-element.component.scss | 1 + .../person-list-element.component.spec.ts | 0 .../person/person-list-element.component.ts | 4 +- ...erson-metadata-list-element.component.html | 0 .../person-metadata-list-element.component.ts | 6 +-- .../project-list-element.component.html | 0 .../project-list-element.component.scss | 1 + .../project-list-element.component.spec.ts | 0 .../project/project-list-element.component.ts | 4 +- .../orgunit/orgunit.component.html | 0 .../orgunit/orgunit.component.scss | 0 .../orgunit/orgunit.component.spec.ts | 0 .../item-pages}/orgunit/orgunit.component.ts | 7 +++- .../item-pages}/person/person.component.html | 0 .../item-pages}/person/person.component.scss | 0 .../person/person.component.spec.ts | 0 .../item-pages}/person/person.component.ts | 7 +++- .../project/project.component.html | 0 .../project/project.component.scss | 0 .../project/project.component.spec.ts | 0 .../item-pages}/project/project.component.ts | 7 +++- .../research-entities.module.ts | 42 +++++++++++++++++++ .../orgunit-list-element.component.scss | 1 - .../person/person-list-element.component.scss | 1 - .../project-list-element.component.scss | 1 - src/app/shared/shared.module.ts | 16 ------- 61 files changed, 150 insertions(+), 69 deletions(-) rename src/app/{shared/object-list/item-list-element/item-types => entity-groups/journal-entities/item-list-elements}/journal-issue/journal-issue-list-element.component.html (100%) rename src/app/{shared/object-list/item-list-element/item-types => entity-groups/journal-entities/item-list-elements}/journal-issue/journal-issue-list-element.component.scss (100%) rename src/app/{shared/object-list/item-list-element/item-types => entity-groups/journal-entities/item-list-elements}/journal-issue/journal-issue-list-element.component.spec.ts (100%) rename src/app/{shared/object-list/item-list-element/item-types => entity-groups/journal-entities/item-list-elements}/journal-issue/journal-issue-list-element.component.ts (64%) rename src/app/{shared/object-list/item-list-element/item-types => entity-groups/journal-entities/item-list-elements}/journal-volume/journal-volume-list-element.component.html (100%) rename src/app/{shared/object-list/item-list-element/item-types => entity-groups/journal-entities/item-list-elements}/journal-volume/journal-volume-list-element.component.scss (100%) rename src/app/{shared/object-list/item-list-element/item-types => entity-groups/journal-entities/item-list-elements}/journal-volume/journal-volume-list-element.component.spec.ts (100%) rename src/app/{shared/object-list/item-list-element/item-types => entity-groups/journal-entities/item-list-elements}/journal-volume/journal-volume-list-element.component.ts (64%) rename src/app/{shared/object-list/item-list-element/item-types => entity-groups/journal-entities/item-list-elements}/journal/journal-list-element.component.html (100%) rename src/app/{shared/object-list/item-list-element/item-types => entity-groups/journal-entities/item-list-elements}/journal/journal-list-element.component.scss (100%) rename src/app/{shared/object-list/item-list-element/item-types => entity-groups/journal-entities/item-list-elements}/journal/journal-list-element.component.spec.ts (100%) rename src/app/{shared/object-list/item-list-element/item-types => entity-groups/journal-entities/item-list-elements}/journal/journal-list-element.component.ts (62%) rename src/app/{+item-page/simple/item-types => entity-groups/journal-entities/item-pages}/journal-issue/journal-issue.component.html (100%) rename src/app/{+item-page/simple/item-types => entity-groups/journal-entities/item-pages}/journal-issue/journal-issue.component.scss (100%) rename src/app/{+item-page/simple/item-types => entity-groups/journal-entities/item-pages}/journal-issue/journal-issue.component.spec.ts (100%) rename src/app/{+item-page/simple/item-types => entity-groups/journal-entities/item-pages}/journal-issue/journal-issue.component.ts (87%) rename src/app/{+item-page/simple/item-types => entity-groups/journal-entities/item-pages}/journal-volume/journal-volume.component.html (100%) rename src/app/{+item-page/simple/item-types => entity-groups/journal-entities/item-pages}/journal-volume/journal-volume.component.scss (100%) rename src/app/{+item-page/simple/item-types => entity-groups/journal-entities/item-pages}/journal-volume/journal-volume.component.spec.ts (100%) rename src/app/{+item-page/simple/item-types => entity-groups/journal-entities/item-pages}/journal-volume/journal-volume.component.ts (86%) rename src/app/{+item-page/simple/item-types => entity-groups/journal-entities/item-pages}/journal/journal.component.html (100%) rename src/app/{+item-page/simple/item-types => entity-groups/journal-entities/item-pages}/journal/journal.component.scss (100%) rename src/app/{+item-page/simple/item-types => entity-groups/journal-entities/item-pages}/journal/journal.component.spec.ts (100%) rename src/app/{+item-page/simple/item-types => entity-groups/journal-entities/item-pages}/journal/journal.component.ts (84%) create mode 100644 src/app/entity-groups/journal-entities/journal-entities.module.ts rename src/app/{shared/object-list/item-list-element/item-types => entity-groups/research-entities/item-list-elements}/orgunit/orgunit-list-element.component.html (100%) create mode 100644 src/app/entity-groups/research-entities/item-list-elements/orgunit/orgunit-list-element.component.scss rename src/app/{shared/object-list/item-list-element/item-types => entity-groups/research-entities/item-list-elements}/orgunit/orgunit-list-element.component.spec.ts (100%) rename src/app/{shared/object-list/item-list-element/item-types => entity-groups/research-entities/item-list-elements}/orgunit/orgunit-list-element.component.ts (63%) rename src/app/{shared/object-list/item-list-element/item-types => entity-groups/research-entities/item-list-elements}/orgunit/orgunit-metadata-list-element.component.html (100%) rename src/app/{shared/object-list/item-list-element/item-types => entity-groups/research-entities/item-list-elements}/orgunit/orgunit-metadata-list-element.component.ts (53%) rename src/app/{shared/object-list/item-list-element/item-types => entity-groups/research-entities/item-list-elements}/person/person-list-element.component.html (100%) create mode 100644 src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.scss rename src/app/{shared/object-list/item-list-element/item-types => entity-groups/research-entities/item-list-elements}/person/person-list-element.component.spec.ts (100%) rename src/app/{shared/object-list/item-list-element/item-types => entity-groups/research-entities/item-list-elements}/person/person-list-element.component.ts (62%) rename src/app/{shared/object-list/item-list-element/item-types => entity-groups/research-entities/item-list-elements}/person/person-metadata-list-element.component.html (100%) rename src/app/{shared/object-list/item-list-element/item-types => entity-groups/research-entities/item-list-elements}/person/person-metadata-list-element.component.ts (53%) rename src/app/{shared/object-list/item-list-element/item-types => entity-groups/research-entities/item-list-elements}/project/project-list-element.component.html (100%) create mode 100644 src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.scss rename src/app/{shared/object-list/item-list-element/item-types => entity-groups/research-entities/item-list-elements}/project/project-list-element.component.spec.ts (100%) rename src/app/{shared/object-list/item-list-element/item-types => entity-groups/research-entities/item-list-elements}/project/project-list-element.component.ts (62%) rename src/app/{+item-page/simple/item-types => entity-groups/research-entities/item-pages}/orgunit/orgunit.component.html (100%) rename src/app/{+item-page/simple/item-types => entity-groups/research-entities/item-pages}/orgunit/orgunit.component.scss (100%) rename src/app/{+item-page/simple/item-types => entity-groups/research-entities/item-pages}/orgunit/orgunit.component.spec.ts (100%) rename src/app/{+item-page/simple/item-types => entity-groups/research-entities/item-pages}/orgunit/orgunit.component.ts (88%) rename src/app/{+item-page/simple/item-types => entity-groups/research-entities/item-pages}/person/person.component.html (100%) rename src/app/{+item-page/simple/item-types => entity-groups/research-entities/item-pages}/person/person.component.scss (100%) rename src/app/{+item-page/simple/item-types => entity-groups/research-entities/item-pages}/person/person.component.spec.ts (100%) rename src/app/{+item-page/simple/item-types => entity-groups/research-entities/item-pages}/person/person.component.ts (90%) rename src/app/{+item-page/simple/item-types => entity-groups/research-entities/item-pages}/project/project.component.html (100%) rename src/app/{+item-page/simple/item-types => entity-groups/research-entities/item-pages}/project/project.component.scss (100%) rename src/app/{+item-page/simple/item-types => entity-groups/research-entities/item-pages}/project/project.component.spec.ts (100%) rename src/app/{+item-page/simple/item-types => entity-groups/research-entities/item-pages}/project/project.component.ts (88%) create mode 100644 src/app/entity-groups/research-entities/research-entities.module.ts delete mode 100644 src/app/shared/object-list/item-list-element/item-types/orgunit/orgunit-list-element.component.scss delete mode 100644 src/app/shared/object-list/item-list-element/item-types/person/person-list-element.component.scss delete mode 100644 src/app/shared/object-list/item-list-element/item-types/project/project-list-element.component.scss diff --git a/src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts b/src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts index 223b5f7c8e..811965e145 100644 --- a/src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts +++ b/src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts @@ -33,6 +33,7 @@ const ITEM_EDIT_DELETE_PATH = 'delete'; { path: '', redirectTo: 'status', + pathMatch: 'full' }, { path: 'status', diff --git a/src/app/+item-page/item-page.module.ts b/src/app/+item-page/item-page.module.ts index 0c4ccc868b..d01363f55c 100644 --- a/src/app/+item-page/item-page.module.ts +++ b/src/app/+item-page/item-page.module.ts @@ -22,12 +22,6 @@ import { FullFileSectionComponent } from './full/field-components/file-section/f import { RelatedItemsComponent } from './simple/related-items/related-items-component'; import { SearchPageModule } from '../+search-page/search-page.module'; import { PublicationComponent } from './simple/item-types/publication/publication.component'; -import { PersonComponent } from './simple/item-types/person/person.component'; -import { OrgunitComponent } from './simple/item-types/orgunit/orgunit.component'; -import { ProjectComponent } from './simple/item-types/project/project.component'; -import { JournalComponent } from './simple/item-types/journal/journal.component'; -import { JournalVolumeComponent } from './simple/item-types/journal-volume/journal-volume.component'; -import { JournalIssueComponent } from './simple/item-types/journal-issue/journal-issue.component'; import { ItemComponent } from './simple/item-types/shared/item.component'; import { EditItemPageModule } from './edit-item-page/edit-item-page.module'; import { MetadataRepresentationListComponent } from './simple/metadata-representation-list/metadata-representation-list.component'; @@ -57,26 +51,22 @@ import { RelatedEntitiesSearchComponent } from './simple/related-entities/relate CollectionsComponent, FullFileSectionComponent, PublicationComponent, - ProjectComponent, - OrgunitComponent, - PersonComponent, RelatedItemsComponent, ItemComponent, GenericItemPageFieldComponent, - JournalComponent, - JournalIssueComponent, - JournalVolumeComponent, MetadataRepresentationListComponent, RelatedEntitiesSearchComponent ], + exports: [ + ItemComponent, + MetadataValuesComponent, + MetadataFieldWrapperComponent, + GenericItemPageFieldComponent, + RelatedEntitiesSearchComponent, + RelatedItemsComponent + ], entryComponents: [ - PublicationComponent, - ProjectComponent, - OrgunitComponent, - PersonComponent, - JournalComponent, - JournalIssueComponent, - JournalVolumeComponent + PublicationComponent ] }) export class ItemPageModule { diff --git a/src/app/app.module.ts b/src/app/app.module.ts index f9d6e50dcc..ce5a2d78a2 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -37,6 +37,8 @@ import { AdminSidebarComponent } from './+admin/admin-sidebar/admin-sidebar.comp import { AdminSidebarSectionComponent } from './+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component'; import { ExpandableAdminSidebarSectionComponent } from './+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component'; import { NavbarModule } from './navbar/navbar.module'; +import { JournalEntitiesModule } from './entity-groups/journal-entities/journal-entities.module'; +import { ResearchEntitiesModule } from './entity-groups/research-entities/research-entities.module'; export function getConfig() { return ENV_CONFIG; @@ -66,6 +68,11 @@ const IMPORTS = [ StoreRouterConnectingModule, ]; +const ENTITY_IMPORTS = [ + JournalEntitiesModule, + ResearchEntitiesModule +]; + IMPORTS.push( StoreDevtoolsModule.instrument({ maxAge: 100, @@ -112,7 +119,8 @@ const EXPORTS = [ @NgModule({ imports: [ - ...IMPORTS + ...IMPORTS, + ...ENTITY_IMPORTS ], providers: [ ...PROVIDERS diff --git a/src/app/shared/object-list/item-list-element/item-types/journal-issue/journal-issue-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.html similarity index 100% rename from src/app/shared/object-list/item-list-element/item-types/journal-issue/journal-issue-list-element.component.html rename to src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.html diff --git a/src/app/shared/object-list/item-list-element/item-types/journal-issue/journal-issue-list-element.component.scss b/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.scss similarity index 100% rename from src/app/shared/object-list/item-list-element/item-types/journal-issue/journal-issue-list-element.component.scss rename to src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.scss diff --git a/src/app/shared/object-list/item-list-element/item-types/journal-issue/journal-issue-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.spec.ts similarity index 100% rename from src/app/shared/object-list/item-list-element/item-types/journal-issue/journal-issue-list-element.component.spec.ts rename to src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.spec.ts diff --git a/src/app/shared/object-list/item-list-element/item-types/journal-issue/journal-issue-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.ts similarity index 64% rename from src/app/shared/object-list/item-list-element/item-types/journal-issue/journal-issue-list-element.component.ts rename to src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.ts index 92a8dd9930..e1aeb7c4e6 100644 --- a/src/app/shared/object-list/item-list-element/item-types/journal-issue/journal-issue-list-element.component.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; -import { ItemViewMode, rendersItemType } from '../../../../items/item-type-decorator'; -import { TypedItemSearchResultListElementComponent } from '../typed-item-search-result-list-element.component'; +import { ItemViewMode, rendersItemType } from '../../../../shared/items/item-type-decorator'; +import { TypedItemSearchResultListElementComponent } from '../../../../shared/object-list/item-list-element/item-types/typed-item-search-result-list-element.component'; @rendersItemType('JournalIssue', ItemViewMode.Element) @Component({ diff --git a/src/app/shared/object-list/item-list-element/item-types/journal-volume/journal-volume-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.html similarity index 100% rename from src/app/shared/object-list/item-list-element/item-types/journal-volume/journal-volume-list-element.component.html rename to src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.html diff --git a/src/app/shared/object-list/item-list-element/item-types/journal-volume/journal-volume-list-element.component.scss b/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.scss similarity index 100% rename from src/app/shared/object-list/item-list-element/item-types/journal-volume/journal-volume-list-element.component.scss rename to src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.scss diff --git a/src/app/shared/object-list/item-list-element/item-types/journal-volume/journal-volume-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.spec.ts similarity index 100% rename from src/app/shared/object-list/item-list-element/item-types/journal-volume/journal-volume-list-element.component.spec.ts rename to src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.spec.ts diff --git a/src/app/shared/object-list/item-list-element/item-types/journal-volume/journal-volume-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.ts similarity index 64% rename from src/app/shared/object-list/item-list-element/item-types/journal-volume/journal-volume-list-element.component.ts rename to src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.ts index 01acf3ca34..42e83ea7bd 100644 --- a/src/app/shared/object-list/item-list-element/item-types/journal-volume/journal-volume-list-element.component.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; -import { ItemViewMode, rendersItemType } from '../../../../items/item-type-decorator'; -import { TypedItemSearchResultListElementComponent } from '../typed-item-search-result-list-element.component'; +import { ItemViewMode, rendersItemType } from '../../../../shared/items/item-type-decorator'; +import { TypedItemSearchResultListElementComponent } from '../../../../shared/object-list/item-list-element/item-types/typed-item-search-result-list-element.component'; @rendersItemType('JournalVolume', ItemViewMode.Element) @Component({ diff --git a/src/app/shared/object-list/item-list-element/item-types/journal/journal-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.html similarity index 100% rename from src/app/shared/object-list/item-list-element/item-types/journal/journal-list-element.component.html rename to src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.html diff --git a/src/app/shared/object-list/item-list-element/item-types/journal/journal-list-element.component.scss b/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.scss similarity index 100% rename from src/app/shared/object-list/item-list-element/item-types/journal/journal-list-element.component.scss rename to src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.scss diff --git a/src/app/shared/object-list/item-list-element/item-types/journal/journal-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.spec.ts similarity index 100% rename from src/app/shared/object-list/item-list-element/item-types/journal/journal-list-element.component.spec.ts rename to src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.spec.ts diff --git a/src/app/shared/object-list/item-list-element/item-types/journal/journal-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.ts similarity index 62% rename from src/app/shared/object-list/item-list-element/item-types/journal/journal-list-element.component.ts rename to src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.ts index a40891b452..fdcf0ba5b0 100644 --- a/src/app/shared/object-list/item-list-element/item-types/journal/journal-list-element.component.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; -import { ItemViewMode, rendersItemType } from '../../../../items/item-type-decorator'; -import { TypedItemSearchResultListElementComponent } from '../typed-item-search-result-list-element.component'; +import { ItemViewMode, rendersItemType } from '../../../../shared/items/item-type-decorator'; +import { TypedItemSearchResultListElementComponent } from '../../../../shared/object-list/item-list-element/item-types/typed-item-search-result-list-element.component'; @rendersItemType('Journal', ItemViewMode.Element) @Component({ diff --git a/src/app/+item-page/simple/item-types/journal-issue/journal-issue.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html similarity index 100% rename from src/app/+item-page/simple/item-types/journal-issue/journal-issue.component.html rename to src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html diff --git a/src/app/+item-page/simple/item-types/journal-issue/journal-issue.component.scss b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.scss similarity index 100% rename from src/app/+item-page/simple/item-types/journal-issue/journal-issue.component.scss rename to src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.scss diff --git a/src/app/+item-page/simple/item-types/journal-issue/journal-issue.component.spec.ts b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.spec.ts similarity index 100% rename from src/app/+item-page/simple/item-types/journal-issue/journal-issue.component.spec.ts rename to src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.spec.ts diff --git a/src/app/+item-page/simple/item-types/journal-issue/journal-issue.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts similarity index 87% rename from src/app/+item-page/simple/item-types/journal-issue/journal-issue.component.ts rename to src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts index 77ed54d67f..5f3d3b557d 100644 --- a/src/app/+item-page/simple/item-types/journal-issue/journal-issue.component.ts +++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts @@ -5,8 +5,11 @@ import { Item } from '../../../../core/shared/item.model'; import { ItemViewMode, rendersItemType } from '../../../../shared/items/item-type-decorator'; import { ITEM } from '../../../../shared/items/switcher/item-type-switcher.component'; import { isNotEmpty } from '../../../../shared/empty.util'; -import { ItemComponent } from '../shared/item.component'; -import { filterRelationsByTypeLabel, relationsToItems } from '../shared/item-relationships-utils'; +import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component'; +import { + filterRelationsByTypeLabel, + relationsToItems +} from '../../../../+item-page/simple/item-types/shared/item-relationships-utils'; @rendersItemType('JournalIssue', ItemViewMode.Full) @Component({ diff --git a/src/app/+item-page/simple/item-types/journal-volume/journal-volume.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html similarity index 100% rename from src/app/+item-page/simple/item-types/journal-volume/journal-volume.component.html rename to src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html diff --git a/src/app/+item-page/simple/item-types/journal-volume/journal-volume.component.scss b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.scss similarity index 100% rename from src/app/+item-page/simple/item-types/journal-volume/journal-volume.component.scss rename to src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.scss diff --git a/src/app/+item-page/simple/item-types/journal-volume/journal-volume.component.spec.ts b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.spec.ts similarity index 100% rename from src/app/+item-page/simple/item-types/journal-volume/journal-volume.component.spec.ts rename to src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.spec.ts diff --git a/src/app/+item-page/simple/item-types/journal-volume/journal-volume.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts similarity index 86% rename from src/app/+item-page/simple/item-types/journal-volume/journal-volume.component.ts rename to src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts index 616d96178a..cff840e5bd 100644 --- a/src/app/+item-page/simple/item-types/journal-volume/journal-volume.component.ts +++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts @@ -5,8 +5,11 @@ import { Item } from '../../../../core/shared/item.model'; import { ItemViewMode, rendersItemType } from '../../../../shared/items/item-type-decorator'; import { ITEM } from '../../../../shared/items/switcher/item-type-switcher.component'; import { isNotEmpty } from '../../../../shared/empty.util'; -import { ItemComponent } from '../shared/item.component'; -import { filterRelationsByTypeLabel, relationsToItems } from '../shared/item-relationships-utils'; +import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component'; +import { + filterRelationsByTypeLabel, + relationsToItems +} from '../../../../+item-page/simple/item-types/shared/item-relationships-utils'; @rendersItemType('JournalVolume', ItemViewMode.Full) @Component({ diff --git a/src/app/+item-page/simple/item-types/journal/journal.component.html b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html similarity index 100% rename from src/app/+item-page/simple/item-types/journal/journal.component.html rename to src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html diff --git a/src/app/+item-page/simple/item-types/journal/journal.component.scss b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.scss similarity index 100% rename from src/app/+item-page/simple/item-types/journal/journal.component.scss rename to src/app/entity-groups/journal-entities/item-pages/journal/journal.component.scss diff --git a/src/app/+item-page/simple/item-types/journal/journal.component.spec.ts b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts similarity index 100% rename from src/app/+item-page/simple/item-types/journal/journal.component.spec.ts rename to src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts diff --git a/src/app/+item-page/simple/item-types/journal/journal.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts similarity index 84% rename from src/app/+item-page/simple/item-types/journal/journal.component.ts rename to src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts index 0799f5c736..71da89cf4c 100644 --- a/src/app/+item-page/simple/item-types/journal/journal.component.ts +++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts @@ -5,8 +5,11 @@ import { Item } from '../../../../core/shared/item.model'; import { ItemViewMode, rendersItemType } from '../../../../shared/items/item-type-decorator'; import { ITEM } from '../../../../shared/items/switcher/item-type-switcher.component'; import { isNotEmpty } from '../../../../shared/empty.util'; -import { ItemComponent } from '../shared/item.component'; -import { filterRelationsByTypeLabel, relationsToItems } from '../shared/item-relationships-utils'; +import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component'; +import { + filterRelationsByTypeLabel, + relationsToItems +} from '../../../../+item-page/simple/item-types/shared/item-relationships-utils'; @rendersItemType('Journal', ItemViewMode.Full) @Component({ diff --git a/src/app/entity-groups/journal-entities/journal-entities.module.ts b/src/app/entity-groups/journal-entities/journal-entities.module.ts new file mode 100644 index 0000000000..50ec160650 --- /dev/null +++ b/src/app/entity-groups/journal-entities/journal-entities.module.ts @@ -0,0 +1,38 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { SharedModule } from '../../shared/shared.module'; +import { ItemPageModule } from '../../+item-page/item-page.module'; +import { JournalComponent } from './item-pages/journal/journal.component'; +import { JournalIssueComponent } from './item-pages/journal-issue/journal-issue.component'; +import { JournalVolumeComponent } from './item-pages/journal-volume/journal-volume.component'; +import { JournalListElementComponent } from './item-list-elements/journal/journal-list-element.component'; +import { JournalIssueListElementComponent } from './item-list-elements/journal-issue/journal-issue-list-element.component'; +import { JournalVolumeListElementComponent } from './item-list-elements/journal-volume/journal-volume-list-element.component'; +import { TooltipModule } from 'ngx-bootstrap'; + +const ENTRY_COMPONENTS = [ + JournalComponent, + JournalIssueComponent, + JournalVolumeComponent, + JournalListElementComponent, + JournalIssueListElementComponent, + JournalVolumeListElementComponent +]; + +@NgModule({ + imports: [ + CommonModule, + SharedModule, + TooltipModule.forRoot(), + ItemPageModule + ], + declarations: [ + ...ENTRY_COMPONENTS + ], + entryComponents: [ + ...ENTRY_COMPONENTS + ] +}) +export class JournalEntitiesModule { + +} diff --git a/src/app/shared/object-list/item-list-element/item-types/orgunit/orgunit-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/orgunit/orgunit-list-element.component.html similarity index 100% rename from src/app/shared/object-list/item-list-element/item-types/orgunit/orgunit-list-element.component.html rename to src/app/entity-groups/research-entities/item-list-elements/orgunit/orgunit-list-element.component.html diff --git a/src/app/entity-groups/research-entities/item-list-elements/orgunit/orgunit-list-element.component.scss b/src/app/entity-groups/research-entities/item-list-elements/orgunit/orgunit-list-element.component.scss new file mode 100644 index 0000000000..1d0786105c --- /dev/null +++ b/src/app/entity-groups/research-entities/item-list-elements/orgunit/orgunit-list-element.component.scss @@ -0,0 +1 @@ +@import '../../../../../styles/variables'; diff --git a/src/app/shared/object-list/item-list-element/item-types/orgunit/orgunit-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/orgunit/orgunit-list-element.component.spec.ts similarity index 100% rename from src/app/shared/object-list/item-list-element/item-types/orgunit/orgunit-list-element.component.spec.ts rename to src/app/entity-groups/research-entities/item-list-elements/orgunit/orgunit-list-element.component.spec.ts diff --git a/src/app/shared/object-list/item-list-element/item-types/orgunit/orgunit-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/orgunit/orgunit-list-element.component.ts similarity index 63% rename from src/app/shared/object-list/item-list-element/item-types/orgunit/orgunit-list-element.component.ts rename to src/app/entity-groups/research-entities/item-list-elements/orgunit/orgunit-list-element.component.ts index f047aac586..9a56bb6d03 100644 --- a/src/app/shared/object-list/item-list-element/item-types/orgunit/orgunit-list-element.component.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/orgunit/orgunit-list-element.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; -import { ItemViewMode, rendersItemType } from '../../../../items/item-type-decorator'; -import { TypedItemSearchResultListElementComponent } from '../typed-item-search-result-list-element.component'; +import { ItemViewMode, rendersItemType } from '../../../../shared/items/item-type-decorator'; +import { TypedItemSearchResultListElementComponent } from '../../../../shared/object-list/item-list-element/item-types/typed-item-search-result-list-element.component'; @rendersItemType('OrgUnit', ItemViewMode.Element) @Component({ diff --git a/src/app/shared/object-list/item-list-element/item-types/orgunit/orgunit-metadata-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/orgunit/orgunit-metadata-list-element.component.html similarity index 100% rename from src/app/shared/object-list/item-list-element/item-types/orgunit/orgunit-metadata-list-element.component.html rename to src/app/entity-groups/research-entities/item-list-elements/orgunit/orgunit-metadata-list-element.component.html diff --git a/src/app/shared/object-list/item-list-element/item-types/orgunit/orgunit-metadata-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/orgunit/orgunit-metadata-list-element.component.ts similarity index 53% rename from src/app/shared/object-list/item-list-element/item-types/orgunit/orgunit-metadata-list-element.component.ts rename to src/app/entity-groups/research-entities/item-list-elements/orgunit/orgunit-metadata-list-element.component.ts index 42c6c6f6a2..d59e5c6cc3 100644 --- a/src/app/shared/object-list/item-list-element/item-types/orgunit/orgunit-metadata-list-element.component.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/orgunit/orgunit-metadata-list-element.component.ts @@ -1,7 +1,7 @@ -import { ItemViewMode, rendersItemType } from '../../../../items/item-type-decorator'; import { Component } from '@angular/core'; -import { TypedItemSearchResultListElementComponent } from '../typed-item-search-result-list-element.component'; -import { MetadataRepresentationType } from '../../../../../core/shared/metadata-representation/metadata-representation.model'; +import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model'; +import { ItemViewMode, rendersItemType } from '../../../../shared/items/item-type-decorator'; +import { TypedItemSearchResultListElementComponent } from '../../../../shared/object-list/item-list-element/item-types/typed-item-search-result-list-element.component'; @rendersItemType('OrgUnit', ItemViewMode.Element, MetadataRepresentationType.Item) @Component({ diff --git a/src/app/shared/object-list/item-list-element/item-types/person/person-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.html similarity index 100% rename from src/app/shared/object-list/item-list-element/item-types/person/person-list-element.component.html rename to src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.html diff --git a/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.scss b/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.scss new file mode 100644 index 0000000000..1d0786105c --- /dev/null +++ b/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.scss @@ -0,0 +1 @@ +@import '../../../../../styles/variables'; diff --git a/src/app/shared/object-list/item-list-element/item-types/person/person-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.spec.ts similarity index 100% rename from src/app/shared/object-list/item-list-element/item-types/person/person-list-element.component.spec.ts rename to src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.spec.ts diff --git a/src/app/shared/object-list/item-list-element/item-types/person/person-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.ts similarity index 62% rename from src/app/shared/object-list/item-list-element/item-types/person/person-list-element.component.ts rename to src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.ts index b3834a8aab..46d90a6f2d 100644 --- a/src/app/shared/object-list/item-list-element/item-types/person/person-list-element.component.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; -import { ItemViewMode, rendersItemType } from '../../../../items/item-type-decorator'; -import { TypedItemSearchResultListElementComponent } from '../typed-item-search-result-list-element.component'; +import { ItemViewMode, rendersItemType } from '../../../../shared/items/item-type-decorator'; +import { TypedItemSearchResultListElementComponent } from '../../../../shared/object-list/item-list-element/item-types/typed-item-search-result-list-element.component'; @rendersItemType('Person', ItemViewMode.Element) @Component({ diff --git a/src/app/shared/object-list/item-list-element/item-types/person/person-metadata-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/person/person-metadata-list-element.component.html similarity index 100% rename from src/app/shared/object-list/item-list-element/item-types/person/person-metadata-list-element.component.html rename to src/app/entity-groups/research-entities/item-list-elements/person/person-metadata-list-element.component.html diff --git a/src/app/shared/object-list/item-list-element/item-types/person/person-metadata-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/person/person-metadata-list-element.component.ts similarity index 53% rename from src/app/shared/object-list/item-list-element/item-types/person/person-metadata-list-element.component.ts rename to src/app/entity-groups/research-entities/item-list-elements/person/person-metadata-list-element.component.ts index 959673242d..b036768d0a 100644 --- a/src/app/shared/object-list/item-list-element/item-types/person/person-metadata-list-element.component.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/person/person-metadata-list-element.component.ts @@ -1,7 +1,7 @@ -import { ItemViewMode, rendersItemType } from '../../../../items/item-type-decorator'; import { Component } from '@angular/core'; -import { TypedItemSearchResultListElementComponent } from '../typed-item-search-result-list-element.component'; -import { MetadataRepresentationType } from '../../../../../core/shared/metadata-representation/metadata-representation.model'; +import { ItemViewMode, rendersItemType } from '../../../../shared/items/item-type-decorator'; +import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model'; +import { TypedItemSearchResultListElementComponent } from '../../../../shared/object-list/item-list-element/item-types/typed-item-search-result-list-element.component'; @rendersItemType('Person', ItemViewMode.Element, MetadataRepresentationType.Item) @Component({ diff --git a/src/app/shared/object-list/item-list-element/item-types/project/project-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.html similarity index 100% rename from src/app/shared/object-list/item-list-element/item-types/project/project-list-element.component.html rename to src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.html diff --git a/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.scss b/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.scss new file mode 100644 index 0000000000..1d0786105c --- /dev/null +++ b/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.scss @@ -0,0 +1 @@ +@import '../../../../../styles/variables'; diff --git a/src/app/shared/object-list/item-list-element/item-types/project/project-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.spec.ts similarity index 100% rename from src/app/shared/object-list/item-list-element/item-types/project/project-list-element.component.spec.ts rename to src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.spec.ts diff --git a/src/app/shared/object-list/item-list-element/item-types/project/project-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.ts similarity index 62% rename from src/app/shared/object-list/item-list-element/item-types/project/project-list-element.component.ts rename to src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.ts index 86b58c94fd..2d3e716ff4 100644 --- a/src/app/shared/object-list/item-list-element/item-types/project/project-list-element.component.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; -import { ItemViewMode, rendersItemType } from '../../../../items/item-type-decorator'; -import { TypedItemSearchResultListElementComponent } from '../typed-item-search-result-list-element.component'; +import { ItemViewMode, rendersItemType } from '../../../../shared/items/item-type-decorator'; +import { TypedItemSearchResultListElementComponent } from '../../../../shared/object-list/item-list-element/item-types/typed-item-search-result-list-element.component'; @rendersItemType('Project', ItemViewMode.Element) @Component({ diff --git a/src/app/+item-page/simple/item-types/orgunit/orgunit.component.html b/src/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.html similarity index 100% rename from src/app/+item-page/simple/item-types/orgunit/orgunit.component.html rename to src/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.html diff --git a/src/app/+item-page/simple/item-types/orgunit/orgunit.component.scss b/src/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.scss similarity index 100% rename from src/app/+item-page/simple/item-types/orgunit/orgunit.component.scss rename to src/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.scss diff --git a/src/app/+item-page/simple/item-types/orgunit/orgunit.component.spec.ts b/src/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.spec.ts similarity index 100% rename from src/app/+item-page/simple/item-types/orgunit/orgunit.component.spec.ts rename to src/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.spec.ts diff --git a/src/app/+item-page/simple/item-types/orgunit/orgunit.component.ts b/src/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.ts similarity index 88% rename from src/app/+item-page/simple/item-types/orgunit/orgunit.component.ts rename to src/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.ts index 96dc9a5960..cae70ce634 100644 --- a/src/app/+item-page/simple/item-types/orgunit/orgunit.component.ts +++ b/src/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.ts @@ -5,8 +5,11 @@ import { Item } from '../../../../core/shared/item.model'; import { ItemViewMode, rendersItemType } from '../../../../shared/items/item-type-decorator'; import { ITEM } from '../../../../shared/items/switcher/item-type-switcher.component'; import { isNotEmpty } from '../../../../shared/empty.util'; -import { ItemComponent } from '../shared/item.component'; -import { filterRelationsByTypeLabel, relationsToItems } from '../shared/item-relationships-utils'; +import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component'; +import { + filterRelationsByTypeLabel, + relationsToItems +} from '../../../../+item-page/simple/item-types/shared/item-relationships-utils'; @rendersItemType('OrgUnit', ItemViewMode.Full) @Component({ diff --git a/src/app/+item-page/simple/item-types/person/person.component.html b/src/app/entity-groups/research-entities/item-pages/person/person.component.html similarity index 100% rename from src/app/+item-page/simple/item-types/person/person.component.html rename to src/app/entity-groups/research-entities/item-pages/person/person.component.html diff --git a/src/app/+item-page/simple/item-types/person/person.component.scss b/src/app/entity-groups/research-entities/item-pages/person/person.component.scss similarity index 100% rename from src/app/+item-page/simple/item-types/person/person.component.scss rename to src/app/entity-groups/research-entities/item-pages/person/person.component.scss diff --git a/src/app/+item-page/simple/item-types/person/person.component.spec.ts b/src/app/entity-groups/research-entities/item-pages/person/person.component.spec.ts similarity index 100% rename from src/app/+item-page/simple/item-types/person/person.component.spec.ts rename to src/app/entity-groups/research-entities/item-pages/person/person.component.spec.ts diff --git a/src/app/+item-page/simple/item-types/person/person.component.ts b/src/app/entity-groups/research-entities/item-pages/person/person.component.ts similarity index 90% rename from src/app/+item-page/simple/item-types/person/person.component.ts rename to src/app/entity-groups/research-entities/item-pages/person/person.component.ts index 67a2ae7a2e..8ef3ceb57e 100644 --- a/src/app/+item-page/simple/item-types/person/person.component.ts +++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.ts @@ -6,8 +6,11 @@ import { ItemViewMode, rendersItemType } from '../../../../shared/items/item-typ import { ITEM } from '../../../../shared/items/switcher/item-type-switcher.component'; import { SearchFixedFilterService } from '../../../../+search-page/search-filters/search-filter/search-fixed-filter.service'; import { isNotEmpty } from '../../../../shared/empty.util'; -import { ItemComponent } from '../shared/item.component'; -import { filterRelationsByTypeLabel, relationsToItems } from '../shared/item-relationships-utils'; +import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component'; +import { + filterRelationsByTypeLabel, + relationsToItems +} from '../../../../+item-page/simple/item-types/shared/item-relationships-utils'; @rendersItemType('Person', ItemViewMode.Full) @Component({ diff --git a/src/app/+item-page/simple/item-types/project/project.component.html b/src/app/entity-groups/research-entities/item-pages/project/project.component.html similarity index 100% rename from src/app/+item-page/simple/item-types/project/project.component.html rename to src/app/entity-groups/research-entities/item-pages/project/project.component.html diff --git a/src/app/+item-page/simple/item-types/project/project.component.scss b/src/app/entity-groups/research-entities/item-pages/project/project.component.scss similarity index 100% rename from src/app/+item-page/simple/item-types/project/project.component.scss rename to src/app/entity-groups/research-entities/item-pages/project/project.component.scss diff --git a/src/app/+item-page/simple/item-types/project/project.component.spec.ts b/src/app/entity-groups/research-entities/item-pages/project/project.component.spec.ts similarity index 100% rename from src/app/+item-page/simple/item-types/project/project.component.spec.ts rename to src/app/entity-groups/research-entities/item-pages/project/project.component.spec.ts diff --git a/src/app/+item-page/simple/item-types/project/project.component.ts b/src/app/entity-groups/research-entities/item-pages/project/project.component.ts similarity index 88% rename from src/app/+item-page/simple/item-types/project/project.component.ts rename to src/app/entity-groups/research-entities/item-pages/project/project.component.ts index cf4ffd4be1..074bc62363 100644 --- a/src/app/+item-page/simple/item-types/project/project.component.ts +++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.ts @@ -5,8 +5,11 @@ import { Item } from '../../../../core/shared/item.model'; import { ItemViewMode, rendersItemType } from '../../../../shared/items/item-type-decorator'; import { ITEM } from '../../../../shared/items/switcher/item-type-switcher.component'; import { isNotEmpty } from '../../../../shared/empty.util'; -import { ItemComponent } from '../shared/item.component'; -import { filterRelationsByTypeLabel, relationsToItems } from '../shared/item-relationships-utils'; +import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component'; +import { + filterRelationsByTypeLabel, + relationsToItems +} from '../../../../+item-page/simple/item-types/shared/item-relationships-utils'; @rendersItemType('Project', ItemViewMode.Full) @Component({ diff --git a/src/app/entity-groups/research-entities/research-entities.module.ts b/src/app/entity-groups/research-entities/research-entities.module.ts new file mode 100644 index 0000000000..ba28f174df --- /dev/null +++ b/src/app/entity-groups/research-entities/research-entities.module.ts @@ -0,0 +1,42 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { SharedModule } from '../../shared/shared.module'; +import { ItemPageModule } from '../../+item-page/item-page.module'; +import { OrgunitComponent } from './item-pages/orgunit/orgunit.component'; +import { PersonComponent } from './item-pages/person/person.component'; +import { ProjectComponent } from './item-pages/project/project.component'; +import { OrgUnitListElementComponent } from './item-list-elements/orgunit/orgunit-list-element.component'; +import { OrgUnitMetadataListElementComponent } from './item-list-elements/orgunit/orgunit-metadata-list-element.component'; +import { PersonMetadataListElementComponent } from './item-list-elements/person/person-metadata-list-element.component'; +import { PersonListElementComponent } from './item-list-elements/person/person-list-element.component'; +import { ProjectListElementComponent } from './item-list-elements/project/project-list-element.component'; +import { TooltipModule } from 'ngx-bootstrap'; + +const ENTRY_COMPONENTS = [ + OrgunitComponent, + PersonComponent, + ProjectComponent, + OrgUnitListElementComponent, + OrgUnitMetadataListElementComponent, + PersonListElementComponent, + PersonMetadataListElementComponent, + ProjectListElementComponent +]; + +@NgModule({ + imports: [ + CommonModule, + SharedModule, + TooltipModule.forRoot(), + ItemPageModule + ], + declarations: [ + ...ENTRY_COMPONENTS + ], + entryComponents: [ + ...ENTRY_COMPONENTS + ] +}) +export class ResearchEntitiesModule { + +} diff --git a/src/app/shared/object-list/item-list-element/item-types/orgunit/orgunit-list-element.component.scss b/src/app/shared/object-list/item-list-element/item-types/orgunit/orgunit-list-element.component.scss deleted file mode 100644 index 5ab410dcb0..0000000000 --- a/src/app/shared/object-list/item-list-element/item-types/orgunit/orgunit-list-element.component.scss +++ /dev/null @@ -1 +0,0 @@ -@import '../../../../../../styles/variables'; diff --git a/src/app/shared/object-list/item-list-element/item-types/person/person-list-element.component.scss b/src/app/shared/object-list/item-list-element/item-types/person/person-list-element.component.scss deleted file mode 100644 index 5ab410dcb0..0000000000 --- a/src/app/shared/object-list/item-list-element/item-types/person/person-list-element.component.scss +++ /dev/null @@ -1 +0,0 @@ -@import '../../../../../../styles/variables'; diff --git a/src/app/shared/object-list/item-list-element/item-types/project/project-list-element.component.scss b/src/app/shared/object-list/item-list-element/item-types/project/project-list-element.component.scss deleted file mode 100644 index 5ab410dcb0..0000000000 --- a/src/app/shared/object-list/item-list-element/item-types/project/project-list-element.component.scss +++ /dev/null @@ -1 +0,0 @@ -@import '../../../../../../styles/variables'; diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 329a588f43..8c15d231b1 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -10,15 +10,8 @@ import { TranslateModule } from '@ngx-translate/core'; import { NgxPaginationModule } from 'ngx-pagination'; import { ItemTypeSwitcherComponent } from './items/switcher/item-type-switcher.component'; -import { OrgUnitMetadataListElementComponent } from './object-list/item-list-element/item-types/orgunit/orgunit-metadata-list-element.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'; -import { ProjectListElementComponent } from './object-list/item-list-element/item-types/project/project-list-element.component'; -import { JournalListElementComponent } from './object-list/item-list-element/item-types/journal/journal-list-element.component'; -import { JournalVolumeListElementComponent } from './object-list/item-list-element/item-types/journal-volume/journal-volume-list-element.component'; -import { JournalIssueListElementComponent } from './object-list/item-list-element/item-types/journal-issue/journal-issue-list-element.component'; import { FileUploadModule } from 'ng2-file-upload'; @@ -103,7 +96,6 @@ import { LangSwitchComponent } from './lang-switch/lang-switch.component'; import { PlainTextMetadataListElementComponent } from './object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component'; import { ItemMetadataListElementComponent } from './object-list/metadata-representation-list-element/item/item-metadata-list-element.component'; import { TooltipModule } from 'ngx-bootstrap'; -import { PersonMetadataListElementComponent } from './object-list/item-list-element/item-types/person/person-metadata-list-element.component'; import { MetadataRepresentationListElementComponent } from './object-list/metadata-representation-list-element/metadata-representation-list-element.component'; import { ComColFormComponent } from './comcol-forms/comcol-form/comcol-form.component'; import { CreateComColPageComponent } from './comcol-forms/create-comcol-page/create-comcol-page.component'; @@ -246,14 +238,6 @@ const ENTRY_COMPONENTS = [ CommunityGridElementComponent, SearchResultGridElementComponent, PublicationListElementComponent, - PersonListElementComponent, - PersonMetadataListElementComponent, - OrgUnitMetadataListElementComponent, - OrgUnitListElementComponent, - ProjectListElementComponent, - JournalListElementComponent, - JournalVolumeListElementComponent, - JournalIssueListElementComponent, BrowseEntryListElementComponent, DsDynamicListComponent, DsDynamicLookupComponent, From 461eacff456f13ec9839d6dcb5513df02686cf9e Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Fri, 10 May 2019 10:19:51 +0200 Subject: [PATCH 2/4] 62264: Group messages --- resources/i18n/en.json | 36 +++++++++---------- .../filtered-search-page.guard.ts | 8 ++--- .../search-page-routing.module.ts | 2 +- .../search-results.component.ts | 2 +- 4 files changed, 23 insertions(+), 25 deletions(-) diff --git a/resources/i18n/en.json b/resources/i18n/en.json index 1bdcb0cf5f..ea7ad35325 100644 --- a/resources/i18n/en.json +++ b/resources/i18n/en.json @@ -302,6 +302,12 @@ }, "listelement": { "badge": "Person" + }, + "search": { + "title": "DSpace Angular :: Person Search", + "results": { + "head": "Person Search Results" + } } }, "project": { @@ -342,6 +348,12 @@ }, "listelement": { "badge": "Journal" + }, + "search": { + "title": "DSpace Angular :: Journal Search", + "results": { + "head": "Journal Search Results" + } } }, "journalvolume": { @@ -378,6 +390,12 @@ }, "listelement": { "badge": "Publication" + }, + "search": { + "title": "DSpace Angular :: Publication Search", + "results": { + "head": "Publication Search Results" + } } }, "nav": { @@ -429,24 +447,6 @@ } }, "search": { - "journal": { - "title": "DSpace Angular :: Journal Search", - "results": { - "head": "Journal Search Results" - } - }, - "person": { - "title": "DSpace Angular :: Person Search", - "results": { - "head": "Person Search Results" - } - }, - "publication": { - "title": "DSpace Angular :: Publication Search", - "results": { - "head": "Publication Search Results" - } - }, "title": "DSpace Angular :: Search", "description": "", "form": { diff --git a/src/app/+search-page/filtered-search-page.guard.ts b/src/app/+search-page/filtered-search-page.guard.ts index 39fbb48c67..6d41d4965d 100644 --- a/src/app/+search-page/filtered-search-page.guard.ts +++ b/src/app/+search-page/filtered-search-page.guard.ts @@ -4,10 +4,8 @@ import { Observable } from 'rxjs'; @Injectable() /** - * Assemble the correct i18n key for the filtered search page's title depending on the current route's filter parameter - * and title data. - * The format of the key will be "{title}{filter}.title" with: - * - title: The prefix of the key stored in route.data + * Assemble the correct i18n key for the filtered search page's title depending on the current route's filter parameter. + * The format of the key will be "{filter}.search.title" with: * - filter: The current filter stored in route.params */ export class FilteredSearchPageGuard implements CanActivate { @@ -16,7 +14,7 @@ export class FilteredSearchPageGuard implements CanActivate { state: RouterStateSnapshot): Observable | Promise | boolean { const filter = route.params.filter; - const newTitle = route.data.title + filter + '.title'; + const newTitle = filter + '.search.title'; route.data = { title: newTitle }; return true; diff --git a/src/app/+search-page/search-page-routing.module.ts b/src/app/+search-page/search-page-routing.module.ts index 8c138c0d52..c3cf4e1343 100644 --- a/src/app/+search-page/search-page-routing.module.ts +++ b/src/app/+search-page/search-page-routing.module.ts @@ -9,7 +9,7 @@ import { FilteredSearchPageGuard } from './filtered-search-page.guard'; imports: [ RouterModule.forChild([ { path: '', component: SearchPageComponent, data: { title: 'search.title' } }, - { path: ':filter', component: FilteredSearchPageComponent, canActivate: [FilteredSearchPageGuard], data: { title: 'search.' }} + { path: ':filter', component: FilteredSearchPageComponent, canActivate: [FilteredSearchPageGuard]} ]) ] }) diff --git a/src/app/+search-page/search-results/search-results.component.ts b/src/app/+search-page/search-results/search-results.component.ts index 9656ba9574..c2c86e8a9f 100644 --- a/src/app/+search-page/search-results/search-results.component.ts +++ b/src/app/+search-page/search-results/search-results.component.ts @@ -60,7 +60,7 @@ export class SearchResultsComponent { */ getTitleKey() { if (isNotEmpty(this.fixedFilter)) { - return 'search.' + this.fixedFilter + '.results.head' + return this.fixedFilter + '.search.results.head' } else { return 'search.results.head'; } From 7ef769431aa484595656beefa16cd44dc3e20600 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Fri, 10 May 2019 10:43:23 +0200 Subject: [PATCH 3/4] 62264: Fixed tests --- .../journal-issue-list-element.component.spec.ts | 8 ++++---- .../journal-volume-list-element.component.spec.ts | 8 ++++---- .../journal/journal-list-element.component.spec.ts | 8 ++++---- .../journal-issue/journal-issue.component.spec.ts | 5 ++++- .../journal-volume/journal-volume.component.spec.ts | 5 ++++- .../item-pages/journal/journal.component.spec.ts | 2 +- .../orgunit/orgunit-list-element.component.spec.ts | 8 ++++---- .../person/person-list-element.component.spec.ts | 8 ++++---- .../project/project-list-element.component.spec.ts | 8 ++++---- .../item-pages/orgunit/orgunit.component.spec.ts | 5 ++++- .../item-pages/person/person.component.spec.ts | 5 ++++- .../item-pages/project/project.component.spec.ts | 5 ++++- 12 files changed, 45 insertions(+), 30 deletions(-) diff --git a/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.spec.ts index 05de6c814b..c5757f3d51 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.spec.ts @@ -1,12 +1,12 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { Item } from '../../../../../core/shared/item.model'; -import { TruncatePipe } from '../../../../utils/truncate.pipe'; -import { TruncatableService } from '../../../../truncatable/truncatable.service'; -import { ITEM } from '../../../../items/switcher/item-type-switcher.component'; import { JournalIssueListElementComponent } from './journal-issue-list-element.component'; import { of as observableOf } from 'rxjs'; +import { Item } from '../../../../core/shared/item.model'; +import { TruncatePipe } from '../../../../shared/utils/truncate.pipe'; +import { ITEM } from '../../../../shared/items/switcher/item-type-switcher.component'; +import { TruncatableService } from '../../../../shared/truncatable/truncatable.service'; let journalIssueListElementComponent: JournalIssueListElementComponent; let fixture: ComponentFixture; diff --git a/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.spec.ts index 4cdfb0d732..6ea5c80a5f 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.spec.ts @@ -1,12 +1,12 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { Item } from '../../../../../core/shared/item.model'; -import { TruncatePipe } from '../../../../utils/truncate.pipe'; -import { TruncatableService } from '../../../../truncatable/truncatable.service'; -import { ITEM } from '../../../../items/switcher/item-type-switcher.component'; import { JournalVolumeListElementComponent } from './journal-volume-list-element.component'; import { of as observableOf } from 'rxjs'; +import { Item } from '../../../../core/shared/item.model'; +import { TruncatePipe } from '../../../../shared/utils/truncate.pipe'; +import { ITEM } from '../../../../shared/items/switcher/item-type-switcher.component'; +import { TruncatableService } from '../../../../shared/truncatable/truncatable.service'; let journalVolumeListElementComponent: JournalVolumeListElementComponent; let fixture: ComponentFixture; diff --git a/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.spec.ts index fc7ef06fa0..ff419148c6 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.spec.ts @@ -1,12 +1,12 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { Item } from '../../../../../core/shared/item.model'; -import { TruncatePipe } from '../../../../utils/truncate.pipe'; -import { TruncatableService } from '../../../../truncatable/truncatable.service'; -import { ITEM } from '../../../../items/switcher/item-type-switcher.component'; import { JournalListElementComponent } from './journal-list-element.component'; import { of as observableOf } from 'rxjs'; +import { Item } from '../../../../core/shared/item.model'; +import { TruncatePipe } from '../../../../shared/utils/truncate.pipe'; +import { ITEM } from '../../../../shared/items/switcher/item-type-switcher.component'; +import { TruncatableService } from '../../../../shared/truncatable/truncatable.service'; let journalListElementComponent: JournalListElementComponent; let fixture: ComponentFixture; diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.spec.ts b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.spec.ts index 24b18af96e..0711a67492 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.spec.ts @@ -2,9 +2,12 @@ import { Item } from '../../../../core/shared/item.model'; import { RemoteData } from '../../../../core/data/remote-data'; import { PaginatedList } from '../../../../core/data/paginated-list'; import { PageInfo } from '../../../../core/shared/page-info.model'; -import { createRelationshipsObservable, getItemPageFieldsTest } from '../shared/item.component.spec'; import { JournalIssueComponent } from './journal-issue.component'; import { of as observableOf } from 'rxjs'; +import { + createRelationshipsObservable, + getItemPageFieldsTest +} from '../../../../+item-page/simple/item-types/shared/item.component.spec'; const mockItem: Item = Object.assign(new Item(), { bitstreams: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))), diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.spec.ts b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.spec.ts index a6f32e9b5f..3beca0c17a 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.spec.ts @@ -2,9 +2,12 @@ import { Item } from '../../../../core/shared/item.model'; import { RemoteData } from '../../../../core/data/remote-data'; import { PaginatedList } from '../../../../core/data/paginated-list'; import { PageInfo } from '../../../../core/shared/page-info.model'; -import { createRelationshipsObservable, getItemPageFieldsTest } from '../shared/item.component.spec'; import { JournalVolumeComponent } from './journal-volume.component'; import { of as observableOf } from 'rxjs'; +import { + createRelationshipsObservable, + getItemPageFieldsTest +} from '../../../../+item-page/simple/item-types/shared/item.component.spec'; const mockItem: Item = Object.assign(new Item(), { bitstreams: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))), diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts index 08e8859b35..4189713cb9 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts @@ -8,13 +8,13 @@ import { Item } from '../../../../core/shared/item.model'; import { By } from '@angular/platform-browser'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { MockTranslateLoader } from '../../../../shared/mocks/mock-translate-loader'; -import { GenericItemPageFieldComponent } from '../../field-components/specific-field/generic/generic-item-page-field.component'; import { RemoteData } from '../../../../core/data/remote-data'; import { PaginatedList } from '../../../../core/data/paginated-list'; import { PageInfo } from '../../../../core/shared/page-info.model'; import { isNotEmpty } from '../../../../shared/empty.util'; import { JournalComponent } from './journal.component'; import { of as observableOf } from 'rxjs'; +import { GenericItemPageFieldComponent } from '../../../../+item-page/simple/field-components/specific-field/generic/generic-item-page-field.component'; let comp: JournalComponent; let fixture: ComponentFixture; diff --git a/src/app/entity-groups/research-entities/item-list-elements/orgunit/orgunit-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/orgunit/orgunit-list-element.component.spec.ts index 8e74c389e9..ef5d7a0b4e 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/orgunit/orgunit-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/orgunit/orgunit-list-element.component.spec.ts @@ -1,12 +1,12 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { Item } from '../../../../../core/shared/item.model'; -import { TruncatePipe } from '../../../../utils/truncate.pipe'; -import { TruncatableService } from '../../../../truncatable/truncatable.service'; -import { ITEM } from '../../../../items/switcher/item-type-switcher.component'; import { OrgUnitListElementComponent } from './orgunit-list-element.component'; import { of as observableOf } from 'rxjs'; +import { Item } from '../../../../core/shared/item.model'; +import { TruncatePipe } from '../../../../shared/utils/truncate.pipe'; +import { ITEM } from '../../../../shared/items/switcher/item-type-switcher.component'; +import { TruncatableService } from '../../../../shared/truncatable/truncatable.service'; let orgUnitListElementComponent: OrgUnitListElementComponent; let fixture: ComponentFixture; diff --git a/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.spec.ts index 67dc4e92ac..7c5240da95 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.spec.ts @@ -1,12 +1,12 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { Item } from '../../../../../core/shared/item.model'; -import { TruncatePipe } from '../../../../utils/truncate.pipe'; -import { TruncatableService } from '../../../../truncatable/truncatable.service'; -import { ITEM } from '../../../../items/switcher/item-type-switcher.component'; import { PersonListElementComponent } from './person-list-element.component'; import { of as observableOf } from 'rxjs'; +import { Item } from '../../../../core/shared/item.model'; +import { TruncatePipe } from '../../../../shared/utils/truncate.pipe'; +import { ITEM } from '../../../../shared/items/switcher/item-type-switcher.component'; +import { TruncatableService } from '../../../../shared/truncatable/truncatable.service'; let personListElementComponent: PersonListElementComponent; let fixture: ComponentFixture; diff --git a/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.spec.ts index 1dd3c42042..f74d7931b0 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.spec.ts @@ -1,12 +1,12 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { Item } from '../../../../../core/shared/item.model'; -import { TruncatePipe } from '../../../../utils/truncate.pipe'; -import { TruncatableService } from '../../../../truncatable/truncatable.service'; -import { ITEM } from '../../../../items/switcher/item-type-switcher.component'; import { ProjectListElementComponent } from './project-list-element.component'; import { of as observableOf } from 'rxjs'; +import { Item } from '../../../../core/shared/item.model'; +import { TruncatePipe } from '../../../../shared/utils/truncate.pipe'; +import { ITEM } from '../../../../shared/items/switcher/item-type-switcher.component'; +import { TruncatableService } from '../../../../shared/truncatable/truncatable.service'; let projectListElementComponent: ProjectListElementComponent; let fixture: ComponentFixture; diff --git a/src/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.spec.ts b/src/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.spec.ts index fa5396fb3d..52caf69d72 100644 --- a/src/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.spec.ts @@ -2,9 +2,12 @@ import { Item } from '../../../../core/shared/item.model'; import { RemoteData } from '../../../../core/data/remote-data'; import { PaginatedList } from '../../../../core/data/paginated-list'; import { PageInfo } from '../../../../core/shared/page-info.model'; -import { createRelationshipsObservable, getItemPageFieldsTest } from '../shared/item.component.spec'; import { OrgunitComponent } from './orgunit.component'; import { of as observableOf } from 'rxjs'; +import { + createRelationshipsObservable, + getItemPageFieldsTest +} from '../../../../+item-page/simple/item-types/shared/item.component.spec'; const mockItem: Item = Object.assign(new Item(), { bitstreams: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))), diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.spec.ts b/src/app/entity-groups/research-entities/item-pages/person/person.component.spec.ts index cf0d5c197d..beadbbef79 100644 --- a/src/app/entity-groups/research-entities/item-pages/person/person.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.spec.ts @@ -2,9 +2,12 @@ import { Item } from '../../../../core/shared/item.model'; import { RemoteData } from '../../../../core/data/remote-data'; import { PaginatedList } from '../../../../core/data/paginated-list'; import { PageInfo } from '../../../../core/shared/page-info.model'; -import { createRelationshipsObservable, getItemPageFieldsTest } from '../shared/item.component.spec'; import { PersonComponent } from './person.component'; import { of as observableOf } from 'rxjs'; +import { + createRelationshipsObservable, + getItemPageFieldsTest +} from '../../../../+item-page/simple/item-types/shared/item.component.spec'; const mockItem: Item = Object.assign(new Item(), { bitstreams: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))), diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.spec.ts b/src/app/entity-groups/research-entities/item-pages/project/project.component.spec.ts index 9b54ff9a41..1e1fd42517 100644 --- a/src/app/entity-groups/research-entities/item-pages/project/project.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.spec.ts @@ -2,9 +2,12 @@ import { Item } from '../../../../core/shared/item.model'; import { RemoteData } from '../../../../core/data/remote-data'; import { PaginatedList } from '../../../../core/data/paginated-list'; import { PageInfo } from '../../../../core/shared/page-info.model'; -import { createRelationshipsObservable, getItemPageFieldsTest } from '../shared/item.component.spec'; import { ProjectComponent } from './project.component'; import { of as observableOf } from 'rxjs'; +import { + createRelationshipsObservable, + getItemPageFieldsTest +} from '../../../../+item-page/simple/item-types/shared/item.component.spec'; const mockItem: Item = Object.assign(new Item(), { bitstreams: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))), From b8822e996d849c5cfa6938b8b8b3cc63cc663be7 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Mon, 20 May 2019 10:50:49 +0200 Subject: [PATCH 4/4] 62264: Fix module export --- src/app/+item-page/item-page.module.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app/+item-page/item-page.module.ts b/src/app/+item-page/item-page.module.ts index 593684714e..6743028b6c 100644 --- a/src/app/+item-page/item-page.module.ts +++ b/src/app/+item-page/item-page.module.ts @@ -24,6 +24,8 @@ import { ItemComponent } from './simple/item-types/shared/item.component'; import { EditItemPageModule } from './edit-item-page/edit-item-page.module'; import { MetadataRepresentationListComponent } from './simple/metadata-representation-list/metadata-representation-list.component'; import { RelatedEntitiesSearchComponent } from './simple/related-entities/related-entities-search/related-entities-search.component'; +import { MetadataValuesComponent } from './field-components/metadata-values/metadata-values.component'; +import { MetadataFieldWrapperComponent } from './field-components/metadata-field-wrapper/metadata-field-wrapper.component'; @NgModule({ imports: [ @@ -59,7 +61,8 @@ import { RelatedEntitiesSearchComponent } from './simple/related-entities/relate MetadataFieldWrapperComponent, GenericItemPageFieldComponent, RelatedEntitiesSearchComponent, - RelatedItemsComponent + RelatedItemsComponent, + MetadataRepresentationListComponent ], entryComponents: [ PublicationComponent