[DURACOM-327] Reorganize code to remove dependency between core and app classes

Author: atarix83

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

@@ -1,9 +1,14 @@
+import { Group } from '@dspace/core/eperson/models/group.model';
 import { URLCombiner } from '@dspace/core/url-combiner/url-combiner';
 
-import { getAccessControlModuleRoute } from '../app-routing-paths';
-
 export const EPERSON_PATH = 'epeople';
 
+export const ACCESS_CONTROL_MODULE_PATH = 'access-control';
+
+export function getAccessControlModuleRoute() {
+  return `/${ACCESS_CONTROL_MODULE_PATH}`;
+}
+
 export function getEPersonsRoute(): string {
   return new URLCombiner(getAccessControlModuleRoute(), EPERSON_PATH).toString();
 }
@@ -21,3 +26,11 @@ export function getGroupsRoute() {
 export function getGroupEditRoute(id: string) {
   return new URLCombiner(getGroupsRoute(), id, 'edit').toString();
 }
+
+/**
+ * Get Edit page of group
+ * @param group Group we want edit page for
+ */
+export function getGroupEditPageRouterLink(group: Group): string {
+  return getGroupEditRoute(group.id);
+}

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

@@ -82,7 +82,7 @@ <h2>{{messagePrefix + '.groupsEPersonIsMemberOf' | translate}}</h2>
                         <td class="align-middle">{{group.id}}</td>
                         <td class="align-middle">
                           <a (click)="groupRegistryService.startEditingNewGroup(group)"
-                            [routerLink]="[groupsDataService.getGroupEditPageRouterLink(group)]">
+                            [routerLink]="[getGroupEditPageRouterLink(group)]">
                             {{ dsoNameService.getName(group) }}
                           </a>
                         </td>

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

@@ -71,7 +71,10 @@ import { FormComponent } from '../../../shared/form/form.component';
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
 import { PaginationComponent } from '../../../shared/pagination/pagination.component';
 import { HasNoValuePipe } from '../../../shared/utils/has-no-value.pipe';
-import { getEPersonsRoute } from '../../access-control-routing-paths';
+import {
+  getEPersonsRoute,
+  getGroupEditPageRouterLink,
+} from '../../access-control-routing-paths';
 import { GroupRegistryService } from '../../group-registry/group-registry.service';
 import { EpeopleRegistryService } from '../epeople-registry.service';
 import { ValidateEmailNotTaken } from './validators/email-taken.validator';
@@ -238,6 +241,8 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    */
   emailValueChangeSubscribe: Subscription;
 
+  protected readonly getGroupEditPageRouterLink = getGroupEditPageRouterLink;
+
   constructor(
     protected changeDetectorRef: ChangeDetectorRef,
     public epersonService: EPersonDataService,
@@ -636,4 +641,5 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
       this.groups$ = this.groupsDataService.findListByHref(eperson._links.groups.href, options);
     }));
   }
+
 }

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

@@ -25,7 +25,7 @@ <h4>{{messagePrefix + '.headSubgroups' | translate}}</h4>
                 <td class="align-middle">{{group.id}}</td>
                 <td class="align-middle">
                   <a (click)="groupRegistryService.startEditingNewGroup(group)"
-                    [routerLink]="[groupDataService.getGroupEditPageRouterLink(group)]">
+                    [routerLink]="[getGroupEditPageRouterLink(group)]">
                     {{ dsoNameService.getName(group) }}
                   </a>
                 </td>
@@ -108,7 +108,7 @@ <h4 id="search" class="border-bottom pb-2">
                 <td class="align-middle">{{group.id}}</td>
                 <td class="align-middle">
                   <a (click)="groupRegistryService.startEditingNewGroup(group)"
-                    [routerLink]="[groupDataService.getGroupEditPageRouterLink(group)]">
+                    [routerLink]="[getGroupEditPageRouterLink(group)]">
                     {{ dsoNameService.getName(group) }}
                   </a>
                 </td>

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

