From 5f63e3051e0786ca34e04a2bac6260138c5b07a4 Mon Sep 17 00:00:00 2001 From: Mykhaylo Date: Mon, 30 Oct 2023 12:26:33 +0100 Subject: [PATCH] [CST-11178] Fix issue with correction type routing --- src/app/app-routing-paths.ts | 3 -- src/app/item-page/item-page-routing.module.ts | 7 +++ .../correction-type-menu.component.ts | 20 ++++---- .../correction-suggestion-routing.module.ts | 2 +- ...nage-relation-correction-type.component.ts | 46 ++++++++++--------- 5 files changed, 41 insertions(+), 37 deletions(-) diff --git a/src/app/app-routing-paths.ts b/src/app/app-routing-paths.ts index 8430454d63..2f52c64366 100644 --- a/src/app/app-routing-paths.ts +++ b/src/app/app-routing-paths.ts @@ -138,7 +138,4 @@ export function getEditItemPageRoute() { return `/${EDIT_ITEM_PATH}`; } export const CORRECTION_TYPE_PATH = 'corrections'; -export function getCorrectionTypePageRoute(itemUuid: string, typeId: string) { - return `/items/${itemUuid}/${CORRECTION_TYPE_PATH}/${typeId}`; -} diff --git a/src/app/item-page/item-page-routing.module.ts b/src/app/item-page/item-page-routing.module.ts index 0c855ab34d..1d683201f0 100644 --- a/src/app/item-page/item-page-routing.module.ts +++ b/src/app/item-page/item-page-routing.module.ts @@ -16,6 +16,7 @@ import { MenuItemType } from '../shared/menu/menu-item-type.model'; import { VersionPageComponent } from './version-page/version-page/version-page.component'; import { BitstreamRequestACopyPageComponent } from './bitstreams/request-a-copy/bitstream-request-a-copy-page.component'; import { REQUEST_COPY_MODULE_PATH } from '../app-routing-paths'; +import { CORRECTION_TYPE_PATH, REQUEST_COPY_MODULE_PATH } from '../app-routing-paths'; import { OrcidPageComponent } from './orcid-page/orcid-page.component'; import { OrcidPageGuard } from './orcid-page/orcid-page.guard'; import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver'; @@ -41,6 +42,12 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver'; path: 'full', component: ThemedFullItemPageComponent, }, + { + path: CORRECTION_TYPE_PATH, + loadChildren: () => import('../shared/correction-suggestion/correction-suggestion.module') + .then((m) => m.CorrectionSuggestionModule), + canActivate: [AuthenticatedGuard] + }, { path: ITEM_EDIT_PATH, loadChildren: () => import('./edit-item-page/edit-item-page.module') diff --git a/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.ts b/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.ts index a4cc7b608e..2fb195ccf7 100644 --- a/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.ts +++ b/src/app/shared/context-menu/correction-type-menu/correction-type-menu.component.ts @@ -1,17 +1,15 @@ -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { getAllSucceededRemoteDataPayload, getPaginatedListPayload } from './../../../core/shared/operators'; -import { CorrectionTypeDataService } from './../../../core/submission/correctiontype-data.service'; -import { DSpaceObject } from './../../../core/shared/dspace-object.model'; +import { getAllSucceededRemoteDataPayload, getPaginatedListPayload } from '../../../core/shared/operators'; +import { CorrectionTypeDataService } from '../../../core/submission/correctiontype-data.service'; +import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; import { ContextMenuEntryComponent } from '../context-menu-entry.component'; import { ContextMenuEntryType } from '../context-menu-entry-type'; import { BehaviorSubject, map, Observable, startWith, Subscription } from 'rxjs'; import { CorrectionType } from '../../../core/submission/models/correction-type-mode.model'; import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; -import { NotificationsService } from '../../notifications/notifications.service'; import { hasValue, isNotEmpty } from '../../empty.util'; import { rendersContextMenuEntriesForType } from '../context-menu.decorator'; -import { getCorrectionTypePageRoute } from '../../../app-routing-paths'; +import { CORRECTION_TYPE_PATH } from '../../../app-routing-paths'; @Component({ selector: 'ds-correction-type-menu', @@ -42,8 +40,6 @@ export class CorrectionTypeMenuComponent extends ContextMenuEntryComponent imple @Inject('contextMenuObjectProvider') protected injectedContextMenuObject: DSpaceObject, @Inject('contextMenuObjectTypeProvider') protected injectedContextMenuObjectType: DSpaceObjectType, private correctionTypeService: CorrectionTypeDataService, - private notificationService: NotificationsService, - private authorizeService: AuthorizationDataService ) { super(injectedContextMenuObject, injectedContextMenuObjectType, ContextMenuEntryType.CorrectionType); } @@ -56,7 +52,7 @@ export class CorrectionTypeMenuComponent extends ContextMenuEntryComponent imple * Check if edit mode is available */ getCorrectionTypes(): Observable { - return this.correctionTypes$; + return this.correctionTypes$.asObservable(); } /** @@ -84,11 +80,11 @@ export class CorrectionTypeMenuComponent extends ContextMenuEntryComponent imple /** * Get the route to the correction type page - * @param id correction type id + * @param typeId correction type id * @returns the route to the correction type page */ - getTypeRoute(id: string): string { - return getCorrectionTypePageRoute(this.contextMenuObject.id, id); + getTypeRoute(typeId: string): string[] { + return ['./', CORRECTION_TYPE_PATH, typeId]; } /** diff --git a/src/app/shared/correction-suggestion/correction-suggestion-routing.module.ts b/src/app/shared/correction-suggestion/correction-suggestion-routing.module.ts index 06e013cb9e..07b1066e6b 100644 --- a/src/app/shared/correction-suggestion/correction-suggestion-routing.module.ts +++ b/src/app/shared/correction-suggestion/correction-suggestion-routing.module.ts @@ -5,7 +5,7 @@ import { CorrectionSuggestionComponent } from './correction-suggestion.component const routes: Routes = [ { - path: ':uuid/corrections/:correctionType', + path: ':correctionType', component: CorrectionSuggestionComponent, resolve: { breadcrumb: ItemBreadcrumbResolver, diff --git a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts index eee2053e8d..4db0aff528 100644 --- a/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts +++ b/src/app/shared/correction-suggestion/correction-types/manage-relation-correction-type/manage-relation-correction-type.component.ts @@ -1,28 +1,32 @@ -import { NotificationsService } from './../../../notifications/notifications.service'; -import { OpenaireBrokerEventObject } from './../../../../core/openaire/broker/models/openaire-broker-event.model'; -import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from './../../../../core/shared/operators'; -import { ItemDataService } from './../../../../core/data/item-data.service'; -import { OpenaireBrokerEventRestService } from './../../../../core/openaire/broker/events/openaire-broker-event-rest.service'; -import { Context } from './../../../../core/shared/context.model'; -import { CollectionElementLinkType } from './../../../object-collection/collection-element-link.type'; -import { DSpaceObject } from './../../../../core/shared/dspace-object.model'; -import { SearchResult } from './../../../search/models/search-result.model'; -import { RemoteData } from './../../../../core/data/remote-data'; -import { PaginatedList } from './../../../../core/data/paginated-list.model'; -import { PaginatedSearchOptions } from './../../../search/models/paginated-search-options.model'; -import { SelectableListService } from './../../../object-list/selectable-list/selectable-list.service'; -import { SearchService } from './../../../../core/shared/search/search.service'; -import { PaginationComponentOptions } from './../../../pagination/pagination-component-options.model'; +import { NotificationsService } from '../../../notifications/notifications.service'; +import { OpenaireBrokerEventObject } from '../../../../core/openaire/broker/models/openaire-broker-event.model'; +import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators'; +import { ItemDataService } from '../../../../core/data/item-data.service'; +import { + OpenaireBrokerEventRestService +} from '../../../../core/openaire/broker/events/openaire-broker-event-rest.service'; +import { Context } from '../../../../core/shared/context.model'; +import { CollectionElementLinkType } from '../../../object-collection/collection-element-link.type'; +import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; +import { SearchResult } from '../../../search/models/search-result.model'; +import { RemoteData } from '../../../../core/data/remote-data'; +import { PaginatedList } from '../../../../core/data/paginated-list.model'; +import { PaginatedSearchOptions } from '../../../search/models/paginated-search-options.model'; +import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service'; +import { SearchService } from '../../../../core/shared/search/search.service'; +import { PaginationComponentOptions } from '../../../pagination/pagination-component-options.model'; import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; import { renderCorrectionFor } from '../../correction-suggestion-page.decorator'; import { CorrectionType } from '../../../../core/submission/models/correction-type-mode.model'; -import { CorrectionTypeForms } from './../correction-type-forms'; +import { CorrectionTypeForms } from '../correction-type-forms'; import { ActivatedRoute, Router } from '@angular/router'; -import { Observable, Subscription, of as observableOf, switchMap } from 'rxjs'; -import { hasValue, isNotEmpty } from '../../../../shared/empty.util'; -import { ListableObject } from '../../../../shared/object-collection/shared/listable-object.model'; +import { Observable, of as observableOf, Subscription, switchMap } from 'rxjs'; +import { hasValue, isNotEmpty } from '../../../empty.util'; +import { ListableObject } from '../../../object-collection/shared/listable-object.model'; import { Item } from '../../../../core/shared/item.model'; -import { ImportType } from '../../../../openaire/broker/project-entry-import-modal/project-entry-import-modal.component'; +import { + ImportType +} from '../../../../openaire/broker/project-entry-import-modal/project-entry-import-modal.component'; import { TranslateService } from '@ngx-translate/core'; @Component({ @@ -236,7 +240,7 @@ export class ManageRelationCorrectionTypeComponent implements OnInit, OnDestroy * Navigate back to the previous page */ back() { - this.router.navigate(['../'], { relativeTo: this.aroute }); + this.router.navigate(['../../'], { relativeTo: this.aroute }); } /**