From a37dc2feef73808c34087835d84047e78e662908 Mon Sep 17 00:00:00 2001
From: Nicoleta Panaghiu <nicoleta.panaghiu.ext@knecon.com>
Date: Wed, 3 Jul 2024 13:01:49 +0300
Subject: [PATCH] RED-9525: use backend error for add dossier & import
 mat-dialog-close.

---
 .../confirm-delete-dossier-state-dialog.component.ts       | 3 ++-
 .../file-attributes-csv-import-dialog.component.ts         | 3 ++-
 apps/red-ui/src/app/services/dossiers/dossiers.service.ts  | 7 +++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts
index 2f61e9cb8..cddad66b3 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts
@@ -1,6 +1,6 @@
 import { Component, Inject } from '@angular/core';
 import { DossierState } from '@red/domain';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { MAT_DIALOG_DATA, MatDialogClose, MatDialogRef } from '@angular/material/dialog';
 import { FormBuilder, ReactiveFormsModule } from '@angular/forms';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { combineLatest, firstValueFrom } from 'rxjs';
@@ -36,6 +36,7 @@ export interface ConfirmDeleteDossierStateDialogData {
         IconButtonComponent,
         CircleButtonComponent,
         NgIf,
+        MatDialogClose,
     ],
 })
 export class ConfirmDeleteDossierStateDialogComponent {
diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts
index 164beff9e..85259a9b8 100644
--- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts
@@ -2,7 +2,7 @@ import { AsyncPipe, NgForOf, NgIf } from '@angular/common';
 import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
 import { AbstractControl, ReactiveFormsModule, UntypedFormBuilder, UntypedFormGroup, ValidatorFn, Validators } from '@angular/forms';
 import { MatAutocomplete, MatAutocompleteTrigger, MatOption } from '@angular/material/autocomplete';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { MAT_DIALOG_DATA, MatDialogClose, MatDialogRef } from '@angular/material/dialog';
 import { MatFormField } from '@angular/material/form-field';
 import { MatSelect, MatSelectTrigger } from '@angular/material/select';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
@@ -54,6 +54,7 @@ export interface IFileAttributesCSVImportData {
         IconButtonComponent,
         NgForOf,
         ActiveFieldsListingComponent,
+        MatDialogClose,
     ],
 })
 export class FileAttributesCsvImportDialogComponent extends ListingComponent<IField> {
diff --git a/apps/red-ui/src/app/services/dossiers/dossiers.service.ts b/apps/red-ui/src/app/services/dossiers/dossiers.service.ts
index d4873fef6..aea9fda45 100644
--- a/apps/red-ui/src/app/services/dossiers/dossiers.service.ts
+++ b/apps/red-ui/src/app/services/dossiers/dossiers.service.ts
@@ -10,7 +10,6 @@ import { DashboardStatsService } from '../dossier-templates/dashboard-stats.serv
 import { mapEach } from '@iqser/common-ui/lib/utils';
 
 const CONFLICT_MSG = _('add-dossier-dialog.errors.dossier-already-exists');
-const GENERIC_MSG = _('add-dossier-dialog.errors.generic');
 
 export abstract class DossiersService extends EntitiesService<IDossier, Dossier> {
     protected readonly _dossierStatsService = inject(DossierStatsService);
@@ -23,7 +22,11 @@ export abstract class DossiersService extends EntitiesService<IDossier, Dossier>
 
     createOrUpdate(dossier: IDossierRequest): Observable<Dossier> {
         const showToast = (error: HttpErrorResponse) => {
-            this._toaster.error(error.status === HttpStatusCode.Conflict ? CONFLICT_MSG : GENERIC_MSG);
+            if (error.status === HttpStatusCode.Conflict) {
+                this._toaster.error(CONFLICT_MSG);
+            } else {
+                this._toaster.rawError(error.error.message);
+            }
             return of(null);
         };