diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.html b/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
index cc50f68f02d..85aa9876051 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
@@ -24,8 +24,7 @@
{{messagePrefix + '.headMembers' | translate}}
{{eperson.id}} |
-
+
{{ dsoNameService.getName(eperson) }}
|
@@ -106,8 +105,7 @@
{{eperson.id}} |
-
+
{{ dsoNameService.getName(eperson) }}
|
diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts
index 02d0460677d..c63ff40df8f 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts
@@ -62,6 +62,8 @@ import { PaginationServiceStub } from '../../../../shared/testing/pagination-ser
import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
import { MembersListComponent } from './members-list.component';
+// todo: optimize imports
+
describe('MembersListComponent', () => {
let component: MembersListComponent;
let fixture: ComponentFixture;
@@ -99,9 +101,6 @@ describe('MembersListComponent', () => {
clearLinkRequests() {
// empty
},
- getEPeoplePageRouterLink(): string {
- return '/access-control/epeople';
- },
};
groupsDataServiceStub = {
activeGroup: activeGroup,
diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
index 6c9e1e36669..002e20524c3 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
@@ -33,6 +33,9 @@ import {
} from '../../../../core/shared/operators';
import { NotificationsService } from '../../../../shared/notifications/notifications.service';
import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
+import { getEPersonEditRoute } from '../../../access-control-routing-paths';
+
+// todo: optimize imports
/**
* Keys to keep track of specific subscriptions
@@ -141,6 +144,8 @@ export class MembersListComponent implements OnInit, OnDestroy {
// current active group being edited
groupBeingEdited: Group;
+ readonly getEPersonEditRoute = getEPersonEditRoute;
+
constructor(
protected groupDataService: GroupDataService,
public ePersonDataService: EPersonDataService,
diff --git a/src/app/core/eperson/eperson-data.service.ts b/src/app/core/eperson/eperson-data.service.ts
index 045408782c6..94fc399ed52 100644
--- a/src/app/core/eperson/eperson-data.service.ts
+++ b/src/app/core/eperson/eperson-data.service.ts
@@ -12,10 +12,7 @@ import {
take,
} from 'rxjs/operators';
-import {
- getEPersonEditRoute,
- getEPersonsRoute,
-} from '../../access-control/access-control-routing-paths';
+import { getEPersonEditRoute } from '../../access-control/access-control-routing-paths';
import {
EPeopleRegistryCancelEPersonAction,
EPeopleRegistryEditEPersonAction,
@@ -72,6 +69,8 @@ import { PageInfo } from '../shared/page-info.model';
import { EPerson } from './models/eperson.model';
import { EPERSON } from './models/eperson.resource-type';
+// todo: optimize imports
+
const ePeopleRegistryStateSelector = (state: AppState) => state.epeopleRegistry;
const editEPersonSelector = createSelector(ePeopleRegistryStateSelector, (ePeopleRegistryState: EPeopleRegistryState) => ePeopleRegistryState.editEPerson);
@@ -349,13 +348,6 @@ export class EPersonDataService extends IdentifiableDataService impleme
return getEPersonEditRoute(ePerson.id);
}
- /**
- * Get EPeople admin page
- */
- public getEPeoplePageRouterLink(): string {
- return getEPersonsRoute();
- }
-
/**
* Create a new EPerson using a token
* @param eperson
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.spec.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.spec.ts
index 5b29ecf47ad..7608d3751ff 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.spec.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.spec.ts
@@ -62,6 +62,8 @@ import { PaginationServiceStub } from '../../../../shared/testing/pagination-ser
import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
import { ReviewersListComponent } from './reviewers-list.component';
+// todo: optimize imports
+
// NOTE: Because ReviewersListComponent extends MembersListComponent, the below tests ONLY validate
// features which are *unique* to ReviewersListComponent. All other features are tested in the
// members-list.component.spec.ts file.
@@ -102,9 +104,6 @@ describe('ReviewersListComponent', () => {
clearLinkRequests() {
// empty
},
- getEPeoplePageRouterLink(): string {
- return '/access-control/epeople';
- },
};
groupsDataServiceStub = {
activeGroup: activeGroup,