Remove circular dependencies

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

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+
+import { CollectionFormComponent } from './collection-form.component';
+import { SharedModule } from '../../shared/shared.module';
+
+@NgModule({
+  imports: [
+    SharedModule
+  ],
+  declarations: [
+    CollectionFormComponent,
+  ],
+  exports: [
+    CollectionFormComponent
+  ]
+})
+export class CollectionFormModule {
+
+}

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

@@ -6,13 +6,13 @@ import { SharedModule } from '../shared/shared.module';
 import { CollectionPageComponent } from './collection-page.component';
 import { CollectionPageRoutingModule } from './collection-page-routing.module';
 import { CreateCollectionPageComponent } from './create-collection-page/create-collection-page.component';
-import { CollectionFormComponent } from './collection-form/collection-form.component';
 import { DeleteCollectionPageComponent } from './delete-collection-page/delete-collection-page.component';
 import { EditItemTemplatePageComponent } from './edit-item-template-page/edit-item-template-page.component';
 import { EditItemPageModule } from '../+item-page/edit-item-page/edit-item-page.module';
 import { CollectionItemMapperComponent } from './collection-item-mapper/collection-item-mapper.component';
 import { SearchService } from '../core/shared/search/search.service';
 import { StatisticsModule } from '../statistics/statistics.module';
+import { CollectionFormModule } from './collection-form/collection-form.module';
 
 @NgModule({
   imports: [
@@ -20,19 +20,16 @@ import { StatisticsModule } from '../statistics/statistics.module';
     SharedModule,
     CollectionPageRoutingModule,
     StatisticsModule.forRoot(),
-    EditItemPageModule
+    EditItemPageModule,
+    CollectionFormModule
   ],
   declarations: [
     CollectionPageComponent,
     CreateCollectionPageComponent,
     DeleteCollectionPageComponent,
-    CollectionFormComponent,
     EditItemTemplatePageComponent,
     CollectionItemMapperComponent
   ],
-  exports: [
-    CollectionFormComponent
-  ],
   providers: [
     SearchService,
   ]

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

@@ -4,11 +4,11 @@ import { CommonModule } from '@angular/common';
 import { SharedModule } from '../../shared/shared.module';
 import { EditCollectionPageRoutingModule } from './edit-collection-page.routing.module';
 import { CollectionMetadataComponent } from './collection-metadata/collection-metadata.component';
-import { CollectionPageModule } from '../collection-page.module';
 import { CollectionRolesComponent } from './collection-roles/collection-roles.component';
 import { CollectionCurateComponent } from './collection-curate/collection-curate.component';
 import { CollectionSourceComponent } from './collection-source/collection-source.component';
 import { CollectionAuthorizationsComponent } from './collection-authorizations/collection-authorizations.component';
+import { CollectionFormModule } from '../collection-form/collection-form.module';
 
 /**
  * Module that contains all components related to the Edit Collection page administrator functionality
@@ -18,7 +18,7 @@ import { CollectionAuthorizationsComponent } from './collection-authorizations/c
     CommonModule,
     SharedModule,
     EditCollectionPageRoutingModule,
-    CollectionPageModule
+    CollectionFormModule
   ],
   declarations: [
     EditCollectionPageComponent,

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

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+
+import { CommunityFormComponent } from './community-form.component';
+import { SharedModule } from '../../shared/shared.module';
+
+@NgModule({
+  imports: [
+    SharedModule
+  ],
+  declarations: [
+    CommunityFormComponent,
+  ],
+  exports: [
+    CommunityFormComponent
+  ]
+})
+export class CommunityFormModule {
+
+}

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

@@ -8,27 +8,24 @@ import { CommunityPageSubCollectionListComponent } from './sub-collection-list/c
 import { CommunityPageRoutingModule } from './community-page-routing.module';
 import { CommunityPageSubCommunityListComponent } from './sub-community-list/community-page-sub-community-list.component';
 import { CreateCommunityPageComponent } from './create-community-page/create-community-page.component';
-import { CommunityFormComponent } from './community-form/community-form.component';
 import { DeleteCommunityPageComponent } from './delete-community-page/delete-community-page.component';
 import { StatisticsModule } from '../statistics/statistics.module';
+import { CommunityFormModule } from './community-form/community-form.module';
 
 @NgModule({
   imports: [
     CommonModule,
     SharedModule,
     CommunityPageRoutingModule,
-    StatisticsModule.forRoot()
+    StatisticsModule.forRoot(),
+    CommunityFormModule
   ],
   declarations: [
     CommunityPageComponent,
     CommunityPageSubCollectionListComponent,
     CommunityPageSubCommunityListComponent,
     CreateCommunityPageComponent,
-    DeleteCommunityPageComponent,
+    DeleteCommunityPageComponent
-    CommunityFormComponent
-  ],
-  exports: [
-    CommunityFormComponent
   ]
 })
 

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

@@ -2,12 +2,12 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { SharedModule } from '../../shared/shared.module';
 import { EditCommunityPageRoutingModule } from './edit-community-page.routing.module';
-import { CommunityPageModule } from '../community-page.module';
 import { EditCommunityPageComponent } from './edit-community-page.component';
 import { CommunityCurateComponent } from './community-curate/community-curate.component';
 import { CommunityMetadataComponent } from './community-metadata/community-metadata.component';
 import { CommunityRolesComponent } from './community-roles/community-roles.component';
 import { CommunityAuthorizationsComponent } from './community-authorizations/community-authorizations.component';
+import { CommunityFormModule } from '../community-form/community-form.module';
 
 /**
  * Module that contains all components related to the Edit Community page administrator functionality
@@ -17,7 +17,7 @@ import { CommunityAuthorizationsComponent } from './community-authorizations/com
     CommonModule,
     SharedModule,
     EditCommunityPageRoutingModule,
-    CommunityPageModule
+    CommunityFormModule
   ],
   declarations: [
     EditCommunityPageComponent,

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

@@ -1,22 +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 { Observable } from 'rxjs';
+import { BehaviorSubject, Observable } from 'rxjs';
 import { GroupDataService } from '../../../../core/eperson/group-data.service';
 import { Collection } from '../../../../core/shared/collection.model';
-import { map, switchMap } from 'rxjs/operators';
+import { filter, map, switchMap } from 'rxjs/operators';
-import {
+import { getAllCompletedRemoteData, getFirstCompletedRemoteData } from '../../../../core/shared/operators';
-  getFirstCompletedRemoteData,
-  getAllCompletedRemoteData
-} 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 '../../../../+admin/admin-access-control/admin-access-control-routing-paths';
-import { hasValue, hasNoValue } from '../../../empty.util';
+import { hasNoValue, hasValue } from '../../../empty.util';
-import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 import { NoContent } from '../../../../core/shared/NoContent.model';
-import { filter } from 'rxjs/internal/operators/filter';
 
 /**
  * Component for managing a community or collection role.