From fd949af1fcfdfbd8d2e7c95629c5c96d1ac21ea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Thu, 14 Oct 2021 11:56:24 +0300 Subject: [PATCH] RED-2460: Fixed delete template error msg --- .../dossier-template-actions.component.ts | 10 ++++++---- .../screen/dossier-overview-screen.component.ts | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/apps/red-ui/src/app/modules/admin/components/dossier-template-actions/dossier-template-actions.component.ts b/apps/red-ui/src/app/modules/admin/components/dossier-template-actions/dossier-template-actions.component.ts index 95ee9824e..bd7cc22a0 100644 --- a/apps/red-ui/src/app/modules/admin/components/dossier-template-actions/dossier-template-actions.component.ts +++ b/apps/red-ui/src/app/modules/admin/components/dossier-template-actions/dossier-template-actions.component.ts @@ -50,6 +50,12 @@ export class DossierTemplateActionsComponent implements OnInit { await this._dossierTemplatesService .delete([this.dossierTemplateId]) .toPromise() + .then(async () => { + await this._dossierTemplatesService.loadAll().toPromise(); + await this._appStateService.loadDictionaryData(); + this.loadDossierTemplatesData.emit(); + await this._router.navigate(['main', 'admin']); + }) .catch(error => { if (error.status === 409) { this._toaster.error(_('dossier-templates-listing.error.conflict')); @@ -58,11 +64,7 @@ export class DossierTemplateActionsComponent implements OnInit { } this._loadingService.stop(); }); - await this._dossierTemplatesService.loadAll().toPromise(); - await this._appStateService.loadDictionaryData(); - await this._router.navigate(['main', 'admin']); this._loadingService.stop(); - this.loadDossierTemplatesData.emit(); }); } } diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts index 907fdd45b..8e2e77b76 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts @@ -113,8 +113,8 @@ export class DossierOverviewScreenComponent extends ListingComponent imple private _fileAttributeConfigs: IFileAttributeConfig[]; set fileAttributeConfigs(value: IFileAttributeConfig[]) { - this._fileAttributeConfigs = value; - this.displayedInFileListAttributes = value.filter(config => config.displayedInFileList); + this._fileAttributeConfigs = value || []; + this.displayedInFileListAttributes = this._fileAttributeConfigs.filter(config => config.displayedInFileList); this.displayedAttributes = this.displayedInFileListAttributes.filter(c => c.displayedInFileList); }