77205: Move admin-access-control out of +admin

src/app/+admin/admin-routing.module.ts

@@ -18,7 +18,7 @@ import { ACCESS_CONTROL_MODULE_PATH, REGISTRIES_MODULE_PATH } from './admin-rout
       },
       {
         path: ACCESS_CONTROL_MODULE_PATH,
-        loadChildren: () => import('./admin-access-control/admin-access-control.module')
+        loadChildren: () => import('../admin-access-control/admin-access-control.module')
           .then((m) => m.AdminAccessControlModule),
       },
       {

src/app/+admin/admin.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { SharedModule } from '../shared/shared.module';
-import { AdminAccessControlModule } from './admin-access-control/admin-access-control.module';
+import { AdminAccessControlModule } from '../admin-access-control/admin-access-control.module';
 import { MetadataImportPageComponent } from './admin-import-metadata-page/metadata-import-page.component';
 import { AdminRegistriesModule } from './admin-registries/admin-registries.module';
 import { AdminRoutingModule } from './admin-routing.module';

src/app/admin-access-control/admin-access-control-routing-paths.ts

@@ -1,5 +1,5 @@
-import { URLCombiner } from '../../core/url-combiner/url-combiner';
+import { URLCombiner } from '../core/url-combiner/url-combiner';
-import { getAccessControlModuleRoute } from '../admin-routing-paths';
+import { getAccessControlModuleRoute } from '../+admin/admin-routing-paths';
 
 export const GROUP_EDIT_PATH = 'groups';
 

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

@@ -1,7 +1,7 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { SharedModule } from '../../shared/shared.module';
+import { SharedModule } from '../shared/shared.module';
 import { AdminAccessControlRoutingModule } from './admin-access-control-routing.module';
 import { EPeopleRegistryComponent } from './epeople-registry/epeople-registry.component';
 import { EPersonFormComponent } from './epeople-registry/eperson-form/eperson-form.component';

src/app/admin-access-control/epeople-registry/epeople-registry.actions.ts

@@ -1,6 +1,6 @@
 import { Action } from '@ngrx/store';
-import { EPerson } from '../../../core/eperson/models/eperson.model';
+import { EPerson } from '../../core/eperson/models/eperson.model';
-import { type } from '../../../shared/ngrx/type';
+import { type } from '../../shared/ngrx/type';
 
 /**
  * For each action type in an action group, make a simple

src/app/admin-access-control/epeople-registry/epeople-registry.component.spec.ts

@@ -7,24 +7,24 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { BrowserModule, By } from '@angular/platform-browser';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model';
+import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model';
-import { RemoteData } from '../../../core/data/remote-data';
+import { RemoteData } from '../../core/data/remote-data';
-import { FindListOptions } from '../../../core/data/request.models';
+import { FindListOptions } from '../../core/data/request.models';
-import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { EPerson } from '../../../core/eperson/models/eperson.model';
+import { EPerson } from '../../core/eperson/models/eperson.model';
-import { PageInfo } from '../../../core/shared/page-info.model';
+import { PageInfo } from '../../core/shared/page-info.model';
-import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
+import { FormBuilderService } from '../../shared/form/builder/form-builder.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { EPeopleRegistryComponent } from './epeople-registry.component';
-import { EPersonMock, EPersonMock2 } from '../../../shared/testing/eperson.mock';
+import { EPersonMock, EPersonMock2 } from '../../shared/testing/eperson.mock';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
+import { getMockFormBuilderService } from '../../shared/mocks/form-builder-service.mock';
-import { getMockTranslateService } from '../../../shared/mocks/translate.service.mock';
+import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
-import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { RouterStub } from '../../../shared/testing/router.stub';
+import { RouterStub } from '../../shared/testing/router.stub';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { RequestService } from '../../../core/data/request.service';
+import { RequestService } from '../../core/data/request.service';
 
 describe('EPeopleRegistryComponent', () => {
   let component: EPeopleRegistryComponent;

src/app/admin-access-control/epeople-registry/epeople-registry.component.ts

@@ -4,25 +4,25 @@ import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs';
 import { map, switchMap, take } from 'rxjs/operators';
-import { PaginatedList, buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { PaginatedList, buildPaginatedList } from '../../core/data/paginated-list.model';
-import { RemoteData } from '../../../core/data/remote-data';
+import { RemoteData } from '../../core/data/remote-data';
-import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { EPerson } from '../../../core/eperson/models/eperson.model';
+import { EPerson } from '../../core/eperson/models/eperson.model';
-import { hasValue } from '../../../shared/empty.util';
+import { hasValue } from '../../shared/empty.util';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { EpersonDtoModel } from '../../../core/eperson/models/eperson-dto.model';
+import { EpersonDtoModel } from '../../core/eperson/models/eperson-dto.model';
-import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import {
   getFirstCompletedRemoteData,
   getAllSucceededRemoteData
-} from '../../../core/shared/operators';
+} from '../../core/shared/operators';
-import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component';
+import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { RequestService } from '../../../core/data/request.service';
+import { RequestService } from '../../core/data/request.service';
-import { PageInfo } from '../../../core/shared/page-info.model';
+import { PageInfo } from '../../core/shared/page-info.model';
-import { NoContent } from '../../../core/shared/NoContent.model';
+import { NoContent } from '../../core/shared/NoContent.model';
 
 @Component({
   selector: 'ds-epeople-registry',

src/app/admin-access-control/epeople-registry/epeople-registry.reducers.spec.ts

@@ -1,6 +1,6 @@
 import { EPeopleRegistryCancelEPersonAction, EPeopleRegistryEditEPersonAction } from './epeople-registry.actions';
 import { ePeopleRegistryReducer, EPeopleRegistryState } from './epeople-registry.reducers';
-import { EPersonMock } from '../../../shared/testing/eperson.mock';
+import { EPersonMock } from '../../shared/testing/eperson.mock';
 
 const initialState: EPeopleRegistryState = {
   editEPerson: null,

src/app/admin-access-control/epeople-registry/epeople-registry.reducers.ts

@@ -1,4 +1,4 @@
-import { EPerson } from '../../../core/eperson/models/eperson.model';
+import { EPerson } from '../../core/eperson/models/eperson.model';
 import {
   EPeopleRegistryAction,
   EPeopleRegistryActionTypes,

src/app/admin-access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts

@@ -6,26 +6,26 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { BrowserModule, By } from '@angular/platform-browser';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { buildPaginatedList, PaginatedList } from '../../../../core/data/paginated-list.model';
+import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model';
-import { RemoteData } from '../../../../core/data/remote-data';
+import { RemoteData } from '../../../core/data/remote-data';
-import { FindListOptions } from '../../../../core/data/request.models';
+import { FindListOptions } from '../../../core/data/request.models';
-import { EPersonDataService } from '../../../../core/eperson/eperson-data.service';
+import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
-import { EPerson } from '../../../../core/eperson/models/eperson.model';
+import { EPerson } from '../../../core/eperson/models/eperson.model';
-import { PageInfo } from '../../../../core/shared/page-info.model';
+import { PageInfo } from '../../../core/shared/page-info.model';
-import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
+import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
-import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { EPersonFormComponent } from './eperson-form.component';
-import { EPersonMock, EPersonMock2 } from '../../../../shared/testing/eperson.mock';
+import { EPersonMock, EPersonMock2 } from '../../../shared/testing/eperson.mock';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock';
+import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
-import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
-import { AuthService } from '../../../../core/auth/auth.service';
+import { AuthService } from '../../../core/auth/auth.service';
-import { AuthServiceStub } from '../../../../shared/testing/auth-service.stub';
+import { AuthServiceStub } from '../../../shared/testing/auth-service.stub';
-import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { GroupDataService } from '../../../../core/eperson/group-data.service';
+import { GroupDataService } from '../../../core/eperson/group-data.service';
-import { createPaginatedList } from '../../../../shared/testing/utils.test';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
-import { RequestService } from '../../../../core/data/request.service';
+import { RequestService } from '../../../core/data/request.service';
 
 describe('EPersonFormComponent', () => {
   let component: EPersonFormComponent;

src/app/admin-access-control/epeople-registry/eperson-form/eperson-form.component.ts

@@ -9,28 +9,28 @@ import {
 import { TranslateService } from '@ngx-translate/core';
 import { combineLatest, Observable, of, Subscription } from 'rxjs';
 import { switchMap, take } from 'rxjs/operators';
-import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { RemoteData } from '../../../../core/data/remote-data';
+import { RemoteData } from '../../../core/data/remote-data';
-import { EPersonDataService } from '../../../../core/eperson/eperson-data.service';
+import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
-import { GroupDataService } from '../../../../core/eperson/group-data.service';
+import { GroupDataService } from '../../../core/eperson/group-data.service';
-import { EPerson } from '../../../../core/eperson/models/eperson.model';
+import { EPerson } from '../../../core/eperson/models/eperson.model';
-import { Group } from '../../../../core/eperson/models/group.model';
+import { Group } from '../../../core/eperson/models/group.model';
 import {
   getRemoteDataPayload,
   getFirstSucceededRemoteData,
   getFirstCompletedRemoteData
-} from '../../../../core/shared/operators';
+} from '../../../core/shared/operators';
-import { hasValue } from '../../../../shared/empty.util';
+import { hasValue } from '../../../shared/empty.util';
-import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
+import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
-import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { AuthService } from '../../../../core/auth/auth.service';
+import { AuthService } from '../../../core/auth/auth.service';
-import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { FeatureID } from '../../../../core/data/feature-authorization/feature-id';
+import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-import { ConfirmationModalComponent } from '../../../../shared/confirmation-modal/confirmation-modal.component';
+import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { RequestService } from '../../../../core/data/request.service';
+import { RequestService } from '../../../core/data/request.service';
-import { NoContent } from '../../../../core/shared/NoContent.model';
+import { NoContent } from '../../../core/shared/NoContent.model';
 
 @Component({
   selector: 'ds-eperson-form',

src/app/admin-access-control/group-registry/group-form/group-form.component.spec.ts

@@ -9,30 +9,30 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { Store } from '@ngrx/store';
 import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
 import { Observable, of as observableOf } from 'rxjs';
-import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
+import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
-import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service';
+import { DSOChangeAnalyzer } from '../../../core/data/dso-change-analyzer.service';
-import { DSpaceObjectDataService } from '../../../../core/data/dspace-object-data.service';
+import { DSpaceObjectDataService } from '../../../core/data/dspace-object-data.service';
-import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { buildPaginatedList, PaginatedList } from '../../../../core/data/paginated-list.model';
+import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model';
-import { RemoteData } from '../../../../core/data/remote-data';
+import { RemoteData } from '../../../core/data/remote-data';
-import { EPersonDataService } from '../../../../core/eperson/eperson-data.service';
+import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
-import { GroupDataService } from '../../../../core/eperson/group-data.service';
+import { GroupDataService } from '../../../core/eperson/group-data.service';
-import { Group } from '../../../../core/eperson/models/group.model';
+import { Group } from '../../../core/eperson/models/group.model';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
+import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
-import { PageInfo } from '../../../../core/shared/page-info.model';
+import { PageInfo } from '../../../core/shared/page-info.model';
-import { UUIDService } from '../../../../core/shared/uuid.service';
+import { UUIDService } from '../../../core/shared/uuid.service';
-import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
+import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
-import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { GroupMock, GroupMock2 } from '../../../../shared/testing/group-mock';
+import { GroupMock, GroupMock2 } from '../../../shared/testing/group-mock';
 import { GroupFormComponent } from './group-form.component';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock';
+import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
-import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock';
+import { getMockTranslateService } from '../../../shared/mocks/translate.service.mock';
-import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
+import { TranslateLoaderMock } from '../../../shared/testing/translate-loader.mock';
-import { RouterMock } from '../../../../shared/mocks/router.mock';
+import { RouterMock } from '../../../shared/mocks/router.mock';
-import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { Operation } from 'fast-json-patch';
 
 describe('GroupFormComponent', () => {

src/app/admin-access-control/group-registry/group-form/group-form.component.ts

@@ -17,32 +17,32 @@ import {
   Subscription
 } from 'rxjs';
 import { catchError, map, switchMap, take } from 'rxjs/operators';
-import { getCollectionEditRolesRoute } from '../../../../+collection-page/collection-page-routing-paths';
+import { getCollectionEditRolesRoute } from '../../../+collection-page/collection-page-routing-paths';
-import { getCommunityEditRolesRoute } from '../../../../+community-page/community-page-routing-paths';
+import { getCommunityEditRolesRoute } from '../../../+community-page/community-page-routing-paths';
-import { DSpaceObjectDataService } from '../../../../core/data/dspace-object-data.service';
+import { DSpaceObjectDataService } from '../../../core/data/dspace-object-data.service';
-import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { FeatureID } from '../../../../core/data/feature-authorization/feature-id';
+import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { RemoteData } from '../../../../core/data/remote-data';
+import { RemoteData } from '../../../core/data/remote-data';
-import { RequestService } from '../../../../core/data/request.service';
+import { RequestService } from '../../../core/data/request.service';
-import { EPersonDataService } from '../../../../core/eperson/eperson-data.service';
+import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
-import { GroupDataService } from '../../../../core/eperson/group-data.service';
+import { GroupDataService } from '../../../core/eperson/group-data.service';
-import { Group } from '../../../../core/eperson/models/group.model';
+import { Group } from '../../../core/eperson/models/group.model';
-import { Collection } from '../../../../core/shared/collection.model';
+import { Collection } from '../../../core/shared/collection.model';
-import { Community } from '../../../../core/shared/community.model';
+import { Community } from '../../../core/shared/community.model';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import {
   getRemoteDataPayload,
   getFirstSucceededRemoteData,
   getFirstCompletedRemoteData
-} from '../../../../core/shared/operators';
+} from '../../../core/shared/operators';
-import { AlertType } from '../../../../shared/alert/aletr-type';
+import { AlertType } from '../../../shared/alert/aletr-type';
-import { ConfirmationModalComponent } from '../../../../shared/confirmation-modal/confirmation-modal.component';
+import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component';
-import { hasValue, isNotEmpty, hasValueOperator } from '../../../../shared/empty.util';
+import { hasValue, isNotEmpty, hasValueOperator } from '../../../shared/empty.util';
-import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
+import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
-import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { followLink } from '../../../../shared/utils/follow-link-config.model';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
-import { NoContent } from '../../../../core/shared/NoContent.model';
+import { NoContent } from '../../../core/shared/NoContent.model';
 import { Operation } from 'fast-json-patch';
 
 @Component({

src/app/admin-access-control/group-registry/group-form/members-list/members-list.component.spec.ts

@@ -7,25 +7,25 @@ import { Router } from '@angular/router';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
 import { Observable, of as observableOf } from 'rxjs';
-import { RestResponse } from '../../../../../core/cache/response.models';
+import { RestResponse } from '../../../../core/cache/response.models';
-import { buildPaginatedList, PaginatedList } from '../../../../../core/data/paginated-list.model';
+import { buildPaginatedList, PaginatedList } from '../../../../core/data/paginated-list.model';
-import { RemoteData } from '../../../../../core/data/remote-data';
+import { RemoteData } from '../../../../core/data/remote-data';
-import { EPersonDataService } from '../../../../../core/eperson/eperson-data.service';
+import { EPersonDataService } from '../../../../core/eperson/eperson-data.service';
-import { GroupDataService } from '../../../../../core/eperson/group-data.service';
+import { GroupDataService } from '../../../../core/eperson/group-data.service';
-import { EPerson } from '../../../../../core/eperson/models/eperson.model';
+import { EPerson } from '../../../../core/eperson/models/eperson.model';
-import { Group } from '../../../../../core/eperson/models/group.model';
+import { Group } from '../../../../core/eperson/models/group.model';
-import { PageInfo } from '../../../../../core/shared/page-info.model';
+import { PageInfo } from '../../../../core/shared/page-info.model';
-import { FormBuilderService } from '../../../../../shared/form/builder/form-builder.service';
+import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
-import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { GroupMock, GroupMock2 } from '../../../../../shared/testing/group-mock';
+import { GroupMock, GroupMock2 } from '../../../../shared/testing/group-mock';
 import { MembersListComponent } from './members-list.component';
-import { EPersonMock, EPersonMock2 } from '../../../../../shared/testing/eperson.mock';
+import { EPersonMock, EPersonMock2 } from '../../../../shared/testing/eperson.mock';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { getMockTranslateService } from '../../../../../shared/mocks/translate.service.mock';
+import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock';
-import { getMockFormBuilderService } from '../../../../../shared/mocks/form-builder-service.mock';
+import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock';
-import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
+import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
-import { NotificationsServiceStub } from '../../../../../shared/testing/notifications-service.stub';
+import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
-import { RouterMock } from '../../../../../shared/mocks/router.mock';
+import { RouterMock } from '../../../../shared/mocks/router.mock';
 
 describe('MembersListComponent', () => {
   let component: MembersListComponent;

src/app/admin-access-control/group-registry/group-form/members-list/members-list.component.ts

@@ -10,20 +10,20 @@ import {
   combineLatest as observableCombineLatest, ObservedValueOf,
 } from 'rxjs';
 import { map, mergeMap, switchMap, take } from 'rxjs/operators';
-import {buildPaginatedList, PaginatedList} from '../../../../../core/data/paginated-list.model';
+import {buildPaginatedList, PaginatedList} from '../../../../core/data/paginated-list.model';
-import { RemoteData } from '../../../../../core/data/remote-data';
+import { RemoteData } from '../../../../core/data/remote-data';
-import { EPersonDataService } from '../../../../../core/eperson/eperson-data.service';
+import { EPersonDataService } from '../../../../core/eperson/eperson-data.service';
-import { GroupDataService } from '../../../../../core/eperson/group-data.service';
+import { GroupDataService } from '../../../../core/eperson/group-data.service';
-import { EPerson } from '../../../../../core/eperson/models/eperson.model';
+import { EPerson } from '../../../../core/eperson/models/eperson.model';
-import { Group } from '../../../../../core/eperson/models/group.model';
+import { Group } from '../../../../core/eperson/models/group.model';
 import {
   getRemoteDataPayload,
   getFirstSucceededRemoteData,
   getFirstCompletedRemoteData, getAllCompletedRemoteData
-} from '../../../../../core/shared/operators';
+} from '../../../../core/shared/operators';
-import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { PaginationComponentOptions } from '../../../../../shared/pagination/pagination-component-options.model';
+import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
-import {EpersonDtoModel} from '../../../../../core/eperson/models/eperson-dto.model';
+import {EpersonDtoModel} from '../../../../core/eperson/models/eperson-dto.model';
 
 /**
  * Keys to keep track of specific subscriptions

src/app/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts

@@ -15,25 +15,25 @@ import { Router } from '@angular/router';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
 import { Observable, of as observableOf, BehaviorSubject } from 'rxjs';
-import { RestResponse } from '../../../../../core/cache/response.models';
+import { RestResponse } from '../../../../core/cache/response.models';
-import { buildPaginatedList, PaginatedList } from '../../../../../core/data/paginated-list.model';
+import { buildPaginatedList, PaginatedList } from '../../../../core/data/paginated-list.model';
-import { RemoteData } from '../../../../../core/data/remote-data';
+import { RemoteData } from '../../../../core/data/remote-data';
-import { GroupDataService } from '../../../../../core/eperson/group-data.service';
+import { GroupDataService } from '../../../../core/eperson/group-data.service';
-import { Group } from '../../../../../core/eperson/models/group.model';
+import { Group } from '../../../../core/eperson/models/group.model';
-import { PageInfo } from '../../../../../core/shared/page-info.model';
+import { PageInfo } from '../../../../core/shared/page-info.model';
-import { FormBuilderService } from '../../../../../shared/form/builder/form-builder.service';
+import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
-import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { GroupMock, GroupMock2 } from '../../../../../shared/testing/group-mock';
+import { GroupMock, GroupMock2 } from '../../../../shared/testing/group-mock';
 import { SubgroupsListComponent } from './subgroups-list.component';
 import {
   createSuccessfulRemoteDataObject$,
   createSuccessfulRemoteDataObject
-} from '../../../../../shared/remote-data.utils';
+} from '../../../../shared/remote-data.utils';
-import { RouterMock } from '../../../../../shared/mocks/router.mock';
+import { RouterMock } from '../../../../shared/mocks/router.mock';
-import { getMockFormBuilderService } from '../../../../../shared/mocks/form-builder-service.mock';
+import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock';
-import { getMockTranslateService } from '../../../../../shared/mocks/translate.service.mock';
+import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock';
-import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
+import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
-import { NotificationsServiceStub } from '../../../../../shared/testing/notifications-service.stub';
+import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
 import { map } from 'rxjs/operators';
 
 describe('SubgroupsListComponent', () => {

src/app/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts

@@ -4,18 +4,18 @@ import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import { Observable, of as observableOf, Subscription, BehaviorSubject } from 'rxjs';
 import { map, mergeMap, take } from 'rxjs/operators';
-import { PaginatedList } from '../../../../../core/data/paginated-list.model';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
-import { RemoteData } from '../../../../../core/data/remote-data';
+import { RemoteData } from '../../../../core/data/remote-data';
-import { GroupDataService } from '../../../../../core/eperson/group-data.service';
+import { GroupDataService } from '../../../../core/eperson/group-data.service';
-import { Group } from '../../../../../core/eperson/models/group.model';
+import { Group } from '../../../../core/eperson/models/group.model';
 import {
   getRemoteDataPayload,
   getFirstSucceededRemoteData,
   getFirstCompletedRemoteData
-} from '../../../../../core/shared/operators';
+} from '../../../../core/shared/operators';
-import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { PaginationComponentOptions } from '../../../../../shared/pagination/pagination-component-options.model';
+import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
-import { NoContent } from '../../../../../core/shared/NoContent.model';
+import { NoContent } from '../../../../core/shared/NoContent.model';
 
 /**
  * Keys to keep track of specific subscriptions

src/app/admin-access-control/group-registry/group-registry.actions.ts

@@ -1,6 +1,6 @@
 import { Action } from '@ngrx/store';
-import { Group } from '../../../core/eperson/models/group.model';
+import { Group } from '../../core/eperson/models/group.model';
-import { type } from '../../../shared/ngrx/type';
+import { type } from '../../shared/ngrx/type';
 
 /**
  * For each action type in an action group, make a simple

src/app/admin-access-control/group-registry/group-registry.reducers.spec.ts

@@ -1,4 +1,4 @@
-import { GroupMock } from '../../../shared/testing/group-mock';
+import { GroupMock } from '../../shared/testing/group-mock';
 import { GroupRegistryCancelGroupAction, GroupRegistryEditGroupAction } from './group-registry.actions';
 import { groupRegistryReducer, GroupRegistryState } from './group-registry.reducers';
 

src/app/admin-access-control/group-registry/group-registry.reducers.ts

@@ -1,4 +1,4 @@
-import { Group } from '../../../core/eperson/models/group.model';
+import { Group } from '../../core/eperson/models/group.model';
 import { GroupRegistryAction, GroupRegistryActionTypes, GroupRegistryEditGroupAction } from './group-registry.actions';
 
 /**

src/app/admin-access-control/group-registry/groups-registry.component.spec.ts

@@ -7,27 +7,27 @@ import { Router } from '@angular/router';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { Observable, of as observableOf } from 'rxjs';
-import { DSpaceObjectDataService } from '../../../core/data/dspace-object-data.service';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model';
+import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model';
-import { RemoteData } from '../../../core/data/remote-data';
+import { RemoteData } from '../../core/data/remote-data';
-import { RequestService } from '../../../core/data/request.service';
+import { RequestService } from '../../core/data/request.service';
-import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { GroupDataService } from '../../../core/eperson/group-data.service';
+import { GroupDataService } from '../../core/eperson/group-data.service';
-import { EPerson } from '../../../core/eperson/models/eperson.model';
+import { EPerson } from '../../core/eperson/models/eperson.model';
-import { Group } from '../../../core/eperson/models/group.model';
+import { Group } from '../../core/eperson/models/group.model';
-import { RouteService } from '../../../core/services/route.service';
+import { RouteService } from '../../core/services/route.service';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { PageInfo } from '../../../core/shared/page-info.model';
+import { PageInfo } from '../../core/shared/page-info.model';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { GroupMock, GroupMock2 } from '../../../shared/testing/group-mock';
+import { GroupMock, GroupMock2 } from '../../shared/testing/group-mock';
 import { GroupsRegistryComponent } from './groups-registry.component';
-import { EPersonMock, EPersonMock2 } from '../../../shared/testing/eperson.mock';
+import { EPersonMock, EPersonMock2 } from '../../shared/testing/eperson.mock';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { TranslateLoaderMock } from '../../../shared/testing/translate-loader.mock';
+import { TranslateLoaderMock } from '../../shared/testing/translate-loader.mock';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { routeServiceStub } from '../../../shared/testing/route-service.stub';
+import { routeServiceStub } from '../../shared/testing/route-service.stub';
-import { RouterMock } from '../../../shared/mocks/router.mock';
+import { RouterMock } from '../../shared/mocks/router.mock';
 
 describe('GroupRegistryComponent', () => {
   let component: GroupsRegistryComponent;

src/app/admin-access-control/group-registry/groups-registry.component.ts

@@ -10,29 +10,29 @@ import {
   of as observableOf
 } from 'rxjs';
 import { catchError, map, switchMap, take } from 'rxjs/operators';
-import { DSpaceObjectDataService } from '../../../core/data/dspace-object-data.service';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
-import { PaginatedList, buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { PaginatedList, buildPaginatedList } from '../../core/data/paginated-list.model';
-import { RemoteData } from '../../../core/data/remote-data';
+import { RemoteData } from '../../core/data/remote-data';
-import { RequestService } from '../../../core/data/request.service';
+import { RequestService } from '../../core/data/request.service';
-import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { GroupDataService } from '../../../core/eperson/group-data.service';
+import { GroupDataService } from '../../core/eperson/group-data.service';
-import { EPerson } from '../../../core/eperson/models/eperson.model';
+import { EPerson } from '../../core/eperson/models/eperson.model';
-import { GroupDtoModel } from '../../../core/eperson/models/group-dto.model';
+import { GroupDtoModel } from '../../core/eperson/models/group-dto.model';
-import { Group } from '../../../core/eperson/models/group.model';
+import { Group } from '../../core/eperson/models/group.model';
-import { RouteService } from '../../../core/services/route.service';
+import { RouteService } from '../../core/services/route.service';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import {
   getAllSucceededRemoteDataPayload,
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteData
-} from '../../../core/shared/operators';
+} from '../../core/shared/operators';
-import { PageInfo } from '../../../core/shared/page-info.model';
+import { PageInfo } from '../../core/shared/page-info.model';
-import { hasValue } from '../../../shared/empty.util';
+import { hasValue } from '../../shared/empty.util';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { NoContent } from '../../../core/shared/NoContent.model';
+import { NoContent } from '../../core/shared/NoContent.model';
 
 @Component({
   selector: 'ds-groups-registry',

src/app/app.reducer.ts

@@ -3,11 +3,11 @@ import { ActionReducerMap, createSelector, MemoizedSelector } from '@ngrx/store'
 import {
   ePeopleRegistryReducer,
   EPeopleRegistryState
-} from './+admin/admin-access-control/epeople-registry/epeople-registry.reducers';
+} from './admin-access-control/epeople-registry/epeople-registry.reducers';
 import {
   groupRegistryReducer,
   GroupRegistryState
-} from './+admin/admin-access-control/group-registry/group-registry.reducers';
+} from './admin-access-control/group-registry/group-registry.reducers';
 import {
   metadataRegistryReducer,
   MetadataRegistryState

src/app/core/eperson/eperson-data.service.spec.ts

@@ -10,7 +10,7 @@ import { TestScheduler } from 'rxjs/testing';
 import {
   EPeopleRegistryCancelEPersonAction,
   EPeopleRegistryEditEPersonAction
-} from '../../+admin/admin-access-control/epeople-registry/epeople-registry.actions';
+} from '../../admin-access-control/epeople-registry/epeople-registry.actions';
 import { RequestParam } from '../cache/models/request-param.model';
 import { CoreState } from '../core.reducers';
 import { ChangeAnalyzer } from '../data/change-analyzer';

src/app/core/eperson/eperson-data.service.ts

@@ -7,8 +7,8 @@ import { find, map, take } from 'rxjs/operators';
 import {
   EPeopleRegistryCancelEPersonAction,
   EPeopleRegistryEditEPersonAction
-} from '../../+admin/admin-access-control/epeople-registry/epeople-registry.actions';
+} from '../../admin-access-control/epeople-registry/epeople-registry.actions';
-import { EPeopleRegistryState } from '../../+admin/admin-access-control/epeople-registry/epeople-registry.reducers';
+import { EPeopleRegistryState } from '../../admin-access-control/epeople-registry/epeople-registry.reducers';
 import { AppState } from '../../app.reducer';
 import { hasValue, hasNoValue } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';

src/app/core/eperson/group-data.service.spec.ts

@@ -8,7 +8,7 @@ import { compare, Operation } from 'fast-json-patch';
 import {
   GroupRegistryCancelGroupAction,
   GroupRegistryEditGroupAction
-} from '../../+admin/admin-access-control/group-registry/group-registry.actions';
+} from '../../admin-access-control/group-registry/group-registry.actions';
 import { GroupMock, GroupMock2 } from '../../shared/testing/group-mock';
 import { RequestParam } from '../cache/models/request-param.model';
 import { CoreState } from '../core.reducers';

src/app/core/eperson/group-data.service.ts

@@ -7,8 +7,8 @@ import { filter, map, take } from 'rxjs/operators';
 import {
   GroupRegistryCancelGroupAction,
   GroupRegistryEditGroupAction
-} from '../../+admin/admin-access-control/group-registry/group-registry.actions';
+} from '../../admin-access-control/group-registry/group-registry.actions';
-import { GroupRegistryState } from '../../+admin/admin-access-control/group-registry/group-registry.reducers';
+import { GroupRegistryState } from '../../admin-access-control/group-registry/group-registry.reducers';
 import { AppState } from '../../app.reducer';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';

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

@@ -9,7 +9,7 @@ import { getAllCompletedRemoteData, getFirstCompletedRemoteData } from '../../..
 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 { getGroupEditRoute } from '../../../../admin-access-control/admin-access-control-routing-paths';
 import { hasNoValue, hasValue } from '../../../empty.util';
 import { NoContent } from '../../../../core/shared/NoContent.model';
 

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

@@ -32,7 +32,7 @@ import { NotificationsService } from '../notifications/notifications.service';
 import { dateToString, stringToNgbDateStruct } from '../date.util';
 import { followLink } from '../utils/follow-link-config.model';
 import { ADMIN_MODULE_PATH } from '../../app-routing-paths';
-import { GROUP_EDIT_PATH } from '../../+admin/admin-access-control/admin-access-control-routing-paths';
+import { GROUP_EDIT_PATH } from '../../admin-access-control/admin-access-control-routing-paths';
 import { ACCESS_CONTROL_MODULE_PATH } from '../../+admin/admin-routing-paths';
 
 interface ResourcePolicyCheckboxEntry {