diff --git a/apps/red-ui/src/app/guards/dossiers.guard.ts b/apps/red-ui/src/app/guards/dossiers.guard.ts index db39ed378..04613f5bf 100644 --- a/apps/red-ui/src/app/guards/dossiers.guard.ts +++ b/apps/red-ui/src/app/guards/dossiers.guard.ts @@ -2,18 +2,26 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, CanActivate, CanDeactivate, Router, RouterStateSnapshot } from '@angular/router'; import { DossiersService } from '@services/entity-services/dossiers.service'; import { BreadcrumbsService } from '@services/breadcrumbs.service'; +import { of } from 'rxjs'; +import { TranslateService } from '@ngx-translate/core'; @Injectable({ providedIn: 'root' }) export class DossiersGuard implements CanActivate, CanDeactivate { constructor( private readonly _dossiersService: DossiersService, private readonly _breadcrumbsService: BreadcrumbsService, + private readonly _translateService: TranslateService, private readonly _router: Router, ) {} async canActivate(): Promise { await this._dossiersService.loadAll().toPromise(); this._breadcrumbsService.hideGoBack(); + this._breadcrumbsService.append({ + name$: of(this._translateService.instant('top-bar.navigation-items.dossiers')), + routerLink: ['/main', 'dossiers'], + routerLinkActiveOptions: { exact: true }, + }); return true; } diff --git a/apps/red-ui/src/app/guards/file-preview.guard.ts b/apps/red-ui/src/app/guards/file-preview.guard.ts index 6d8fe5440..f1334f8d3 100644 --- a/apps/red-ui/src/app/guards/file-preview.guard.ts +++ b/apps/red-ui/src/app/guards/file-preview.guard.ts @@ -43,6 +43,10 @@ export class FilePreviewGuard implements CanActivate, CanDeactivate { const fileId = currentRoute.paramMap.get('fileId'); this._breadcrumbsService.remove(['/main', 'dossiers', dossierId, 'file', fileId]); + if (!nextState.url.includes('dossiers/')) { + this._breadcrumbsService.remove(['/main', 'dossiers', dossierId]); + } + if (!nextState.url.startsWith('/main/dossiers')) { this._breadcrumbsService.showGoBack(); } diff --git a/apps/red-ui/src/app/modules/dossier/dossiers.module.ts b/apps/red-ui/src/app/modules/dossier/dossiers.module.ts index 02a08fd5c..44c107c38 100644 --- a/apps/red-ui/src/app/modules/dossier/dossiers.module.ts +++ b/apps/red-ui/src/app/modules/dossier/dossiers.module.ts @@ -27,9 +27,6 @@ import { EditDossierDeletedDocumentsComponent } from './dialogs/edit-dossier-dia import { OverlayModule } from '@angular/cdk/overlay'; import { SharedDossiersModule } from './shared/shared-dossiers.module'; import { ResizeAnnotationDialogComponent } from './dialogs/resize-annotation-dialog/resize-annotation-dialog.component'; -import { BreadcrumbsService } from '@services/breadcrumbs.service'; -import { of } from 'rxjs'; -import { TranslateService } from '@ngx-translate/core'; import { EditDossierTeamComponent } from './dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component'; const screens = [SearchScreenComponent]; @@ -73,12 +70,4 @@ const services = [ providers: [...services], imports: [CommonModule, SharedModule, SharedDossiersModule, FileUploadDownloadModule, DossiersRoutingModule, OverlayModule], }) -export class DossiersModule { - constructor(breadcrumbsService: BreadcrumbsService, translateService: TranslateService) { - breadcrumbsService.append({ - name$: of(translateService.instant('top-bar.navigation-items.dossiers')), - routerLink: ['/main', 'dossiers'], - routerLinkActiveOptions: { exact: true }, - }); - } -} +export class DossiersModule {}