[DURACOM-191] set providers in core folder

Missing some modules that always load entryComponents as "before Ivy" (e.g. look at eager-theme.module), need to check if they can be refactored

src/app/admin/admin-search-page/admin-search.module.ts

@@ -1,45 +0,0 @@
-import { NgModule } from '@angular/core';
-import { AdminSearchPageComponent } from './admin-search-page.component';
-import { ItemAdminSearchResultListElementComponent } from './admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component';
-import { CommunityAdminSearchResultListElementComponent } from './admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component';
-import { CollectionAdminSearchResultListElementComponent } from './admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component';
-import { ItemAdminSearchResultGridElementComponent } from './admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component';
-import { CommunityAdminSearchResultGridElementComponent } from './admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component';
-import { CollectionAdminSearchResultGridElementComponent } from './admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component';
-import { ItemAdminSearchResultActionsComponent } from './admin-search-results/item-admin-search-result-actions.component';
-import { JournalEntitiesModule } from '../../entity-groups/journal-entities/journal-entities.module';
-import { ResearchEntitiesModule } from '../../entity-groups/research-entities/research-entities.module';
-import { SearchModule } from '../../shared/search/search.module';
-
-const ENTRY_COMPONENTS = [
-  // put only entry components that use custom decorator
-  ItemAdminSearchResultListElementComponent,
-  CommunityAdminSearchResultListElementComponent,
-  CollectionAdminSearchResultListElementComponent,
-  ItemAdminSearchResultGridElementComponent,
-  CommunityAdminSearchResultGridElementComponent,
-  CollectionAdminSearchResultGridElementComponent,
-  ItemAdminSearchResultActionsComponent
-];
-
-@NgModule({
-    imports: [
-        SearchModule,
-        JournalEntitiesModule.withEntryComponents(),
-        ResearchEntitiesModule.withEntryComponents(),
-        AdminSearchPageComponent,
-        ...ENTRY_COMPONENTS
-    ]
-})
-export class AdminSearchModule {
-  /**
-   * NOTE: this method allows to resolve issue with components that using a custom decorator
-   * which are not loaded during SSR otherwise
-   */
-  static withEntryComponents() {
-    return {
-      ngModule: AdminSearchModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({provide: component}))
-    };
-  }
-}

src/app/admin/admin-workflow-page/admin-workflow.module.ts

@@ -1,63 +0,0 @@
-import { NgModule } from '@angular/core';
-
-import {
-  WorkflowItemSearchResultAdminWorkflowGridElementComponent
-} from './admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component';
-import {
-  WorkflowItemAdminWorkflowActionsComponent
-} from './admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component';
-import {
-  WorkflowItemSearchResultAdminWorkflowListElementComponent
-} from './admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component';
-import { AdminWorkflowPageComponent } from './admin-workflow-page.component';
-import { SearchModule } from '../../shared/search/search.module';
-import {
-  WorkspaceItemAdminWorkflowActionsComponent
-} from './admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component';
-import {
-  WorkspaceItemSearchResultAdminWorkflowListElementComponent
-} from './admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component';
-import {
-  WorkspaceItemSearchResultAdminWorkflowGridElementComponent
-} from './admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component';
-import {
-  SupervisionOrderGroupSelectorComponent
-} from './admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component';
-import {
-  SupervisionOrderStatusComponent
-} from './admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component';
-
-const ENTRY_COMPONENTS = [
-  // put only entry components that use custom decorator
-  WorkflowItemSearchResultAdminWorkflowListElementComponent,
-  WorkflowItemSearchResultAdminWorkflowGridElementComponent,
-  WorkspaceItemSearchResultAdminWorkflowListElementComponent,
-  WorkspaceItemSearchResultAdminWorkflowGridElementComponent
-];
-
-@NgModule({
-    imports: [
-        SearchModule,
-        AdminWorkflowPageComponent,
-        SupervisionOrderGroupSelectorComponent,
-        SupervisionOrderStatusComponent,
-        WorkflowItemAdminWorkflowActionsComponent,
-        WorkspaceItemAdminWorkflowActionsComponent,
-        ...ENTRY_COMPONENTS
-    ],
-    exports: [
-        AdminWorkflowPageComponent
-    ]
-})
-export class AdminWorkflowModuleModule {
-  /**
-   * NOTE: this method allows to resolve issue with components that using a custom decorator
-   * which are not loaded during SSR otherwise
-   */
-  static withEntryComponents() {
-    return {
-      ngModule: AdminWorkflowModuleModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({provide: component}))
-    };
-  }
-}

src/app/admin/admin.module.ts

@@ -4,10 +4,10 @@ import { MetadataImportPageComponent } from './admin-import-metadata-page/metada
 import { AdminRegistriesModule } from './admin-registries/admin-registries.module';
 import { AdminRoutingModule } from './admin-routing.module';
 import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component';
-import { AdminWorkflowModuleModule } from './admin-workflow-page/admin-workflow.module';
-import { AdminSearchModule } from './admin-search-page/admin-search.module';
 import { AdminSidebarSectionComponent } from './admin-sidebar/admin-sidebar-section/admin-sidebar-section.component';
-import { ExpandableAdminSidebarSectionComponent } from './admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component';
+import {
+  ExpandableAdminSidebarSectionComponent
+} from './admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component';
 import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component';
 import { UiSwitchModule } from 'ngx-ui-switch';
 import { UploadModule } from '../shared/upload/upload.module';
