Frontend
Public
Commits
Tim Donohue authored and GitHub committed 1c325cd40a2 Merge
| 4 4 | import { bitstreamBreadcrumbResolver } from '../core/breadcrumbs/bitstream-breadcrumb.resolver'; |
| 5 5 | import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; |
| 6 6 | import { ResourcePolicyCreateComponent } from '../shared/resource-policies/create/resource-policy-create.component'; |
| 7 7 | import { ResourcePolicyEditComponent } from '../shared/resource-policies/edit/resource-policy-edit.component'; |
| 8 8 | import { resourcePolicyResolver } from '../shared/resource-policies/resolvers/resource-policy.resolver'; |
| 9 9 | import { resourcePolicyTargetResolver } from '../shared/resource-policies/resolvers/resource-policy-target.resolver'; |
| 10 10 | import { BitstreamAuthorizationsComponent } from './bitstream-authorizations/bitstream-authorizations.component'; |
| 11 11 | import { BitstreamDownloadPageComponent } from './bitstream-download-page/bitstream-download-page.component'; |
| 12 12 | import { bitstreamPageResolver } from './bitstream-page.resolver'; |
| 13 13 | import { ThemedEditBitstreamPageComponent } from './edit-bitstream-page/themed-edit-bitstream-page.component'; |
| 14 - | import { legacyBitstreamUrlResolver } from './legacy-bitstream-url.resolver'; |
| 14 + | import { legacyBitstreamURLRedirectGuard } from './legacy-bitstream-url-redirect.guard'; |
| 15 15 | |
| 16 16 | const EDIT_BITSTREAM_PATH = ':id/edit'; |
| 17 17 | const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations'; |
| 18 18 | |
| 19 19 | /** |
| 20 20 | * Routing module to help navigate Bitstream pages |
| 21 21 | */ |
| 22 22 | export const ROUTES: Route[] = [ |
| 23 23 | { |
| 24 24 | // Resolve XMLUI bitstream download URLs |
| 25 25 | path: 'handle/:prefix/:suffix/:filename', |
| 26 - | component: BitstreamDownloadPageComponent, |
| 27 - | resolve: { |
| 28 - | bitstream: legacyBitstreamUrlResolver, |
| 29 - | }, |
| 26 + | canActivate: [legacyBitstreamURLRedirectGuard], |
| 30 27 | }, |
| 31 28 | { |
| 32 29 | // Resolve JSPUI bitstream download URLs |
| 33 30 | path: ':prefix/:suffix/:sequence_id/:filename', |
| 34 - | component: BitstreamDownloadPageComponent, |
| 35 - | resolve: { |
| 36 - | bitstream: legacyBitstreamUrlResolver, |
| 37 - | }, |
| 31 + | canActivate: [legacyBitstreamURLRedirectGuard], |
| 38 32 | }, |
| 39 33 | { |
| 40 34 | // Resolve angular bitstream download URLs |
| 41 35 | path: ':id/download', |
| 42 36 | component: BitstreamDownloadPageComponent, |
| 43 37 | resolve: { |
| 44 38 | bitstream: bitstreamPageResolver, |
| 45 39 | }, |
| 46 40 | }, |
| 47 41 | { |