120109: Updated the route configuration to only resolve the dsoEditMenuResolver on pages who use the DsoEditMenuComponent

This commit is contained in:
Alexandre Vryghem
2024-11-19 18:45:16 +01:00
parent decacec404
commit 5c9f494f76
6 changed files with 13 additions and 11 deletions

View File

@@ -9,11 +9,6 @@ beforeEach(() => {
// This page is restricted, so we will be shown the login form. Fill it out & submit. // This page is restricted, so we will be shown the login form. Fill it out & submit.
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
// We need to wait for the correction types allowed for the item to be loaded to be sure that each tab is fully loaded.
// This because the edit item page causes often tests to fails due to timeout.
cy.intercept('GET', 'server/api/config/correctiontypes/search/findByItem*').as('correctionTypes');
cy.wait('@correctionTypes');
}); });
describe('Edit Item > Edit Metadata tab', () => { describe('Edit Item > Edit Metadata tab', () => {

View File

@@ -1,6 +1,5 @@
import { Route } from '@angular/router'; import { Route } from '@angular/router';
import { dsoEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
import { browseByDSOBreadcrumbResolver } from './browse-by-dso-breadcrumb.resolver'; import { browseByDSOBreadcrumbResolver } from './browse-by-dso-breadcrumb.resolver';
import { browseByGuard } from './browse-by-guard'; import { browseByGuard } from './browse-by-guard';
import { browseByI18nBreadcrumbResolver } from './browse-by-i18n-breadcrumb.resolver'; import { browseByI18nBreadcrumbResolver } from './browse-by-i18n-breadcrumb.resolver';
@@ -11,7 +10,6 @@ export const ROUTES: Route[] = [
path: '', path: '',
resolve: { resolve: {
breadcrumb: browseByDSOBreadcrumbResolver, breadcrumb: browseByDSOBreadcrumbResolver,
menu: dsoEditMenuResolver,
}, },
children: [ children: [
{ {

View File

@@ -54,7 +54,6 @@ export const ROUTES: Route[] = [
resolve: { resolve: {
dso: collectionPageResolver, dso: collectionPageResolver,
breadcrumb: collectionBreadcrumbResolver, breadcrumb: collectionBreadcrumbResolver,
menu: dsoEditMenuResolver,
}, },
runGuardsAndResolvers: 'always', runGuardsAndResolvers: 'always',
children: [ children: [
@@ -83,6 +82,9 @@ export const ROUTES: Route[] = [
{ {
path: '', path: '',
component: ThemedCollectionPageComponent, component: ThemedCollectionPageComponent,
resolve: {
menu: dsoEditMenuResolver,
},
children: [ children: [
{ {
path: '', path: '',

View File

@@ -51,7 +51,6 @@ export const ROUTES: Route[] = [
resolve: { resolve: {
dso: communityPageResolver, dso: communityPageResolver,
breadcrumb: communityBreadcrumbResolver, breadcrumb: communityBreadcrumbResolver,
menu: dsoEditMenuResolver,
}, },
runGuardsAndResolvers: 'always', runGuardsAndResolvers: 'always',
children: [ children: [
@@ -70,6 +69,9 @@ export const ROUTES: Route[] = [
{ {
path: '', path: '',
component: ThemedCommunityPageComponent, component: ThemedCommunityPageComponent,
resolve: {
menu: dsoEditMenuResolver,
},
children: [ children: [
{ {
path: '', path: '',

View File

@@ -27,7 +27,6 @@ export const ROUTES: Route[] = [
resolve: { resolve: {
dso: itemPageResolver, dso: itemPageResolver,
breadcrumb: itemBreadcrumbResolver, breadcrumb: itemBreadcrumbResolver,
menu: dsoEditMenuResolver,
}, },
runGuardsAndResolvers: 'always', runGuardsAndResolvers: 'always',
children: [ children: [
@@ -35,10 +34,16 @@ export const ROUTES: Route[] = [
path: '', path: '',
component: ThemedItemPageComponent, component: ThemedItemPageComponent,
pathMatch: 'full', pathMatch: 'full',
resolve: {
menu: dsoEditMenuResolver,
},
}, },
{ {
path: 'full', path: 'full',
component: ThemedFullItemPageComponent, component: ThemedFullItemPageComponent,
resolve: {
menu: dsoEditMenuResolver,
},
}, },
{ {
path: ITEM_EDIT_PATH, path: ITEM_EDIT_PATH,

View File

@@ -155,7 +155,7 @@ export class DSOEditMenuResolverService {
this.dsoVersioningModalService.getVersioningTooltipMessage(dso, 'item.page.version.hasDraft', 'item.page.version.create'), this.dsoVersioningModalService.getVersioningTooltipMessage(dso, 'item.page.version.hasDraft', 'item.page.version.create'),
this.authorizationService.isAuthorized(FeatureID.CanSynchronizeWithORCID, dso.self), this.authorizationService.isAuthorized(FeatureID.CanSynchronizeWithORCID, dso.self),
this.authorizationService.isAuthorized(FeatureID.CanClaimItem, dso.self), this.authorizationService.isAuthorized(FeatureID.CanClaimItem, dso.self),
this.correctionTypeDataService.findByItem(dso.uuid, false).pipe( this.correctionTypeDataService.findByItem(dso.uuid, true).pipe(
getFirstCompletedRemoteData(), getFirstCompletedRemoteData(),
getRemoteDataPayload()), getRemoteDataPayload()),
]).pipe( ]).pipe(