@@ -45,6 +45,7 @@ import {
 
 import { ContextHelpDirective } from '../../../../shared/context-help.directive';
 import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
+import { getGroupEditPageRouterLink } from '../../../access-control-routing-paths';
 import { GroupRegistryService } from '../../group-registry.service';
 
 /**
@@ -122,6 +123,8 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
   // current active group being edited
   groupBeingEdited: Group;
 
+  protected readonly getGroupEditPageRouterLink = getGroupEditPageRouterLink;
+
   constructor(public groupDataService: GroupDataService,
               public groupRegistryService: GroupRegistryService,
               private translateService: TranslateService,
@@ -305,4 +308,5 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
     });
     this.search({ query: '' });
   }
+
 }

src/app/access-control/group-registry/groups-registry.component.html

@@ -65,7 +65,7 @@ <h2 id="search" class="border-bottom pb-2">{{messagePrefix + 'search.head' | tra
                         @switch (groupDto.ableToEdit) {
                           @case (true) {
                             <button
-                              [routerLink]="groupService.getGroupEditPageRouterLink(groupDto.group)"
+                              [routerLink]="getGroupEditPageRouterLink(groupDto.group)"
                               class="btn btn-outline-primary btn-sm btn-edit"
                               title="{{messagePrefix + 'table.edit.buttons.edit' | translate: {name: dsoNameService.getName(groupDto.group) } }}"
                               >

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

@@ -68,6 +68,7 @@ import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
 import { PaginationComponent } from '../../shared/pagination/pagination.component';
+import { getGroupEditPageRouterLink } from '../access-control-routing-paths';
 
 @Component({
   selector: 'ds-groups-registry',
@@ -136,6 +137,8 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
    */
   subs: Subscription[] = [];
 
+  protected readonly getGroupEditPageRouterLink = getGroupEditPageRouterLink;
+
   constructor(public groupService: GroupDataService,
               private ePersonDataService: EPersonDataService,
               private dSpaceObjectDataService: DSpaceObjectDataService,
@@ -346,4 +349,5 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
     });
   }
 
+
 }

src/app/app-routes.ts

@@ -23,9 +23,9 @@ import {
 } from '@dspace/core/router/core-routing-paths';
 import { ServerCheckGuard } from '@dspace/core/server-check/server-check.guard';
 
+import { ACCESS_CONTROL_MODULE_PATH } from './access-control/access-control-routing-paths';
 import { NOTIFICATIONS_MODULE_PATH } from './admin/admin-routing-paths';
 import {
-  ACCESS_CONTROL_MODULE_PATH,
   ADMIN_MODULE_PATH,
   FORGOT_PASSWORD_PATH,
   HEALTH_PAGE_PATH,

src/app/app-routing-paths.ts

@@ -49,12 +49,6 @@ export function getInfoModulePath() {
   return `/${INFO_MODULE_PATH}`;
 }
 
-export const ACCESS_CONTROL_MODULE_PATH = 'access-control';
-
-export function getAccessControlModuleRoute() {
-  return `/${ACCESS_CONTROL_MODULE_PATH}`;
-}
-
 export const REQUEST_COPY_MODULE_PATH = 'request-a-copy';
 export function getRequestCopyModulePath() {
   return `/${REQUEST_COPY_MODULE_PATH}`;

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

@@ -8,7 +8,6 @@ import {
 } from 'rxjs';
 import { take } from 'rxjs/operators';
 
-import { getGroupEditRoute } from '../../access-control/access-control-routing-paths';
 import { DSONameService } from '../breadcrumbs/dso-name.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RequestParam } from '../cache/models/request-param.model';
@@ -237,15 +236,6 @@ export class GroupDataService extends IdentifiableDataService<Group> implements
     return '/access-control/groups';
   }
 
-  /**
-   * Get Edit page of group
-   * @param group Group we want edit page for
-   */
-  public getGroupEditPageRouterLink(group: Group): string {
-    return getGroupEditRoute(group.id);
-  }
-
-
   /**
    * Extract optional UUID from a string
    * @param stringWithUUID  String with possible UUID