From 44454ec3785aa676ec2e3fa591fdbaf2eeaaba9a Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 14 Jan 2021 19:44:46 +0100 Subject: [PATCH] import modules optimization --- src/app/+item-page/item-page.module.ts | 25 ------------------- src/app/+search-page/search-page.module.ts | 2 -- .../journal-entities.module.ts | 4 +-- .../research-entities.module.ts | 4 +-- src/app/shared/shared.module.ts | 19 +++++++++++++- 5 files changed, 20 insertions(+), 34 deletions(-) diff --git a/src/app/+item-page/item-page.module.ts b/src/app/+item-page/item-page.module.ts index 7110952708..3e430df719 100644 --- a/src/app/+item-page/item-page.module.ts +++ b/src/app/+item-page/item-page.module.ts @@ -2,7 +2,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SharedModule } from '../shared/shared.module'; -import { GenericItemPageFieldComponent } from './simple/field-components/specific-field/generic/generic-item-page-field.component'; import { ItemPageComponent } from './simple/item-page.component'; import { ItemPageRoutingModule } from './item-page-routing.module'; @@ -17,17 +16,10 @@ import { FileSectionComponent } from './simple/field-components/file-section/fil import { CollectionsComponent } from './field-components/collections/collections.component'; import { FullItemPageComponent } from './full/full-item-page.component'; import { FullFileSectionComponent } from './full/field-components/file-section/full-file-section.component'; -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 { 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'; import { UploadBitstreamComponent } from './bitstreams/upload/upload-bitstream.component'; -import { TabbedRelatedEntitiesSearchComponent } from './simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component'; import { StatisticsModule } from '../statistics/statistics.module'; import { AbstractIncrementalListComponent } from './simple/abstract-incremental-list/abstract-incremental-list.component'; import { UntypedItemComponent } from './simple/item-types/untyped-item/untyped-item.component'; @@ -38,7 +30,6 @@ import { UntypedItemComponent } from './simple/item-types/untyped-item/untyped-i SharedModule, ItemPageRoutingModule, EditItemPageModule, - SearchPageModule, StatisticsModule.forRoot() ], declarations: [ @@ -56,25 +47,9 @@ import { UntypedItemComponent } from './simple/item-types/untyped-item/untyped-i FullFileSectionComponent, PublicationComponent, UntypedItemComponent, - RelatedItemsComponent, ItemComponent, - GenericItemPageFieldComponent, - MetadataRepresentationListComponent, - RelatedEntitiesSearchComponent, UploadBitstreamComponent, - TabbedRelatedEntitiesSearchComponent, AbstractIncrementalListComponent, - ], - exports: [ - ItemComponent, - MetadataValuesComponent, - MetadataFieldWrapperComponent, - GenericItemPageFieldComponent, - RelatedEntitiesSearchComponent, - RelatedItemsComponent, - MetadataRepresentationListComponent, - ItemPageTitleFieldComponent, - TabbedRelatedEntitiesSearchComponent ] }) export class ItemPageModule { diff --git a/src/app/+search-page/search-page.module.ts b/src/app/+search-page/search-page.module.ts index 00c990c665..772fea3e5b 100644 --- a/src/app/+search-page/search-page.module.ts +++ b/src/app/+search-page/search-page.module.ts @@ -4,7 +4,6 @@ import { CoreModule } from '../core/core.module'; import { SharedModule } from '../shared/shared.module'; import { SearchComponent } from './search.component'; import { SidebarService } from '../shared/sidebar/sidebar.service'; -import { ConfigurationSearchPageComponent } from './configuration-search-page.component'; import { ConfigurationSearchPageGuard } from './configuration-search-page.guard'; import { SearchTrackerComponent } from './search-tracker.component'; import { StatisticsModule } from '../statistics/statistics.module'; @@ -16,7 +15,6 @@ import { SearchConfigurationService } from '../core/shared/search/search-configu const components = [ SearchPageComponent, SearchComponent, - ConfigurationSearchPageComponent, SearchTrackerComponent ]; diff --git a/src/app/entity-groups/journal-entities/journal-entities.module.ts b/src/app/entity-groups/journal-entities/journal-entities.module.ts index 45979117b0..6bf25fe199 100644 --- a/src/app/entity-groups/journal-entities/journal-entities.module.ts +++ b/src/app/entity-groups/journal-entities/journal-entities.module.ts @@ -1,7 +1,6 @@ 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'; @@ -45,8 +44,7 @@ const COMPONENTS = [ @NgModule({ imports: [ CommonModule, - SharedModule, - ItemPageModule + SharedModule ], declarations: [ ...COMPONENTS diff --git a/src/app/entity-groups/research-entities/research-entities.module.ts b/src/app/entity-groups/research-entities/research-entities.module.ts index 8a28bb3940..57ec370708 100644 --- a/src/app/entity-groups/research-entities/research-entities.module.ts +++ b/src/app/entity-groups/research-entities/research-entities.module.ts @@ -1,7 +1,6 @@ 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/org-unit/org-unit.component'; import { PersonComponent } from './item-pages/person/person.component'; import { ProjectComponent } from './item-pages/project/project.component'; @@ -61,8 +60,7 @@ const COMPONENTS = [ @NgModule({ imports: [ CommonModule, - SharedModule, - ItemPageModule + SharedModule ], declarations: [ ...COMPONENTS, diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 8b7dbbca79..75ca7faf9c 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -223,6 +223,12 @@ import { SearchObjects } from './search/search-objects.model'; import { SearchResult } from './search/search-result.model'; import { FacetConfigResponse } from './search/facet-config-response.model'; import { FacetValues } from './search/facet-values.model'; +import { GenericItemPageFieldComponent } from '../+item-page/simple/field-components/specific-field/generic/generic-item-page-field.component'; +import { MetadataRepresentationListComponent } from '../+item-page/simple/metadata-representation-list/metadata-representation-list.component'; +import { RelatedItemsComponent } from '../+item-page/simple/related-items/related-items-component'; +import { TabbedRelatedEntitiesSearchComponent } from '../+item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component'; +import { RelatedEntitiesSearchComponent } from '../+item-page/simple/related-entities/related-entities-search/related-entities-search.component'; +import { ConfigurationSearchPageComponent } from '../+search-page/configuration-search-page.component'; /** * Declaration needed to make sure all decorator functions are called in time @@ -452,11 +458,20 @@ const COMPONENTS = [ CommunitySidebarSearchListElementComponent, ]; +const SHARED_SEARCH_PAGE_COMPONENTS = [ + ConfigurationSearchPageComponent +]; + const SHARED_ITEM_PAGE_COMPONENTS = [ MetadataFieldWrapperComponent, MetadataValuesComponent, DsoPageEditButtonComponent, ItemAlertsComponent, + GenericItemPageFieldComponent, + MetadataRepresentationListComponent, + RelatedItemsComponent, + RelatedEntitiesSearchComponent, + TabbedRelatedEntitiesSearchComponent ]; const PROVIDERS = [ @@ -500,7 +515,8 @@ const DIRECTIVES = [ ...PIPES, ...COMPONENTS, ...DIRECTIVES, - ...SHARED_ITEM_PAGE_COMPONENTS + ...SHARED_ITEM_PAGE_COMPONENTS, + ...SHARED_SEARCH_PAGE_COMPONENTS ], providers: [ ...PROVIDERS @@ -510,6 +526,7 @@ const DIRECTIVES = [ ...PIPES, ...COMPONENTS, ...SHARED_ITEM_PAGE_COMPONENTS, + ...SHARED_SEARCH_PAGE_COMPONENTS, ...DIRECTIVES, TranslateModule ]