mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-09 19:13:08 +00:00
77205: Refactor admin-access-control to access-control
This commit is contained in:
@@ -18,8 +18,8 @@ import { ACCESS_CONTROL_MODULE_PATH, REGISTRIES_MODULE_PATH } from './admin-rout
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: ACCESS_CONTROL_MODULE_PATH,
|
path: ACCESS_CONTROL_MODULE_PATH,
|
||||||
loadChildren: () => import('../admin-access-control/admin-access-control.module')
|
loadChildren: () => import('../access-control/access-control.module')
|
||||||
.then((m) => m.AdminAccessControlModule),
|
.then((m) => m.AccessControlModule),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'search',
|
path: 'search',
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { SharedModule } from '../shared/shared.module';
|
import { SharedModule } from '../shared/shared.module';
|
||||||
import { AdminAccessControlModule } from '../admin-access-control/admin-access-control.module';
|
import { AccessControlModule } from '../access-control/access-control.module';
|
||||||
import { MetadataImportPageComponent } from './admin-import-metadata-page/metadata-import-page.component';
|
import { MetadataImportPageComponent } from './admin-import-metadata-page/metadata-import-page.component';
|
||||||
import { AdminRegistriesModule } from './admin-registries/admin-registries.module';
|
import { AdminRegistriesModule } from './admin-registries/admin-registries.module';
|
||||||
import { AdminRoutingModule } from './admin-routing.module';
|
import { AdminRoutingModule } from './admin-routing.module';
|
||||||
@@ -21,7 +21,7 @@ const ENTRY_COMPONENTS = [
|
|||||||
imports: [
|
imports: [
|
||||||
AdminRoutingModule,
|
AdminRoutingModule,
|
||||||
AdminRegistriesModule,
|
AdminRegistriesModule,
|
||||||
AdminAccessControlModule,
|
AccessControlModule,
|
||||||
AdminSearchModule.withEntryComponents(),
|
AdminSearchModule.withEntryComponents(),
|
||||||
AdminWorkflowModuleModule.withEntryComponents(),
|
AdminWorkflowModuleModule.withEntryComponents(),
|
||||||
SharedModule,
|
SharedModule,
|
||||||
|
@@ -3,7 +3,7 @@ import { RouterModule } from '@angular/router';
|
|||||||
import { EPeopleRegistryComponent } from './epeople-registry/epeople-registry.component';
|
import { EPeopleRegistryComponent } from './epeople-registry/epeople-registry.component';
|
||||||
import { GroupFormComponent } from './group-registry/group-form/group-form.component';
|
import { GroupFormComponent } from './group-registry/group-form/group-form.component';
|
||||||
import { GroupsRegistryComponent } from './group-registry/groups-registry.component';
|
import { GroupsRegistryComponent } from './group-registry/groups-registry.component';
|
||||||
import { GROUP_EDIT_PATH } from './admin-access-control-routing-paths';
|
import { GROUP_EDIT_PATH } from './access-control-routing-paths';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
@@ -26,6 +26,6 @@ import { GROUP_EDIT_PATH } from './admin-access-control-routing-paths';
|
|||||||
/**
|
/**
|
||||||
* Routing module for the AccessControl section of the admin sidebar
|
* Routing module for the AccessControl section of the admin sidebar
|
||||||
*/
|
*/
|
||||||
export class AdminAccessControlRoutingModule {
|
export class AccessControlRoutingModule {
|
||||||
|
|
||||||
}
|
}
|
@@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common';
|
|||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
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 { AccessControlRoutingModule } from './access-control-routing.module';
|
||||||
import { EPeopleRegistryComponent } from './epeople-registry/epeople-registry.component';
|
import { EPeopleRegistryComponent } from './epeople-registry/epeople-registry.component';
|
||||||
import { EPersonFormComponent } from './epeople-registry/eperson-form/eperson-form.component';
|
import { EPersonFormComponent } from './epeople-registry/eperson-form/eperson-form.component';
|
||||||
import { GroupFormComponent } from './group-registry/group-form/group-form.component';
|
import { GroupFormComponent } from './group-registry/group-form/group-form.component';
|
||||||
@@ -15,7 +15,7 @@ import { GroupsRegistryComponent } from './group-registry/groups-registry.compon
|
|||||||
CommonModule,
|
CommonModule,
|
||||||
SharedModule,
|
SharedModule,
|
||||||
RouterModule,
|
RouterModule,
|
||||||
AdminAccessControlRoutingModule
|
AccessControlRoutingModule
|
||||||
],
|
],
|
||||||
declarations: [
|
declarations: [
|
||||||
EPeopleRegistryComponent,
|
EPeopleRegistryComponent,
|
||||||
@@ -29,6 +29,6 @@ import { GroupsRegistryComponent } from './group-registry/groups-registry.compon
|
|||||||
/**
|
/**
|
||||||
* This module handles all components related to the access control pages
|
* This module handles all components related to the access control pages
|
||||||
*/
|
*/
|
||||||
export class AdminAccessControlModule {
|
export class AccessControlModule {
|
||||||
|
|
||||||
}
|
}
|
@@ -3,11 +3,11 @@ import { ActionReducerMap, createSelector, MemoizedSelector } from '@ngrx/store'
|
|||||||
import {
|
import {
|
||||||
ePeopleRegistryReducer,
|
ePeopleRegistryReducer,
|
||||||
EPeopleRegistryState
|
EPeopleRegistryState
|
||||||
} from './admin-access-control/epeople-registry/epeople-registry.reducers';
|
} from './access-control/epeople-registry/epeople-registry.reducers';
|
||||||
import {
|
import {
|
||||||
groupRegistryReducer,
|
groupRegistryReducer,
|
||||||
GroupRegistryState
|
GroupRegistryState
|
||||||
} from './admin-access-control/group-registry/group-registry.reducers';
|
} from './access-control/group-registry/group-registry.reducers';
|
||||||
import {
|
import {
|
||||||
metadataRegistryReducer,
|
metadataRegistryReducer,
|
||||||
MetadataRegistryState
|
MetadataRegistryState
|
||||||
|
@@ -10,7 +10,7 @@ import { TestScheduler } from 'rxjs/testing';
|
|||||||
import {
|
import {
|
||||||
EPeopleRegistryCancelEPersonAction,
|
EPeopleRegistryCancelEPersonAction,
|
||||||
EPeopleRegistryEditEPersonAction
|
EPeopleRegistryEditEPersonAction
|
||||||
} from '../../admin-access-control/epeople-registry/epeople-registry.actions';
|
} from '../../access-control/epeople-registry/epeople-registry.actions';
|
||||||
import { RequestParam } from '../cache/models/request-param.model';
|
import { RequestParam } from '../cache/models/request-param.model';
|
||||||
import { CoreState } from '../core.reducers';
|
import { CoreState } from '../core.reducers';
|
||||||
import { ChangeAnalyzer } from '../data/change-analyzer';
|
import { ChangeAnalyzer } from '../data/change-analyzer';
|
||||||
|
@@ -7,8 +7,8 @@ import { find, map, take } from 'rxjs/operators';
|
|||||||
import {
|
import {
|
||||||
EPeopleRegistryCancelEPersonAction,
|
EPeopleRegistryCancelEPersonAction,
|
||||||
EPeopleRegistryEditEPersonAction
|
EPeopleRegistryEditEPersonAction
|
||||||
} from '../../admin-access-control/epeople-registry/epeople-registry.actions';
|
} from '../../access-control/epeople-registry/epeople-registry.actions';
|
||||||
import { EPeopleRegistryState } from '../../admin-access-control/epeople-registry/epeople-registry.reducers';
|
import { EPeopleRegistryState } from '../../access-control/epeople-registry/epeople-registry.reducers';
|
||||||
import { AppState } from '../../app.reducer';
|
import { AppState } from '../../app.reducer';
|
||||||
import { hasValue, hasNoValue } from '../../shared/empty.util';
|
import { hasValue, hasNoValue } from '../../shared/empty.util';
|
||||||
import { NotificationsService } from '../../shared/notifications/notifications.service';
|
import { NotificationsService } from '../../shared/notifications/notifications.service';
|
||||||
|
@@ -8,7 +8,7 @@ import { compare, Operation } from 'fast-json-patch';
|
|||||||
import {
|
import {
|
||||||
GroupRegistryCancelGroupAction,
|
GroupRegistryCancelGroupAction,
|
||||||
GroupRegistryEditGroupAction
|
GroupRegistryEditGroupAction
|
||||||
} from '../../admin-access-control/group-registry/group-registry.actions';
|
} from '../../access-control/group-registry/group-registry.actions';
|
||||||
import { GroupMock, GroupMock2 } from '../../shared/testing/group-mock';
|
import { GroupMock, GroupMock2 } from '../../shared/testing/group-mock';
|
||||||
import { RequestParam } from '../cache/models/request-param.model';
|
import { RequestParam } from '../cache/models/request-param.model';
|
||||||
import { CoreState } from '../core.reducers';
|
import { CoreState } from '../core.reducers';
|
||||||
|
@@ -7,8 +7,8 @@ import { filter, map, take } from 'rxjs/operators';
|
|||||||
import {
|
import {
|
||||||
GroupRegistryCancelGroupAction,
|
GroupRegistryCancelGroupAction,
|
||||||
GroupRegistryEditGroupAction
|
GroupRegistryEditGroupAction
|
||||||
} from '../../admin-access-control/group-registry/group-registry.actions';
|
} from '../../access-control/group-registry/group-registry.actions';
|
||||||
import { GroupRegistryState } from '../../admin-access-control/group-registry/group-registry.reducers';
|
import { GroupRegistryState } from '../../access-control/group-registry/group-registry.reducers';
|
||||||
import { AppState } from '../../app.reducer';
|
import { AppState } from '../../app.reducer';
|
||||||
import { NotificationsService } from '../../shared/notifications/notifications.service';
|
import { NotificationsService } from '../../shared/notifications/notifications.service';
|
||||||
import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
|
import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
|
||||||
|
@@ -9,7 +9,7 @@ import { getAllCompletedRemoteData, getFirstCompletedRemoteData } from '../../..
|
|||||||
import { RequestService } from '../../../../core/data/request.service';
|
import { RequestService } from '../../../../core/data/request.service';
|
||||||
import { RemoteData } from '../../../../core/data/remote-data';
|
import { RemoteData } from '../../../../core/data/remote-data';
|
||||||
import { HALLink } from '../../../../core/shared/hal-link.model';
|
import { HALLink } from '../../../../core/shared/hal-link.model';
|
||||||
import { getGroupEditRoute } from '../../../../admin-access-control/admin-access-control-routing-paths';
|
import { getGroupEditRoute } from '../../../../access-control/access-control-routing-paths';
|
||||||
import { hasNoValue, hasValue } from '../../../empty.util';
|
import { hasNoValue, hasValue } from '../../../empty.util';
|
||||||
import { NoContent } from '../../../../core/shared/NoContent.model';
|
import { NoContent } from '../../../../core/shared/NoContent.model';
|
||||||
|
|
||||||
|
@@ -32,7 +32,7 @@ import { NotificationsService } from '../notifications/notifications.service';
|
|||||||
import { dateToString, stringToNgbDateStruct } from '../date.util';
|
import { dateToString, stringToNgbDateStruct } from '../date.util';
|
||||||
import { followLink } from '../utils/follow-link-config.model';
|
import { followLink } from '../utils/follow-link-config.model';
|
||||||
import { ADMIN_MODULE_PATH } from '../../app-routing-paths';
|
import { ADMIN_MODULE_PATH } from '../../app-routing-paths';
|
||||||
import { GROUP_EDIT_PATH } from '../../admin-access-control/admin-access-control-routing-paths';
|
import { GROUP_EDIT_PATH } from '../../access-control/access-control-routing-paths';
|
||||||
import { ACCESS_CONTROL_MODULE_PATH } from '../../+admin/admin-routing-paths';
|
import { ACCESS_CONTROL_MODULE_PATH } from '../../+admin/admin-routing-paths';
|
||||||
|
|
||||||
interface ResourcePolicyCheckboxEntry {
|
interface ResourcePolicyCheckboxEntry {
|
||||||
|
Reference in New Issue
Block a user