[CST-4633] Create search.module and resolve dependencies issues

src/app/access-control/access-control.module.ts

@@ -9,13 +9,15 @@ import { GroupFormComponent } from './group-registry/group-form/group-form.compo
 import { MembersListComponent } from './group-registry/group-form/members-list/members-list.component';
 import { SubgroupsListComponent } from './group-registry/group-form/subgroup-list/subgroups-list.component';
 import { GroupsRegistryComponent } from './group-registry/groups-registry.component';
+import { FormModule } from '../shared/form/form.module';
 
 @NgModule({
   imports: [
     CommonModule,
     SharedModule,
     RouterModule,
-    AccessControlRoutingModule
+    AccessControlRoutingModule,
+    FormModule
   ],
   declarations: [
     EPeopleRegistryComponent,

src/app/admin/admin-registries/admin-registries.module.ts

@@ -8,6 +8,7 @@ import { SharedModule } from '../../shared/shared.module';
 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 { BitstreamFormatsModule } from './bitstream-formats/bitstream-formats.module';
+import { FormModule } from '../../shared/form/form.module';
 
 @NgModule({
   imports: [
@@ -15,7 +16,8 @@ import { BitstreamFormatsModule } from './bitstream-formats/bitstream-formats.mo
     SharedModule,
     RouterModule,
     BitstreamFormatsModule,
-    AdminRegistriesRoutingModule
+    AdminRegistriesRoutingModule,
+    FormModule
   ],
   declarations: [
     MetadataRegistryComponent,

src/app/admin/admin-registries/bitstream-formats/bitstream-formats.module.ts

@@ -7,13 +7,15 @@ import { FormatFormComponent } from './format-form/format-form.component';
 import { EditBitstreamFormatComponent } from './edit-bitstream-format/edit-bitstream-format.component';
 import { BitstreamFormatsRoutingModule } from './bitstream-formats-routing.module';
 import { AddBitstreamFormatComponent } from './add-bitstream-format/add-bitstream-format.component';
+import { FormModule } from '../../../shared/form/form.module';
 
 @NgModule({
   imports: [
     CommonModule,
     SharedModule,
     RouterModule,
-    BitstreamFormatsRoutingModule
+    BitstreamFormatsRoutingModule,
+    FormModule
   ],
   declarations: [
     BitstreamFormatsComponent,

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

@@ -10,6 +10,7 @@ import { CollectionAdminSearchResultGridElementComponent } from './admin-search-
 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
@@ -24,6 +25,7 @@ const ENTRY_COMPONENTS = [
 
 @NgModule({
   imports: [
+    SearchModule,
     SharedModule.withEntryComponents(),
     JournalEntitiesModule.withEntryComponents(),
     ResearchEntitiesModule.withEntryComponents()

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

@@ -5,6 +5,7 @@ import { WorkflowItemSearchResultAdminWorkflowGridElementComponent } from './adm
 import { WorkflowItemAdminWorkflowActionsComponent } from './admin-workflow-search-results/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';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
@@ -14,6 +15,7 @@ const ENTRY_COMPONENTS = [
 
 @NgModule({
   imports: [
+    SearchModule,
     SharedModule.withEntryComponents()
   ],
   declarations: [

src/app/admin/admin.module.ts

@@ -24,7 +24,7 @@ const ENTRY_COMPONENTS = [
     AccessControlModule,
     AdminSearchModule.withEntryComponents(),
     AdminWorkflowModuleModule.withEntryComponents(),
-    SharedModule,
+    SharedModule
   ],
   declarations: [
     AdminCurationTasksComponent,

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

@@ -4,6 +4,8 @@ import { SharedModule } from '../shared/shared.module';
 import { EditBitstreamPageComponent } from './edit-bitstream-page/edit-bitstream-page.component';
 import { BitstreamPageRoutingModule } from './bitstream-page-routing.module';
 import { BitstreamAuthorizationsComponent } from './bitstream-authorizations/bitstream-authorizations.component';
+import { FormModule } from '../shared/form/form.module';
+import { ResourcePoliciesModule } from '../shared/resource-policies/resource-policies.module';
 
 /**
  * This module handles all components that are necessary for Bitstream related pages
@@ -12,7 +14,9 @@ import { BitstreamAuthorizationsComponent } from './bitstream-authorizations/bit
   imports: [
     CommonModule,
     SharedModule,
-    BitstreamPageRoutingModule
+    BitstreamPageRoutingModule,
+    FormModule,
+    ResourcePoliciesModule
   ],
   declarations: [
     BitstreamAuthorizationsComponent,

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

@@ -6,6 +6,7 @@ import { BrowseByMetadataPageComponent } from './browse-by-metadata-page/browse-
 import { BrowseByDatePageComponent } from './browse-by-date-page/browse-by-date-page.component';
 import { BrowseBySwitcherComponent } from './browse-by-switcher/browse-by-switcher.component';
 import { ThemedBrowseBySwitcherComponent } from './browse-by-switcher/themed-browse-by-switcher.component';
+import { ComcolModule } from '../shared/comcol/comcol.module';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
@@ -17,6 +18,7 @@ const ENTRY_COMPONENTS = [
 @NgModule({
   imports: [
     CommonModule,
+    ComcolModule,
     SharedModule
   ],
   declarations: [

src/app/collection-page/collection-form/collection-form.component.ts

@@ -10,7 +10,7 @@ import {
 } from '@ng-dynamic-forms/core';
 
 import { Collection } from '../../core/shared/collection.model';
-import { ComColFormComponent } from '../../shared/comcol-forms/comcol-form/comcol-form.component';
+import { ComColFormComponent } from '../../shared/comcol/comcol-forms/comcol-form/comcol-form.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { CommunityDataService } from '../../core/data/community-data.service';
 import { AuthService } from '../../core/auth/auth.service';
@@ -28,8 +28,8 @@ import { NONE_ENTITY_TYPE } from '../../core/shared/item-relationships/item-type
  */
 @Component({
   selector: 'ds-collection-form',
-  styleUrls: ['../../shared/comcol-forms/comcol-form/comcol-form.component.scss'],
-  templateUrl: '../../shared/comcol-forms/comcol-form/comcol-form.component.html'
+  styleUrls: ['../../shared/comcol/comcol-forms/comcol-form/comcol-form.component.scss'],
+  templateUrl: '../../shared/comcol/comcol-forms/comcol-form/comcol-form.component.html'
 })
 export class CollectionFormComponent extends ComColFormComponent<Collection> implements OnInit {
   /**

src/app/collection-page/collection-form/collection-form.module.ts

@@ -2,9 +2,13 @@ import { NgModule } from '@angular/core';
 
 import { CollectionFormComponent } from './collection-form.component';
 import { SharedModule } from '../../shared/shared.module';
+import { ComcolModule } from '../../shared/comcol/comcol.module';
+import { FormModule } from '../../shared/form/form.module';
 
 @NgModule({
   imports: [
+    ComcolModule,
+    FormModule,
     SharedModule
   ],
   declarations: [

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

@@ -14,6 +14,7 @@ import { SearchService } from '../core/shared/search/search.service';
 import { StatisticsModule } from '../statistics/statistics.module';
 import { CollectionFormModule } from './collection-form/collection-form.module';
 import { ThemedCollectionPageComponent } from './themed-collection-page.component';
+import { ComcolModule } from '../shared/comcol/comcol.module';
 
 @NgModule({
   imports: [
@@ -22,7 +23,8 @@ import { ThemedCollectionPageComponent } from './themed-collection-page.componen
     CollectionPageRoutingModule,
     StatisticsModule.forRoot(),
     EditItemPageModule,
-    CollectionFormModule
+    CollectionFormModule,
+    ComcolModule
   ],
   declarations: [
     CollectionPageComponent,

src/app/collection-page/create-collection-page/create-collection-page.component.ts

@@ -2,12 +2,12 @@ import { Component } from '@angular/core';
 import { CommunityDataService } from '../../core/data/community-data.service';
 import { RouteService } from '../../core/services/route.service';
 import { Router } from '@angular/router';
-import { CreateComColPageComponent } from '../../shared/comcol-forms/create-comcol-page/create-comcol-page.component';
+import { CreateComColPageComponent } from '../../shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component';
 import { Collection } from '../../core/shared/collection.model';
 import { CollectionDataService } from '../../core/data/collection-data.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
-import {RequestService} from '../../core/data/request.service';
+import { RequestService } from '../../core/data/request.service';
 
 /**
  * Component that represents the page where a user can create a new Collection

src/app/collection-page/delete-collection-page/delete-collection-page.component.ts

@@ -1,11 +1,11 @@
 import { Component } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { DeleteComColPageComponent } from '../../shared/comcol-forms/delete-comcol-page/delete-comcol-page.component';
+import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { CollectionDataService } from '../../core/data/collection-data.service';
 import { Collection } from '../../core/shared/collection.model';
 import { TranslateService } from '@ngx-translate/core';
-import {RequestService} from '../../core/data/request.service';
+import { RequestService } from '../../core/data/request.service';
 
 /**
  * Component that represents the page where a user can delete an existing Collection

src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts

@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { ComcolMetadataComponent } from '../../../shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component';
+import { ComcolMetadataComponent } from '../../../shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component';
 import { Collection } from '../../../core/shared/collection.model';
 import { CollectionDataService } from '../../../core/data/collection-data.service';
 import { ActivatedRoute, Router } from '@angular/router';

src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.spec.ts

@@ -12,6 +12,7 @@ import { RequestService } from '../../../core/data/request.service';
 import { RouterTestingModule } from '@angular/router/testing';
 import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { ComcolModule } from '../../../shared/comcol/comcol.module';
 
 describe('CollectionRolesComponent', () => {
 
@@ -65,6 +66,7 @@ describe('CollectionRolesComponent', () => {
 
     TestBed.configureTestingModule({
       imports: [
+        ComcolModule,
         SharedModule,
         RouterTestingModule.withRoutes([]),
         TranslateModule.forRoot(),

src/app/collection-page/edit-collection-page/edit-collection-page.component.ts

@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { EditComColPageComponent } from '../../shared/comcol-forms/edit-comcol-page/edit-comcol-page.component';
+import { EditComColPageComponent } from '../../shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component';
 import { Collection } from '../../core/shared/collection.model';
 import { getCollectionPageRoute } from '../collection-page-routing-paths';
 
@@ -9,7 +9,7 @@ import { getCollectionPageRoute } from '../collection-page-routing-paths';
  */
 @Component({
   selector: 'ds-edit-collection',
-  templateUrl: '../../shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.html'
+  templateUrl: '../../shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html'
 })
 export class EditCollectionPageComponent extends EditComColPageComponent<Collection> {
   type = 'collection';

src/app/collection-page/edit-collection-page/edit-collection-page.module.ts

@@ -10,6 +10,9 @@ import { CollectionSourceComponent } from './collection-source/collection-source
 import { CollectionAuthorizationsComponent } from './collection-authorizations/collection-authorizations.component';
 import { CollectionFormModule } from '../collection-form/collection-form.module';
 import { CollectionSourceControlsComponent } from './collection-source/collection-source-controls/collection-source-controls.component';
+import { ResourcePoliciesModule } from '../../shared/resource-policies/resource-policies.module';
+import { FormModule } from '../../shared/form/form.module';
+import { ComcolModule } from '../../shared/comcol/comcol.module';
 
 /**
  * Module that contains all components related to the Edit Collection page administrator functionality
@@ -19,7 +22,10 @@ import { CollectionSourceControlsComponent } from './collection-source/collectio
     CommonModule,
     SharedModule,
     EditCollectionPageRoutingModule,
-    CollectionFormModule
+    CollectionFormModule,
+    ResourcePoliciesModule,
+    FormModule,
+    ComcolModule
   ],
   declarations: [
     EditCollectionPageComponent,

src/app/community-page/community-form/community-form.component.ts

@@ -6,7 +6,7 @@ import {
   DynamicTextAreaModel
 } from '@ng-dynamic-forms/core';
 import { Community } from '../../core/shared/community.model';
-import { ComColFormComponent } from '../../shared/comcol-forms/comcol-form/comcol-form.component';
+import { ComColFormComponent } from '../../shared/comcol/comcol-forms/comcol-form/comcol-form.component';
 import { TranslateService } from '@ngx-translate/core';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { CommunityDataService } from '../../core/data/community-data.service';
@@ -19,8 +19,8 @@ import { ObjectCacheService } from '../../core/cache/object-cache.service';
  */
 @Component({
   selector: 'ds-community-form',
-  styleUrls: ['../../shared/comcol-forms/comcol-form/comcol-form.component.scss'],
-  templateUrl: '../../shared/comcol-forms/comcol-form/comcol-form.component.html'
+  styleUrls: ['../../shared/comcol/comcol-forms/comcol-form/comcol-form.component.scss'],
+  templateUrl: '../../shared/comcol/comcol-forms/comcol-form/comcol-form.component.html'
 })
 export class CommunityFormComponent extends ComColFormComponent<Community> {
   /**

src/app/community-page/community-form/community-form.module.ts

@@ -2,9 +2,13 @@ import { NgModule } from '@angular/core';
 
 import { CommunityFormComponent } from './community-form.component';
 import { SharedModule } from '../../shared/shared.module';
+import { ComcolModule } from '../../shared/comcol/comcol.module';
+import { FormModule } from '../../shared/form/form.module';
 
 @NgModule({
   imports: [
+    ComcolModule,
+    FormModule,
     SharedModule
   ],
   declarations: [

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

@@ -12,6 +12,7 @@ import { DeleteCommunityPageComponent } from './delete-community-page/delete-com
 import { StatisticsModule } from '../statistics/statistics.module';
 import { CommunityFormModule } from './community-form/community-form.module';
 import { ThemedCommunityPageComponent } from './themed-community-page.component';
+import { ComcolModule } from '../shared/comcol/comcol.module';
 
 const DECLARATIONS = [CommunityPageComponent,
   ThemedCommunityPageComponent,
@@ -26,7 +27,8 @@ const DECLARATIONS = [CommunityPageComponent,
     SharedModule,
     CommunityPageRoutingModule,
     StatisticsModule.forRoot(),
-    CommunityFormModule
+    CommunityFormModule,
+    ComcolModule
   ],
   declarations: [
     ...DECLARATIONS

src/app/community-page/create-community-page/create-community-page.component.ts

@@ -3,7 +3,7 @@ import { Community } from '../../core/shared/community.model';
 import { CommunityDataService } from '../../core/data/community-data.service';
 import { RouteService } from '../../core/services/route.service';
 import { Router } from '@angular/router';
-import { CreateComColPageComponent } from '../../shared/comcol-forms/create-comcol-page/create-comcol-page.component';
+import { CreateComColPageComponent } from '../../shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import { RequestService } from '../../core/data/request.service';

src/app/community-page/delete-community-page/delete-community-page.component.ts

@@ -2,10 +2,10 @@ import { Component } from '@angular/core';
 import { Community } from '../../core/shared/community.model';
 import { CommunityDataService } from '../../core/data/community-data.service';
 import { ActivatedRoute, Router } from '@angular/router';
-import { DeleteComColPageComponent } from '../../shared/comcol-forms/delete-comcol-page/delete-comcol-page.component';
+import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
-import {RequestService} from '../../core/data/request.service';
+import { RequestService } from '../../core/data/request.service';
 
 /**
  * Component that represents the page where a user can delete an existing Community

src/app/community-page/edit-community-page/community-metadata/community-metadata.component.ts

@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { ComcolMetadataComponent } from '../../../shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component';
+import { ComcolMetadataComponent } from '../../../shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Community } from '../../../core/shared/community.model';
 import { CommunityDataService } from '../../../core/data/community-data.service';

src/app/community-page/edit-community-page/community-roles/community-roles.component.spec.ts

@@ -12,6 +12,7 @@ import { SharedModule } from '../../../shared/shared.module';
 import { RouterTestingModule } from '@angular/router/testing';
 import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { ComcolModule } from '../../../shared/comcol/comcol.module';
 
 describe('CommunityRolesComponent', () => {
 
@@ -50,6 +51,7 @@ describe('CommunityRolesComponent', () => {
 
     TestBed.configureTestingModule({
       imports: [
+        ComcolModule,
         SharedModule,
         RouterTestingModule.withRoutes([]),
         TranslateModule.forRoot(),

src/app/community-page/edit-community-page/edit-community-page.component.ts

@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { Community } from '../../core/shared/community.model';
 import { ActivatedRoute, Router } from '@angular/router';
-import { EditComColPageComponent } from '../../shared/comcol-forms/edit-comcol-page/edit-comcol-page.component';
+import { EditComColPageComponent } from '../../shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component';
 import { getCommunityPageRoute } from '../community-page-routing-paths';
 
 /**
@@ -9,7 +9,7 @@ import { getCommunityPageRoute } from '../community-page-routing-paths';
  */
 @Component({
   selector: 'ds-edit-community',
-  templateUrl: '../../shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.html'
+  templateUrl: '../../shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html'
 })
 export class EditCommunityPageComponent extends EditComColPageComponent<Community> {
   type = 'community';

src/app/community-page/edit-community-page/edit-community-page.module.ts

@@ -8,6 +8,8 @@ import { CommunityMetadataComponent } from './community-metadata/community-metad
 import { CommunityRolesComponent } from './community-roles/community-roles.component';
 import { CommunityAuthorizationsComponent } from './community-authorizations/community-authorizations.component';
 import { CommunityFormModule } from '../community-form/community-form.module';
+import { ResourcePoliciesModule } from '../../shared/resource-policies/resource-policies.module';
+import { ComcolModule } from '../../shared/comcol/comcol.module';
 
 /**
  * Module that contains all components related to the Edit Community page administrator functionality
@@ -17,7 +19,9 @@ import { CommunityFormModule } from '../community-form/community-form.module';
     CommonModule,
     SharedModule,
     EditCommunityPageRoutingModule,
-    CommunityFormModule
+    CommunityFormModule,
+    ComcolModule,
+    ResourcePoliciesModule
   ],
   declarations: [
     EditCommunityPageComponent,

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

@@ -19,6 +19,7 @@ import { JournalVolumeSearchResultGridElementComponent } from './item-grid-eleme
 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';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
@@ -45,6 +46,7 @@ const ENTRY_COMPONENTS = [
 @NgModule({
   imports: [
     CommonModule,
+    ItemSharedModule,
     SharedModule
   ],
   declarations: [

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

@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 import { SharedModule } from '../../shared/shared.module';
 import { OrgUnitComponent } from './item-pages/org-unit/org-unit.component';
 import { PersonComponent } from './item-pages/person/person.component';
@@ -27,6 +28,7 @@ import { ExternalSourceEntryListSubmissionElementComponent } from './submission/
 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';
 
 const ENTRY_COMPONENTS = [
 // put only entry components that use custom decorator
@@ -65,7 +67,9 @@ const COMPONENTS = [
 @NgModule({
   imports: [
     CommonModule,
-    SharedModule
+    ItemSharedModule,
+    SharedModule,
+    NgbTooltipModule
   ],
   declarations: [
     ...COMPONENTS,
@@ -79,7 +83,7 @@ export class ResearchEntitiesModule {
   static withEntryComponents() {
     return {
       ngModule: ResearchEntitiesModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({provide: component}))
+      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component }))
     };
   }
 }

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

@@ -1,5 +1,8 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+
+import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+
 import { SharedModule } from '../../shared/shared.module';
 import { EditItemPageRoutingModule } from './edit-item-page.routing.module';
 import { EditItemPageComponent } from './edit-item-page.component';
@@ -31,6 +34,8 @@ import { VirtualMetadataComponent } from './virtual-metadata/virtual-metadata.co
 import { ItemVersionHistoryComponent } from './item-version-history/item-version-history.component';
 import { ItemAuthorizationsComponent } from './item-authorizations/item-authorizations.component';
 import { ObjectValuesPipe } from '../../shared/utils/object-values-pipe';
+import { ResourcePoliciesModule } from '../../shared/resource-policies/resource-policies.module';
+
 
 /**
  * Module that contains all components related to the Edit Item page administrator functionality
@@ -39,9 +44,11 @@ import { ObjectValuesPipe } from '../../shared/utils/object-values-pipe';
   imports: [
     CommonModule,
     SharedModule,
+    NgbTooltipModule,
     EditItemPageRoutingModule,
     SearchPageModule,
-    DragDropModule
+    DragDropModule,
+    ResourcePoliciesModule
   ],
   declarations: [
     EditItemPageComponent,

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

@@ -0,0 +1,36 @@
+import { RelatedEntitiesSearchComponent } from './simple/related-entities/related-entities-search/related-entities-search.component';
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { SearchModule } from '../shared/search/search.module';
+import { SharedModule } from '../shared/shared.module';
+import { TranslateModule } from '@ngx-translate/core';
+import { DYNAMIC_FORM_CONTROL_MAP_FN } from '@ng-dynamic-forms/core';
+import { dsDynamicFormControlMapFn } from '../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component';
+import { TabbedRelatedEntitiesSearchComponent } from './simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component';
+
+const COMPONENTS = [
+  RelatedEntitiesSearchComponent,
+  TabbedRelatedEntitiesSearchComponent
+];
+
+@NgModule({
+  declarations: [
+    ...COMPONENTS
+  ],
+  imports: [
+    CommonModule,
+    SearchModule,
+    SharedModule,
+    TranslateModule
+  ],
+  exports: [
+    ...COMPONENTS
+  ],
+  providers: [
+    {
+      provide: DYNAMIC_FORM_CONTROL_MAP_FN,
+      useValue: dsDynamicFormControlMapFn
+    }
+  ]
+})
+export class ItemSharedModule { }

src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.ts

@@ -10,7 +10,7 @@ import { getFilterByRelation } from '../../../../shared/utils/relation-query.uti
 })
 /**
  * A component to show related items as search results.
- * Related items can be facetted, or queried using an
+ * Related items can be faceted, or queried using an
  * optional search box.
  */
 export class RelatedEntitiesSearchComponent implements OnInit {

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

@@ -14,6 +14,7 @@ import { MyDspaceSearchModule } from './my-dspace-search.module';
 import { MyDSpaceNewSubmissionDropdownComponent } 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';
 
 const DECLARATIONS = [
   MyDSpacePageComponent,
@@ -29,6 +30,7 @@ const DECLARATIONS = [
   imports: [
     CommonModule,
     SharedModule,
+    SearchModule,
     MyDspacePageRoutingModule,
     MyDspaceSearchModule.withEntryComponents()
   ],

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

@@ -6,12 +6,14 @@ import { ProfilePageComponent } from './profile-page.component';
 import { ProfilePageMetadataFormComponent } from './profile-page-metadata-form/profile-page-metadata-form.component';
 import { ProfilePageSecurityFormComponent } from './profile-page-security-form/profile-page-security-form.component';
 import { ThemedProfilePageComponent } from './themed-profile-page.component';
+import { FormModule } from '../shared/form/form.module';
 
 @NgModule({
   imports: [
     ProfilePageRoutingModule,
     CommonModule,
-    SharedModule
+    SharedModule,
+    FormModule
   ],
   exports: [
     ProfilePageSecurityFormComponent,

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

@@ -14,6 +14,7 @@ import { SearchConfigurationService } from '../core/shared/search/search-configu
 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';
 
 const components = [
   SearchPageComponent,
@@ -25,6 +26,7 @@ const components = [
 @NgModule({
   imports: [
     CommonModule,
+    SearchModule,
     SharedModule.withEntryComponents(),
     CoreModule.forRoot(),
     StatisticsModule.forRoot(),

src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.spec.ts

@@ -7,19 +7,19 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { DynamicFormControlModel, DynamicFormService, DynamicInputModel } from '@ng-dynamic-forms/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { AuthService } from '../../../core/auth/auth.service';
-import { ObjectCacheService } from '../../../core/cache/object-cache.service';
-import { RequestService } from '../../../core/data/request.service';
-import { RestRequestMethod } from '../../../core/data/rest-request-method';
-import { Community } from '../../../core/shared/community.model';
-import { hasValue } from '../../empty.util';
-import { AuthServiceMock } from '../../mocks/auth.service.mock';
-import { NotificationsService } from '../../notifications/notifications.service';
-import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
-import { VarDirective } from '../../utils/var.directive';
+import { AuthService } from '../../../../core/auth/auth.service';
+import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
+import { RequestService } from '../../../../core/data/request.service';
+import { RestRequestMethod } from '../../../../core/data/rest-request-method';
+import { Community } from '../../../../core/shared/community.model';
+import { hasValue } from '../../../empty.util';
+import { AuthServiceMock } from '../../../mocks/auth.service.mock';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
+import { VarDirective } from '../../../utils/var.directive';
 import { ComColFormComponent } from './comcol-form.component';
 import { Operation } from 'fast-json-patch';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
+import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils';
 
 describe('ComColFormComponent', () => {
   let comp: ComColFormComponent<any>;

src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts

@@ -1,39 +1,27 @@
-import {
-  Component,
-  EventEmitter,
-  Input,
-  OnDestroy,
-  OnInit,
-  Output,
-  ViewChild
-} from '@angular/core';
+import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild } from '@angular/core';
 import { FormGroup } from '@angular/forms';
-import {
-  DynamicFormControlModel,
-  DynamicFormService,
-  DynamicInputModel
-} from '@ng-dynamic-forms/core';
+import { DynamicFormControlModel, DynamicFormService, DynamicInputModel } from '@ng-dynamic-forms/core';
 import { TranslateService } from '@ngx-translate/core';
 import { FileUploader } from 'ng2-file-upload';
 import { BehaviorSubject, combineLatest as observableCombineLatest, Subscription } from 'rxjs';
-import { AuthService } from '../../../core/auth/auth.service';
-import { ObjectCacheService } from '../../../core/cache/object-cache.service';
-import { ComColDataService } from '../../../core/data/comcol-data.service';
-import { RemoteData } from '../../../core/data/remote-data';
-import { RequestService } from '../../../core/data/request.service';
-import { RestRequestMethod } from '../../../core/data/rest-request-method';
-import { Bitstream } from '../../../core/shared/bitstream.model';
-import { Collection } from '../../../core/shared/collection.model';
-import { Community } from '../../../core/shared/community.model';
-import { MetadataMap, MetadataValue } from '../../../core/shared/metadata.models';
-import { ResourceType } from '../../../core/shared/resource-type';
-import { hasValue, isNotEmpty } from '../../empty.util';
-import { NotificationsService } from '../../notifications/notifications.service';
-import { UploaderOptions } from '../../uploader/uploader-options.model';
-import { UploaderComponent } from '../../uploader/uploader.component';
+import { AuthService } from '../../../../core/auth/auth.service';
+import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
+import { ComColDataService } from '../../../../core/data/comcol-data.service';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { RequestService } from '../../../../core/data/request.service';
+import { RestRequestMethod } from '../../../../core/data/rest-request-method';
+import { Bitstream } from '../../../../core/shared/bitstream.model';
+import { Collection } from '../../../../core/shared/collection.model';
+import { Community } from '../../../../core/shared/community.model';
+import { MetadataMap, MetadataValue } from '../../../../core/shared/metadata.models';
+import { ResourceType } from '../../../../core/shared/resource-type';
+import { hasValue, isNotEmpty } from '../../../empty.util';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import { UploaderOptions } from '../../../uploader/uploader-options.model';
+import { UploaderComponent } from '../../../uploader/uploader.component';
 import { Operation } from 'fast-json-patch';
-import { NoContent } from '../../../core/shared/NoContent.model';
-import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { NoContent } from '../../../../core/shared/NoContent.model';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
 
 /**
  * A form for creating and editing Communities or Collections

src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts

@@ -1,20 +1,20 @@
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { CommunityDataService } from '../../../core/data/community-data.service';
-import { RouteService } from '../../../core/services/route.service';
+import { CommunityDataService } from '../../../../core/data/community-data.service';
+import { RouteService } from '../../../../core/services/route.service';
 import { Router } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { Community } from '../../../core/shared/community.model';
-import { SharedModule } from '../../shared.module';
+import { Community } from '../../../../core/shared/community.model';
+import { SharedModule } from '../../../shared.module';
 import { CommonModule } from '@angular/common';
 import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { CreateComColPageComponent } from './create-comcol-page.component';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
-import { ComColDataService } from '../../../core/data/comcol-data.service';
-import { NotificationsService } from '../../notifications/notifications.service';
-import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
-import { RequestService } from '../../../core/data/request.service';
+import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils';
+import { ComColDataService } from '../../../../core/data/comcol-data.service';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
+import { RequestService } from '../../../../core/data/request.service';
 import { getTestScheduler } from 'jasmine-marbles';
 
 describe('CreateComColPageComponent', () => {

src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.ts

@@ -3,18 +3,18 @@ import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
 import { mergeMap, take } from 'rxjs/operators';
-import { ComColDataService } from '../../../core/data/comcol-data.service';
-import { CommunityDataService } from '../../../core/data/community-data.service';
-import { RemoteData } from '../../../core/data/remote-data';
-import { RouteService } from '../../../core/services/route.service';
-import { Community } from '../../../core/shared/community.model';
-import { getFirstSucceededRemoteDataPayload, } from '../../../core/shared/operators';
-import { ResourceType } from '../../../core/shared/resource-type';
-import { hasValue, isNotEmpty, isNotUndefined } from '../../empty.util';
-import { NotificationsService } from '../../notifications/notifications.service';
-import { RequestParam } from '../../../core/cache/models/request-param.model';
-import { RequestService } from '../../../core/data/request.service';
-import { Collection } from '../../../core/shared/collection.model';
+import { ComColDataService } from '../../../../core/data/comcol-data.service';
+import { CommunityDataService } from '../../../../core/data/community-data.service';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { RouteService } from '../../../../core/services/route.service';
+import { Community } from '../../../../core/shared/community.model';
+import { getFirstSucceededRemoteDataPayload, } from '../../../../core/shared/operators';
+import { ResourceType } from '../../../../core/shared/resource-type';
+import { hasValue, isNotEmpty, isNotUndefined } from '../../../empty.util';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import { RequestParam } from '../../../../core/cache/models/request-param.model';
+import { RequestService } from '../../../../core/data/request.service';
+import { Collection } from '../../../../core/shared/collection.model';
 
 /**
  * Component representing the create page for communities and collections

src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts

@@ -1,20 +1,20 @@
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { CommunityDataService } from '../../../core/data/community-data.service';
+import { CommunityDataService } from '../../../../core/data/community-data.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { Community } from '../../../core/shared/community.model';
-import { SharedModule } from '../../shared.module';
+import { Community } from '../../../../core/shared/community.model';
+import { SharedModule } from '../../../shared.module';
 import { CommonModule } from '@angular/common';
 import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { DeleteComColPageComponent } from './delete-comcol-page.component';
-import { NotificationsService } from '../../notifications/notifications.service';
-import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
-import { RequestService } from '../../../core/data/request.service';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
+import { RequestService } from '../../../../core/data/request.service';
 import { getTestScheduler } from 'jasmine-marbles';
-import { ComColDataService } from '../../../core/data/comcol-data.service';
-import { createFailedRemoteDataObject$, createNoContentRemoteDataObject$ } from '../../remote-data.utils';
+import { ComColDataService } from '../../../../core/data/comcol-data.service';
+import { createFailedRemoteDataObject$, createNoContentRemoteDataObject$ } from '../../../remote-data.utils';
 
 describe('DeleteComColPageComponent', () => {
   let comp: DeleteComColPageComponent<any>;

src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts

@@ -1,16 +1,16 @@
 import { Component, OnInit } from '@angular/core';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { ActivatedRoute, Router } from '@angular/router';
-import { RemoteData } from '../../../core/data/remote-data';
+import { RemoteData } from '../../../../core/data/remote-data';
 import { first, map } from 'rxjs/operators';
-import { NotificationsService } from '../../notifications/notifications.service';
+import { NotificationsService } from '../../../notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
-import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
-import { NoContent } from '../../../core/shared/NoContent.model';
-import { RequestService } from '../../../core/data/request.service';
-import { ComColDataService } from '../../../core/data/comcol-data.service';
-import { Community } from '../../../core/shared/community.model';
-import { Collection } from '../../../core/shared/collection.model';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import { NoContent } from '../../../../core/shared/NoContent.model';
+import { RequestService } from '../../../../core/data/request.service';
+import { ComColDataService } from '../../../../core/data/comcol-data.service';
+import { Community } from '../../../../core/shared/community.model';
+import { Collection } from '../../../../core/shared/collection.model';
 
 /**
  * Component representing the delete page for communities and collections

src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts

@@ -5,16 +5,16 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { ComColDataService } from '../../../../core/data/comcol-data.service';
-import { Community } from '../../../../core/shared/community.model';
-import { NotificationsService } from '../../../notifications/notifications.service';
-import { SharedModule } from '../../../shared.module';
-import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
+import { ComColDataService } from '../../../../../core/data/comcol-data.service';
+import { Community } from '../../../../../core/shared/community.model';
+import { NotificationsService } from '../../../../notifications/notifications.service';
+import { SharedModule } from '../../../../shared.module';
+import { NotificationsServiceStub } from '../../../../testing/notifications-service.stub';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
   createSuccessfulRemoteDataObject$
-} from '../../../remote-data.utils';
+} from '../../../../remote-data.utils';
 import { ComcolMetadataComponent } from './comcol-metadata.component';
 
 describe('ComColMetadataComponent', () => {

src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.ts

@@ -1,17 +1,17 @@
 import { Component, OnInit } from '@angular/core';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../../../../core/data/remote-data';
+import { RemoteData } from '../../../../../core/data/remote-data';
 import { ActivatedRoute, Router } from '@angular/router';
 import { first, map, take } from 'rxjs/operators';
-import { getFirstSucceededRemoteData, getFirstCompletedRemoteData } from '../../../../core/shared/operators';
-import { hasValue, isEmpty } from '../../../empty.util';
-import { ResourceType } from '../../../../core/shared/resource-type';
-import { ComColDataService } from '../../../../core/data/comcol-data.service';
-import { NotificationsService } from '../../../notifications/notifications.service';
+import { getFirstCompletedRemoteData, getFirstSucceededRemoteData } from '../../../../../core/shared/operators';
+import { hasValue, isEmpty } from '../../../../empty.util';
+import { ResourceType } from '../../../../../core/shared/resource-type';
+import { ComColDataService } from '../../../../../core/data/comcol-data.service';
+import { NotificationsService } from '../../../../notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
-import { Community } from '../../../../core/shared/community.model';
-import { Collection } from '../../../../core/shared/collection.model';
+import { Community } from '../../../../../core/shared/community.model';
+import { Collection } from '../../../../../core/shared/collection.model';
 
 @Component({
   selector: 'ds-comcol-metadata',

src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.spec.ts

@@ -1,15 +1,15 @@
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { ComcolRoleComponent } from './comcol-role.component';
-import { GroupDataService } from '../../../../core/eperson/group-data.service';
+import { GroupDataService } from '../../../../../core/eperson/group-data.service';
 import { By } from '@angular/platform-browser';
-import { SharedModule } from '../../../shared.module';
 import { TranslateModule } from '@ngx-translate/core';
 import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { RequestService } from '../../../../core/data/request.service';
+import { RequestService } from '../../../../../core/data/request.service';
 import { of as observableOf } from 'rxjs';
 import { RouterTestingModule } from '@angular/router/testing';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils';
+import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { ComcolModule } from '../../../comcol.module';
 
 describe('ComcolRoleComponent', () => {
 
@@ -32,7 +32,7 @@ describe('ComcolRoleComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
-        SharedModule,
+        ComcolModule,
         RouterTestingModule.withRoutes([]),
         TranslateModule.forRoot(),
         NoopAnimationsModule

src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts

@@ -1,17 +1,17 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { Group } from '../../../../core/eperson/models/group.model';
-import { Community } from '../../../../core/shared/community.model';
+import { Group } from '../../../../../core/eperson/models/group.model';
+import { Community } from '../../../../../core/shared/community.model';
 import { BehaviorSubject, Observable } from 'rxjs';
-import { GroupDataService } from '../../../../core/eperson/group-data.service';
-import { Collection } from '../../../../core/shared/collection.model';
+import { GroupDataService } from '../../../../../core/eperson/group-data.service';
+import { Collection } from '../../../../../core/shared/collection.model';
 import { filter, map, switchMap } from 'rxjs/operators';
-import { getAllCompletedRemoteData, getFirstCompletedRemoteData } from '../../../../core/shared/operators';
-import { RequestService } from '../../../../core/data/request.service';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { HALLink } from '../../../../core/shared/hal-link.model';
-import { getGroupEditRoute } from '../../../../access-control/access-control-routing-paths';
-import { hasNoValue, hasValue } from '../../../empty.util';
-import { NoContent } from '../../../../core/shared/NoContent.model';
+import { getAllCompletedRemoteData, getFirstCompletedRemoteData } from '../../../../../core/shared/operators';
+import { RequestService } from '../../../../../core/data/request.service';
+import { RemoteData } from '../../../../../core/data/remote-data';
+import { HALLink } from '../../../../../core/shared/hal-link.model';
+import { getGroupEditRoute } from '../../../../../access-control/access-control-routing-paths';
+import { hasNoValue, hasValue } from '../../../../empty.util';
+import { NoContent } from '../../../../../core/shared/NoContent.model';
 
 /**
  * Component for managing a community or collection role.

src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.spec.ts

@@ -2,12 +2,12 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { ActivatedRoute, Router } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { Community } from '../../../core/shared/community.model';
-import { SharedModule } from '../../shared.module';
+import { Community } from '../../../../core/shared/community.model';
+import { SharedModule } from '../../../shared.module';
 import { CommonModule } from '@angular/common';
 import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { EditComColPageComponent } from './edit-comcol-page.component';
 
 describe('EditComColPageComponent', () => {

src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts

@@ -4,9 +4,9 @@ import { Observable } from 'rxjs';
 import { first, map } from 'rxjs/operators';
 
 import { ActivatedRoute, Router } from '@angular/router';
-import { RemoteData } from '../../../core/data/remote-data';
-import { isNotEmpty } from '../../empty.util';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { isNotEmpty } from '../../../empty.util';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 
 /**
  * Component representing the edit page for communities and collections

src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts

@@ -2,10 +2,10 @@ import { Component, Input, OnInit } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { ActivatedRoute, Params, Router } from '@angular/router';
-import { BrowseByTypeConfig } from '../../../config/browse-by-type-config.interface';
-import { environment } from '../../../environments/environment';
-import { getCommunityPageRoute } from '../../community-page/community-page-routing-paths';
-import { getCollectionPageRoute } from '../../collection-page/collection-page-routing-paths';
+import { BrowseByTypeConfig } from '../../../../config/browse-by-type-config.interface';
+import { environment } from '../../../../environments/environment';
+import { getCommunityPageRoute } from '../../../community-page/community-page-routing-paths';
+import { getCollectionPageRoute } from '../../../collection-page/collection-page-routing-paths';
 
 export interface ComColPageNavOption {
   id: string;

src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.ts

@@ -1,6 +1,6 @@
 import { Component, Input } from '@angular/core';
 
-import { Bitstream } from '../../core/shared/bitstream.model';
+import { Bitstream } from '../../../core/shared/bitstream.model';
 
 @Component({
   selector: 'ds-comcol-page-logo',

src/app/shared/comcol/comcol.module.ts

@@ -0,0 +1,42 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { ComcolPageContentComponent } from './comcol-page-content/comcol-page-content.component';
+import { ComcolPageHandleComponent } from './comcol-page-handle/comcol-page-handle.component';
+import { ComcolPageHeaderComponent } from './comcol-page-header/comcol-page-header.component';
+import { ComcolPageLogoComponent } from './comcol-page-logo/comcol-page-logo.component';
+import { ComColFormComponent } from './comcol-forms/comcol-form/comcol-form.component';
+import { CreateComColPageComponent } from './comcol-forms/create-comcol-page/create-comcol-page.component';
+import { EditComColPageComponent } from './comcol-forms/edit-comcol-page/edit-comcol-page.component';
+import { DeleteComColPageComponent } from './comcol-forms/delete-comcol-page/delete-comcol-page.component';
+import { ComcolPageBrowseByComponent } from './comcol-page-browse-by/comcol-page-browse-by.component';
+import { ComcolRoleComponent } from './comcol-forms/edit-comcol-page/comcol-role/comcol-role.component';
+import { SharedModule } from '../shared.module';
+import { FormModule } from '../form/form.module';
+
+const COMPONENTS = [
+  ComcolPageContentComponent,
+  ComcolPageHandleComponent,
+  ComcolPageHeaderComponent,
+  ComcolPageLogoComponent,
+  ComColFormComponent,
+  CreateComColPageComponent,
+  EditComColPageComponent,
+  DeleteComColPageComponent,
+  ComcolPageBrowseByComponent,
+  ComcolRoleComponent,
+];
+
+@NgModule({
+  declarations: [
+    ...COMPONENTS
+  ],
+  imports: [
+    CommonModule,
+    FormModule,
+    SharedModule
+  ],
+  exports: [
+    ...COMPONENTS
+  ]
+})
+export class ComcolModule { }

src/app/shared/form/form.module.ts

@@ -0,0 +1,82 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormComponent } from './form.component';
+import { DsDynamicFormComponent } from './builder/ds-dynamic-form-ui/ds-dynamic-form.component';
+import {
+  DsDynamicFormControlContainerComponent,
+  dsDynamicFormControlMapFn
+} from './builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component';
+import { DsDynamicListComponent } from './builder/ds-dynamic-form-ui/models/list/dynamic-list.component';
+import { DsDynamicLookupComponent } from './builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component';
+import { DsDynamicDisabledComponent } from './builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component';
+import { DsDynamicLookupRelationModalComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component';
+import { DsDynamicScrollableDropdownComponent } from './builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component';
+import { DsDynamicTagComponent } from './builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component';
+import { DsDynamicOneboxComponent } from './builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component';
+import { DsDynamicRelationGroupComponent } from './builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components';
+import { DsDatePickerComponent } from './builder/ds-dynamic-form-ui/models/date-picker/date-picker.component';
+import { DsDynamicFormGroupComponent } from './builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component';
+import { DsDynamicFormArrayComponent } from './builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component';
+import { DsDatePickerInlineComponent } from './builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component';
+import { DsDynamicLookupRelationSearchTabComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component';
+import { DsDynamicLookupRelationSelectionTabComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component';
+import { DsDynamicLookupRelationExternalSourceTabComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component';
+import { SharedModule } from '../shared.module';
+import { TranslateModule } from '@ngx-translate/core';
+import { SearchModule } from '../search/search.module';
+import { DYNAMIC_FORM_CONTROL_MAP_FN, DynamicFormsCoreModule } from '@ng-dynamic-forms/core';
+import { ExistingMetadataListElementComponent } from './builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component';
+import { ExistingRelationListElementComponent } from './builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component';
+import { ExternalSourceEntryImportModalComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component';
+import { CustomSwitchComponent } from './builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component';
+import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
+
+const COMPONENTS = [
+  CustomSwitchComponent,
+  DsDynamicFormComponent,
+  DsDynamicFormControlContainerComponent,
+  DsDynamicListComponent,
+  DsDynamicLookupComponent,
+  DsDynamicLookupRelationSearchTabComponent,
+  DsDynamicLookupRelationSelectionTabComponent,
+  DsDynamicLookupRelationExternalSourceTabComponent,
+  DsDynamicDisabledComponent,
+  DsDynamicLookupRelationModalComponent,
+  DsDynamicScrollableDropdownComponent,
+  DsDynamicTagComponent,
+  DsDynamicOneboxComponent,
+  DsDynamicRelationGroupComponent,
+  DsDatePickerComponent,
+  DsDynamicFormGroupComponent,
+  DsDynamicFormArrayComponent,
+  DsDatePickerInlineComponent,
+  ExistingMetadataListElementComponent,
+  ExistingRelationListElementComponent,
+  ExternalSourceEntryImportModalComponent,
+  FormComponent
+];
+
+@NgModule({
+  declarations: [
+    ...COMPONENTS
+  ],
+  imports: [
+    CommonModule,
+    DynamicFormsCoreModule,
+    DynamicFormsNGBootstrapUIModule,
+    SearchModule,
+    SharedModule,
+    TranslateModule
+  ],
+  exports: [
+    ...COMPONENTS
+  ],
+  providers: [
+    {
+      provide: DYNAMIC_FORM_CONTROL_MAP_FN,
+      useValue: dsDynamicFormControlMapFn
+    }
+  ]
+})
+export class FormModule {
+}

src/app/shared/resource-policies/resource-policies.module.ts

@@ -0,0 +1,52 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { TranslateModule } from '@ngx-translate/core';
+
+import { ResourcePoliciesComponent } from './resource-policies.component';
+import { ResourcePolicyFormComponent } from './form/resource-policy-form.component';
+import { ResourcePolicyEditComponent } from './edit/resource-policy-edit.component';
+import { ResourcePolicyCreateComponent } from './create/resource-policy-create.component';
+import { FormModule } from '../form/form.module';
+import { ResourcePolicyResolver } from './resolvers/resource-policy.resolver';
+import { ResourcePolicyTargetResolver } from './resolvers/resource-policy-target.resolver';
+import { EpersonGroupListComponent } from './form/eperson-group-list/eperson-group-list.component';
+import { GroupSearchBoxComponent } from './form/eperson-group-list/group-search-box/group-search-box.component';
+import { EpersonSearchBoxComponent } from './form/eperson-group-list/eperson-search-box/eperson-search-box.component';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { SharedModule } from '../shared.module';
+
+const COMPONENTS = [
+  ResourcePoliciesComponent,
+  ResourcePolicyFormComponent,
+  ResourcePolicyEditComponent,
+  ResourcePolicyCreateComponent,
+  EpersonGroupListComponent,
+  EpersonSearchBoxComponent,
+  GroupSearchBoxComponent
+];
+
+const PROVIDERS = [
+  ResourcePolicyResolver,
+  ResourcePolicyTargetResolver
+];
+
+@NgModule({
+  declarations: [
+    ...COMPONENTS
+  ],
+  imports: [
+    NgbModule,
+    CommonModule,
+    FormModule,
+    TranslateModule,
+    SharedModule
+  ],
+  providers: [
+    ...PROVIDERS
+  ],
+  exports: [
+    ...COMPONENTS
+  ]
+})
+export class ResourcePoliciesModule { }

src/app/shared/search/search.module.ts

@@ -0,0 +1,103 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { SearchSwitchConfigurationComponent } from './search-switch-configuration/search-switch-configuration.component';
+import { SearchFiltersComponent } from './search-filters/search-filters.component';
+import { SearchFilterComponent } from './search-filters/search-filter/search-filter.component';
+import { SearchFacetFilterComponent } from './search-filters/search-filter/search-facet-filter/search-facet-filter.component';
+import { SearchLabelsComponent } from './search-labels/search-labels.component';
+import { SearchLabelComponent } from './search-labels/search-label/search-label.component';
+import { SearchFacetFilterWrapperComponent } from './search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component';
+import { SearchRangeFilterComponent } from './search-filters/search-filter/search-range-filter/search-range-filter.component';
+import { SearchTextFilterComponent } from './search-filters/search-filter/search-text-filter/search-text-filter.component';
+import { SearchHierarchyFilterComponent } from './search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component';
+import { SearchBooleanFilterComponent } from './search-filters/search-filter/search-boolean-filter/search-boolean-filter.component';
+import { SearchFacetOptionComponent } from './search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component';
+import { SearchFacetSelectedOptionComponent } from './search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component';
+import { SearchFacetRangeOptionComponent } from './search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component';
+import { SearchAuthorityFilterComponent } from './search-filters/search-filter/search-authority-filter/search-authority-filter.component';
+import { SearchSidebarComponent } from './search-sidebar/search-sidebar.component';
+import { SearchSettingsComponent } from './search-settings/search-settings.component';
+import { ConfigurationSearchPageComponent } from '../../search-page/configuration-search-page.component';
+import { ThemedConfigurationSearchPageComponent } from '../../search-page/themed-configuration-search-page.component';
+import { SearchObjects } from './search-objects.model';
+import { FacetConfigResponse } from './facet-config-response.model';
+import { FacetValues } from './facet-values.model';
+import { SearchResult } from './search-result.model';
+import { MissingTranslationHandler, TranslateModule } from '@ngx-translate/core';
+import { MissingTranslationHelper } from '../translate/missing-translation.helper';
+import { SharedModule } from '../shared.module';
+import { SearchResultsComponent } from './search-results/search-results.component';
+
+const COMPONENTS = [
+  SearchResultsComponent,
+  SearchSidebarComponent,
+  SearchSettingsComponent,
+  SearchFiltersComponent,
+  SearchFilterComponent,
+  SearchFacetFilterComponent,
+  SearchLabelsComponent,
+  SearchLabelComponent,
+  SearchFacetFilterWrapperComponent,
+  SearchRangeFilterComponent,
+  SearchTextFilterComponent,
+  SearchHierarchyFilterComponent,
+  SearchBooleanFilterComponent,
+  SearchFacetOptionComponent,
+  SearchFacetSelectedOptionComponent,
+  SearchFacetRangeOptionComponent,
+  SearchAuthorityFilterComponent,
+  SearchSwitchConfigurationComponent,
+  ConfigurationSearchPageComponent,
+  ThemedConfigurationSearchPageComponent
+];
+
+const ENTRY_COMPONENTS = [
+  SearchFacetFilterComponent,
+  SearchRangeFilterComponent,
+  SearchTextFilterComponent,
+  SearchHierarchyFilterComponent,
+  SearchBooleanFilterComponent,
+  SearchFacetOptionComponent,
+  SearchFacetSelectedOptionComponent,
+  SearchFacetRangeOptionComponent,
+  SearchAuthorityFilterComponent,
+];
+
+/**
+ * Declaration needed to make sure all decorator functions are called in time
+ */
+export const MODELS = [
+  SearchObjects,
+  FacetConfigResponse,
+  FacetValues,
+  SearchResult
+];
+
+@NgModule({
+  declarations: [
+    ...COMPONENTS
+  ],
+  imports: [
+    CommonModule,
+    TranslateModule.forChild({
+      missingTranslationHandler: { provide: MissingTranslationHandler, useClass: MissingTranslationHelper },
+      useDefaultLang: true
+    }),
+    SharedModule.withEntryComponents()
+  ],
+  exports: [
+    ...COMPONENTS
+  ]
+})
+export class SearchModule {
+  /**
+   * 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: SearchModule,
+      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component }))
+    };
+  }
+}

src/app/shared/shared.module.ts

@@ -6,17 +6,21 @@ import { CdkTreeModule } from '@angular/cdk/tree';
 import { DragDropModule } from '@angular/cdk/drag-drop';
 
 import { NouisliderModule } from 'ng2-nouislider';
-import { NgbDatepickerModule, NgbModule, NgbTimepickerModule, NgbTypeaheadModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  NgbDatepickerModule,
+  NgbDropdownModule,
+  NgbNavModule,
+  NgbPaginationModule,
+  NgbTimepickerModule,
+  NgbTooltipModule,
+  NgbTypeaheadModule
+} from '@ng-bootstrap/ng-bootstrap';
 import { MissingTranslationHandler, TranslateModule } from '@ngx-translate/core';
 import { NgxPaginationModule } from 'ngx-pagination';
 import { FileUploadModule } from 'ng2-file-upload';
 import { InfiniteScrollModule } from 'ngx-infinite-scroll';
-import { DYNAMIC_FORM_CONTROL_MAP_FN, DynamicFormsCoreModule } from '@ng-dynamic-forms/core';
-import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
 import { TextMaskModule } from 'angular2-text-mask';
 import { MomentModule } from 'ngx-moment';
-
-import { ComcolRoleComponent } from './comcol-forms/edit-comcol-page/comcol-role/comcol-role.component';
 import { ConfirmationModalComponent } from './confirmation-modal/confirmation-modal.component';
 import { ExportMetadataSelectorComponent } from './dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component';
 import { FileDropzoneNoUploaderComponent } from './file-dropzone-no-uploader/file-dropzone-no-uploader.component';
@@ -35,10 +39,6 @@ import { CommunityGridElementComponent } from './object-grid/community-grid-elem
 import { AbstractListableElementComponent } from './object-collection/shared/object-collection-element/abstract-listable-element.component';
 import { ObjectGridComponent } from './object-grid/object-grid.component';
 import { ObjectCollectionComponent } from './object-collection/object-collection.component';
-import { ComcolPageContentComponent } from './comcol-page-content/comcol-page-content.component';
-import { ComcolPageHandleComponent } from './comcol-page-handle/comcol-page-handle.component';
-import { ComcolPageHeaderComponent } from './comcol-page-header/comcol-page-header.component';
-import { ComcolPageLogoComponent } from './comcol-page-logo/comcol-page-logo.component';
 import { ErrorComponent } from './error/error.component';
 import { LoadingComponent } from './loading/loading.component';
 import { PaginationComponent } from './pagination/pagination.component';
@@ -49,14 +49,6 @@ import { ViewModeSwitchComponent } from './view-mode-switch/view-mode-switch.com
 import { VarDirective } from './utils/var.directive';
 import { AuthNavMenuComponent } from './auth-nav-menu/auth-nav-menu.component';
 import { LogOutComponent } from './log-out/log-out.component';
-import { FormComponent } from './form/form.component';
-import { DsDynamicOneboxComponent } from './form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component';
-import { DsDynamicScrollableDropdownComponent } from './form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component';
-import {
-  DsDynamicFormControlContainerComponent,
-  dsDynamicFormControlMapFn,
-} from './form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component';
-import { DsDynamicFormComponent } from './form/builder/ds-dynamic-form-ui/ds-dynamic-form.component';
 import { DragClickDirective } from './utils/drag-click.directive';
 import { TruncatePipe } from './utils/truncate.pipe';
 import { TruncatableComponent } from './truncatable/truncatable.component';
@@ -64,15 +56,7 @@ import { TruncatableService } from './truncatable/truncatable.service';
 import { TruncatablePartComponent } from './truncatable/truncatable-part/truncatable-part.component';
 import { UploaderComponent } from './uploader/uploader.component';
 import { ChipsComponent } from './chips/chips.component';
-import { DsDynamicTagComponent } from './form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component';
-import { DsDynamicListComponent } from './form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component';
-import { DsDynamicFormGroupComponent } from './form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component';
-import { DsDynamicFormArrayComponent } from './form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component';
-import { DsDynamicRelationGroupComponent } from './form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components';
-import { DsDatePickerInlineComponent } from './form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component';
 import { NumberPickerComponent } from './number-picker/number-picker.component';
-import { DsDatePickerComponent } from './form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component';
-import { DsDynamicLookupComponent } from './form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component';
 import { MockAdminGuard } from './mocks/admin-guard.service.mock';
 import { AlertComponent } from './alert/alert.component';
 import { SearchResultDetailElementComponent } from './object-detail/my-dspace-result-detail-element/search-result-detail-element.component';
@@ -101,14 +85,9 @@ import { LangSwitchComponent } from './lang-switch/lang-switch.component';
 import { PlainTextMetadataListElementComponent } from './object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component';
 import { ItemMetadataListElementComponent } from './object-list/metadata-representation-list-element/item/item-metadata-list-element.component';
 import { MetadataRepresentationListElementComponent } from './object-list/metadata-representation-list-element/metadata-representation-list-element.component';
-import { ComColFormComponent } from './comcol-forms/comcol-form/comcol-form.component';
-import { CreateComColPageComponent } from './comcol-forms/create-comcol-page/create-comcol-page.component';
-import { EditComColPageComponent } from './comcol-forms/edit-comcol-page/edit-comcol-page.component';
-import { DeleteComColPageComponent } from './comcol-forms/delete-comcol-page/delete-comcol-page.component';
 import { ObjectValuesPipe } from './utils/object-values-pipe';
 import { InListValidator } from './utils/in-list-validator.directive';
 import { AutoFocusDirective } from './utils/auto-focus.directive';
-import { ComcolPageBrowseByComponent } from './comcol-page-browse-by/comcol-page-browse-by.component';
 import { StartsWithDateComponent } from './starts-with/date/starts-with-date.component';
 import { StartsWithTextComponent } from './starts-with/text/starts-with-text.component';
 import { DSOSelectorComponent } from './dso-selector/dso-selector/dso-selector.component';
@@ -127,32 +106,11 @@ import { RoleDirective } from './roles/role.directive';
 import { UserMenuComponent } from './auth-nav-menu/user-menu/user-menu.component';
 import { ClaimedTaskActionsReturnToPoolComponent } from './mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component';
 import { ItemDetailPreviewFieldComponent } from './object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component';
-import { DsDynamicLookupRelationModalComponent } from './form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component';
-import { SearchResultsComponent } from './search/search-results/search-results.component';
-import { SearchSidebarComponent } from './search/search-sidebar/search-sidebar.component';
-import { SearchSettingsComponent } from './search/search-settings/search-settings.component';
 import { CollectionSearchResultGridElementComponent } from './object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component';
 import { CommunitySearchResultGridElementComponent } from './object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component';
-import { SearchFiltersComponent } from './search/search-filters/search-filters.component';
-import { SearchFilterComponent } from './search/search-filters/search-filter/search-filter.component';
-import { SearchFacetFilterComponent } from './search/search-filters/search-filter/search-facet-filter/search-facet-filter.component';
-import { SearchLabelsComponent } from './search/search-labels/search-labels.component';
-import { SearchFacetFilterWrapperComponent } from './search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component';
-import { SearchRangeFilterComponent } from './search/search-filters/search-filter/search-range-filter/search-range-filter.component';
-import { SearchTextFilterComponent } from './search/search-filters/search-filter/search-text-filter/search-text-filter.component';
-import { SearchHierarchyFilterComponent } from './search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component';
-import { SearchBooleanFilterComponent } from './search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component';
-import { SearchFacetOptionComponent } from './search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component';
-import { SearchFacetSelectedOptionComponent } from './search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component';
-import { SearchFacetRangeOptionComponent } from './search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component';
-import { SearchSwitchConfigurationComponent } from './search/search-switch-configuration/search-switch-configuration.component';
-import { SearchAuthorityFilterComponent } from './search/search-filters/search-filter/search-authority-filter/search-authority-filter.component';
-import { DsDynamicDisabledComponent } from './form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component';
-import { DsDynamicLookupRelationSearchTabComponent } from './form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component';
-import { DsDynamicLookupRelationSelectionTabComponent } from './form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component';
 import { PageSizeSelectorComponent } from './page-size-selector/page-size-selector.component';
 import { AbstractTrackableComponent } from './trackable/abstract-trackable.component';
-import { ComcolMetadataComponent } from './comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component';
+import { ComcolMetadataComponent } from './comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component';
 import { ItemSelectComponent } from './object-select/item-select/item-select.component';
 import { CollectionSelectComponent } from './object-select/collection-select/collection-select.component';
 import { FilterInputSuggestionsComponent } from './input-suggestions/filter-suggestions/filter-input-suggestions.component';
@@ -164,48 +122,34 @@ import { MetadataRepresentationDirective } from './metadata-representation/metad
 import { ListableObjectComponentLoaderComponent } from './object-collection/shared/listable-object/listable-object-component-loader.component';
 import { ItemSearchResultListElementComponent } from './object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
 import { ListableObjectDirective } from './object-collection/shared/listable-object/listable-object.directive';
-import { SearchLabelComponent } from './search/search-labels/search-label/search-label.component';
 import { ItemMetadataRepresentationListElementComponent } from './object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component';
 import { PageWithSidebarComponent } from './sidebar/page-with-sidebar.component';
 import { SidebarDropdownComponent } from './sidebar/sidebar-dropdown.component';
 import { SidebarFilterComponent } from './sidebar/filter/sidebar-filter.component';
 import { SidebarFilterSelectedOptionComponent } from './sidebar/filter/sidebar-filter-selected-option.component';
 import { SelectableListItemControlComponent } from './object-collection/shared/selectable-list-item-control/selectable-list-item-control.component';
-import { DsDynamicLookupRelationExternalSourceTabComponent } from './form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component';
-import { ExternalSourceEntryImportModalComponent } from './form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component';
 import { ImportableListItemControlComponent } from './object-collection/shared/importable-list-item-control/importable-list-item-control.component';
-import { ExistingMetadataListElementComponent } from './form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component';
 import { ItemVersionsComponent } from './item/item-versions/item-versions.component';
 import { SortablejsModule } from 'ngx-sortablejs';
 import { LogInContainerComponent } from './log-in/container/log-in-container.component';
 import { LogInShibbolethComponent } from './log-in/methods/shibboleth/log-in-shibboleth.component';
 import { LogInPasswordComponent } from './log-in/methods/password/log-in-password.component';
 import { LogInComponent } from './log-in/log-in.component';
-import { CustomSwitchComponent } from './form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component';
 import { BundleListElementComponent } from './object-list/bundle-list-element/bundle-list-element.component';
 import { MissingTranslationHelper } from './translate/missing-translation.helper';
 import { ItemVersionsNoticeComponent } from './item/item-versions/notice/item-versions-notice.component';
 import { FileValidator } from './utils/require-file.validator';
 import { FileValueAccessorDirective } from './utils/file-value-accessor.directive';
 import { FileSectionComponent } from '../item-page/simple/field-components/file-section/file-section.component';
-import { ExistingRelationListElementComponent } from './form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component';
 import { ModifyItemOverviewComponent } from '../item-page/edit-item-page/modify-item-overview/modify-item-overview.component';
 import { ClaimedTaskActionsLoaderComponent } from './mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component';
 import { ClaimedTaskActionsDirective } from './mydspace-actions/claimed-task/switcher/claimed-task-actions.directive';
 import { ClaimedTaskActionsEditMetadataComponent } from './mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component';
 import { ImpersonateNavbarComponent } from './impersonate-navbar/impersonate-navbar.component';
-import { ResourcePoliciesComponent } from './resource-policies/resource-policies.component';
 import { NgForTrackByIdDirective } from './ng-for-track-by-id.directive';
-import { ResourcePolicyFormComponent } from './resource-policies/form/resource-policy-form.component';
-import { EpersonGroupListComponent } from './resource-policies/form/eperson-group-list/eperson-group-list.component';
-import { ResourcePolicyTargetResolver } from './resource-policies/resolvers/resource-policy-target.resolver';
-import { ResourcePolicyResolver } from './resource-policies/resolvers/resource-policy.resolver';
-import { EpersonSearchBoxComponent } from './resource-policies/form/eperson-group-list/eperson-search-box/eperson-search-box.component';
-import { GroupSearchBoxComponent } from './resource-policies/form/eperson-group-list/group-search-box/group-search-box.component';
 import { FileDownloadLinkComponent } from './file-download-link/file-download-link.component';
 import { CollectionDropdownComponent } from './collection-dropdown/collection-dropdown.component';
 import { EntityDropdownComponent } from './entity-dropdown/entity-dropdown.component';
-import { DsSelectComponent } from './ds-select/ds-select.component';
 import { VocabularyTreeviewComponent } from './vocabulary-treeview/vocabulary-treeview.component';
 import { CurationFormComponent } from '../curation-form/curation-form.component';
 import { PublicationSidebarSearchListElementComponent } from './object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component';
@@ -219,53 +163,35 @@ import { HoverClassDirective } from './hover-class.directive';
 import { ValidationSuggestionsComponent } from './input-suggestions/validation-suggestions/validation-suggestions.component';
 import { ItemAlertsComponent } from './item/item-alerts/item-alerts.component';
 import { ItemSearchResultGridElementComponent } from './object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component';
-import { ResourcePolicyEditComponent } from './resource-policies/edit/resource-policy-edit.component';
-import { ResourcePolicyCreateComponent } from './resource-policies/create/resource-policy-create.component';
-import { SearchObjects } from './search/search-objects.model';
-import { SearchResult } from './search/search-result.model';
-import { FacetConfigResponse } from './search/facet-config-response.model';
-import { FacetValues } from './search/facet-values.model';
 import { BitstreamDownloadPageComponent } from './bitstream-download-page/bitstream-download-page.component';
 import { GenericItemPageFieldComponent } from '../item-page/simple/field-components/specific-field/generic/generic-item-page-field.component';
 import { MetadataRepresentationListComponent } from '../item-page/simple/metadata-representation-list/metadata-representation-list.component';
 import { RelatedItemsComponent } from '../item-page/simple/related-items/related-items-component';
-import { TabbedRelatedEntitiesSearchComponent } from '../item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component';
-import { RelatedEntitiesSearchComponent } from '../item-page/simple/related-entities/related-entities-search/related-entities-search.component';
-import { ConfigurationSearchPageComponent } from '../search-page/configuration-search-page.component';
 import { LinkMenuItemComponent } from './menu/menu-item/link-menu-item.component';
 import { OnClickMenuItemComponent } from './menu/menu-item/onclick-menu-item.component';
 import { TextMenuItemComponent } from './menu/menu-item/text-menu-item.component';
-import { ThemedConfigurationSearchPageComponent } from '../search-page/themed-configuration-search-page.component';
 import { SearchNavbarComponent } from '../search-navbar/search-navbar.component';
 import { ItemVersionsSummaryModalComponent } from './item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component';
 import { ItemVersionsDeleteModalComponent } from './item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component';
 import { ScopeSelectorModalComponent } from './search-form/scope-selector-modal/scope-selector-modal.component';
 import { BitstreamRequestACopyPageComponent } from './bitstream-request-a-copy-page/bitstream-request-a-copy-page.component';
-
-/**
- * Declaration needed to make sure all decorator functions are called in time
- */
-export const MODELS = [
-  SearchObjects,
-  FacetConfigResponse,
-  FacetValues,
-  SearchResult
-];
+import { DsSelectComponent } from './ds-select/ds-select.component';
 
 const MODULES = [
   // Do NOT include UniversalModule, HttpModule, or JsonpModule here
   CommonModule,
   SortablejsModule,
-  DynamicFormsCoreModule,
-  DynamicFormsNGBootstrapUIModule,
   FileUploadModule,
   FormsModule,
   InfiniteScrollModule,
-  NgbModule,
+  NgbNavModule,
   NgbDatepickerModule,
   NgbTimepickerModule,
   NgbTypeaheadModule,
   NgxPaginationModule,
+  NgbPaginationModule,
+  NgbDropdownModule,
+  NgbTooltipModule,
   ReactiveFormsModule,
   RouterModule,
   NouisliderModule,
@@ -302,34 +228,9 @@ const COMPONENTS = [
   AuthNavMenuComponent,
   UserMenuComponent,
   ChipsComponent,
-  ComcolPageContentComponent,
-  ComcolPageHandleComponent,
-  ComcolPageHeaderComponent,
-  ComcolPageLogoComponent,
-  ComColFormComponent,
-  CreateComColPageComponent,
-  EditComColPageComponent,
-  DeleteComColPageComponent,
-  ComcolPageBrowseByComponent,
-  ComcolRoleComponent,
-  DsDynamicFormComponent,
-  DsDynamicFormControlContainerComponent,
-  DsDynamicListComponent,
-  DsDynamicLookupComponent,
-  DsDynamicDisabledComponent,
-  DsDynamicLookupRelationModalComponent,
-  DsDynamicScrollableDropdownComponent,
-  DsDynamicTagComponent,
-  DsDynamicOneboxComponent,
-  DsDynamicRelationGroupComponent,
-  DsDatePickerComponent,
-  DsDynamicFormGroupComponent,
-  DsDynamicFormArrayComponent,
-  DsDatePickerInlineComponent,
   DsSelectComponent,
   ErrorComponent,
   FileSectionComponent,
-  FormComponent,
   LangSwitchComponent,
   LoadingComponent,
   LogInComponent,
@@ -382,26 +283,9 @@ const COMPONENTS = [
   CommunitySearchResultListElementComponent,
   CollectionSearchResultListElementComponent,
   BrowseByComponent,
-  SearchResultsComponent,
-  SearchSidebarComponent,
-  SearchSettingsComponent,
+
   CollectionSearchResultGridElementComponent,
   CommunitySearchResultGridElementComponent,
-  SearchFiltersComponent,
-  SearchFilterComponent,
-  SearchFacetFilterComponent,
-  SearchLabelsComponent,
-  SearchLabelComponent,
-  SearchFacetFilterWrapperComponent,
-  SearchRangeFilterComponent,
-  SearchTextFilterComponent,
-  SearchHierarchyFilterComponent,
-  SearchBooleanFilterComponent,
-  SearchFacetOptionComponent,
-  SearchFacetSelectedOptionComponent,
-  SearchFacetRangeOptionComponent,
-  SearchSwitchConfigurationComponent,
-  SearchAuthorityFilterComponent,
   PageSizeSelectorComponent,
   ListableObjectComponentLoaderComponent,
   CollectionListElementComponent,
@@ -414,15 +298,14 @@ const COMPONENTS = [
   TypeBadgeComponent,
   BrowseByComponent,
   AbstractTrackableComponent,
-  CustomSwitchComponent,
+
   ItemSelectComponent,
   CollectionSelectComponent,
   MetadataRepresentationLoaderComponent,
   SelectableListItemControlComponent,
-  ExternalSourceEntryImportModalComponent,
+
   ImportableListItemControlComponent,
-  ExistingMetadataListElementComponent,
-  ExistingRelationListElementComponent,
+
   LogInShibbolethComponent,
   LogInPasswordComponent,
   LogInContainerComponent,
@@ -431,13 +314,6 @@ const COMPONENTS = [
   ItemVersionsNoticeComponent,
   ModifyItemOverviewComponent,
   ImpersonateNavbarComponent,
-  ResourcePoliciesComponent,
-  ResourcePolicyFormComponent,
-  ResourcePolicyEditComponent,
-  ResourcePolicyCreateComponent,
-  EpersonGroupListComponent,
-  EpersonSearchBoxComponent,
-  GroupSearchBoxComponent,
   FileDownloadLinkComponent,
   BitstreamDownloadPageComponent,
   BitstreamRequestACopyPageComponent,
@@ -458,10 +334,7 @@ const COMPONENTS = [
   PlainTextMetadataListElementComponent,
   ItemMetadataListElementComponent,
   MetadataRepresentationListElementComponent,
-  DsDynamicLookupRelationSearchTabComponent,
-  DsDynamicLookupRelationSelectionTabComponent,
   ItemMetadataRepresentationListElementComponent,
-  DsDynamicLookupRelationExternalSourceTabComponent,
   BundleListElementComponent,
   StartsWithDateComponent,
   StartsWithTextComponent,
@@ -502,18 +375,7 @@ const ENTRY_COMPONENTS = [
   PlainTextMetadataListElementComponent,
   ItemMetadataListElementComponent,
   MetadataRepresentationListElementComponent,
-  CustomSwitchComponent,
   ItemMetadataRepresentationListElementComponent,
-  SearchResultsComponent,
-  SearchFacetFilterComponent,
-  SearchRangeFilterComponent,
-  SearchTextFilterComponent,
-  SearchHierarchyFilterComponent,
-  SearchBooleanFilterComponent,
-  SearchFacetOptionComponent,
-  SearchFacetSelectedOptionComponent,
-  SearchFacetRangeOptionComponent,
-  SearchAuthorityFilterComponent,
   LogInPasswordComponent,
   LogInShibbolethComponent,
   BundleListElementComponent,
@@ -539,11 +401,6 @@ const ENTRY_COMPONENTS = [
   ScopeSelectorModalComponent,
 ];
 
-const SHARED_SEARCH_PAGE_COMPONENTS = [
-  ConfigurationSearchPageComponent,
-  ThemedConfigurationSearchPageComponent
-];
-
 const SHARED_ITEM_PAGE_COMPONENTS = [
   MetadataFieldWrapperComponent,
   MetadataValuesComponent,
@@ -553,20 +410,13 @@ const SHARED_ITEM_PAGE_COMPONENTS = [
   GenericItemPageFieldComponent,
   MetadataRepresentationListComponent,
   RelatedItemsComponent,
-  RelatedEntitiesSearchComponent,
-  TabbedRelatedEntitiesSearchComponent
+
 ];
 
 const PROVIDERS = [
   TruncatableService,
   MockAdminGuard,
-  AbstractTrackableComponent,
-  {
-    provide: DYNAMIC_FORM_CONTROL_MAP_FN,
-    useValue: dsDynamicFormControlMapFn
-  },
-  ResourcePolicyResolver,
-  ResourcePolicyTargetResolver
+  AbstractTrackableComponent
 ];
 
 const DIRECTIVES = [
@@ -599,7 +449,6 @@ const DIRECTIVES = [
     ...COMPONENTS,
     ...DIRECTIVES,
     ...SHARED_ITEM_PAGE_COMPONENTS,
-    ...SHARED_SEARCH_PAGE_COMPONENTS,
     ItemVersionsSummaryModalComponent,
     ItemVersionsDeleteModalComponent,
   ],
@@ -611,7 +460,6 @@ const DIRECTIVES = [
     ...PIPES,
     ...COMPONENTS,
     ...SHARED_ITEM_PAGE_COMPONENTS,
-    ...SHARED_SEARCH_PAGE_COMPONENTS,
     ...DIRECTIVES,
     TranslateModule
   ]
@@ -628,7 +476,7 @@ export class SharedModule {
   static withEntryComponents() {
     return {
       ngModule: SharedModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({provide: component}))
+      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component }))
     };
   }
 }

src/app/submission/submission.module.ts

@@ -37,6 +37,8 @@ import { ResearchEntitiesModule } from '../entity-groups/research-entities/resea
 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 { FormModule } from '../shared/form/form.module';
+import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
 
 const DECLARATIONS = [
   SubmissionSectionUploadAccessConditionsComponent,
@@ -73,15 +75,17 @@ const ENTRY_COMPONENTS = [
 ];
 
 @NgModule({
-  imports: [
-    CommonModule,
-    CoreModule.forRoot(),
-    SharedModule,
-    StoreModule.forFeature('submission', submissionReducers, storeModuleConfig as StoreConfig<SubmissionState, Action>),
-    EffectsModule.forFeature(submissionEffects),
-    JournalEntitiesModule.withEntryComponents(),
-    ResearchEntitiesModule.withEntryComponents(),
-  ],
+    imports: [
+        CommonModule,
+        CoreModule.forRoot(),
+        SharedModule,
+        StoreModule.forFeature('submission', submissionReducers, storeModuleConfig as StoreConfig<SubmissionState, Action>),
+        EffectsModule.forFeature(submissionEffects),
+        JournalEntitiesModule.withEntryComponents(),
+        ResearchEntitiesModule.withEntryComponents(),
+        FormModule,
+        NgbAccordionModule
+    ],
   declarations: DECLARATIONS,
   exports: DECLARATIONS,
   providers: [

src/themes/custom/theme.module.ts

@@ -79,7 +79,10 @@ import { HeaderComponent } from './app/header/header.component';
 import { FooterComponent } from './app/footer/footer.component';
 import { BreadcrumbsComponent } from './app/breadcrumbs/breadcrumbs.component';
 import { HeaderNavbarWrapperComponent } from './app/header-nav-wrapper/header-navbar-wrapper.component';
-import { FileSectionComponent} from './app/item-page/simple/field-components/file-section/file-section.component';
+import { FileSectionComponent } from './app/item-page/simple/field-components/file-section/file-section.component';
+import { SearchModule } from '../../app/shared/search/search.module';
+import { ResourcePoliciesModule } from '../../app/shared/resource-policies/resource-policies.module';
+import { ComcolModule } from '../../app/shared/comcol/comcol.module';
 
 const DECLARATIONS = [
   FileSectionComponent,
@@ -168,6 +171,10 @@ const DECLARATIONS = [
     SubmissionModule,
     MyDSpacePageModule,
     MyDspaceSearchModule,
+    SearchModule,
+    FormsModule,
+    ResourcePoliciesModule,
+    ComcolModule
   ],
   declarations: DECLARATIONS
 })

src/themes/dspace/theme.module.ts

@@ -43,6 +43,9 @@ import { MyDSpacePageModule } from '../../app/my-dspace-page/my-dspace-page.modu
 import { NavbarComponent } from './app/navbar/navbar.component';
 import { HeaderComponent } from './app/header/header.component';
 import { HeaderNavbarWrapperComponent } from './app/header-nav-wrapper/header-navbar-wrapper.component';
+import { SearchModule } from '../../app/shared/search/search.module';
+import { ResourcePoliciesModule } from '../../app/shared/resource-policies/resource-policies.module';
+import { ComcolModule } from '../../app/shared/comcol/comcol.module';
 
 const DECLARATIONS = [
   HomeNewsComponent,
@@ -94,6 +97,10 @@ const DECLARATIONS = [
     SubmissionModule,
     MyDSpacePageModule,
     MyDspaceSearchModule,
+    SearchModule,
+    FormsModule,
+    ResourcePoliciesModule,
+    ComcolModule
   ],
   declarations: DECLARATIONS
 })