From 5eec2efa9c0dbb58eaf331ba48fa07eab3ba29bf Mon Sep 17 00:00:00 2001 From: Yura Bondarenko Date: Thu, 25 Feb 2021 13:37:24 +0100 Subject: [PATCH] 77205: Move admin-access-control out of +admin --- src/app/+admin/admin-routing.module.ts | 2 +- src/app/+admin/admin.module.ts | 2 +- .../admin-access-control-routing-paths.ts | 4 +- .../admin-access-control-routing.module.ts | 0 .../admin-access-control.module.ts | 2 +- .../epeople-registry.actions.ts | 4 +- .../epeople-registry.component.html | 0 .../epeople-registry.component.spec.ts | 34 +++++++------- .../epeople-registry.component.ts | 30 ++++++------ .../epeople-registry.reducers.spec.ts | 2 +- .../epeople-registry.reducers.ts | 2 +- .../eperson-form/eperson-form.component.html | 0 .../eperson-form.component.spec.ts | 38 +++++++-------- .../eperson-form/eperson-form.component.ts | 34 +++++++------- .../group-form/group-form.component.html | 0 .../group-form/group-form.component.spec.ts | 46 +++++++++---------- .../group-form/group-form.component.ts | 44 +++++++++--------- .../members-list/members-list.component.html | 0 .../members-list.component.spec.ts | 36 +++++++-------- .../members-list/members-list.component.ts | 20 ++++---- .../subgroups-list.component.html | 0 .../subgroups-list.component.spec.ts | 30 ++++++------ .../subgroup-list/subgroups-list.component.ts | 16 +++---- .../group-registry/group-registry.actions.ts | 4 +- .../group-registry.reducers.spec.ts | 2 +- .../group-registry/group-registry.reducers.ts | 2 +- .../groups-registry.component.html | 0 .../groups-registry.component.spec.ts | 40 ++++++++-------- .../groups-registry.component.ts | 38 +++++++-------- src/app/app.reducer.ts | 4 +- .../core/eperson/eperson-data.service.spec.ts | 2 +- src/app/core/eperson/eperson-data.service.ts | 4 +- .../core/eperson/group-data.service.spec.ts | 2 +- src/app/core/eperson/group-data.service.ts | 4 +- .../comcol-role/comcol-role.component.ts | 2 +- .../resource-policies.component.ts | 2 +- 36 files changed, 226 insertions(+), 226 deletions(-) rename src/app/{+admin => }/admin-access-control/admin-access-control-routing-paths.ts (56%) rename src/app/{+admin => }/admin-access-control/admin-access-control-routing.module.ts (100%) rename src/app/{+admin => }/admin-access-control/admin-access-control.module.ts (95%) rename src/app/{+admin => }/admin-access-control/epeople-registry/epeople-registry.actions.ts (91%) rename src/app/{+admin => }/admin-access-control/epeople-registry/epeople-registry.component.html (100%) rename src/app/{+admin => }/admin-access-control/epeople-registry/epeople-registry.component.spec.ts (87%) rename src/app/{+admin => }/admin-access-control/epeople-registry/epeople-registry.component.ts (88%) rename src/app/{+admin => }/admin-access-control/epeople-registry/epeople-registry.reducers.spec.ts (96%) rename src/app/{+admin => }/admin-access-control/epeople-registry/epeople-registry.reducers.ts (93%) rename src/app/{+admin => }/admin-access-control/epeople-registry/eperson-form/eperson-form.component.html (100%) rename src/app/{+admin => }/admin-access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts (87%) rename src/app/{+admin => }/admin-access-control/epeople-registry/eperson-form/eperson-form.component.ts (91%) rename src/app/{+admin => }/admin-access-control/group-registry/group-form/group-form.component.html (100%) rename src/app/{+admin => }/admin-access-control/group-registry/group-form/group-form.component.spec.ts (77%) rename src/app/{+admin => }/admin-access-control/group-registry/group-form/group-form.component.ts (89%) rename src/app/{+admin => }/admin-access-control/group-registry/group-form/members-list/members-list.component.html (100%) rename src/app/{+admin => }/admin-access-control/group-registry/group-form/members-list/members-list.component.spec.ts (85%) rename src/app/{+admin => }/admin-access-control/group-registry/group-form/members-list/members-list.component.ts (93%) rename src/app/{+admin => }/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html (100%) rename src/app/{+admin => }/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts (86%) rename src/app/{+admin => }/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts (93%) rename src/app/{+admin => }/admin-access-control/group-registry/group-registry.actions.ts (91%) rename src/app/{+admin => }/admin-access-control/group-registry/group-registry.reducers.spec.ts (96%) rename src/app/{+admin => }/admin-access-control/group-registry/group-registry.reducers.ts (93%) rename src/app/{+admin => }/admin-access-control/group-registry/groups-registry.component.html (100%) rename src/app/{+admin => }/admin-access-control/group-registry/groups-registry.component.spec.ts (81%) rename src/app/{+admin => }/admin-access-control/group-registry/groups-registry.component.ts (84%) diff --git a/src/app/+admin/admin-routing.module.ts b/src/app/+admin/admin-routing.module.ts index 6c44af8190..5094201841 100644 --- a/src/app/+admin/admin-routing.module.ts +++ b/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), }, { diff --git a/src/app/+admin/admin.module.ts b/src/app/+admin/admin.module.ts index 494edd71eb..a1a5caaf99 100644 --- a/src/app/+admin/admin.module.ts +++ b/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'; diff --git a/src/app/+admin/admin-access-control/admin-access-control-routing-paths.ts b/src/app/admin-access-control/admin-access-control-routing-paths.ts similarity index 56% rename from src/app/+admin/admin-access-control/admin-access-control-routing-paths.ts rename to src/app/admin-access-control/admin-access-control-routing-paths.ts index 2080cb14a7..2a38a78015 100644 --- a/src/app/+admin/admin-access-control/admin-access-control-routing-paths.ts +++ b/src/app/admin-access-control/admin-access-control-routing-paths.ts @@ -1,5 +1,5 @@ -import { URLCombiner } from '../../core/url-combiner/url-combiner'; -import { getAccessControlModuleRoute } from '../admin-routing-paths'; +import { URLCombiner } from '../core/url-combiner/url-combiner'; +import { getAccessControlModuleRoute } from '../+admin/admin-routing-paths'; export const GROUP_EDIT_PATH = 'groups'; diff --git a/src/app/+admin/admin-access-control/admin-access-control-routing.module.ts b/src/app/admin-access-control/admin-access-control-routing.module.ts similarity index 100% rename from src/app/+admin/admin-access-control/admin-access-control-routing.module.ts rename to src/app/admin-access-control/admin-access-control-routing.module.ts diff --git a/src/app/+admin/admin-access-control/admin-access-control.module.ts b/src/app/admin-access-control/admin-access-control.module.ts similarity index 95% rename from src/app/+admin/admin-access-control/admin-access-control.module.ts rename to src/app/admin-access-control/admin-access-control.module.ts index 04051ff46c..c26191c376 100644 --- a/src/app/+admin/admin-access-control/admin-access-control.module.ts +++ b/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'; diff --git a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.actions.ts b/src/app/admin-access-control/epeople-registry/epeople-registry.actions.ts similarity index 91% rename from src/app/+admin/admin-access-control/epeople-registry/epeople-registry.actions.ts rename to src/app/admin-access-control/epeople-registry/epeople-registry.actions.ts index 000dc48263..b8b1044362 100644 --- a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.actions.ts +++ b/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 { type } from '../../../shared/ngrx/type'; +import { EPerson } from '../../core/eperson/models/eperson.model'; +import { type } from '../../shared/ngrx/type'; /** * For each action type in an action group, make a simple diff --git a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.html b/src/app/admin-access-control/epeople-registry/epeople-registry.component.html similarity index 100% rename from src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.html rename to src/app/admin-access-control/epeople-registry/epeople-registry.component.html diff --git a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.spec.ts b/src/app/admin-access-control/epeople-registry/epeople-registry.component.spec.ts similarity index 87% rename from src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.spec.ts rename to src/app/admin-access-control/epeople-registry/epeople-registry.component.spec.ts index c104de0b17..425a61ddb3 100644 --- a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.spec.ts +++ b/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 { RemoteData } from '../../../core/data/remote-data'; -import { FindListOptions } from '../../../core/data/request.models'; -import { EPersonDataService } from '../../../core/eperson/eperson-data.service'; -import { EPerson } from '../../../core/eperson/models/eperson.model'; -import { PageInfo } from '../../../core/shared/page-info.model'; -import { FormBuilderService } from '../../../shared/form/builder/form-builder.service'; -import { NotificationsService } from '../../../shared/notifications/notifications.service'; +import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model'; +import { RemoteData } from '../../core/data/remote-data'; +import { FindListOptions } from '../../core/data/request.models'; +import { EPersonDataService } from '../../core/eperson/eperson-data.service'; +import { EPerson } from '../../core/eperson/models/eperson.model'; +import { PageInfo } from '../../core/shared/page-info.model'; +import { FormBuilderService } from '../../shared/form/builder/form-builder.service'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; import { EPeopleRegistryComponent } from './epeople-registry.component'; -import { EPersonMock, EPersonMock2 } from '../../../shared/testing/eperson.mock'; -import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; -import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock'; -import { getMockTranslateService } from '../../../shared/mocks/translate.service.mock'; -import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock'; -import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub'; -import { RouterStub } from '../../../shared/testing/router.stub'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { RequestService } from '../../../core/data/request.service'; +import { EPersonMock, EPersonMock2 } from '../../shared/testing/eperson.mock'; +import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; +import { getMockFormBuilderService } from '../../shared/mocks/form-builder-service.mock'; +import { getMockTranslateService } from '../../shared/mocks/translate.service.mock'; +import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock'; +import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub'; +import { RouterStub } from '../../shared/testing/router.stub'; +import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; +import { RequestService } from '../../core/data/request.service'; describe('EPeopleRegistryComponent', () => { let component: EPeopleRegistryComponent; diff --git a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.ts b/src/app/admin-access-control/epeople-registry/epeople-registry.component.ts similarity index 88% rename from src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.ts rename to src/app/admin-access-control/epeople-registry/epeople-registry.component.ts index 11b146b294..3e9b137965 100644 --- a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.ts +++ b/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 { RemoteData } from '../../../core/data/remote-data'; -import { EPersonDataService } from '../../../core/eperson/eperson-data.service'; -import { EPerson } from '../../../core/eperson/models/eperson.model'; -import { hasValue } from '../../../shared/empty.util'; -import { NotificationsService } from '../../../shared/notifications/notifications.service'; -import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model'; -import { EpersonDtoModel } from '../../../core/eperson/models/eperson-dto.model'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; +import { PaginatedList, buildPaginatedList } from '../../core/data/paginated-list.model'; +import { RemoteData } from '../../core/data/remote-data'; +import { EPersonDataService } from '../../core/eperson/eperson-data.service'; +import { EPerson } from '../../core/eperson/models/eperson.model'; +import { hasValue } from '../../shared/empty.util'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; +import { EpersonDtoModel } from '../../core/eperson/models/eperson-dto.model'; +import { FeatureID } from '../../core/data/feature-authorization/feature-id'; +import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; import { getFirstCompletedRemoteData, getAllSucceededRemoteData -} from '../../../core/shared/operators'; -import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component'; +} from '../../core/shared/operators'; +import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { RequestService } from '../../../core/data/request.service'; -import { PageInfo } from '../../../core/shared/page-info.model'; -import { NoContent } from '../../../core/shared/NoContent.model'; +import { RequestService } from '../../core/data/request.service'; +import { PageInfo } from '../../core/shared/page-info.model'; +import { NoContent } from '../../core/shared/NoContent.model'; @Component({ selector: 'ds-epeople-registry', diff --git a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.reducers.spec.ts b/src/app/admin-access-control/epeople-registry/epeople-registry.reducers.spec.ts similarity index 96% rename from src/app/+admin/admin-access-control/epeople-registry/epeople-registry.reducers.spec.ts rename to src/app/admin-access-control/epeople-registry/epeople-registry.reducers.spec.ts index 87ab70a942..7158acc79b 100644 --- a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.reducers.spec.ts +++ b/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, diff --git a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.reducers.ts b/src/app/admin-access-control/epeople-registry/epeople-registry.reducers.ts similarity index 93% rename from src/app/+admin/admin-access-control/epeople-registry/epeople-registry.reducers.ts rename to src/app/admin-access-control/epeople-registry/epeople-registry.reducers.ts index 42b31d61e9..1e0319f3ba 100644 --- a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.reducers.ts +++ b/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, diff --git a/src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.html b/src/app/admin-access-control/epeople-registry/eperson-form/eperson-form.component.html similarity index 100% rename from src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.html rename to src/app/admin-access-control/epeople-registry/eperson-form/eperson-form.component.html diff --git a/src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts b/src/app/admin-access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts similarity index 87% rename from src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts rename to src/app/admin-access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts index 1163490e12..454dad0018 100644 --- a/src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts +++ b/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 { RemoteData } from '../../../../core/data/remote-data'; -import { FindListOptions } from '../../../../core/data/request.models'; -import { EPersonDataService } from '../../../../core/eperson/eperson-data.service'; -import { EPerson } from '../../../../core/eperson/models/eperson.model'; -import { PageInfo } from '../../../../core/shared/page-info.model'; -import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service'; -import { NotificationsService } from '../../../../shared/notifications/notifications.service'; +import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model'; +import { RemoteData } from '../../../core/data/remote-data'; +import { FindListOptions } from '../../../core/data/request.models'; +import { EPersonDataService } from '../../../core/eperson/eperson-data.service'; +import { EPerson } from '../../../core/eperson/models/eperson.model'; +import { PageInfo } from '../../../core/shared/page-info.model'; +import { FormBuilderService } from '../../../shared/form/builder/form-builder.service'; +import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { EPersonFormComponent } from './eperson-form.component'; -import { EPersonMock, EPersonMock2 } from '../../../../shared/testing/eperson.mock'; -import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; -import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock'; -import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub'; -import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock'; -import { AuthService } from '../../../../core/auth/auth.service'; -import { AuthServiceStub } from '../../../../shared/testing/auth-service.stub'; -import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; -import { GroupDataService } from '../../../../core/eperson/group-data.service'; -import { createPaginatedList } from '../../../../shared/testing/utils.test'; -import { RequestService } from '../../../../core/data/request.service'; +import { EPersonMock, EPersonMock2 } from '../../../shared/testing/eperson.mock'; +import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; +import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock'; +import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub'; +import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock'; +import { AuthService } from '../../../core/auth/auth.service'; +import { AuthServiceStub } from '../../../shared/testing/auth-service.stub'; +import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; +import { GroupDataService } from '../../../core/eperson/group-data.service'; +import { createPaginatedList } from '../../../shared/testing/utils.test'; +import { RequestService } from '../../../core/data/request.service'; describe('EPersonFormComponent', () => { let component: EPersonFormComponent; diff --git a/src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/admin-access-control/epeople-registry/eperson-form/eperson-form.component.ts similarity index 91% rename from src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.ts rename to src/app/admin-access-control/epeople-registry/eperson-form/eperson-form.component.ts index 3c284735a9..ecb4606ae4 100644 --- a/src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.ts +++ b/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 { RemoteData } from '../../../../core/data/remote-data'; -import { EPersonDataService } from '../../../../core/eperson/eperson-data.service'; -import { GroupDataService } from '../../../../core/eperson/group-data.service'; -import { EPerson } from '../../../../core/eperson/models/eperson.model'; -import { Group } from '../../../../core/eperson/models/group.model'; +import { PaginatedList } from '../../../core/data/paginated-list.model'; +import { RemoteData } from '../../../core/data/remote-data'; +import { EPersonDataService } from '../../../core/eperson/eperson-data.service'; +import { GroupDataService } from '../../../core/eperson/group-data.service'; +import { EPerson } from '../../../core/eperson/models/eperson.model'; +import { Group } from '../../../core/eperson/models/group.model'; import { getRemoteDataPayload, getFirstSucceededRemoteData, getFirstCompletedRemoteData -} from '../../../../core/shared/operators'; -import { hasValue } from '../../../../shared/empty.util'; -import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service'; -import { NotificationsService } from '../../../../shared/notifications/notifications.service'; -import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model'; -import { AuthService } from '../../../../core/auth/auth.service'; -import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../../core/data/feature-authorization/feature-id'; -import { ConfirmationModalComponent } from '../../../../shared/confirmation-modal/confirmation-modal.component'; +} from '../../../core/shared/operators'; +import { hasValue } from '../../../shared/empty.util'; +import { FormBuilderService } from '../../../shared/form/builder/form-builder.service'; +import { NotificationsService } from '../../../shared/notifications/notifications.service'; +import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model'; +import { AuthService } from '../../../core/auth/auth.service'; +import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; +import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { RequestService } from '../../../../core/data/request.service'; -import { NoContent } from '../../../../core/shared/NoContent.model'; +import { RequestService } from '../../../core/data/request.service'; +import { NoContent } from '../../../core/shared/NoContent.model'; @Component({ selector: 'ds-eperson-form', diff --git a/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.html b/src/app/admin-access-control/group-registry/group-form/group-form.component.html similarity index 100% rename from src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.html rename to src/app/admin-access-control/group-registry/group-form/group-form.component.html diff --git a/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.spec.ts b/src/app/admin-access-control/group-registry/group-form/group-form.component.spec.ts similarity index 77% rename from src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.spec.ts rename to src/app/admin-access-control/group-registry/group-form/group-form.component.spec.ts index fd5edf0354..00fe2aa6e6 100644 --- a/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.spec.ts +++ b/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 { ObjectCacheService } from '../../../../core/cache/object-cache.service'; -import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service'; -import { DSpaceObjectDataService } from '../../../../core/data/dspace-object-data.service'; -import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; -import { buildPaginatedList, PaginatedList } from '../../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { EPersonDataService } from '../../../../core/eperson/eperson-data.service'; -import { GroupDataService } from '../../../../core/eperson/group-data.service'; -import { Group } from '../../../../core/eperson/models/group.model'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; -import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service'; -import { PageInfo } from '../../../../core/shared/page-info.model'; -import { UUIDService } from '../../../../core/shared/uuid.service'; -import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service'; -import { NotificationsService } from '../../../../shared/notifications/notifications.service'; -import { GroupMock, GroupMock2 } from '../../../../shared/testing/group-mock'; +import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service'; +import { ObjectCacheService } from '../../../core/cache/object-cache.service'; +import { DSOChangeAnalyzer } from '../../../core/data/dso-change-analyzer.service'; +import { DSpaceObjectDataService } from '../../../core/data/dspace-object-data.service'; +import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; +import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model'; +import { RemoteData } from '../../../core/data/remote-data'; +import { EPersonDataService } from '../../../core/eperson/eperson-data.service'; +import { GroupDataService } from '../../../core/eperson/group-data.service'; +import { Group } from '../../../core/eperson/models/group.model'; +import { DSpaceObject } from '../../../core/shared/dspace-object.model'; +import { HALEndpointService } from '../../../core/shared/hal-endpoint.service'; +import { PageInfo } from '../../../core/shared/page-info.model'; +import { UUIDService } from '../../../core/shared/uuid.service'; +import { FormBuilderService } from '../../../shared/form/builder/form-builder.service'; +import { NotificationsService } from '../../../shared/notifications/notifications.service'; +import { GroupMock, GroupMock2 } from '../../../shared/testing/group-mock'; import { GroupFormComponent } from './group-form.component'; -import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; -import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock'; -import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock'; -import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock'; -import { RouterMock } from '../../../../shared/mocks/router.mock'; -import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub'; +import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; +import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock'; +import { getMockTranslateService } from '../../../shared/mocks/translate.service.mock'; +import { TranslateLoaderMock } from '../../../shared/testing/translate-loader.mock'; +import { RouterMock } from '../../../shared/mocks/router.mock'; +import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub'; import { Operation } from 'fast-json-patch'; describe('GroupFormComponent', () => { diff --git a/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.ts b/src/app/admin-access-control/group-registry/group-form/group-form.component.ts similarity index 89% rename from src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.ts rename to src/app/admin-access-control/group-registry/group-form/group-form.component.ts index 7984fc50d1..2b834bde1d 100644 --- a/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.ts +++ b/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 { getCommunityEditRolesRoute } from '../../../../+community-page/community-page-routing-paths'; -import { DSpaceObjectDataService } from '../../../../core/data/dspace-object-data.service'; -import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../../core/data/feature-authorization/feature-id'; -import { PaginatedList } from '../../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { RequestService } from '../../../../core/data/request.service'; -import { EPersonDataService } from '../../../../core/eperson/eperson-data.service'; -import { GroupDataService } from '../../../../core/eperson/group-data.service'; -import { Group } from '../../../../core/eperson/models/group.model'; -import { Collection } from '../../../../core/shared/collection.model'; -import { Community } from '../../../../core/shared/community.model'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; +import { getCollectionEditRolesRoute } from '../../../+collection-page/collection-page-routing-paths'; +import { getCommunityEditRolesRoute } from '../../../+community-page/community-page-routing-paths'; +import { DSpaceObjectDataService } from '../../../core/data/dspace-object-data.service'; +import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; +import { PaginatedList } from '../../../core/data/paginated-list.model'; +import { RemoteData } from '../../../core/data/remote-data'; +import { RequestService } from '../../../core/data/request.service'; +import { EPersonDataService } from '../../../core/eperson/eperson-data.service'; +import { GroupDataService } from '../../../core/eperson/group-data.service'; +import { Group } from '../../../core/eperson/models/group.model'; +import { Collection } from '../../../core/shared/collection.model'; +import { Community } from '../../../core/shared/community.model'; +import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { getRemoteDataPayload, getFirstSucceededRemoteData, getFirstCompletedRemoteData -} from '../../../../core/shared/operators'; -import { AlertType } from '../../../../shared/alert/aletr-type'; -import { ConfirmationModalComponent } from '../../../../shared/confirmation-modal/confirmation-modal.component'; -import { hasValue, isNotEmpty, hasValueOperator } from '../../../../shared/empty.util'; -import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service'; -import { NotificationsService } from '../../../../shared/notifications/notifications.service'; -import { followLink } from '../../../../shared/utils/follow-link-config.model'; -import { NoContent } from '../../../../core/shared/NoContent.model'; +} from '../../../core/shared/operators'; +import { AlertType } from '../../../shared/alert/aletr-type'; +import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component'; +import { hasValue, isNotEmpty, hasValueOperator } from '../../../shared/empty.util'; +import { FormBuilderService } from '../../../shared/form/builder/form-builder.service'; +import { NotificationsService } from '../../../shared/notifications/notifications.service'; +import { followLink } from '../../../shared/utils/follow-link-config.model'; +import { NoContent } from '../../../core/shared/NoContent.model'; import { Operation } from 'fast-json-patch'; @Component({ diff --git a/src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.html b/src/app/admin-access-control/group-registry/group-form/members-list/members-list.component.html similarity index 100% rename from src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.html rename to src/app/admin-access-control/group-registry/group-form/members-list/members-list.component.html diff --git a/src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.spec.ts b/src/app/admin-access-control/group-registry/group-form/members-list/members-list.component.spec.ts similarity index 85% rename from src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.spec.ts rename to src/app/admin-access-control/group-registry/group-form/members-list/members-list.component.spec.ts index 10735cbde5..bb7fd48ec6 100644 --- a/src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.spec.ts +++ b/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 { buildPaginatedList, PaginatedList } from '../../../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../../../core/data/remote-data'; -import { EPersonDataService } from '../../../../../core/eperson/eperson-data.service'; -import { GroupDataService } from '../../../../../core/eperson/group-data.service'; -import { EPerson } from '../../../../../core/eperson/models/eperson.model'; -import { Group } from '../../../../../core/eperson/models/group.model'; -import { PageInfo } from '../../../../../core/shared/page-info.model'; -import { FormBuilderService } from '../../../../../shared/form/builder/form-builder.service'; -import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; -import { GroupMock, GroupMock2 } from '../../../../../shared/testing/group-mock'; +import { RestResponse } from '../../../../core/cache/response.models'; +import { buildPaginatedList, PaginatedList } from '../../../../core/data/paginated-list.model'; +import { RemoteData } from '../../../../core/data/remote-data'; +import { EPersonDataService } from '../../../../core/eperson/eperson-data.service'; +import { GroupDataService } from '../../../../core/eperson/group-data.service'; +import { EPerson } from '../../../../core/eperson/models/eperson.model'; +import { Group } from '../../../../core/eperson/models/group.model'; +import { PageInfo } from '../../../../core/shared/page-info.model'; +import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service'; +import { NotificationsService } from '../../../../shared/notifications/notifications.service'; +import { GroupMock, GroupMock2 } from '../../../../shared/testing/group-mock'; import { MembersListComponent } from './members-list.component'; -import { EPersonMock, EPersonMock2 } from '../../../../../shared/testing/eperson.mock'; -import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils'; -import { getMockTranslateService } from '../../../../../shared/mocks/translate.service.mock'; -import { getMockFormBuilderService } from '../../../../../shared/mocks/form-builder-service.mock'; -import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock'; -import { NotificationsServiceStub } from '../../../../../shared/testing/notifications-service.stub'; -import { RouterMock } from '../../../../../shared/mocks/router.mock'; +import { EPersonMock, EPersonMock2 } from '../../../../shared/testing/eperson.mock'; +import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; +import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock'; +import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock'; +import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock'; +import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub'; +import { RouterMock } from '../../../../shared/mocks/router.mock'; describe('MembersListComponent', () => { let component: MembersListComponent; diff --git a/src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.ts b/src/app/admin-access-control/group-registry/group-form/members-list/members-list.component.ts similarity index 93% rename from src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.ts rename to src/app/admin-access-control/group-registry/group-form/members-list/members-list.component.ts index f1d25725d6..475ee0de7f 100644 --- a/src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.ts +++ b/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 { RemoteData } from '../../../../../core/data/remote-data'; -import { EPersonDataService } from '../../../../../core/eperson/eperson-data.service'; -import { GroupDataService } from '../../../../../core/eperson/group-data.service'; -import { EPerson } from '../../../../../core/eperson/models/eperson.model'; -import { Group } from '../../../../../core/eperson/models/group.model'; +import {buildPaginatedList, PaginatedList} from '../../../../core/data/paginated-list.model'; +import { RemoteData } from '../../../../core/data/remote-data'; +import { EPersonDataService } from '../../../../core/eperson/eperson-data.service'; +import { GroupDataService } from '../../../../core/eperson/group-data.service'; +import { EPerson } from '../../../../core/eperson/models/eperson.model'; +import { Group } from '../../../../core/eperson/models/group.model'; import { getRemoteDataPayload, getFirstSucceededRemoteData, getFirstCompletedRemoteData, getAllCompletedRemoteData -} from '../../../../../core/shared/operators'; -import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; -import { PaginationComponentOptions } from '../../../../../shared/pagination/pagination-component-options.model'; -import {EpersonDtoModel} from '../../../../../core/eperson/models/eperson-dto.model'; +} from '../../../../core/shared/operators'; +import { NotificationsService } from '../../../../shared/notifications/notifications.service'; +import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model'; +import {EpersonDtoModel} from '../../../../core/eperson/models/eperson-dto.model'; /** * Keys to keep track of specific subscriptions diff --git a/src/app/+admin/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html b/src/app/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html similarity index 100% rename from src/app/+admin/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html rename to src/app/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html diff --git a/src/app/+admin/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts b/src/app/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts similarity index 86% rename from src/app/+admin/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts rename to src/app/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts index 9841d2b02e..b8ba1e4f13 100644 --- a/src/app/+admin/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts +++ b/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 { buildPaginatedList, PaginatedList } from '../../../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../../../core/data/remote-data'; -import { GroupDataService } from '../../../../../core/eperson/group-data.service'; -import { Group } from '../../../../../core/eperson/models/group.model'; -import { PageInfo } from '../../../../../core/shared/page-info.model'; -import { FormBuilderService } from '../../../../../shared/form/builder/form-builder.service'; -import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; -import { GroupMock, GroupMock2 } from '../../../../../shared/testing/group-mock'; +import { RestResponse } from '../../../../core/cache/response.models'; +import { buildPaginatedList, PaginatedList } from '../../../../core/data/paginated-list.model'; +import { RemoteData } from '../../../../core/data/remote-data'; +import { GroupDataService } from '../../../../core/eperson/group-data.service'; +import { Group } from '../../../../core/eperson/models/group.model'; +import { PageInfo } from '../../../../core/shared/page-info.model'; +import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service'; +import { NotificationsService } from '../../../../shared/notifications/notifications.service'; +import { GroupMock, GroupMock2 } from '../../../../shared/testing/group-mock'; import { SubgroupsListComponent } from './subgroups-list.component'; import { createSuccessfulRemoteDataObject$, createSuccessfulRemoteDataObject -} from '../../../../../shared/remote-data.utils'; -import { RouterMock } from '../../../../../shared/mocks/router.mock'; -import { getMockFormBuilderService } from '../../../../../shared/mocks/form-builder-service.mock'; -import { getMockTranslateService } from '../../../../../shared/mocks/translate.service.mock'; -import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock'; -import { NotificationsServiceStub } from '../../../../../shared/testing/notifications-service.stub'; +} from '../../../../shared/remote-data.utils'; +import { RouterMock } from '../../../../shared/mocks/router.mock'; +import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock'; +import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock'; +import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock'; +import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub'; import { map } from 'rxjs/operators'; describe('SubgroupsListComponent', () => { diff --git a/src/app/+admin/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts b/src/app/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts similarity index 93% rename from src/app/+admin/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts rename to src/app/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts index d754e71e4f..d9f03963d6 100644 --- a/src/app/+admin/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts +++ b/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 { RemoteData } from '../../../../../core/data/remote-data'; -import { GroupDataService } from '../../../../../core/eperson/group-data.service'; -import { Group } from '../../../../../core/eperson/models/group.model'; +import { PaginatedList } from '../../../../core/data/paginated-list.model'; +import { RemoteData } from '../../../../core/data/remote-data'; +import { GroupDataService } from '../../../../core/eperson/group-data.service'; +import { Group } from '../../../../core/eperson/models/group.model'; import { getRemoteDataPayload, getFirstSucceededRemoteData, getFirstCompletedRemoteData -} from '../../../../../core/shared/operators'; -import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; -import { PaginationComponentOptions } from '../../../../../shared/pagination/pagination-component-options.model'; -import { NoContent } from '../../../../../core/shared/NoContent.model'; +} from '../../../../core/shared/operators'; +import { NotificationsService } from '../../../../shared/notifications/notifications.service'; +import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model'; +import { NoContent } from '../../../../core/shared/NoContent.model'; /** * Keys to keep track of specific subscriptions diff --git a/src/app/+admin/admin-access-control/group-registry/group-registry.actions.ts b/src/app/admin-access-control/group-registry/group-registry.actions.ts similarity index 91% rename from src/app/+admin/admin-access-control/group-registry/group-registry.actions.ts rename to src/app/admin-access-control/group-registry/group-registry.actions.ts index b5ba3bc4b5..bc1c0b97a6 100644 --- a/src/app/+admin/admin-access-control/group-registry/group-registry.actions.ts +++ b/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 { type } from '../../../shared/ngrx/type'; +import { Group } from '../../core/eperson/models/group.model'; +import { type } from '../../shared/ngrx/type'; /** * For each action type in an action group, make a simple diff --git a/src/app/+admin/admin-access-control/group-registry/group-registry.reducers.spec.ts b/src/app/admin-access-control/group-registry/group-registry.reducers.spec.ts similarity index 96% rename from src/app/+admin/admin-access-control/group-registry/group-registry.reducers.spec.ts rename to src/app/admin-access-control/group-registry/group-registry.reducers.spec.ts index 6c9f9d327a..de5b65f5ba 100644 --- a/src/app/+admin/admin-access-control/group-registry/group-registry.reducers.spec.ts +++ b/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'; diff --git a/src/app/+admin/admin-access-control/group-registry/group-registry.reducers.ts b/src/app/admin-access-control/group-registry/group-registry.reducers.ts similarity index 93% rename from src/app/+admin/admin-access-control/group-registry/group-registry.reducers.ts rename to src/app/admin-access-control/group-registry/group-registry.reducers.ts index eca6c282a7..8e288b7f3a 100644 --- a/src/app/+admin/admin-access-control/group-registry/group-registry.reducers.ts +++ b/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'; /** diff --git a/src/app/+admin/admin-access-control/group-registry/groups-registry.component.html b/src/app/admin-access-control/group-registry/groups-registry.component.html similarity index 100% rename from src/app/+admin/admin-access-control/group-registry/groups-registry.component.html rename to src/app/admin-access-control/group-registry/groups-registry.component.html diff --git a/src/app/+admin/admin-access-control/group-registry/groups-registry.component.spec.ts b/src/app/admin-access-control/group-registry/groups-registry.component.spec.ts similarity index 81% rename from src/app/+admin/admin-access-control/group-registry/groups-registry.component.spec.ts rename to src/app/admin-access-control/group-registry/groups-registry.component.spec.ts index dd08ea6772..c7d502eff6 100644 --- a/src/app/+admin/admin-access-control/group-registry/groups-registry.component.spec.ts +++ b/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 { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { RequestService } from '../../../core/data/request.service'; -import { EPersonDataService } from '../../../core/eperson/eperson-data.service'; -import { GroupDataService } from '../../../core/eperson/group-data.service'; -import { EPerson } from '../../../core/eperson/models/eperson.model'; -import { Group } from '../../../core/eperson/models/group.model'; -import { RouteService } from '../../../core/services/route.service'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { PageInfo } from '../../../core/shared/page-info.model'; -import { NotificationsService } from '../../../shared/notifications/notifications.service'; -import { GroupMock, GroupMock2 } from '../../../shared/testing/group-mock'; +import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; +import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; +import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model'; +import { RemoteData } from '../../core/data/remote-data'; +import { RequestService } from '../../core/data/request.service'; +import { EPersonDataService } from '../../core/eperson/eperson-data.service'; +import { GroupDataService } from '../../core/eperson/group-data.service'; +import { EPerson } from '../../core/eperson/models/eperson.model'; +import { Group } from '../../core/eperson/models/group.model'; +import { RouteService } from '../../core/services/route.service'; +import { DSpaceObject } from '../../core/shared/dspace-object.model'; +import { PageInfo } from '../../core/shared/page-info.model'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { GroupMock, GroupMock2 } from '../../shared/testing/group-mock'; import { GroupsRegistryComponent } from './groups-registry.component'; -import { EPersonMock, EPersonMock2 } from '../../../shared/testing/eperson.mock'; -import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; -import { TranslateLoaderMock } from '../../../shared/testing/translate-loader.mock'; -import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub'; -import { routeServiceStub } from '../../../shared/testing/route-service.stub'; -import { RouterMock } from '../../../shared/mocks/router.mock'; +import { EPersonMock, EPersonMock2 } from '../../shared/testing/eperson.mock'; +import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; +import { TranslateLoaderMock } from '../../shared/testing/translate-loader.mock'; +import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub'; +import { routeServiceStub } from '../../shared/testing/route-service.stub'; +import { RouterMock } from '../../shared/mocks/router.mock'; describe('GroupRegistryComponent', () => { let component: GroupsRegistryComponent; diff --git a/src/app/+admin/admin-access-control/group-registry/groups-registry.component.ts b/src/app/admin-access-control/group-registry/groups-registry.component.ts similarity index 84% rename from src/app/+admin/admin-access-control/group-registry/groups-registry.component.ts rename to src/app/admin-access-control/group-registry/groups-registry.component.ts index 305da75eeb..bfe6d50c43 100644 --- a/src/app/+admin/admin-access-control/group-registry/groups-registry.component.ts +++ b/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 { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; -import { PaginatedList, buildPaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { RequestService } from '../../../core/data/request.service'; -import { EPersonDataService } from '../../../core/eperson/eperson-data.service'; -import { GroupDataService } from '../../../core/eperson/group-data.service'; -import { EPerson } from '../../../core/eperson/models/eperson.model'; -import { GroupDtoModel } from '../../../core/eperson/models/group-dto.model'; -import { Group } from '../../../core/eperson/models/group.model'; -import { RouteService } from '../../../core/services/route.service'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; +import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; +import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '../../core/data/feature-authorization/feature-id'; +import { PaginatedList, buildPaginatedList } from '../../core/data/paginated-list.model'; +import { RemoteData } from '../../core/data/remote-data'; +import { RequestService } from '../../core/data/request.service'; +import { EPersonDataService } from '../../core/eperson/eperson-data.service'; +import { GroupDataService } from '../../core/eperson/group-data.service'; +import { EPerson } from '../../core/eperson/models/eperson.model'; +import { GroupDtoModel } from '../../core/eperson/models/group-dto.model'; +import { Group } from '../../core/eperson/models/group.model'; +import { RouteService } from '../../core/services/route.service'; +import { DSpaceObject } from '../../core/shared/dspace-object.model'; import { getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData, getFirstSucceededRemoteData -} from '../../../core/shared/operators'; -import { PageInfo } from '../../../core/shared/page-info.model'; -import { hasValue } from '../../../shared/empty.util'; -import { NotificationsService } from '../../../shared/notifications/notifications.service'; -import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model'; -import { NoContent } from '../../../core/shared/NoContent.model'; +} from '../../core/shared/operators'; +import { PageInfo } from '../../core/shared/page-info.model'; +import { hasValue } from '../../shared/empty.util'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; +import { NoContent } from '../../core/shared/NoContent.model'; @Component({ selector: 'ds-groups-registry', diff --git a/src/app/app.reducer.ts b/src/app/app.reducer.ts index 813b8d0f4f..dceb779fad 100644 --- a/src/app/app.reducer.ts +++ b/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 diff --git a/src/app/core/eperson/eperson-data.service.spec.ts b/src/app/core/eperson/eperson-data.service.spec.ts index 3af02b267b..f403dd4cc0 100644 --- a/src/app/core/eperson/eperson-data.service.spec.ts +++ b/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'; diff --git a/src/app/core/eperson/eperson-data.service.ts b/src/app/core/eperson/eperson-data.service.ts index 79df246833..152b3c3c11 100644 --- a/src/app/core/eperson/eperson-data.service.ts +++ b/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'; -import { EPeopleRegistryState } from '../../+admin/admin-access-control/epeople-registry/epeople-registry.reducers'; +} from '../../admin-access-control/epeople-registry/epeople-registry.actions'; +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'; diff --git a/src/app/core/eperson/group-data.service.spec.ts b/src/app/core/eperson/group-data.service.spec.ts index f77c831b55..b39a58c83d 100644 --- a/src/app/core/eperson/group-data.service.spec.ts +++ b/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'; diff --git a/src/app/core/eperson/group-data.service.ts b/src/app/core/eperson/group-data.service.ts index dc5fd97d9a..3e5424b376 100644 --- a/src/app/core/eperson/group-data.service.ts +++ b/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'; -import { GroupRegistryState } from '../../+admin/admin-access-control/group-registry/group-registry.reducers'; +} from '../../admin-access-control/group-registry/group-registry.actions'; +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'; diff --git a/src/app/shared/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts b/src/app/shared/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts index 7ec422e69d..65a0881fc7 100644 --- a/src/app/shared/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts +++ b/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'; diff --git a/src/app/shared/resource-policies/resource-policies.component.ts b/src/app/shared/resource-policies/resource-policies.component.ts index d52d7a0799..38981b4f05 100644 --- a/src/app/shared/resource-policies/resource-policies.component.ts +++ b/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 {