optimized module imports

This commit is contained in:
Giuseppe Digilio
2020-12-03 19:36:19 +01:00
parent 308aa34d8a
commit 9ed1c74f29
11 changed files with 24 additions and 104 deletions

View File

@@ -1,7 +1,6 @@
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
import { TranslateModule } from '@ngx-translate/core';
import { SharedModule } from '../../shared/shared.module'; import { SharedModule } from '../../shared/shared.module';
import { AdminAccessControlRoutingModule } from './admin-access-control-routing.module'; import { AdminAccessControlRoutingModule } from './admin-access-control-routing.module';
import { EPeopleRegistryComponent } from './epeople-registry/epeople-registry.component'; import { EPeopleRegistryComponent } from './epeople-registry/epeople-registry.component';
@@ -16,7 +15,6 @@ import { GroupsRegistryComponent } from './group-registry/groups-registry.compon
CommonModule, CommonModule,
SharedModule, SharedModule,
RouterModule, RouterModule,
TranslateModule,
AdminAccessControlRoutingModule AdminAccessControlRoutingModule
], ],
declarations: [ declarations: [

View File

@@ -4,7 +4,6 @@ import { AdminRegistriesRoutingModule } from './admin-registries-routing.module'
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component'; import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
import { TranslateModule } from '@ngx-translate/core';
import { SharedModule } from '../../shared/shared.module'; import { SharedModule } from '../../shared/shared.module';
import { MetadataSchemaFormComponent } from './metadata-registry/metadata-schema-form/metadata-schema-form.component'; import { MetadataSchemaFormComponent } from './metadata-registry/metadata-schema-form/metadata-schema-form.component';
import { MetadataFieldFormComponent } from './metadata-schema/metadata-field-form/metadata-field-form.component'; import { MetadataFieldFormComponent } from './metadata-schema/metadata-field-form/metadata-field-form.component';
@@ -15,7 +14,6 @@ import { BitstreamFormatsModule } from './bitstream-formats/bitstream-formats.mo
CommonModule, CommonModule,
SharedModule, SharedModule,
RouterModule, RouterModule,
TranslateModule,
BitstreamFormatsModule, BitstreamFormatsModule,
AdminRegistriesRoutingModule AdminRegistriesRoutingModule
], ],

View File

