Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Merge branch 'VM/RED-9508' into 'master'

Browse Source 
RED-9508 - Page not responsive after switching Dossier view from active to archived

Closes RED-9508

See merge request redactmanager/red-ui!492
This commit is contained in:
Dan Percic 2024-07-03 10:48:33 +02:00
commit 7a2551f71f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/red-ui/src/app/app-routing.module.ts
View File

@ -78,7 +78,7 @@ const dossierTemplateIdRoutes: IqserRoutes = [
{ {
path: `${ARCHIVE_ROUTE}`, path: `${ARCHIVE_ROUTE}`,
loadChildren: () => import('./modules/archive/archive.routes'), loadChildren: () => import('./modules/archive/archive.routes'),
canActivate: [CompositeRouteGuard, webViewerLoadedGuard(), loadArchivedDossiersGuard()], canActivate: [CompositeRouteGuard, loadArchivedDossiersGuard()],
data: { data: {
routeGuards: [FeaturesGuard], routeGuards: [FeaturesGuard],
features: [DOSSIERS_ARCHIVE], features: [DOSSIERS_ARCHIVE],

3
apps/red-ui/src/app/modules/archive/archive.routes.ts
View File

@ -4,6 +4,7 @@ import { CompositeRouteGuard, IqserRoutes } from '@iqser/common-ui';
import { ARCHIVED_DOSSIERS_SERVICE } from '../../tokens'; import { ARCHIVED_DOSSIERS_SERVICE } from '../../tokens';
import { DossierFilesGuard } from '@guards/dossier-files-guard'; import { DossierFilesGuard } from '@guards/dossier-files-guard';
import { ConfigService } from './services/config.service'; import { ConfigService } from './services/config.service';
import { webViewerLoadedGuard } from '../pdf-viewer/services/webviewer-loaded.guard';
export default [ export default [
{ {
@ -32,7 +33,7 @@ export default [
}, },
{ {
path: `:${DOSSIER_ID}/file/:${FILE_ID}`, path: `:${DOSSIER_ID}/file/:${FILE_ID}`,
canActivate: [CompositeRouteGuard], canActivate: [CompositeRouteGuard, webViewerLoadedGuard()],
data: { data: {
routeGuards: [DossierFilesGuard], routeGuards: [DossierFilesGuard],
breadcrumbs: [BreadcrumbTypes.dossierTemplate, BreadcrumbTypes.dossier, BreadcrumbTypes.file], breadcrumbs: [BreadcrumbTypes.dossierTemplate, BreadcrumbTypes.dossier, BreadcrumbTypes.file],