diff --git a/src/app/admin/admin-notifications/admin-notifications-routing-paths.ts b/src/app/admin/admin-notifications/admin-notifications-routing-paths.ts
index 870458fa9f..c517ddafd4 100644
--- a/src/app/admin/admin-notifications/admin-notifications-routing-paths.ts
+++ b/src/app/admin/admin-notifications/admin-notifications-routing-paths.ts
@@ -1,9 +1,7 @@
-import { URLCombiner } from '../../core/url-combiner/url-combiner';
-import { getNotificationsModuleRoute } from '../admin-routing-paths';
export const QUALITY_ASSURANCE_EDIT_PATH = 'quality-assurance';
export const NOTIFICATIONS_RECITER_SUGGESTION_PATH = 'suggestion-targets';
-export function getQualityAssuranceRoute(id: string) {
- return new URLCombiner(getNotificationsModuleRoute(), QUALITY_ASSURANCE_EDIT_PATH, id).toString();
+export function getQualityAssuranceEditRoute() {
+ return `/${QUALITY_ASSURANCE_EDIT_PATH}`;
}
diff --git a/src/app/admin/admin-routing-paths.ts b/src/app/admin/admin-routing-paths.ts
index 511680bfd8..5645d88952 100644
--- a/src/app/admin/admin-routing-paths.ts
+++ b/src/app/admin/admin-routing-paths.ts
@@ -1,5 +1,6 @@
import { URLCombiner } from '../core/url-combiner/url-combiner';
import { getAdminModuleRoute } from '../app-routing-paths';
+import { getQualityAssuranceEditRoute } from './admin-notifications/admin-notifications-routing-paths';
export const REGISTRIES_MODULE_PATH = 'registries';
export const NOTIFICATIONS_MODULE_PATH = 'notifications';
@@ -10,12 +11,10 @@ export function getRegistriesModuleRoute() {
return new URLCombiner(getAdminModuleRoute(), REGISTRIES_MODULE_PATH).toString();
}
-export function getNotificationsModuleRoute() {
- return new URLCombiner(getAdminModuleRoute(), NOTIFICATIONS_MODULE_PATH).toString();
-}
-
export function getLdnServicesModuleRoute() {
return new URLCombiner(getAdminModuleRoute(), LDN_PATH).toString();
}
-
+export function getNotificatioQualityAssuranceRoute() {
+ return new URLCombiner(`/${NOTIFICATIONS_MODULE_PATH}`, getQualityAssuranceEditRoute()).toString();
+}
diff --git a/src/app/admin/admin-routing.module.ts b/src/app/admin/admin-routing.module.ts
index 3acc219bce..b590df69ca 100644
--- a/src/app/admin/admin-routing.module.ts
+++ b/src/app/admin/admin-routing.module.ts
@@ -6,17 +6,12 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
import { AdminWorkflowPageComponent } from './admin-workflow-page/admin-workflow-page.component';
import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service';
import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component';
-import { LDN_PATH, REGISTRIES_MODULE_PATH, NOTIFICATIONS_MODULE_PATH } from './admin-routing-paths';
+import { LDN_PATH, REGISTRIES_MODULE_PATH } from './admin-routing-paths';
import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component';
@NgModule({
imports: [
RouterModule.forChild([
- {
- path: NOTIFICATIONS_MODULE_PATH,
- loadChildren: () => import('./admin-notifications/admin-notifications.module')
- .then((m) => m.AdminNotificationsModule),
- },
{
path: REGISTRIES_MODULE_PATH,
loadChildren: () => import('./admin-registries/admin-registries.module')
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 9cbd246f0b..31bef6cf5a 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -41,6 +41,7 @@ import { ServerCheckGuard } from './core/server-check/server-check.guard';
import { SUGGESTION_MODULE_PATH } from './suggestions-page/suggestions-page-routing-paths';
import { MenuResolver } from './menu.resolver';
import { ThemedPageErrorComponent } from './page-error/themed-page-error.component';
+import { NOTIFICATIONS_MODULE_PATH } from './admin/admin-routing-paths';
@NgModule({
imports: [
@@ -157,6 +158,12 @@ import { ThemedPageErrorComponent } from './page-error/themed-page-error.compone
.then((m) => m.AdminModule),
canActivate: [SiteAdministratorGuard, EndUserAgreementCurrentUserGuard]
},
+ {
+ path: NOTIFICATIONS_MODULE_PATH,
+ loadChildren: () => import('./admin/admin-notifications/admin-notifications.module')
+ .then((m) => m.AdminNotificationsModule),
+ canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard]
+ },
{
path: 'login',
loadChildren: () => import('./login-page/login-page.module')
diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html
index 7f9e7fbd4e..f64b654728 100644
--- a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html
+++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html
@@ -5,7 +5,7 @@
{{'item.qa-event-notification.check.notification-info' | translate : {num:
source.totalEvents } }}
-
diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts
index 1ecd084cfd..c9e0bfe72f 100644
--- a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts
+++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts
@@ -7,8 +7,9 @@ import { FindListOptions } from '../../../core/data/find-list-options.model';
import { RequestParam } from '../../../core/cache/models/request-param.model';
import { QualityAssuranceSourceDataService } from '../../../core/suggestion-notifications/qa/source/quality-assurance-source-data.service';
import { QualityAssuranceSourceObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-source.model';
-import { PaginatedList } from 'src/app/core/data/paginated-list.model';
-import { hasValue } from 'src/app/shared/empty.util';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { hasValue } from '../../../shared/empty.util';
+import { getNotificatioQualityAssuranceRoute } from '../../../admin/admin-routing-paths';
@Component({
selector: 'ds-qa-event-notification',
@@ -53,4 +54,12 @@ export class QaEventNotificationComponent {
getPaginatedListPayload(),
);
}
+
+ /**
+ * Returns the quality assurance route.
+ * @returns The quality assurance route.
+ */
+ getQualityAssuranceRoute(): string {
+ return getNotificatioQualityAssuranceRoute();
+ }
}
diff --git a/src/app/menu.resolver.ts b/src/app/menu.resolver.ts
index 23ba31b103..a1e3bd58a6 100644
--- a/src/app/menu.resolver.ts
+++ b/src/app/menu.resolver.ts
@@ -578,7 +578,7 @@ export class MenuResolver implements Resolve {
model: {
type: MenuItemType.LINK,
text: 'menu.section.quality-assurance',
- link: '/admin/notifications/quality-assurance'
+ link: '/notifications/quality-assurance'
} as LinkMenuItemModel,
},
{
@@ -589,7 +589,7 @@ export class MenuResolver implements Resolve {
model: {
type: MenuItemType.LINK,
text: 'menu.section.notifications_reciter',
- link: '/admin/notifications/' + NOTIFICATIONS_RECITER_SUGGESTION_PATH
+ link: '/notifications/' + NOTIFICATIONS_RECITER_SUGGESTION_PATH
} as LinkMenuItemModel,
},
/* Admin Search */
diff --git a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html
index baf90fdf53..42e9939aae 100644
--- a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html
+++ b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html
@@ -17,7 +17,7 @@
}}