From a4b0c5a13db87ab00ef6aa1f3d09c46b2e5575f2 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Thu, 30 Nov 2023 13:01:46 +0100 Subject: [PATCH] cherry-picked "[CST-12791] changed the route for suggestions to be be accessible to any logged in user" to CST-12109 --- .../admin-notifications-routing-paths.ts | 6 ++---- src/app/admin/admin-routing-paths.ts | 5 +++++ src/app/admin/admin-routing.module.ts | 7 +------ src/app/app-routing.module.ts | 7 +++++++ .../qa-event-notification.component.ts | 10 ++++++++++ src/app/menu.resolver.ts | 2 +- .../my-dspace-qa-events-notifications.component.html | 2 +- .../my-dspace-qa-events-notifications.component.ts | 9 +++++++++ .../qa/topics/quality-assurance-topics.component.ts | 9 +++++++++ 9 files changed, 45 insertions(+), 12 deletions(-) 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 2820a9a2c7..791b44af2b 100644 --- a/src/app/admin/admin-notifications/admin-notifications-routing-paths.ts +++ b/src/app/admin/admin-notifications/admin-notifications-routing-paths.ts @@ -1,8 +1,6 @@ -import { URLCombiner } from '../../core/url-combiner/url-combiner'; -import { getNotificationsModuleRoute } from '../admin-routing-paths'; export const QUALITY_ASSURANCE_EDIT_PATH = 'quality-assurance'; -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 30f801cecb..144b9d09bf 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'; @@ -11,3 +12,7 @@ export function getRegistriesModuleRoute() { export function getNotificationsModuleRoute() { return new URLCombiner(getAdminModuleRoute(), NOTIFICATIONS_MODULE_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 65b16139c1..c17dd5554f 100644 --- a/src/app/admin/admin-routing.module.ts +++ b/src/app/admin/admin-routing.module.ts @@ -6,7 +6,7 @@ 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 { REGISTRIES_MODULE_PATH, NOTIFICATIONS_MODULE_PATH } from './admin-routing-paths'; +import { REGISTRIES_MODULE_PATH } from './admin-routing-paths'; import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component'; import { SiteAdministratorGuard @@ -15,11 +15,6 @@ import { @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 6c247eb9bf..6932275245 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -37,6 +37,7 @@ import { import { ServerCheckGuard } from './core/server-check/server-check.guard'; 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: [ @@ -153,6 +154,12 @@ import { ThemedPageErrorComponent } from './page-error/themed-page-error.compone .then((m) => m.AdminModule), canActivate: [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.ts b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts index 4fb40cddcd..adb120e2a5 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 @@ -8,6 +8,8 @@ import { QualityAssuranceSourceDataService } from '../../../core/notifications/q import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model'; import { map, tap } from 'rxjs/operators'; import { RemoteData } from '../../../core/data/remote-data'; +import { getNotificatioQualityAssuranceRoute } from '../../../admin/admin-routing-paths'; + @Component({ selector: 'ds-qa-event-notification', templateUrl: './qa-event-notification.component.html', @@ -50,4 +52,12 @@ export class QaEventNotificationComponent { }) ); } + + /** + * 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 a9a247007f..318667267b 100644 --- a/src/app/menu.resolver.ts +++ b/src/app/menu.resolver.ts @@ -556,7 +556,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, }, /* 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 e4713d282f..46c7bdc3cf 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 @@ -14,7 +14,7 @@ {{ "mydspace.qa-event-notification.check.notification-info" | translate : { num: source.totalEvents } }}