Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/app/app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
import { NgxMaskModule } from 'ngx-mask';

import { environment } from '../environments/environment';
import { EagerThemesModule } from '../themes/eager-themes.module';
import { appEffects } from './app.effects';
import { MENUS } from './app.menus';
import {
Expand Down Expand Up @@ -99,7 +98,6 @@ export const commonAppConfig: ApplicationConfig = {
StoreModule.forRoot(appReducers, storeModuleConfig),
StoreRouterConnectingModule.forRoot(),
StoreDevModules,
EagerThemesModule,
RootModule,
ListableModule.withEntryComponents(),
NgxMaskModule.forRoot(),
Expand Down
2 changes: 2 additions & 0 deletions src/app/root.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';

import { EAGER_THEME_COMPONENTS } from '../themes/eager-themes-components';
import { AdminSidebarComponent } from './admin/admin-sidebar/admin-sidebar.component';
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';
Expand Down Expand Up @@ -38,6 +39,7 @@ const PROVIDERS = [
];

const DECLARATIONS = [
...EAGER_THEME_COMPONENTS,
RootComponent,
ThemedRootComponent,
HeaderComponent,
Expand Down
2 changes: 2 additions & 0 deletions src/app/shared/listable.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { FormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router';
import { TranslateModule } from '@ngx-translate/core';

import { THEME_LISTABLE_COMPONENTS } from '../../themes/themes-listable-components';
import { CollectionAdminSearchResultGridElementComponent } from '../admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component';
import { CommunityAdminSearchResultGridElementComponent } from '../admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component';
import { ItemAdminSearchResultGridElementComponent } from '../admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component';
Expand Down Expand Up @@ -124,6 +125,7 @@ import { TruncatableComponent } from './truncatable/truncatable.component';
import { TruncatablePartComponent } from './truncatable/truncatable-part/truncatable-part.component';

const ENTRY_COMPONENTS = [
...THEME_LISTABLE_COMPONENTS,
BitstreamListItemComponent,
BrowseEntryListElementComponent,
BundleListElementComponent,
Expand Down
32 changes: 32 additions & 0 deletions src/themes/custom/eager-theme-components.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/* eslint-disable dspace-angular-ts/themed-component-usages */
import { FooterComponent } from './app/footer/footer.component';
import { HeaderComponent } from './app/header/header.component';
import { HeaderNavbarWrapperComponent } from './app/header-nav-wrapper/header-navbar-wrapper.component';
import { HomeNewsComponent } from './app/home-page/home-news/home-news.component';
import { NavbarComponent } from './app/navbar/navbar.component';
import { SearchNavbarComponent } from './app/search-navbar/search-navbar.component';
import { CreateCollectionParentSelectorComponent } from './app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component';
import { CreateCommunityParentSelectorComponent } from './app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component';
import { CreateItemParentSelectorComponent } from './app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
import { EditCollectionSelectorComponent } from './app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component';
import { EditCommunitySelectorComponent } from './app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component';
import { EditItemSelectorComponent } from './app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component';
import { LangSwitchComponent } from './app/shared/lang-switch/lang-switch.component';
import { LogInComponent } from './app/shared/log-in/log-in.component';

export const COMPONENTS = [
HomeNewsComponent,
HeaderComponent,
HeaderNavbarWrapperComponent,
NavbarComponent,
SearchNavbarComponent,
FooterComponent,
CreateCollectionParentSelectorComponent,
CreateCommunityParentSelectorComponent,
CreateItemParentSelectorComponent,
EditCollectionSelectorComponent,
EditCommunitySelectorComponent,
EditItemSelectorComponent,
LogInComponent,
LangSwitchComponent,
];
97 changes: 0 additions & 97 deletions src/themes/custom/eager-theme.module.ts

This file was deleted.

29 changes: 29 additions & 0 deletions src/themes/custom/lazy-listable-components.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import { JournalComponent } from './app/entity-groups/journal-entities/item-pages/journal/journal.component';
import { JournalIssueComponent } from './app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component';
import { JournalVolumeComponent } from './app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component';
import { PersonComponent } from './app/entity-groups/research-entities/item-pages/person/person.component';
import { PublicationComponent } from './app/item-page/simple/item-types/publication/publication.component';
import { UntypedItemComponent } from './app/item-page/simple/item-types/untyped-item/untyped-item.component';
import { BrowseEntryListElementComponent } from './app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component';
import { CollectionListElementComponent } from './app/shared/object-list/collection-list-element/collection-list-element.component';
import { CommunityListElementComponent } from './app/shared/object-list/community-list-element/community-list-element.component';
import { ItemSearchResultListElementComponent } from './app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
import { PublicationSidebarSearchListElementComponent } from './app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component';

/**
* Add components that use the @listableObjectComponent decorator here.
* This will ensure that the decorators get picked up when the app loads
*/
export const LISTABLE_COMPONENTS = [
JournalComponent,
JournalIssueComponent,
JournalVolumeComponent,
PersonComponent,
PublicationComponent,
UntypedItemComponent,
CommunityListElementComponent,
CollectionListElementComponent,
PublicationSidebarSearchListElementComponent,
ItemSearchResultListElementComponent,
BrowseEntryListElementComponent,
];
Loading
Loading