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

RED-2889 quickfix

Browse Source
This commit is contained in:
Adina Țeudan 2021-12-08 09:34:49 +02:00
parent 23c24fe291
commit 6e97dd3931
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/red-ui/src/app/guards/dossiers.guard.ts
View File

@ -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<unknown> {
constructor(
private readonly _dossiersService: DossiersService,
private readonly _breadcrumbsService: BreadcrumbsService,
private readonly _translateService: TranslateService,
private readonly _router: Router,
) {}
async canActivate(): Promise<boolean> {
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;
}

4
apps/red-ui/src/app/guards/file-preview.guard.ts
View File

@ -43,6 +43,10 @@ export class FilePreviewGuard implements CanActivate, CanDeactivate<unknown> {
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();
}

13
apps/red-ui/src/app/modules/dossier/dossiers.module.ts
View File

@ -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 {}