@@ -1,7 +1,6 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
import { TranslateModule } from '@ngx-translate/core';
import { BitstreamFormatsComponent } from './bitstream-formats.component'; import { BitstreamFormatsComponent } from './bitstream-formats.component';
import { SharedModule } from '../../../shared/shared.module'; import { SharedModule } from '../../../shared/shared.module';
import { FormatFormComponent } from './format-form/format-form.component'; import { FormatFormComponent } from './format-form/format-form.component';
@@ -14,7 +13,6 @@ import { AddBitstreamFormatComponent } from './add-bitstream-format/add-bitstrea
CommonModule, CommonModule,
SharedModule, SharedModule,
RouterModule, RouterModule,
TranslateModule,
BitstreamFormatsRoutingModule BitstreamFormatsRoutingModule
], ],
declarations: [ declarations: [

View File

@@ -18,7 +18,7 @@ import { JournalVolumeSearchResultListElementComponent } from './item-list-eleme
import { JournalIssueSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component'; import { JournalIssueSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component';
import { JournalVolumeSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component'; import { JournalVolumeSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component';
const ENTRY_COMPONENTS = [ const COMPONENTS = [
JournalComponent, JournalComponent,
JournalIssueComponent, JournalIssueComponent,
JournalVolumeComponent, JournalVolumeComponent,
@@ -43,7 +43,7 @@ const ENTRY_COMPONENTS = [
ItemPageModule ItemPageModule
], ],
declarations: [ declarations: [
...ENTRY_COMPONENTS ...COMPONENTS
] ]
}) })
export class JournalEntitiesModule { export class JournalEntitiesModule {

View File

@@ -26,7 +26,7 @@ import { OrgUnitInputSuggestionsComponent } from './submission/item-list-element
import { OrgUnitSearchResultListSubmissionElementComponent } from './submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component'; import { OrgUnitSearchResultListSubmissionElementComponent } from './submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component';
import { ExternalSourceEntryListSubmissionElementComponent } from './submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component'; import { ExternalSourceEntryListSubmissionElementComponent } from './submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component';
const ENTRY_COMPONENTS = [ const COMPONENTS = [
OrgUnitComponent, OrgUnitComponent,
PersonComponent, PersonComponent,
ProjectComponent, ProjectComponent,
@@ -59,7 +59,7 @@ const ENTRY_COMPONENTS = [
ItemPageModule ItemPageModule
], ],
declarations: [ declarations: [
...ENTRY_COMPONENTS, ...COMPONENTS,
] ]
}) })
export class ResearchEntitiesModule { export class ResearchEntitiesModule {

View File

@@ -1,12 +1,14 @@
import { SharedModule } from '../shared/shared.module';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { EffectsModule } from '@ngrx/effects'; import { EffectsModule } from '@ngrx/effects';
import { CoreModule } from '../core/core.module'; import { CoreModule } from '../core/core.module';
import { NavbarEffects } from './navbar.effects'; import { NavbarEffects } from './navbar.effects';
import { NavbarSectionComponent } from './navbar-section/navbar-section.component'; import { NavbarSectionComponent } from './navbar-section/navbar-section.component';
import { ExpandableNavbarSectionComponent } from './expandable-navbar-section/expandable-navbar-section.component'; import { ExpandableNavbarSectionComponent } from './expandable-navbar-section/expandable-navbar-section.component';
import { NavbarComponent } from './navbar.component'; import { NavbarComponent } from './navbar.component';
import { MenuModule } from '../shared/menu/menu.module';
const effects = [ const effects = [
NavbarEffects NavbarEffects
@@ -15,7 +17,7 @@ const effects = [
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SharedModule, MenuModule,
EffectsModule.forFeature(effects), EffectsModule.forFeature(effects),
CoreModule.forRoot() CoreModule.forRoot()
], ],

View File

@@ -16,12 +16,6 @@ const COMPONENTS = [
OnClickMenuItemComponent OnClickMenuItemComponent
]; ];
const ENTRY_COMPONENTS = [
LinkMenuItemComponent,
TextMenuItemComponent,
OnClickMenuItemComponent
];
const MODULES = [ const MODULES = [
TranslateModule, TranslateModule,
RouterModule, RouterModule,
@@ -36,8 +30,7 @@ const PROVIDERS = [
...MODULES ...MODULES
], ],
declarations: [ declarations: [
...COMPONENTS, ...COMPONENTS
...ENTRY_COMPONENTS,
], ],
providers: [ providers: [
...PROVIDERS ...PROVIDERS

View File

@@ -98,7 +98,6 @@ import { InputSuggestionsComponent } from './input-suggestions/input-suggestions
import { CapitalizePipe } from './utils/capitalize.pipe'; import { CapitalizePipe } from './utils/capitalize.pipe';
import { ObjectKeysPipe } from './utils/object-keys-pipe'; import { ObjectKeysPipe } from './utils/object-keys-pipe';
import { AuthorityConfidenceStateDirective } from './authority-confidence/authority-confidence-state.directive'; import { AuthorityConfidenceStateDirective } from './authority-confidence/authority-confidence-state.directive';
import { MenuModule } from './menu/menu.module';
import { LangSwitchComponent } from './lang-switch/lang-switch.component'; 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 { 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 { ItemMetadataListElementComponent } from './object-list/metadata-representation-list-element/item/item-metadata-list-element.component';
@@ -229,7 +228,6 @@ const MODULES = [
NouisliderModule, NouisliderModule,
MomentModule, MomentModule,
TextMaskModule, TextMaskModule,
MenuModule,
DragDropModule, DragDropModule,
CdkTreeModule CdkTreeModule
]; ];
@@ -350,7 +348,6 @@ const COMPONENTS = [
SearchFacetFilterComponent, SearchFacetFilterComponent,
SearchLabelsComponent, SearchLabelsComponent,
SearchLabelComponent, SearchLabelComponent,
SearchFacetFilterComponent,
SearchFacetFilterWrapperComponent, SearchFacetFilterWrapperComponent,
SearchRangeFilterComponent, SearchRangeFilterComponent,
SearchTextFilterComponent, SearchTextFilterComponent,
@@ -362,8 +359,6 @@ const COMPONENTS = [
SearchSwitchConfigurationComponent, SearchSwitchConfigurationComponent,
SearchAuthorityFilterComponent, SearchAuthorityFilterComponent,
PageSizeSelectorComponent, PageSizeSelectorComponent,
CommunitySearchResultGridElementComponent,
CollectionSearchResultGridElementComponent,
ListableObjectComponentLoaderComponent, ListableObjectComponentLoaderComponent,
CollectionListElementComponent, CollectionListElementComponent,
CommunityListElementComponent, CommunityListElementComponent,
@@ -401,87 +396,25 @@ const COMPONENTS = [
CollectionDropdownComponent, CollectionDropdownComponent,
ExportMetadataSelectorComponent, ExportMetadataSelectorComponent,
ConfirmationModalComponent, ConfirmationModalComponent,
VocabularyTreeviewComponent VocabularyTreeviewComponent,
]; CurationFormComponent,
const ENTRY_COMPONENTS = [
// put shared entry components (components that are created dynamically) here
CollectionListElementComponent,
CommunityListElementComponent,
SearchResultListElementComponent,
CommunitySearchResultListElementComponent,
CollectionSearchResultListElementComponent,
CollectionGridElementComponent,
CommunityGridElementComponent,
CommunitySearchResultGridElementComponent,
CollectionSearchResultGridElementComponent,
SearchResultGridElementComponent,
PublicationListElementComponent, PublicationListElementComponent,
PublicationGridElementComponent, SearchResultListElementComponent,
PublicationSearchResultListElementComponent,
PublicationSearchResultGridElementComponent,
BrowseEntryListElementComponent,
SearchResultDetailElementComponent,
SearchResultGridElementComponent, SearchResultGridElementComponent,
DsDynamicListComponent, SearchResultDetailElementComponent,
DsDynamicLookupComponent, BrowseEntryListElementComponent,
DsDynamicDisabledComponent,
DsDynamicLookupRelationModalComponent,
DsDynamicScrollableDropdownComponent,
DsDynamicTagComponent,
DsDynamicOneboxComponent,
DsDynamicRelationGroupComponent,
DsDatePickerComponent,
DsDynamicFormGroupComponent,
DsDynamicFormArrayComponent,
DsDatePickerInlineComponent,
StartsWithDateComponent,
StartsWithTextComponent,
DSOSelectorComponent,
CreateCommunityParentSelectorComponent,
CreateCollectionParentSelectorComponent,
CreateItemParentSelectorComponent,
EditCommunitySelectorComponent,
EditCollectionSelectorComponent,
EditItemSelectorComponent,
StartsWithTextComponent,
PlainTextMetadataListElementComponent, PlainTextMetadataListElementComponent,
ItemMetadataListElementComponent, ItemMetadataListElementComponent,
MetadataRepresentationListElementComponent, MetadataRepresentationListElementComponent,
CustomSwitchComponent,
ItemMetadataRepresentationListElementComponent,
SearchResultsComponent,
CollectionSearchResultGridElementComponent,
CommunitySearchResultGridElementComponent,
SearchFacetFilterComponent,
SearchRangeFilterComponent,
SearchTextFilterComponent,
SearchHierarchyFilterComponent,
SearchBooleanFilterComponent,
SearchFacetOptionComponent,
SearchFacetSelectedOptionComponent,
SearchFacetRangeOptionComponent,
SearchAuthorityFilterComponent,
DsDynamicLookupRelationSearchTabComponent, DsDynamicLookupRelationSearchTabComponent,
DsDynamicLookupRelationSelectionTabComponent, DsDynamicLookupRelationSelectionTabComponent,
PublicationGridElementComponent,
PublicationSearchResultGridElementComponent,
ItemMetadataRepresentationListElementComponent,
DsDynamicLookupRelationExternalSourceTabComponent, DsDynamicLookupRelationExternalSourceTabComponent,
ExternalSourceEntryImportModalComponent,
ExistingRelationListElementComponent,
LogInPasswordComponent,
LogInShibbolethComponent,
ItemVersionsComponent,
BundleListElementComponent, BundleListElementComponent,
ItemVersionsNoticeComponent, StartsWithDateComponent,
ClaimedTaskActionsApproveComponent, StartsWithTextComponent
ClaimedTaskActionsRejectComponent,
ClaimedTaskActionsReturnToPoolComponent,
ClaimedTaskActionsEditMetadataComponent,
CollectionDropdownComponent,
FileDownloadLinkComponent,
CurationFormComponent,
ExportMetadataSelectorComponent,
ConfirmationModalComponent,
VocabularyTreeviewComponent
]; ];
const SHARED_ITEM_PAGE_COMPONENTS = [ const SHARED_ITEM_PAGE_COMPONENTS = [
@@ -522,14 +455,13 @@ const DIRECTIVES = [
@NgModule({ @NgModule({
imports: [ imports: [
...ROOT_MODULES,
...MODULES, ...MODULES,
...ROOT_MODULES
], ],
declarations: [ declarations: [
...PIPES, ...PIPES,
...COMPONENTS, ...COMPONENTS,
...DIRECTIVES, ...DIRECTIVES,
...ENTRY_COMPONENTS,
...SHARED_ITEM_PAGE_COMPONENTS ...SHARED_ITEM_PAGE_COMPONENTS
], ],
providers: [ providers: [
@@ -541,6 +473,7 @@ const DIRECTIVES = [
...COMPONENTS, ...COMPONENTS,
...SHARED_ITEM_PAGE_COMPONENTS, ...SHARED_ITEM_PAGE_COMPONENTS,
...DIRECTIVES, ...DIRECTIVES,
TranslateModule,
CurationFormComponent CurationFormComponent
] ]
}) })

View File

@@ -1,5 +1,6 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { CoreModule } from '../core/core.module'; import { CoreModule } from '../core/core.module';
import { SharedModule } from '../shared/shared.module'; import { SharedModule } from '../shared/shared.module';
import { StatisticsModule } from '../statistics/statistics.module'; import { StatisticsModule } from '../statistics/statistics.module';
@@ -15,7 +16,7 @@ const components = [
SiteStatisticsPageComponent, SiteStatisticsPageComponent,
ItemStatisticsPageComponent, ItemStatisticsPageComponent,
CollectionStatisticsPageComponent, CollectionStatisticsPageComponent,
CommunityStatisticsPageComponent, CommunityStatisticsPageComponent
]; ];
@NgModule({ @NgModule({

View File

@@ -3,7 +3,6 @@ import { CommonModule } from '@angular/common';
import { CoreModule } from '../core/core.module'; import { CoreModule } from '../core/core.module';
import { SharedModule } from '../shared/shared.module'; import { SharedModule } from '../shared/shared.module';
import { ViewTrackerComponent } from './angulartics/dspace/view-tracker.component'; import { ViewTrackerComponent } from './angulartics/dspace/view-tracker.component';
import { StatisticsService } from './statistics.service';
@NgModule({ @NgModule({
imports: [ imports: [

View File

@@ -1,5 +1,4 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { TranslateModule } from '@ngx-translate/core';
import { CoreModule } from '../core/core.module'; import { CoreModule } from '../core/core.module';
import { SharedModule } from '../shared/shared.module'; import { SharedModule } from '../shared/shared.module';
@@ -40,8 +39,7 @@ import { SubmissionSectionCcLicensesComponent } from './sections/cc-license/subm
CoreModule.forRoot(), CoreModule.forRoot(),
SharedModule, SharedModule,
StoreModule.forFeature('submission', submissionReducers, storeModuleConfig as StoreConfig<SubmissionState, Action>), StoreModule.forFeature('submission', submissionReducers, storeModuleConfig as StoreConfig<SubmissionState, Action>),
EffectsModule.forFeature(submissionEffects), EffectsModule.forFeature(submissionEffects)
TranslateModule
], ],
declarations: [ declarations: [
SubmissionSectionUploadAccessConditionsComponent, SubmissionSectionUploadAccessConditionsComponent,