@@ -24,8 +24,6 @@ const ENTRY_COMPONENTS = [
         AdminRoutingModule,
         AdminRegistriesModule,
         AccessControlModule,
-        AdminSearchModule.withEntryComponents(),
-        AdminWorkflowModuleModule.withEntryComponents(),
         UiSwitchModule,
         UploadModule,
         AdminCurationTasksComponent,

src/app/app.module.ts

@@ -31,6 +31,11 @@ import { RootModule } from './root.module';
 import { models, provideCore } from './core/provide-core';
 import { ThemedRootComponent } from './root/themed-root.component';
 import { listableObjects } from './core/provide-listable-objects';
+import { workflowTasks } from './core/provide-workflow-tasks';
+import { metadataRepresentations } from './core/provide-metadata-representation';
+import { renderStartsWith } from './core/provide-render-starts-with';
+import { renderBrowseBy } from './core/provide-render-browse-by';
+import { renderAuthMethod } from './core/provide-render-auth-method';
 
 export function getConfig() {
   return environment;
@@ -127,4 +132,9 @@ export class AppModule {
   /* Use models object so all decorators are actually called */
   modelList = models;
   listableObjects = listableObjects;
+  workflowTasks = workflowTasks;
+  metadataRepresentations = metadataRepresentations;
+  renderStartsWith = renderStartsWith;
+  renderBrowseBy = renderBrowseBy;
+  renderAuthMethod = renderAuthMethod;
 }

src/app/browse-by/browse-by-page.module.ts

@@ -1,6 +1,5 @@
 import { NgModule } from '@angular/core';
 import { BrowseByRoutingModule } from './browse-by-routing.module';
-import { BrowseByModule } from './browse-by.module';
 import { ItemDataService } from '../core/data/item-data.service';
 import { BrowseService } from '../core/browse/browse.service';
 import { BrowseByGuard } from './browse-by-guard';
@@ -10,7 +9,6 @@ import { SharedBrowseByModule } from '../shared/browse-by/shared-browse-by.modul
   imports: [
     SharedBrowseByModule,
     BrowseByRoutingModule,
-    BrowseByModule.withEntryComponents(),
   ],
   providers: [
     ItemDataService,

src/app/browse-by/browse-by.module.ts

@@ -1,57 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { BrowseByTitlePageComponent } from './browse-by-title-page/browse-by-title-page.component';
-import { BrowseByMetadataPageComponent } from './browse-by-metadata-page/browse-by-metadata-page.component';
-import { BrowseByDatePageComponent } from './browse-by-date-page/browse-by-date-page.component';
-import { BrowseBySwitcherComponent } from './browse-by-switcher/browse-by-switcher.component';
-import { BrowseByTaxonomyPageComponent } from './browse-by-taxonomy-page/browse-by-taxonomy-page.component';
-import { ThemedBrowseBySwitcherComponent } from './browse-by-switcher/themed-browse-by-switcher.component';
-import { ComcolModule } from '../shared/comcol/comcol.module';
-import { ThemedBrowseByMetadataPageComponent } from './browse-by-metadata-page/themed-browse-by-metadata-page.component';
-import { ThemedBrowseByDatePageComponent } from './browse-by-date-page/themed-browse-by-date-page.component';
-import { ThemedBrowseByTitlePageComponent } from './browse-by-title-page/themed-browse-by-title-page.component';
-import { ThemedBrowseByTaxonomyPageComponent } from './browse-by-taxonomy-page/themed-browse-by-taxonomy-page.component';
-import { SharedBrowseByModule } from '../shared/browse-by/shared-browse-by.module';
-import { DsoPageModule } from '../shared/dso-page/dso-page.module';
-import { FormModule } from '../shared/form/form.module';
-
-const ENTRY_COMPONENTS = [
-  // put only entry components that use custom decorator
-  BrowseByTitlePageComponent,
-  BrowseByMetadataPageComponent,
-  BrowseByDatePageComponent,
-  BrowseByTaxonomyPageComponent,
-
-  ThemedBrowseByMetadataPageComponent,
-  ThemedBrowseByDatePageComponent,
-  ThemedBrowseByTitlePageComponent,
-  ThemedBrowseByTaxonomyPageComponent,
-];
-
-@NgModule({
-    imports: [
-        SharedBrowseByModule,
-        CommonModule,
-        ComcolModule,
-        DsoPageModule,
-        FormModule,
-        BrowseBySwitcherComponent,
-        ThemedBrowseBySwitcherComponent,
-        ...ENTRY_COMPONENTS
-    ],
-    exports: [
-        BrowseBySwitcherComponent
-    ]
-})
-export class BrowseByModule {
-  /**
-   * NOTE: this method allows to resolve issue with components that using a custom decorator
-   * which are not loaded during SSR otherwise
-   */
-  static withEntryComponents() {
-    return {
-      ngModule: SharedBrowseByModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({provide: component}))
-    };
-  }
-}

src/app/core/provide-listable-objects.ts

@@ -5,9 +5,6 @@ import {
 import {
   CommunityListElementComponent
 } from '../shared/object-list/community-list-element/community-list-element.component';
-import {
-  SearchResultListElementComponent
-} from '../shared/object-list/search-result-list-element/search-result-list-element.component';
 import {
   CommunitySearchResultListElementComponent
 } from '../shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component';
@@ -26,9 +23,6 @@ import {
 import {
   CollectionSearchResultGridElementComponent
 } from '../shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component';
-import {
-  SearchResultGridElementComponent
-} from '../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
 import {
   ItemListElementComponent
 } from '../shared/object-list/item-list-element/item-types/item/item-list-element.component';
@@ -45,87 +39,6 @@ import {
 import {
   BrowseEntryListElementComponent
 } from '../shared/object-list/browse-entry-list-element/browse-entry-list-element.component';
-import {
-  SearchResultDetailElementComponent
-} from '../shared/object-detail/my-dspace-result-detail-element/search-result-detail-element.component';
-import { StartsWithDateComponent } from '../shared/starts-with/date/starts-with-date.component';
-import { StartsWithTextComponent } from '../shared/starts-with/text/starts-with-text.component';
-import {
-  CreateCommunityParentSelectorComponent
-} from '../shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component';
-import {
-  ThemedCreateCommunityParentSelectorComponent
-} from '../shared/dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component';
-import {
-  CreateCollectionParentSelectorComponent
-} from '../shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component';
-import {
-  ThemedCreateCollectionParentSelectorComponent
-} from '../shared/dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component';
-import {
-  CreateItemParentSelectorComponent
-} from '../shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
-import {
-  ThemedCreateItemParentSelectorComponent
-} from '../shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component';
-import {
-  EditCommunitySelectorComponent
-} from '../shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component';
-import {
-  ThemedEditCommunitySelectorComponent
-} from '../shared/dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component';
-import {
-  EditCollectionSelectorComponent
-} from '../shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component';
-import {
-  ThemedEditCollectionSelectorComponent
-} from '../shared/dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component';
-import {
-  EditItemSelectorComponent
-} from '../shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component';
-import {
-  ThemedEditItemSelectorComponent
-} from '../shared/dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component';
-import {
-  PlainTextMetadataListElementComponent
-} from '../shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component';
-import {
-  BrowseLinkMetadataListElementComponent
-} from '../shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component';
-import {
-  ItemMetadataListElementComponent
-} from '../shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component';
-import {
-  MetadataRepresentationListElementComponent
-} from '../shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component';
-import {
-  ItemMetadataRepresentationListElementComponent
-} from '../shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component';
-import { LogInPasswordComponent } from '../shared/log-in/methods/password/log-in-password.component';
-import {
-  LogInExternalProviderComponent
-} from '../shared/log-in/methods/log-in-external-provider/log-in-external-provider.component';
-import {
-  ClaimedTaskActionsDeclineTaskComponent
-} from '../shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component';
-import { CollectionDropdownComponent } from '../shared/collection-dropdown/collection-dropdown.component';
-import { ThemedCollectionDropdownComponent } from '../shared/collection-dropdown/themed-collection-dropdown.component';
-import { FileDownloadLinkComponent } from '../shared/file-download-link/file-download-link.component';
-import { ThemedFileDownloadLinkComponent } from '../shared/file-download-link/themed-file-download-link.component';
-import { CurationFormComponent } from '../curation-form/curation-form.component';
-import {
-  ExportMetadataSelectorComponent
-} from '../shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component';
-import {
-  ImportBatchSelectorComponent
-} from '../shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component';
-import {
-  ExportBatchSelectorComponent
-} from '../shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component';
-import { ConfirmationModalComponent } from '../shared/confirmation-modal/confirmation-modal.component';
-import {
-  SidebarSearchListElementComponent
-} from '../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
 import {
   PublicationSidebarSearchListElementComponent
 } from '../shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component';
@@ -135,110 +48,273 @@ import {
 import {
   CommunitySidebarSearchListElementComponent
 } from '../shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component';
-import { ScopeSelectorModalComponent } from '../shared/search-form/scope-selector-modal/scope-selector-modal.component';
 import {
   ListableNotificationObjectComponent
 } from '../shared/object-list/listable-notification-object/listable-notification-object.component';
 import {
-  AdvancedClaimedTaskActionSelectReviewerComponent
+  ItemAdminSearchResultListElementComponent
-} from '../shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component';
+} from '../admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component';
 import {
-  AdvancedClaimedTaskActionRatingComponent
+  CommunityAdminSearchResultListElementComponent
-} from '../shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component';
+} from '../admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component';
-import { EpersonGroupListComponent } from '../shared/eperson-group-list/eperson-group-list.component';
 import {
-  EpersonSearchBoxComponent
+  CollectionAdminSearchResultListElementComponent
-} from '../shared/eperson-group-list/eperson-search-box/eperson-search-box.component';
+} from '../admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component';
-import { GroupSearchBoxComponent } from '../shared/eperson-group-list/group-search-box/group-search-box.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';
+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 {
+  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 { JournalComponent } from '../entity-groups/journal-entities/item-pages/journal/journal.component';
+import {
+  JournalIssueComponent
+} from '../entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component';
+import {
+  JournalVolumeComponent
+} from '../entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component';
+import {
+  JournalListElementComponent
+} from '../entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component';
+import {
+  JournalIssueListElementComponent
+} from '../entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component';
+import {
+  JournalVolumeListElementComponent
+} from '../entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component';
+import {
+  JournalIssueGridElementComponent
+} from '../entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component';
+import {
+  JournalVolumeGridElementComponent
+} from '../entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component';
+import {
+  JournalGridElementComponent
+} from '../entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component';
+import {
+  JournalSearchResultListElementComponent
+} from '../entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component';
+import {
+  JournalIssueSearchResultListElementComponent
+} from '../entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component';
+import {
+  JournalVolumeSearchResultListElementComponent
+} from '../entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component';
+import {
+  JournalIssueSearchResultGridElementComponent
+} from '../entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component';
+import {
+  JournalVolumeSearchResultGridElementComponent
+} from '../entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component';
+import {
+  JournalSearchResultGridElementComponent
+} from '../entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component';
+import {
+  JournalVolumeSidebarSearchListElementComponent
+} from '../entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component';
+import {
+  JournalIssueSidebarSearchListElementComponent
+} from '../entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component';
+import {
+  JournalSidebarSearchListElementComponent
+} from '../entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component';
+import { OrgUnitComponent } from '../entity-groups/research-entities/item-pages/org-unit/org-unit.component';
+import { PersonComponent } from '../entity-groups/research-entities/item-pages/person/person.component';
+import { ProjectComponent } from '../entity-groups/research-entities/item-pages/project/project.component';
+import {
+  OrgUnitListElementComponent
+} from '../entity-groups/research-entities/item-list-elements/org-unit/org-unit-list-element.component';
+import {
+  PersonListElementComponent
+} from '../entity-groups/research-entities/item-list-elements/person/person-list-element.component';
+import {
+  ProjectListElementComponent
+} from '../entity-groups/research-entities/item-list-elements/project/project-list-element.component';
+import {
+  PersonGridElementComponent
+} from '../entity-groups/research-entities/item-grid-elements/person/person-grid-element.component';
+import {
+  OrgUnitGridElementComponent
+} from '../entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component';
+import {
+  ProjectGridElementComponent
+} from '../entity-groups/research-entities/item-grid-elements/project/project-grid-element.component';
+import {
+  OrgUnitSearchResultListElementComponent
+} from '../entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component';
+import {
+  PersonSearchResultListElementComponent
+} from '../entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component';
+import {
+  ProjectSearchResultListElementComponent
+} from '../entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component';
+import {
+  PersonSearchResultGridElementComponent
+} from '../entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component';
+import {
+  OrgUnitSearchResultGridElementComponent
+} from '../entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component';
+import {
+  ProjectSearchResultGridElementComponent
+} from '../entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component';
+import {
+  PersonSearchResultListSubmissionElementComponent
+} from '../entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component';
+import {
+  OrgUnitSearchResultListSubmissionElementComponent
+} from '../entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component';
+import {
+  ExternalSourceEntryListSubmissionElementComponent
+} from '../entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component';
+import {
+  OrgUnitSidebarSearchListElementComponent
+} from '../entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component';
+import {
+  PersonSidebarSearchListElementComponent
+} from '../entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component';
+import {
+  ProjectSidebarSearchListElementComponent
+} from '../entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component';
+import {
+  WorkflowItemSearchResultAdminWorkflowListElementComponent
+} from '../admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component';
+import {
+  WorkflowItemSearchResultAdminWorkflowGridElementComponent
+} from '../admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component';
+import {
+  WorkspaceItemSearchResultAdminWorkflowListElementComponent
+} from '../admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component';
+import {
+  WorkspaceItemSearchResultAdminWorkflowGridElementComponent
+} from '../admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component';
+import {
+  WorkspaceItemSearchResultListElementComponent
+} from '../shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component';
+import {
+  WorkflowItemSearchResultListElementComponent
+} from '../shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component';
+import {
+  ClaimedSearchResultListElementComponent
+} from '../shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component';
+import {
+  ClaimedApprovedSearchResultListElementComponent
+} from '../shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component';
+import {
+  ClaimedDeclinedSearchResultListElementComponent
+} from '../shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component';
+import {
+  ClaimedDeclinedTaskSearchResultListElementComponent
+} from '../shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component';
+import {
+  PoolSearchResultListElementComponent
+} from '../shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component';
+import {
+  ItemSearchResultDetailElementComponent
+} from '../shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component';
+import {
+  WorkspaceItemSearchResultDetailElementComponent
+} from '../shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component';
+import {
+  WorkflowItemSearchResultDetailElementComponent
+} from '../shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component';
+import {
+  ClaimedTaskSearchResultDetailElementComponent
+} from '../shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component';
+import {
+  PoolSearchResultDetailElementComponent
+} from '../shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component';
+import {
+  ItemSearchResultListElementSubmissionComponent
+} from '../shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component';
 
 
-// export const provideCore = () => {
-//   console.log('provideCore');
-//   return makeEnvironmentProviders([
-//     {provide: DspaceRestService, useFactory: restServiceFactory, deps: [MOCK_RESPONSE_MAP, HttpClient]},
-//
-//     importProvidersFrom(
-//       StoreModule.forFeature('core', coreReducers, storeModuleConfig as StoreConfig<CoreState, Action>),
-//       EffectsModule.forFeature(coreEffects)
-//     ),
-//   ]);
-// };
-//
-// /**
-//  * When not in production, endpoint responses can be mocked for testing purposes
-//  * If there is no mock version available for the endpoint, the actual REST response will be used just like in production mode
-//  */
-// export const restServiceFactory = (mocks: ResponseMapMock, http: HttpClient) => {
-//   if (environment.production) {
-//     return new DspaceRestService(http);
-//   } else {
-//     return new EndpointMockingRestService(mocks, http);
-//   }
-// };
-
 /**
  * Declaration needed to make sure all decorator functions are called in time
  */
 export const listableObjects =
   [
-    BundleListElementComponent,
-    CollectionListElementComponent,
-    CommunityListElementComponent,
-    SearchResultListElementComponent,
-    CommunitySearchResultListElementComponent,
-    CollectionSearchResultListElementComponent,
-    CollectionGridElementComponent,
-    CommunityGridElementComponent,
-    CommunitySearchResultGridElementComponent,
-    CollectionSearchResultGridElementComponent,
-    SearchResultGridElementComponent,
-    ItemListElementComponent,
-    ItemGridElementComponent,
     BitstreamListItemComponent,
-    ItemSearchResultListElementComponent,
-    ItemSearchResultGridElementComponent,
     BrowseEntryListElementComponent,
-    SearchResultDetailElementComponent,
+    BundleListElementComponent,
-    StartsWithDateComponent,
+    CollectionAdminSearchResultGridElementComponent,
-    StartsWithTextComponent,
+    CollectionAdminSearchResultListElementComponent,
-    CreateCommunityParentSelectorComponent,
+    CollectionGridElementComponent,
-    ThemedCreateCommunityParentSelectorComponent,
+    CollectionListElementComponent,
-    CreateCollectionParentSelectorComponent,
+    CollectionSearchResultGridElementComponent,
-    ThemedCreateCollectionParentSelectorComponent,
+    CollectionSearchResultListElementComponent,
-    CreateItemParentSelectorComponent,
-    ThemedCreateItemParentSelectorComponent,
-    EditCommunitySelectorComponent,
-    ThemedEditCommunitySelectorComponent,
-    EditCollectionSelectorComponent,
-    ThemedEditCollectionSelectorComponent,
-    EditItemSelectorComponent,
-    ThemedEditItemSelectorComponent,
-    PlainTextMetadataListElementComponent,
-    BrowseLinkMetadataListElementComponent,
-    ItemMetadataListElementComponent,
-    MetadataRepresentationListElementComponent,
-    ItemMetadataRepresentationListElementComponent,
-    LogInPasswordComponent,
-    LogInExternalProviderComponent,
-    ClaimedTaskActionsDeclineTaskComponent,
-    CollectionDropdownComponent,
-    ThemedCollectionDropdownComponent,
-    FileDownloadLinkComponent,
-    ThemedFileDownloadLinkComponent,
-    CurationFormComponent,
-    ExportMetadataSelectorComponent,
-    ImportBatchSelectorComponent,
-    ExportBatchSelectorComponent,
-    ConfirmationModalComponent,
-    SidebarSearchListElementComponent,
-    PublicationSidebarSearchListElementComponent,
     CollectionSidebarSearchListElementComponent,
+    CommunityAdminSearchResultGridElementComponent,
+    CommunityAdminSearchResultListElementComponent,
+    CommunityGridElementComponent,
+    CommunityListElementComponent,
+    CommunitySearchResultGridElementComponent,
+    CommunitySearchResultListElementComponent,
     CommunitySidebarSearchListElementComponent,
-    ScopeSelectorModalComponent,
+    ExternalSourceEntryListSubmissionElementComponent,
+    ItemAdminSearchResultGridElementComponent,
+    ItemAdminSearchResultListElementComponent,
+    ItemGridElementComponent,
+    ItemListElementComponent,
+    ItemSearchResultGridElementComponent,
+    ItemSearchResultListElementComponent,
+    JournalComponent,
+    JournalGridElementComponent,
+    JournalIssueComponent,
+    JournalIssueGridElementComponent,
+    JournalIssueListElementComponent,
+    JournalIssueSearchResultGridElementComponent,
+    JournalIssueSearchResultListElementComponent,
+    JournalIssueSidebarSearchListElementComponent,
+    JournalListElementComponent,
+    JournalSearchResultGridElementComponent,
+    JournalSearchResultListElementComponent,
+    JournalSidebarSearchListElementComponent,
+    JournalVolumeComponent,
+    JournalVolumeGridElementComponent,
+    JournalVolumeListElementComponent,
+    JournalVolumeSearchResultGridElementComponent,
+    JournalVolumeSearchResultListElementComponent,
+    JournalVolumeSidebarSearchListElementComponent,
     ListableNotificationObjectComponent,
-    AdvancedClaimedTaskActionSelectReviewerComponent,
+    OrgUnitComponent,
-    AdvancedClaimedTaskActionRatingComponent,
+    OrgUnitGridElementComponent,
-    EpersonGroupListComponent,
+    OrgUnitListElementComponent,
-    EpersonSearchBoxComponent,
+    OrgUnitSearchResultGridElementComponent,
-    GroupSearchBoxComponent
+    OrgUnitSearchResultListElementComponent,
+    OrgUnitSearchResultListSubmissionElementComponent,
+    OrgUnitSidebarSearchListElementComponent,
+    PersonComponent,
+    PersonGridElementComponent,
+    PersonListElementComponent,
+    PersonSearchResultGridElementComponent,
+    PersonSearchResultListElementComponent,
+    PersonSearchResultListSubmissionElementComponent,
+    PersonSidebarSearchListElementComponent,
+    ProjectComponent,
+    ProjectGridElementComponent,
+    ProjectListElementComponent,
+    ProjectSearchResultGridElementComponent,
+    ProjectSearchResultListElementComponent,
+    ProjectSidebarSearchListElementComponent,
+    PublicationSidebarSearchListElementComponent,
+    WorkflowItemSearchResultAdminWorkflowListElementComponent,
+    WorkflowItemSearchResultAdminWorkflowGridElementComponent,
+    WorkspaceItemSearchResultAdminWorkflowListElementComponent,
+    WorkspaceItemSearchResultAdminWorkflowGridElementComponent,
+    WorkspaceItemSearchResultListElementComponent,
+    WorkflowItemSearchResultListElementComponent,
+    ClaimedSearchResultListElementComponent,
+    ClaimedApprovedSearchResultListElementComponent,
+    ClaimedDeclinedSearchResultListElementComponent,
+    ClaimedDeclinedTaskSearchResultListElementComponent,
+    PoolSearchResultListElementComponent,
+    ItemSearchResultDetailElementComponent,
+    WorkspaceItemSearchResultDetailElementComponent,
+    WorkflowItemSearchResultDetailElementComponent,
+    ClaimedTaskSearchResultDetailElementComponent,
+    PoolSearchResultDetailElementComponent,
+    ItemSearchResultListElementSubmissionComponent,
   ];

src/app/core/provide-metadata-representation.ts

@@ -0,0 +1,44 @@
+import {
+  BrowseLinkMetadataListElementComponent
+} from '../shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component';
+import {
+  ExportMetadataSelectorComponent
+} from '../shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component';
+import {
+  ItemMetadataListElementComponent
+} from '../shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component';
+import {
+  ItemMetadataRepresentationListElementComponent
+} from '../shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component';
+import {
+  MetadataRepresentationListElementComponent
+} from '../shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component';
+import {
+  OrgUnitItemMetadataListElementComponent
+} from '../entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component';
+import {
+  PersonItemMetadataListElementComponent
+} from '../entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component';
+import {
+  PlainTextMetadataListElementComponent
+} from '../shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component';
+import {
+  ProjectItemMetadataListElementComponent
+} from '../entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component';
+
+
+/**
+ * Declaration needed to make sure all decorator functions are called in time
+ */
+export const metadataRepresentations =
+  [
+    BrowseLinkMetadataListElementComponent,
+    ExportMetadataSelectorComponent,
+    ItemMetadataListElementComponent,
+    ItemMetadataRepresentationListElementComponent,
+    MetadataRepresentationListElementComponent,
+    OrgUnitItemMetadataListElementComponent,
+    PersonItemMetadataListElementComponent,
+    PlainTextMetadataListElementComponent,
+    ProjectItemMetadataListElementComponent,
+  ];

src/app/core/provide-render-auth-method.ts

@@ -0,0 +1,14 @@
+import {
+  LogInExternalProviderComponent
+} from '../shared/log-in/methods/log-in-external-provider/log-in-external-provider.component';
+import { LogInPasswordComponent } from '../shared/log-in/methods/password/log-in-password.component';
+
+
+/**
+ * Declaration needed to make sure all decorator functions are called in time
+ */
+export const renderAuthMethod =
+  [
+    LogInExternalProviderComponent,
+    LogInPasswordComponent,
+  ];

src/app/core/provide-render-browse-by.ts

@@ -0,0 +1,22 @@
+import {
+  ThemedBrowseByMetadataPageComponent
+} from '../browse-by/browse-by-metadata-page/themed-browse-by-metadata-page.component';
+import { ThemedBrowseByDatePageComponent } from '../browse-by/browse-by-date-page/themed-browse-by-date-page.component';
+import {
+  ThemedBrowseByTitlePageComponent
+} from '../browse-by/browse-by-title-page/themed-browse-by-title-page.component';
+import {
+  ThemedBrowseByTaxonomyPageComponent
+} from '../browse-by/browse-by-taxonomy-page/themed-browse-by-taxonomy-page.component';
+
+
+/**
+ * Declaration needed to make sure all decorator functions are called in time
+ */
+export const renderBrowseBy =
+  [
+    ThemedBrowseByMetadataPageComponent,
+    ThemedBrowseByDatePageComponent,
+    ThemedBrowseByTitlePageComponent,
+    ThemedBrowseByTaxonomyPageComponent,
+  ];

src/app/core/provide-render-starts-with.ts

@@ -0,0 +1,12 @@
+import { StartsWithDateComponent } from '../shared/starts-with/date/starts-with-date.component';
+import { StartsWithTextComponent } from '../shared/starts-with/text/starts-with-text.component';
+
+
+/**
+ * Declaration needed to make sure all decorator functions are called in time
+ */
+export const renderStartsWith =
+  [
+    StartsWithDateComponent,
+    StartsWithTextComponent,
+  ];

src/app/core/provide-workflow-tasks.ts

@@ -0,0 +1,20 @@
+import {
+  ClaimedTaskActionsDeclineTaskComponent
+} from '../shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component';
+import {
+  AdvancedClaimedTaskActionSelectReviewerComponent
+} from '../shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component';
+import {
+  AdvancedClaimedTaskActionRatingComponent
+} from '../shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component';
+
+
+/**
+ * Declaration needed to make sure all decorator functions are called in time
+ */
+export const workflowTasks =
+  [
+    AdvancedClaimedTaskActionRatingComponent,
+    AdvancedClaimedTaskActionSelectReviewerComponent,
+    ClaimedTaskActionsDeclineTaskComponent,
+  ];

src/app/entity-groups/journal-entities/journal-entities.module.ts

@@ -1,68 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-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 { JournalIssueGridElementComponent } from './item-grid-elements/journal-issue/journal-issue-grid-element.component';
-import { JournalVolumeGridElementComponent } from './item-grid-elements/journal-volume/journal-volume-grid-element.component';
-import { JournalGridElementComponent } from './item-grid-elements/journal/journal-grid-element.component';
-import { JournalSearchResultListElementComponent } from './item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component';
-import { JournalSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component';
-import { JournalIssueSearchResultListElementComponent } from './item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component';
-import { JournalVolumeSearchResultListElementComponent } from './item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-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 { JournalVolumeSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component';
-import { JournalIssueSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component';
-import { JournalSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component';
-import { ItemSharedModule } from '../../item-page/item-shared.module';
-import { ResultsBackButtonModule } from '../../shared/results-back-button/results-back-button.module';
-import { DsoPageModule } from '../../shared/dso-page/dso-page.module';
-
-const ENTRY_COMPONENTS = [
-  // put only entry components that use custom decorator
-  JournalComponent,
-  JournalIssueComponent,
-  JournalVolumeComponent,
-  JournalListElementComponent,
-  JournalIssueListElementComponent,
-  JournalVolumeListElementComponent,
-  JournalIssueGridElementComponent,
-  JournalVolumeGridElementComponent,
-  JournalGridElementComponent,
-  JournalSearchResultListElementComponent,
-  JournalIssueSearchResultListElementComponent,
-  JournalVolumeSearchResultListElementComponent,
-  JournalIssueSearchResultGridElementComponent,
-  JournalVolumeSearchResultGridElementComponent,
-  JournalSearchResultGridElementComponent,
-  JournalVolumeSidebarSearchListElementComponent,
-  JournalIssueSidebarSearchListElementComponent,
-  JournalSidebarSearchListElementComponent,
-];
-
-@NgModule({
-    imports: [
-        CommonModule,
-        ItemSharedModule,
-        ResultsBackButtonModule,
-        DsoPageModule,
-        ...ENTRY_COMPONENTS
-    ]
-})
-export class JournalEntitiesModule {
-  /**
-   * NOTE: this method allows to resolve issue with components that using a custom decorator
-   * which are not loaded during SSR otherwise
-   */
-  static withEntryComponents() {
-    return {
-      ngModule: JournalEntitiesModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({provide: component}))
-    };
-  }
-
-}

src/app/entity-groups/research-entities/research-entities.module.ts

@@ -1,91 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
-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';
-import { OrgUnitListElementComponent } from './item-list-elements/org-unit/org-unit-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 { PersonGridElementComponent } from './item-grid-elements/person/person-grid-element.component';
-import { OrgUnitGridElementComponent } from './item-grid-elements/org-unit/org-unit-grid-element.component';
-import { ProjectGridElementComponent } from './item-grid-elements/project/project-grid-element.component';
-import { OrgUnitSearchResultListElementComponent } from './item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component';
-import { PersonSearchResultListElementComponent } from './item-list-elements/search-result-list-elements/person/person-search-result-list-element.component';
-import { ProjectSearchResultListElementComponent } from './item-list-elements/search-result-list-elements/project/project-search-result-list-element.component';
-import { PersonSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component';
-import { OrgUnitSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component';
-import { ProjectSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component';
-import { PersonItemMetadataListElementComponent } from './metadata-representations/person/person-item-metadata-list-element.component';
-import { OrgUnitItemMetadataListElementComponent } from './metadata-representations/org-unit/org-unit-item-metadata-list-element.component';
-import { ProjectItemMetadataListElementComponent } from './metadata-representations/project/project-item-metadata-list-element.component';
-import { PersonSearchResultListSubmissionElementComponent } from './submission/item-list-elements/person/person-search-result-list-submission-element.component';
-import { PersonInputSuggestionsComponent } from './submission/item-list-elements/person/person-suggestions/person-input-suggestions.component';
-import { NameVariantModalComponent } from './submission/name-variant-modal/name-variant-modal.component';
-import { OrgUnitInputSuggestionsComponent } from './submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.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 { OrgUnitSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component';
-import { PersonSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component';
-import { ProjectSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component';
-import { ItemSharedModule } from '../../item-page/item-shared.module';
-import { ResultsBackButtonModule } from '../../shared/results-back-button/results-back-button.module';
-import { DsoPageModule } from '../../shared/dso-page/dso-page.module';
-
-const ENTRY_COMPONENTS = [
-// put only entry components that use custom decorator
-  OrgUnitComponent,
-  PersonComponent,
-  ProjectItemMetadataListElementComponent,
-  ProjectComponent,
-  OrgUnitListElementComponent,
-  OrgUnitItemMetadataListElementComponent,
-  PersonListElementComponent,
-  PersonItemMetadataListElementComponent,
-  ProjectListElementComponent,
-  PersonGridElementComponent,
-  OrgUnitGridElementComponent,
-  ProjectGridElementComponent,
-  OrgUnitSearchResultListElementComponent,
-  PersonSearchResultListElementComponent,
-  ProjectSearchResultListElementComponent,
-  PersonSearchResultGridElementComponent,
-  OrgUnitSearchResultGridElementComponent,
-  ProjectSearchResultGridElementComponent,
-  PersonSearchResultListSubmissionElementComponent,
-  OrgUnitSearchResultListSubmissionElementComponent,
-  OrgUnitInputSuggestionsComponent,
-  ExternalSourceEntryListSubmissionElementComponent,
-  OrgUnitSidebarSearchListElementComponent,
-  PersonSidebarSearchListElementComponent,
-  ProjectSidebarSearchListElementComponent,
-];
-
-const COMPONENTS = [
-  NameVariantModalComponent,
-  PersonInputSuggestionsComponent,
-  ...ENTRY_COMPONENTS
-];
-
-@NgModule({
-    imports: [
-        CommonModule,
-        ItemSharedModule,
-        NgbTooltipModule,
-        ResultsBackButtonModule,
-        DsoPageModule,
-        ...COMPONENTS
-    ]
-})
-export class ResearchEntitiesModule {
-  /**
-   * NOTE: this method allows to resolve issue with components that using a custom decorator
-   * which are not loaded during SSR otherwise
-   */
-  static withEntryComponents() {
-    return {
-      ngModule: ResearchEntitiesModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component }))
-    };
-  }
-}

src/app/home-page/home-page.module.ts

@@ -9,9 +9,9 @@ import { StatisticsModule } from '../statistics/statistics.module';
 import { ThemedHomeNewsComponent } from './home-news/themed-home-news.component';
 import { ThemedHomePageComponent } from './themed-home-page.component';
 import { RecentItemListComponent } from './recent-item-list/recent-item-list.component';
-import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
+import {
-import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
+  ThemedTopLevelCommunityListComponent
-import { ThemedTopLevelCommunityListComponent } from './top-level-community-list/themed-top-level-community-list.component';
+} from './top-level-community-list/themed-top-level-community-list.component';
 
 const DECLARATIONS = [
   HomePageComponent,
@@ -26,8 +26,6 @@ const DECLARATIONS = [
 @NgModule({
     imports: [
         CommonModule,
-        JournalEntitiesModule.withEntryComponents(),
-        ResearchEntitiesModule.withEntryComponents(),
         HomePageRoutingModule,
         StatisticsModule.forRoot(),
         ...DECLARATIONS

src/app/import-external-page/import-external-page.module.ts

@@ -4,16 +4,12 @@ import { NgModule } from '@angular/core';
 import { ImportExternalRoutingModule } from './import-external-routing.module';
 import { SubmissionModule } from '../submission/submission.module';
 import { ImportExternalPageComponent } from './import-external-page.component';
-import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
-import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
 
 @NgModule({
     imports: [
         CommonModule,
         ImportExternalRoutingModule,
         SubmissionModule,
-        JournalEntitiesModule.withEntryComponents(),
-        ResearchEntitiesModule.withEntryComponents(),
         ImportExternalPageComponent
     ]
 })

src/app/item-page/item-page.module.ts

@@ -28,8 +28,6 @@ import {
   AbstractIncrementalListComponent
 } from './simple/abstract-incremental-list/abstract-incremental-list.component';
 import { UntypedItemComponent } from './simple/item-types/untyped-item/untyped-item.component';
-import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
-import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
 import { ThemedItemPageComponent } from './simple/themed-item-page.component';
 import { ThemedFullItemPageComponent } from './full/themed-full-item-page.component';
 import { MediaViewerComponent } from './media-viewer/media-viewer.component';
@@ -51,7 +49,9 @@ import { UploadModule } from '../shared/upload/upload.module';
 import { ResultsBackButtonModule } from '../shared/results-back-button/results-back-button.module';
 import { ItemAlertsComponent } from './alerts/item-alerts.component';
 import { ItemVersionsModule } from './versions/item-versions.module';
-import { BitstreamRequestACopyPageComponent } from './bitstreams/request-a-copy/bitstream-request-a-copy-page.component';
+import {
+  BitstreamRequestACopyPageComponent
+} from './bitstreams/request-a-copy/bitstream-request-a-copy-page.component';
 import { FileSectionComponent } from './simple/field-components/file-section/file-section.component';
 import { ItemSharedModule } from './item-shared.module';
 import { DsoPageModule } from '../shared/dso-page/dso-page.module';
@@ -112,8 +112,6 @@ const DECLARATIONS = [
         ItemVersionsModule,
         ItemSharedModule,
         StatisticsModule.forRoot(),
-        JournalEntitiesModule.withEntryComponents(),
-        ResearchEntitiesModule.withEntryComponents(),
         NgxGalleryModule,
         NgbAccordionModule,
         ResultsBackButtonModule,

src/app/my-dspace-page/my-dspace-page.module.ts

@@ -8,9 +8,12 @@ import { MyDSpaceNewSubmissionComponent } from './my-dspace-new-submission/my-ds
 import { MyDSpaceGuard } from './my-dspace.guard';
 import { MyDSpaceConfigurationService } from './my-dspace-configuration.service';
 import { CollectionSelectorComponent } from './collection-selector/collection-selector.component';
-import { MyDspaceSearchModule } from './my-dspace-search.module';
+import {
-import { MyDSpaceNewSubmissionDropdownComponent } from './my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component';
+  MyDSpaceNewSubmissionDropdownComponent
-import { MyDSpaceNewExternalDropdownComponent } from './my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component';
+} from './my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component';
+import {
+  MyDSpaceNewExternalDropdownComponent
+} from './my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component';
 import { ThemedMyDSpacePageComponent } from './themed-my-dspace-page.component';
 import { SearchModule } from '../shared/search/search.module';
 import { UploadModule } from '../shared/upload/upload.module';
@@ -29,7 +32,6 @@ const DECLARATIONS = [
         CommonModule,
         SearchModule,
         MyDspacePageRoutingModule,
-        MyDspaceSearchModule.withEntryComponents(),
         UploadModule,
         ...DECLARATIONS
     ],

src/app/my-dspace-page/my-dspace-search.module.ts

@@ -1,80 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-
-
-import { MyDspacePageRoutingModule } from './my-dspace-page-routing.module';
-import { WorkspaceItemSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component';
-import { ClaimedSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component';
-import { PoolSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component';
-import { ItemSearchResultDetailElementComponent } from '../shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component';
-import { WorkspaceItemSearchResultDetailElementComponent } from '../shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component';
-import { WorkflowItemSearchResultDetailElementComponent } from '../shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component';
-import { ClaimedTaskSearchResultDetailElementComponent } from '../shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component';
-import { ItemSearchResultListElementSubmissionComponent } from '../shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component';
-import { WorkflowItemSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component';
-import { PoolSearchResultDetailElementComponent } from '../shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component';
-import { ClaimedApprovedSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component';
-import { ClaimedDeclinedSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component';
-import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
-import { ItemSubmitterComponent } from '../shared/object-collection/shared/mydspace-item-submitter/item-submitter.component';
-import { ItemCollectionComponent } from '../shared/object-collection/shared/mydspace-item-collection/item-collection.component';
-import { ItemDetailPreviewComponent } from '../shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component';
-import { ItemDetailPreviewFieldComponent } from '../shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component';
-import { ItemListPreviewComponent } from '../shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component';
-import { ThemedItemListPreviewComponent } from '../shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component';
-import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
-import { MyDSpaceActionsModule } from '../shared/mydspace-actions/mydspace-actions.module';
-import { ClaimedDeclinedTaskSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component';
-
-const ENTRY_COMPONENTS = [
-  WorkspaceItemSearchResultListElementComponent,
-  WorkflowItemSearchResultListElementComponent,
-  ClaimedSearchResultListElementComponent,
-  ClaimedApprovedSearchResultListElementComponent,
-  ClaimedDeclinedSearchResultListElementComponent,
-  ClaimedDeclinedTaskSearchResultListElementComponent,
-  PoolSearchResultListElementComponent,
-  ItemSearchResultDetailElementComponent,
-  WorkspaceItemSearchResultDetailElementComponent,
-  WorkflowItemSearchResultDetailElementComponent,
-  ClaimedTaskSearchResultDetailElementComponent,
-  PoolSearchResultDetailElementComponent,
-  ItemSearchResultListElementSubmissionComponent,
-];
-
-const DECLARATIONS = [
-  ...ENTRY_COMPONENTS,
-  ItemSubmitterComponent,
-  ItemCollectionComponent,
-  ItemDetailPreviewComponent,
-  ItemDetailPreviewFieldComponent,
-  ItemListPreviewComponent,
-  ThemedItemListPreviewComponent,
-];
-
-@NgModule({
-    imports: [
-        CommonModule,
-        MyDspacePageRoutingModule,
-        MyDSpaceActionsModule,
-        ResearchEntitiesModule.withEntryComponents(),
-        JournalEntitiesModule.withEntryComponents(),
-        ...DECLARATIONS
-    ]
-})
-
-/**
- * This module handles all components that are necessary for the mydspace page
- */
-export class MyDspaceSearchModule {
-  /**
-   * NOTE: this method allows to resolve issue with components that using a custom decorator
-   * which are not loaded during SSR otherwise
-   */
-  static withEntryComponents() {
-    return {
-      ngModule: MyDspaceSearchModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({provide: component}))
-    };
-  }
-}

src/app/search-page/search-page.module.ts

@@ -6,8 +6,6 @@ import { StatisticsModule } from '../statistics/statistics.module';
 import { SearchPageComponent } from './search-page.component';
 import { SearchFilterService } from '../core/shared/search/search-filter.service';
 import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
-import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
-import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
 import { ThemedSearchPageComponent } from './themed-search-page.component';
 import { SearchModule } from '../shared/search/search.module';
 
@@ -21,8 +19,6 @@ const components = [
         CommonModule,
         SearchModule,
         StatisticsModule.forRoot(),
-        JournalEntitiesModule.withEntryComponents(),
-        ResearchEntitiesModule.withEntryComponents(),
         ...components
     ],
     providers: [

src/app/submission/submission.module.ts

@@ -42,12 +42,12 @@ import {
   SubmissionImportExternalCollectionComponent
 } from './import-external/import-external-collection/submission-import-external-collection.component';
 import { SubmissionSectionCcLicensesComponent } from './sections/cc-license/submission-section-cc-licenses.component';
-import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
-import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
 import { ThemedSubmissionEditComponent } from './edit/themed-submission-edit.component';
 import { ThemedSubmissionSubmitComponent } from './submit/themed-submission-submit.component';
 import { ThemedSubmissionImportExternalComponent } from './import-external/themed-submission-import-external.component';
-import { ThemedSubmissionSectionUploadFileComponent } from './sections/upload/file/themed-section-upload-file.component';
+import {
+  ThemedSubmissionSectionUploadFileComponent
+} from './sections/upload/file/themed-section-upload-file.component';
 import { FormModule } from '../shared/form/form.module';
 import { NgbAccordionModule, NgbCollapseModule, NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
 import { SubmissionSectionAccessesComponent } from './sections/accesses/section-accesses.component';
@@ -64,7 +64,7 @@ import {
   MetadataInformationComponent
 } from './sections/sherpa-policies/metadata-information/metadata-information.component';
 import { SectionFormOperationsService } from './sections/form/section-form-operations.service';
-import {SubmissionSectionIdentifiersComponent} from './sections/identifiers/section-identifiers.component';
+import { SubmissionSectionIdentifiersComponent } from './sections/identifiers/section-identifiers.component';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
@@ -111,8 +111,6 @@ const DECLARATIONS = [
         CommonModule,
         StoreModule.forFeature('submission', submissionReducers, storeModuleConfig as StoreConfig<SubmissionState, Action>),
         EffectsModule.forFeature(submissionEffects),
-        JournalEntitiesModule.withEntryComponents(),
-        ResearchEntitiesModule.withEntryComponents(),
         FormModule,
         NgbModalModule,
         NgbCollapseModule,

src/themes/custom/lazy-theme.module.ts

@@ -1,10 +1,7 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { AdminRegistriesModule } from '../../app/admin/admin-registries/admin-registries.module';
-import { AdminSearchModule } from '../../app/admin/admin-search-page/admin-search.module';
-import { AdminWorkflowModuleModule } from '../../app/admin/admin-workflow-page/admin-workflow.module';
 import { BitstreamFormatsModule } from '../../app/admin/admin-registries/bitstream-formats/bitstream-formats.module';
-import { BrowseByModule } from '../../app/browse-by/browse-by.module';
 import { CollectionFormModule } from '../../app/collection-page/collection-form/collection-form.module';
 import { CommunityFormModule } from '../../app/community-page/community-form/community-form.module';
 import { DragDropModule } from '@angular/cdk/drag-drop';
@@ -12,14 +9,11 @@ import { EditItemPageModule } from '../../app/item-page/edit-item-page/edit-item
 import { FormsModule } from '@angular/forms';
 import { HttpClientModule } from '@angular/common/http';
 import { IdlePreloadModule } from 'angular-idle-preload';
-import { JournalEntitiesModule } from '../../app/entity-groups/journal-entities/journal-entities.module';
-import { MyDspaceSearchModule } from '../../app/my-dspace-page/my-dspace-search.module';
 import { MenuModule } from '../../app/shared/menu/menu.module';
 import { NavbarModule } from '../../app/navbar/navbar.module';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { ProfilePageModule } from '../../app/profile-page/profile-page.module';
 import { RegisterEmailFormModule } from '../../app/register-email-form/register-email-form.module';
-import { ResearchEntitiesModule } from '../../app/entity-groups/research-entities/research-entities.module';
 import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
 import { SearchPageModule } from '../../app/search-page/search-page.module';
 import { StatisticsModule } from '../../app/statistics/statistics.module';
@@ -180,7 +174,7 @@ import { ItemStatusComponent } from './app/item-page/edit-item-page/item-status/
 import { EditBitstreamPageComponent } from './app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component';
 import { FormModule } from '../../app/shared/form/form.module';
 import { RequestCopyModule } from 'src/app/request-copy/request-copy.module';
-import {UserMenuComponent} from './app/shared/auth-nav-menu/user-menu/user-menu.component';
+import { UserMenuComponent } from './app/shared/auth-nav-menu/user-menu/user-menu.component';
 import { BrowseByComponent } from './app/shared/browse-by/browse-by.component';
 import { RegisterEmailFormComponent } from './app/register-email-form/register-email-form.component';
 
@@ -274,12 +268,9 @@ const DECLARATIONS = [
 @NgModule({
     imports: [
         AdminRegistriesModule,
-        AdminSearchModule,
-        AdminWorkflowModuleModule,
         AppModule,
         RootModule,
         BitstreamFormatsModule,
-        BrowseByModule,
         CollectionFormModule,
         CollectionPageModule,
         CommonModule,
@@ -296,15 +287,12 @@ const DECLARATIONS = [
         HttpClientModule,
         IdlePreloadModule,
         InfoModule,
-        JournalEntitiesModule,
         MenuModule,
         DsoPageModule,
-        MyDspaceSearchModule,
         NavbarModule,
         NgbModule,
         ProfilePageModule,
         RegisterEmailFormModule,
-        ResearchEntitiesModule,
         RouterModule,
         ScrollToModule,
         SearchPageModule,
@@ -317,7 +305,6 @@ const DECLARATIONS = [
         TranslateModule,
         SubmissionModule,
         MyDSpacePageModule,
-        MyDspaceSearchModule,
         SearchModule,
         FormsModule,
         ResourcePoliciesModule,

src/themes/dspace/lazy-theme.module.ts

@@ -1,35 +1,19 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { AdminRegistriesModule } from '../../app/admin/admin-registries/admin-registries.module';
-import { AdminSearchModule } from '../../app/admin/admin-search-page/admin-search.module';
+import { BitstreamFormatsModule } from '../../app/admin/admin-registries/bitstream-formats/bitstream-formats.module';
-import {
+import { CollectionFormModule } from '../../app/collection-page/collection-form/collection-form.module';
-  AdminWorkflowModuleModule
-} from '../../app/admin/admin-workflow-page/admin-workflow.module';
-import {
-  BitstreamFormatsModule
-} from '../../app/admin/admin-registries/bitstream-formats/bitstream-formats.module';
-import { BrowseByModule } from '../../app/browse-by/browse-by.module';
-import {
-  CollectionFormModule
-} from '../../app/collection-page/collection-form/collection-form.module';
 import { CommunityFormModule } from '../../app/community-page/community-form/community-form.module';
 import { DragDropModule } from '@angular/cdk/drag-drop';
 import { EditItemPageModule } from '../../app/item-page/edit-item-page/edit-item-page.module';
 import { FormsModule } from '@angular/forms';
 import { HttpClientModule } from '@angular/common/http';
 import { IdlePreloadModule } from 'angular-idle-preload';
-import {
-  JournalEntitiesModule
-} from '../../app/entity-groups/journal-entities/journal-entities.module';
-import { MyDspaceSearchModule } from '../../app/my-dspace-page/my-dspace-search.module';
 import { MenuModule } from '../../app/shared/menu/menu.module';
 import { NavbarModule } from '../../app/navbar/navbar.module';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { ProfilePageModule } from '../../app/profile-page/profile-page.module';
 import { RegisterEmailFormModule } from '../../app/register-email-form/register-email-form.module';
-import {
-  ResearchEntitiesModule
-} from '../../app/entity-groups/research-entities/research-entities.module';
 import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
 import { SearchPageModule } from '../../app/search-page/search-page.module';
 import { StatisticsModule } from '../../app/statistics/statistics.module';
@@ -48,9 +32,7 @@ import { CollectionPageModule } from '../../app/collection-page/collection-page.
 import { SubmissionModule } from '../../app/submission/submission.module';
 import { MyDSpacePageModule } from '../../app/my-dspace-page/my-dspace-page.module';
 import { SearchModule } from '../../app/shared/search/search.module';
-import {
+import { ResourcePoliciesModule } from '../../app/shared/resource-policies/resource-policies.module';
-  ResourcePoliciesModule
-} from '../../app/shared/resource-policies/resource-policies.module';
 import { ComcolModule } from '../../app/shared/comcol/comcol.module';
 import { RootModule } from '../../app/root.module';
 import { BrowseByPageModule } from '../../app/browse-by/browse-by-page.module';
@@ -65,12 +47,9 @@ const DECLARATIONS = [
 @NgModule({
   imports: [
     AdminRegistriesModule,
-    AdminSearchModule,
-    AdminWorkflowModuleModule,
     AppModule,
     RootModule,
     BitstreamFormatsModule,
-    BrowseByModule,
     BrowseByPageModule,
     ResultsBackButtonModule,
     CollectionFormModule,
@@ -89,14 +68,11 @@ const DECLARATIONS = [
     HttpClientModule,
     IdlePreloadModule,
     InfoModule,
-    JournalEntitiesModule,
     MenuModule,
-    MyDspaceSearchModule,
     NavbarModule,
     NgbModule,
     ProfilePageModule,
     RegisterEmailFormModule,
-    ResearchEntitiesModule,
     RouterModule,
     ScrollToModule,
     SearchPageModule,
@@ -108,7 +84,6 @@ const DECLARATIONS = [
     TranslateModule,
     SubmissionModule,
     MyDSpacePageModule,
-    MyDspaceSearchModule,
     SearchModule,
     FormsModule,
     ResourcePoliciesModule,