Commits

Tim Donohue authored and GitHub committed 37ebe259f36 Merge
Merge pull request #1628 from 4Science/CST-5676

Bitstream edit page fixes
No tags
gidlmaster

src/app/bitstream-page/bitstream-page-routing.module.ts

Modified
3 3 import { EditBitstreamPageComponent } from './edit-bitstream-page/edit-bitstream-page.component';
4 4 import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
5 5 import { BitstreamPageResolver } from './bitstream-page.resolver';
6 6 import { BitstreamDownloadPageComponent } from '../shared/bitstream-download-page/bitstream-download-page.component';
7 7 import { ResourcePolicyTargetResolver } from '../shared/resource-policies/resolvers/resource-policy-target.resolver';
8 8 import { ResourcePolicyCreateComponent } from '../shared/resource-policies/create/resource-policy-create.component';
9 9 import { ResourcePolicyResolver } from '../shared/resource-policies/resolvers/resource-policy.resolver';
10 10 import { ResourcePolicyEditComponent } from '../shared/resource-policies/edit/resource-policy-edit.component';
11 11 import { BitstreamAuthorizationsComponent } from './bitstream-authorizations/bitstream-authorizations.component';
12 12 import { LegacyBitstreamUrlResolver } from './legacy-bitstream-url.resolver';
13 +import { BitstreamBreadcrumbResolver } from '../core/breadcrumbs/bitstream-breadcrumb.resolver';
14 +import { BitstreamBreadcrumbsService } from '../core/breadcrumbs/bitstream-breadcrumbs.service';
15 +import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
13 16
14 17 const EDIT_BITSTREAM_PATH = ':id/edit';
15 18 const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
16 19
17 20 /**
18 21 * Routing module to help navigate Bitstream pages
19 22 */
20 23 @NgModule({
21 24 imports: [
22 25 RouterModule.forChild([
41 44 path: ':id/download',
42 45 component: BitstreamDownloadPageComponent,
43 46 resolve: {
44 47 bitstream: BitstreamPageResolver
45 48 },
46 49 },
47 50 {
48 51 path: EDIT_BITSTREAM_PATH,
49 52 component: EditBitstreamPageComponent,
50 53 resolve: {
51 - bitstream: BitstreamPageResolver
54 + bitstream: BitstreamPageResolver,
55 + breadcrumb: BitstreamBreadcrumbResolver,
52 56 },
53 57 canActivate: [AuthenticatedGuard]
54 58 },
55 59 {
56 60 path: EDIT_BITSTREAM_AUTHORIZATIONS_PATH,
57 61
58 62 children: [
59 63 {
60 64 path: 'create',
61 65 resolve: {
62 66 resourcePolicyTarget: ResourcePolicyTargetResolver
63 67 },
64 68 component: ResourcePolicyCreateComponent,
65 69 data: { title: 'resource-policies.create.page.title', showBreadcrumbs: true }
66 70 },
67 71 {
68 72 path: 'edit',
69 73 resolve: {
74 + breadcrumb: I18nBreadcrumbResolver,
70 75 resourcePolicy: ResourcePolicyResolver
71 76 },
72 77 component: ResourcePolicyEditComponent,
73 - data: { title: 'resource-policies.edit.page.title', showBreadcrumbs: true }
78 + data: { breadcrumbKey: 'item.edit', title: 'resource-policies.edit.page.title', showBreadcrumbs: true }
74 79 },
75 80 {
76 81 path: '',
77 82 resolve: {
78 - bitstream: BitstreamPageResolver
83 + bitstream: BitstreamPageResolver,
84 + breadcrumb: BitstreamBreadcrumbResolver,
79 85 },
80 86 component: BitstreamAuthorizationsComponent,
81 87 data: { title: 'bitstream.edit.authorizations.title', showBreadcrumbs: true }
82 88 }
83 89 ]
84 90 }
85 91 ])
86 92 ],
87 93 providers: [
88 94 BitstreamPageResolver,
95 + BitstreamBreadcrumbResolver,
96 + BitstreamBreadcrumbsService
89 97 ]
90 98 })
91 99 export class BitstreamPageRoutingModule {
92 100 }

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut