mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-09 19:13:08 +00:00
Merge remote-tracking branch 'upstream/main' into w2p-112970_added-missing-breadcrumbs_contribute-main
# Conflicts: # src/app/collection-page/collection-page-routes.ts # src/app/community-page/community-page-routes.ts # src/app/core/breadcrumbs/community-breadcrumb.resolver.ts # src/app/core/breadcrumbs/dso-breadcrumb.resolver.spec.ts # src/app/core/breadcrumbs/dso-breadcrumb.resolver.ts # src/app/core/submission/resolver/submission-object.resolver.ts # src/app/workflowitems-edit-page/item-from-workflow.resolver.spec.ts # src/app/workflowitems-edit-page/item-from-workflow.resolver.ts # src/app/workflowitems-edit-page/workflowitems-edit-page-routes.ts # src/app/workspaceitems-edit-page/item-from-workspace.resolver.spec.ts # src/app/workspaceitems-edit-page/item-from-workspace.resolver.ts # src/app/workspaceitems-edit-page/workspaceitems-edit-page-routes.ts
This commit is contained in:
@@ -1,14 +1,14 @@
|
||||
import { Routes } from '@angular/router';
|
||||
|
||||
import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
|
||||
import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
|
||||
import { authenticatedGuard } from '../core/auth/authenticated.guard';
|
||||
import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
|
||||
import { ThemedFullItemPageComponent } from '../item-page/full/themed-full-item-page.component';
|
||||
import { ThemedSubmissionEditComponent } from '../submission/edit/themed-submission-edit.component';
|
||||
import { AdvancedWorkflowActionPageComponent } from './advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component';
|
||||
import { ItemFromWorkflowResolver } from './item-from-workflow.resolver';
|
||||
import { itemFromWorkflowResolver } from './item-from-workflow.resolver';
|
||||
import { ItemFromWorkflowBreadcrumbResolver } from './item-from-workflow-breadcrumb.resolver';
|
||||
import { ThemedWorkflowItemDeleteComponent } from './workflow-item-delete/themed-workflow-item-delete.component';
|
||||
import { WorkflowItemPageResolver } from './workflow-item-page.resolver';
|
||||
import { workflowItemPageResolver } from './workflow-item-page.resolver';
|
||||
import { ThemedWorkflowItemSendBackComponent } from './workflow-item-send-back/themed-workflow-item-send-back.component';
|
||||
import {
|
||||
ADVANCED_WORKFLOW_PATH,
|
||||
@@ -23,15 +23,15 @@ export const ROUTES: Routes = [
|
||||
path: ':id',
|
||||
resolve: {
|
||||
breadcrumb: ItemFromWorkflowBreadcrumbResolver,
|
||||
wfi: WorkflowItemPageResolver,
|
||||
wfi: workflowItemPageResolver,
|
||||
},
|
||||
children: [
|
||||
{
|
||||
canActivate: [AuthenticatedGuard],
|
||||
canActivate: [authenticatedGuard],
|
||||
path: WORKFLOW_ITEM_EDIT_PATH,
|
||||
component: ThemedSubmissionEditComponent,
|
||||
resolve: {
|
||||
breadcrumb: I18nBreadcrumbResolver,
|
||||
breadcrumb: i18nBreadcrumbResolver,
|
||||
},
|
||||
data: {
|
||||
title: 'workflow-item.edit.title',
|
||||
@@ -40,39 +40,39 @@ export const ROUTES: Routes = [
|
||||
},
|
||||
},
|
||||
{
|
||||
canActivate: [AuthenticatedGuard],
|
||||
canActivate: [authenticatedGuard],
|
||||
path: WORKFLOW_ITEM_VIEW_PATH,
|
||||
component: ThemedFullItemPageComponent,
|
||||
resolve: {
|
||||
dso: ItemFromWorkflowResolver,
|
||||
breadcrumb: I18nBreadcrumbResolver,
|
||||
dso: itemFromWorkflowResolver,
|
||||
breadcrumb: i18nBreadcrumbResolver,
|
||||
},
|
||||
data: { title: 'workflow-item.view.title', breadcrumbKey: 'workflow-item.view' },
|
||||
},
|
||||
{
|
||||
canActivate: [AuthenticatedGuard],
|
||||
canActivate: [authenticatedGuard],
|
||||
path: WORKFLOW_ITEM_DELETE_PATH,
|
||||
component: ThemedWorkflowItemDeleteComponent,
|
||||
resolve: {
|
||||
breadcrumb: I18nBreadcrumbResolver,
|
||||
breadcrumb: i18nBreadcrumbResolver,
|
||||
},
|
||||
data: { title: 'workflow-item.delete.title', breadcrumbKey: 'workflow-item.edit' },
|
||||
},
|
||||
{
|
||||
canActivate: [AuthenticatedGuard],
|
||||
canActivate: [authenticatedGuard],
|
||||
path: WORKFLOW_ITEM_SEND_BACK_PATH,
|
||||
component: ThemedWorkflowItemSendBackComponent,
|
||||
resolve: {
|
||||
breadcrumb: I18nBreadcrumbResolver,
|
||||
breadcrumb: i18nBreadcrumbResolver,
|
||||
},
|
||||
data: { title: 'workflow-item.send-back.title', breadcrumbKey: 'workflow-item.edit' },
|
||||
},
|
||||
{
|
||||
canActivate: [AuthenticatedGuard],
|
||||
canActivate: [authenticatedGuard],
|
||||
path: ADVANCED_WORKFLOW_PATH,
|
||||
component: AdvancedWorkflowActionPageComponent,
|
||||
resolve: {
|
||||
breadcrumb: I18nBreadcrumbResolver,
|
||||
breadcrumb: i18nBreadcrumbResolver,
|
||||
},
|
||||
data: { title: 'workflow-item.advanced.title', breadcrumbKey: 'workflow-item.edit' },
|
||||
},
|
||||
|
Reference in New Issue
Block a user