diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.ts index d4c47a4c6..9d36614e6 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.ts @@ -34,11 +34,7 @@ export class AddEntityDialogComponent extends BaseDialogComponent { } async save(): Promise { - try { - await this._addEditEntityComponent.save(); - this._dialogRef.close(true); - } catch (e) { - console.error(e); - } + await this._addEditEntityComponent.save(); + this._dialogRef.close(true); } } diff --git a/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.ts b/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.ts index a98e7f510..652c7b7a8 100644 --- a/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.ts @@ -37,16 +37,8 @@ export class EntityInfoComponent { return !this._addEditEntityComponent || this._addEditEntityComponent.form?.invalid || !this._addEditEntityComponent.changed; } - get changed(): boolean { - return this._addEditEntityComponent.changed; - } - async save(): Promise { - try { - await this._addEditEntityComponent.save(); - } catch (e) { - console.error(e); - } + await this._addEditEntityComponent.save(); } revert(): void { diff --git a/apps/red-ui/src/app/services/entity-services/dictionary.service.ts b/apps/red-ui/src/app/services/entity-services/dictionary.service.ts index 48a1f5f0e..d287e476a 100644 --- a/apps/red-ui/src/app/services/entity-services/dictionary.service.ts +++ b/apps/red-ui/src/app/services/entity-services/dictionary.service.ts @@ -1,13 +1,12 @@ -import { HttpErrorResponse, HttpStatusCode } from '@angular/common/http'; +import { HttpErrorResponse } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { EntitiesService, QueryParam, Toaster } from '@iqser/common-ui'; import { List } from '@iqser/common-ui/lib/utils'; import { Dictionary, DictionaryEntryType, DictionaryEntryTypes, IDictionary, IUpdateDictionary, SuperTypes } from '@red/domain'; import { DossierDictionariesMapService } from '@services/entity-services/dossier-dictionaries-map.service'; -import { FALLBACK_COLOR } from '@utils/constants'; -import { firstValueFrom, forkJoin, Observable, throwError } from 'rxjs'; -import { catchError, map, switchMap, tap } from 'rxjs/operators'; +import { firstValueFrom, forkJoin, Observable } from 'rxjs'; +import { map, switchMap, tap } from 'rxjs/operators'; import { IMAGE_CATEGORIES } from '../../modules/file-preview/utils/constants'; import { DictionariesMapService } from './dictionaries-map.service'; import { DossierTemplateStatsService } from './dossier-template-stats.service'; @@ -69,7 +68,6 @@ export class DictionaryService extends EntitiesService const url = `${this._defaultModelPath}/type/${type}/${dossierTemplateId}`; const queryParams = dossierId ? [{ key: 'dossierId', value: dossierId }] : undefined; const request = this._post(body, url, queryParams).pipe( - catchError((error: unknown) => this.#addUpdateDictionaryErrorToast(error)), switchMap(() => this.loadDictionaryDataForDossierTemplate(dossierTemplateId)), switchMap(() => this._dossierTemplateStatsService.getFor([dossierTemplateId])), ); @@ -80,7 +78,6 @@ export class DictionaryService extends EntitiesService async add(dictionary: IDictionary, dossierId?: string): Promise { const queryParams = dossierId ? [{ key: 'dossierId', value: dossierId }] : undefined; const request = this._post(dictionary, `${this._defaultModelPath}/type`, queryParams).pipe( - catchError((error: unknown) => this.#addUpdateDictionaryErrorToast(error)), switchMap(() => this.loadDictionaryDataForDossierTemplate(dictionary.dossierTemplateId)), switchMap(() => this._dossierTemplateStatsService.getFor([dictionary.dossierTemplateId])), ); @@ -291,15 +288,4 @@ export class DictionaryService extends EntitiesService const url = `${this._defaultModelPath}/delete/${type}/${dossierTemplateId}`; return firstValueFrom(this._post(entries, url, queryParams)); } - - #addUpdateDictionaryErrorToast(error: HttpErrorResponse | unknown): Observable { - if ((error as HttpErrorResponse).status === HttpStatusCode.Conflict) { - this._toaster.error(_('add-edit-entity.error.entity-already-exists')); - } else if ((error as HttpErrorResponse).status === HttpStatusCode.BadRequest) { - this._toaster.error(_('add-edit-entity.error.invalid-color-or-rank')); - } else { - this._toaster.error(_('add-edit-entity.error.generic')); - } - return throwError(() => error); - } }