From c3868d6a1727677be60313e60ae20a5671ec519d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Wed, 16 Aug 2023 03:02:03 +0300 Subject: [PATCH] RED-7269: Navigate to new router link after dossier template change --- .../edit-dossier-general-info.component.ts | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts index c0b5cf9b0..de8abc536 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts @@ -38,24 +38,6 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti dossierTemplates: IDossierTemplate[]; states: string[]; - constructor( - readonly permissionsService: PermissionsService, - private readonly _dossierStatesMapService: DossierStatesMapService, - private readonly _dossierTemplatesService: DossierTemplatesService, - private readonly _dossiersService: DossiersService, - private readonly _trashService: TrashService, - private readonly _dossierStatsService: DossierStatsService, - private readonly _formBuilder: UntypedFormBuilder, - private readonly _dialogService: DossiersDialogService, - private readonly _router: Router, - private readonly _tenantsService: TenantsService, - private readonly _editDossierDialogRef: MatDialogRef, - private readonly _toaster: Toaster, - private readonly _loadingService: LoadingService, - private readonly _translateService: TranslateService, - private readonly _archivedDossiersService: ArchivedDossiersService, - ) {} - get changed(): boolean { for (const key of Object.keys(this.form.getRawValue())) { if (key === 'dueDate') { @@ -89,6 +71,24 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti ) as string; } + constructor( + readonly permissionsService: PermissionsService, + private readonly _dossierStatesMapService: DossierStatesMapService, + private readonly _dossierTemplatesService: DossierTemplatesService, + private readonly _dossiersService: DossiersService, + private readonly _trashService: TrashService, + private readonly _dossierStatsService: DossierStatsService, + private readonly _formBuilder: UntypedFormBuilder, + private readonly _dialogService: DossiersDialogService, + private readonly _router: Router, + private readonly _tenantsService: TenantsService, + private readonly _editDossierDialogRef: MatDialogRef, + private readonly _toaster: Toaster, + private readonly _loadingService: LoadingService, + private readonly _translateService: TranslateService, + private readonly _archivedDossiersService: ArchivedDossiersService, + ) {} + ngOnInit() { this.states = [null, ...this._dossierStatesMapService.get(this.dossier.dossierTemplateId).map(s => s.id)]; this.statusPlaceholder = this.#statusPlaceholder; @@ -125,6 +125,9 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti } as IDossierRequest; const updatedDossier = await firstValueFrom(this._dossiersService.createOrUpdate(dossier)); + if (updatedDossier && updatedDossier.dossierTemplateId !== this.dossier.dossierTemplateId) { + await this._router.navigate([`/${this._tenantsService.activeTenantId}${updatedDossier.routerLink}`]); + } return { success: !!updatedDossier }; }