From 3e191bb56e916f979eb5d8160273811318e1f68e Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Wed, 30 Sep 2020 13:53:04 +0200
Subject: [PATCH] move info module paths to separate file

---
 .github/pull_request_template.md    |  1 +
 src/app/core/shared/operators.ts    |  2 +-
 src/app/info/info-routing-paths.ts  | 16 ++++++++++++++++
 src/app/info/info-routing.module.ts | 17 +----------------
 4 files changed, 19 insertions(+), 17 deletions(-)
 create mode 100644 src/app/info/info-routing-paths.ts

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index b4063b0550..5c0163bf8e 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -20,6 +20,7 @@ _This checklist provides a reminder of what we are going to look for when review
 
 - [ ] My PR is small in size (e.g. less than 1,000 lines of code, not including comments & specs/tests), or I have provided reasons as to why that's not possible.
 - [ ] My PR passes [TSLint](https://palantir.github.io/tslint/) validation using `yarn run lint`
+- [ ] My PR doesn't introduce circular dependencies
 - [ ] My PR includes [TypeDoc](https://typedoc.org/) comments for _all new (or modified) public methods and classes_. It also includes TypeDoc for large or complex private methods.
 - [ ] My PR passes all specs/tests and includes new/updated specs or tests based on the [Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Testing+Guide).
 - [ ] If my PR includes new, third-party dependencies (in `package.json`), I've made sure their licenses align with the [DSpace BSD License](https://github.com/DSpace/DSpace/blob/main/LICENSE) based on the [Licensing of Contributions](https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines#CodeContributionGuidelines-LicensingofContributions) documentation.
diff --git a/src/app/core/shared/operators.ts b/src/app/core/shared/operators.ts
index 17823c0447..ad2588f2b9 100644
--- a/src/app/core/shared/operators.ts
+++ b/src/app/core/shared/operators.ts
@@ -14,7 +14,7 @@ import { MetadataSchema } from '../metadata/metadata-schema.model';
 import { BrowseDefinition } from './browse-definition.model';
 import { DSpaceObject } from './dspace-object.model';
 import { getUnauthorizedRoute } from '../../app-routing-paths';
-import { getEndUserAgreementPath } from '../../info/info-routing.module';
+import { getEndUserAgreementPath } from '../../info/info-routing-paths';
 
 /**
  * This file contains custom RxJS operators that can be used in multiple places
diff --git a/src/app/info/info-routing-paths.ts b/src/app/info/info-routing-paths.ts
new file mode 100644
index 0000000000..8ec6dbcb8d
--- /dev/null
+++ b/src/app/info/info-routing-paths.ts
@@ -0,0 +1,16 @@
+import { getInfoModulePath } from '../app-routing-paths';
+
+export const END_USER_AGREEMENT_PATH = 'end-user-agreement';
+export const PRIVACY_PATH = 'privacy';
+
+export function getEndUserAgreementPath() {
+    return getSubPath(END_USER_AGREEMENT_PATH);
+}
+
+export function getPrivacyPath() {
+    return getSubPath(PRIVACY_PATH);
+}
+
+function getSubPath(path: string) {
+    return `${getInfoModulePath()}/${path}`;
+}
diff --git a/src/app/info/info-routing.module.ts b/src/app/info/info-routing.module.ts
index 86ff7fb334..799572f9b9 100644
--- a/src/app/info/info-routing.module.ts
+++ b/src/app/info/info-routing.module.ts
@@ -1,24 +1,9 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { EndUserAgreementComponent } from './end-user-agreement/end-user-agreement.component';
-import { getInfoModulePath } from '../app-routing-paths';
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { PrivacyComponent } from './privacy/privacy.component';
-
-const END_USER_AGREEMENT_PATH = 'end-user-agreement';
-const PRIVACY_PATH = 'privacy';
-
-export function getEndUserAgreementPath() {
-  return getSubPath(END_USER_AGREEMENT_PATH);
-}
-
-export function getPrivacyPath() {
-  return getSubPath(PRIVACY_PATH);
-}
-
-function getSubPath(path: string) {
-  return `${getInfoModulePath()}/${path}`;
-}
+import { PRIVACY_PATH, END_USER_AGREEMENT_PATH } from './info-routing-paths';
 
 @NgModule({
   imports: [