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

Merge branch 'RED-9525' into 'master'

Browse Source 
RED-9525: use backend error for add dossier & import mat-dialog-close.

See merge request redactmanager/red-ui!493
This commit is contained in:
Dan Percic 2024-07-03 12:11:36 +02:00
commit 0e2b9f136a
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts
View File

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

3
apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts
View File

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

7
apps/red-ui/src/app/services/dossiers/dossiers.service.ts
View File

@ -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);
};