From 666ff573ef0ba230b7622ca00e96507b4a121ad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Mon, 14 Feb 2022 12:01:22 +0200 Subject: [PATCH] Dossier templates guard --- apps/red-ui/src/app/app-routing.module.ts | 3 +- .../src/app/guards/dossier-templates.guard.ts | 18 +++ apps/red-ui/src/app/guards/dossiers.guard.ts | 9 +- .../app/modules/admin/admin-routing.module.ts | 4 +- ...ossier-template-breadcrumbs.component.html | 18 +-- .../dossier-template-breadcrumbs.component.ts | 12 +- .../add-edit-dictionary-dialog.component.ts | 18 +-- ...edit-dossier-attribute-dialog.component.ts | 6 +- ...-edit-dossier-template-dialog.component.ts | 10 +- ...ributes-configurations-dialog.component.ts | 15 +- .../default-colors-screen.component.ts | 17 +- .../dictionary-listing-screen.component.ts | 53 ++----- .../dictionary-overview-screen.component.ts | 28 +--- ...ier-attributes-listing-screen.component.ts | 14 +- ...sier-templates-listing-screen.component.ts | 12 +- ...ile-attributes-listing-screen.component.ts | 31 ++-- .../dossier-template-info-screen.component.ts | 2 +- ...d-edit-justification-dialog.component.html | 8 +- ...add-edit-justification-dialog.component.ts | 13 +- .../justifications-dialog.service.ts | 3 +- .../justifications-screen.component.ts | 12 +- .../table-item/table-item.component.ts | 14 +- .../reports-screen.component.ts | 25 +-- .../rules-screen/rules-screen.component.ts | 15 +- .../watermark-screen.component.ts | 78 ++++----- .../admin/services/admin-dialog.service.ts | 6 - .../dossier-template-actions.component.ts | 32 +--- .../document-info-dialog.component.ts | 2 +- .../dossier-attributes.service.ts | 9 +- .../shared/services/dictionary.service.ts | 150 +++++++++--------- .../dossier-templates.service.ts | 82 +++++----- .../entity-services/dossiers.service.ts | 4 +- .../file-attributes.service.ts | 2 +- apps/red-ui/src/app/state/app-state.guard.ts | 2 - libs/common-ui | 2 +- 35 files changed, 337 insertions(+), 392 deletions(-) create mode 100644 apps/red-ui/src/app/guards/dossier-templates.guard.ts diff --git a/apps/red-ui/src/app/app-routing.module.ts b/apps/red-ui/src/app/app-routing.module.ts index b13a5055e..d2f0a48ee 100644 --- a/apps/red-ui/src/app/app-routing.module.ts +++ b/apps/red-ui/src/app/app-routing.module.ts @@ -8,6 +8,7 @@ import { NgModule } from '@angular/core'; import { DownloadsListScreenComponent } from '@components/downloads-list-screen/downloads-list-screen.component'; import { AppStateGuard } from '@state/app-state.guard'; import { DossiersGuard } from '@guards/dossiers.guard'; +import { DossierTemplatesGuard } from '@guards/dossier-templates.guard'; const routes: Routes = [ { @@ -36,7 +37,7 @@ const routes: Routes = [ loadChildren: () => import('./modules/dossier/dossiers.module').then(m => m.DossiersModule), canActivate: [CompositeRouteGuard], data: { - routeGuards: [AuthGuard, RedRoleGuard, AppStateGuard, DossiersGuard], + routeGuards: [AuthGuard, RedRoleGuard, DossierTemplatesGuard, AppStateGuard, DossiersGuard], requiredRoles: ['RED_USER', 'RED_MANAGER'], }, }, diff --git a/apps/red-ui/src/app/guards/dossier-templates.guard.ts b/apps/red-ui/src/app/guards/dossier-templates.guard.ts new file mode 100644 index 000000000..4d0995f44 --- /dev/null +++ b/apps/red-ui/src/app/guards/dossier-templates.guard.ts @@ -0,0 +1,18 @@ +import { Injectable } from '@angular/core'; +import { CanActivate } from '@angular/router'; +import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; +import { firstValueFrom } from 'rxjs'; +import { DictionaryService } from '@shared/services/dictionary.service'; + +@Injectable({ providedIn: 'root' }) +export class DossierTemplatesGuard implements CanActivate { + constructor( + private readonly _dossierTemplatesService: DossierTemplatesService, + private readonly _dictionaryService: DictionaryService, + ) {} + + async canActivate(): Promise { + await firstValueFrom(this._dossierTemplatesService.loadAll()); + return true; + } +} diff --git a/apps/red-ui/src/app/guards/dossiers.guard.ts b/apps/red-ui/src/app/guards/dossiers.guard.ts index 66a37f509..7f056bf71 100644 --- a/apps/red-ui/src/app/guards/dossiers.guard.ts +++ b/apps/red-ui/src/app/guards/dossiers.guard.ts @@ -1,16 +1,11 @@ import { Injectable } from '@angular/core'; -import { CanActivate, Router } from '@angular/router'; +import { CanActivate } from '@angular/router'; import { DossiersService } from '@services/entity-services/dossiers.service'; -import { TranslateService } from '@ngx-translate/core'; import { firstValueFrom } from 'rxjs'; @Injectable({ providedIn: 'root' }) export class DossiersGuard implements CanActivate { - constructor( - private readonly _dossiersService: DossiersService, - private readonly _translateService: TranslateService, - private readonly _router: Router, - ) {} + constructor(private readonly _dossiersService: DossiersService) {} async canActivate(): Promise { await firstValueFrom(this._dossiersService.loadAll()); diff --git a/apps/red-ui/src/app/modules/admin/admin-routing.module.ts b/apps/red-ui/src/app/modules/admin/admin-routing.module.ts index 33215e35e..c4bdb3cf3 100644 --- a/apps/red-ui/src/app/modules/admin/admin-routing.module.ts +++ b/apps/red-ui/src/app/modules/admin/admin-routing.module.ts @@ -18,6 +18,7 @@ import { TrashScreenComponent } from './screens/trash/trash-screen.component'; import { GeneralConfigScreenComponent } from './screens/general-config/general-config-screen.component'; import { BaseAdminScreenComponent } from './base-admin-screen/base-admin-screen.component'; import { BaseDossierTemplateScreenComponent } from './base-dossier-templates-screen/base-dossier-template-screen.component'; +import { DossierTemplatesGuard } from '../../guards/dossier-templates.guard'; const routes: Routes = [ { path: '', redirectTo: 'dossier-templates', pathMatch: 'full' }, @@ -129,8 +130,9 @@ const routes: Routes = [ ], }, ], + canActivate: [CompositeRouteGuard], data: { - routeGuards: [AuthGuard, RedRoleGuard, AppStateGuard], + routeGuards: [AuthGuard, RedRoleGuard, DossierTemplatesGuard, AppStateGuard], requiredRoles: ['RED_MANAGER', 'RED_ADMIN'], }, }, diff --git a/apps/red-ui/src/app/modules/admin/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html b/apps/red-ui/src/app/modules/admin/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html index 0edc6758e..b7c2079b4 100644 --- a/apps/red-ui/src/app/modules/admin/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html +++ b/apps/red-ui/src/app/modules/admin/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html @@ -1,14 +1,14 @@
- - - - + + + + {{ dossierTemplate.name }} diff --git a/apps/red-ui/src/app/modules/admin/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.ts b/apps/red-ui/src/app/modules/admin/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.ts index ea7872bda..a93501e80 100644 --- a/apps/red-ui/src/app/modules/admin/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.ts +++ b/apps/red-ui/src/app/modules/admin/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.ts @@ -1,6 +1,4 @@ import { Component, Input } from '@angular/core'; -import { UserPreferenceService } from '@services/user-preference.service'; -import { PermissionsService } from '@services/permissions.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { Observable, of } from 'rxjs'; import { map, switchMap } from 'rxjs/operators'; @@ -19,20 +17,18 @@ export class DossierTemplateBreadcrumbsComponent { readonly activeDictionary$: Observable; constructor( - readonly userPreferenceService: UserPreferenceService, - readonly permissionService: PermissionsService, - readonly dossierTemplatesService: DossierTemplatesService, - readonly dictionariesMapService: DictionariesMapService, + private readonly _dossierTemplatesService: DossierTemplatesService, + private readonly _dictionariesMapService: DictionariesMapService, private readonly _route: ActivatedRoute, ) { this.dossierTemplate$ = _route.paramMap.pipe( map(params => params.get('dossierTemplateId')), - switchMap((dossierTemplateId: string) => this.dossierTemplatesService.getEntityChanged$(dossierTemplateId)), + switchMap((dossierTemplateId: string) => this._dossierTemplatesService.getEntityChanged$(dossierTemplateId)), ); this.activeDictionary$ = _route.paramMap.pipe( map(params => [params.get('dossierTemplateId'), params.get('dictionary')]), switchMap(([dossierTemplateId, dictionary]: [string, string]) => - dictionary ? this.dictionariesMapService.watch$(dossierTemplateId, dictionary) : of(undefined), + dictionary ? this._dictionariesMapService.watch$(dossierTemplateId, dictionary) : of(undefined), ), ); } diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.ts index 71d08b265..1e713ac18 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.ts @@ -10,7 +10,6 @@ import { DictionaryService } from '@shared/services/dictionary.service'; import { Dictionary, IDictionary } from '@red/domain'; import { UserService } from '@services/user.service'; import { map } from 'rxjs/operators'; -import { HttpStatusCode } from '@angular/common/http'; import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service'; @Component({ @@ -66,28 +65,17 @@ export class AddEditDictionaryDialogComponent extends BaseDialogComponent { async save(): Promise { const dictionary = this._formToObject(); - let observable: Observable; const dossierTemplateId = this._data.dossierTemplateId; if (this.dictionary) { // edit mode - observable = this._dictionaryService.updateDictionary(dictionary, dossierTemplateId, dictionary.type); + await firstValueFrom(this._dictionaryService.updateDictionary(dictionary, dossierTemplateId, dictionary.type)); } else { // create mode - observable = this._dictionaryService.addDictionary({ ...dictionary, dossierTemplateId }); + await firstValueFrom(this._dictionaryService.addDictionary({ ...dictionary, dossierTemplateId })); } - return firstValueFrom(observable) - .then(() => this._dialogRef.close(true)) - .catch(error => { - if (error.status === HttpStatusCode.Conflict) { - this._toaster.error(_('add-edit-dictionary.error.dictionary-already-exists')); - } else if (error.status === HttpStatusCode.BadRequest) { - this._toaster.error(_('add-edit-dictionary.error.invalid-color-or-rank')); - } else { - this._toaster.error(_('add-edit-dictionary.error.generic')); - } - }); + this._dialogRef.close(true); } private _getForm(dictionary: Dictionary): FormGroup { diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts index f20fa7042..94dd875f6 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts @@ -25,7 +25,7 @@ export class AddEditDossierAttributeDialogComponent extends BaseDialogComponent protected readonly _injector: Injector, protected readonly _dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) - readonly data: { readonly dossierAttribute: IDossierAttributeConfig }, + readonly data: { readonly dossierAttribute: IDossierAttributeConfig; dossierTemplateId: string }, ) { super(_injector, _dialogRef); this.form = this._getForm(this.dossierAttribute); @@ -37,7 +37,7 @@ export class AddEditDossierAttributeDialogComponent extends BaseDialogComponent return true; } - for (const key of Object.keys(this.form.getRawValue())) { + for (const key of Object.keys(this.form.getRawValue() as IDossierAttributeConfig)) { if (this.dossierAttribute[key] !== this.form.get(key).value) { return true; } @@ -55,7 +55,7 @@ export class AddEditDossierAttributeDialogComponent extends BaseDialogComponent ...this.form.getRawValue(), }; - this._dossierAttributesService.createOrUpdate(attribute).subscribe( + this._dossierAttributesService.createOrUpdate(attribute, this.data.dossierTemplateId).subscribe( () => { this._dialogRef.close(true); }, diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts index b117b6cfc..f254a884d 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts @@ -8,9 +8,10 @@ import { downloadTypesTranslations } from '../../../../translations/download-typ import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { BaseDialogComponent, LoadingService, Toaster } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { DownloadFileType, IDossierTemplate } from '@red/domain'; +import { DossierTemplate, DownloadFileType, IDossierTemplate } from '@red/domain'; import { HttpStatusCode } from '@angular/common/http'; import { DictionaryService } from '../../../shared/services/dictionary.service'; +import { firstValueFrom } from 'rxjs'; @Component({ templateUrl: './add-edit-dossier-template-dialog.component.html', @@ -24,6 +25,7 @@ export class AddEditDossierTemplateDialogComponent extends BaseDialogComponent { key: type, label: downloadTypesTranslations[type], })); + readonly dossierTemplate: DossierTemplate; private _previousValidFrom: Moment; private _previousValidTo: Moment; private _lastValidFrom: Moment; @@ -37,9 +39,10 @@ export class AddEditDossierTemplateDialogComponent extends BaseDialogComponent { protected readonly _injector: Injector, protected readonly _dialogRef: MatDialogRef, private readonly _loadingService: LoadingService, - @Inject(MAT_DIALOG_DATA) readonly dossierTemplate: IDossierTemplate, + @Inject(MAT_DIALOG_DATA) readonly dossierTemplateId: string, ) { super(_injector, _dialogRef); + this.dossierTemplate = this._dossierTemplatesService.find(this.dossierTemplateId); this.form = this._getForm(); this.initialFormValue = this.form.getRawValue(); this.hasValidFrom = !!this.dossierTemplate?.validFrom; @@ -79,8 +82,7 @@ export class AddEditDossierTemplateDialogComponent extends BaseDialogComponent { validFrom: this.hasValidFrom ? this.form.get('validFrom').value : null, validTo: this.hasValidTo ? this.form.get('validTo').value : null, } as IDossierTemplate; - await this._dossierTemplatesService.createOrUpdate(dossierTemplate).toPromise(); - await this._dictionaryService.loadDictionaryData(); + await firstValueFrom(this._dossierTemplatesService.createOrUpdate(dossierTemplate)); this._dialogRef.close(true); } catch (error: any) { const message = diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts index 136a12bea..37bb5c850 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts @@ -1,9 +1,9 @@ import { ChangeDetectionStrategy, Component, Inject, Injector } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FileAttributeEncodingTypes, IFileAttributesConfig } from '../../../../../../../../libs/red-domain/src'; +import { FileAttributeEncodingTypes, IFileAttributesConfig } from '@red/domain'; import { fileAttributeEncodingTypesTranslations } from '../../translations/file-attribute-encoding-types-translations'; -import { BaseDialogComponent, Toaster } from '../../../../../../../../libs/common-ui/src'; +import { BaseDialogComponent, Toaster } from '@iqser/common-ui'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { firstValueFrom } from 'rxjs'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; @@ -17,7 +17,7 @@ import { FileAttributesService } from '@services/entity-services/file-attributes export class FileAttributesConfigurationsDialogComponent extends BaseDialogComponent { readonly encodingTypeOptions = Object.keys(FileAttributeEncodingTypes); readonly translations = fileAttributeEncodingTypesTranslations; - private readonly _configuration: IFileAttributesConfig = this._data; + private readonly _configuration: IFileAttributesConfig = this._data.config; constructor( private readonly _formBuilder: FormBuilder, @@ -26,7 +26,7 @@ export class FileAttributesConfigurationsDialogComponent extends BaseDialogCompo private readonly _toaster: Toaster, protected readonly _injector: Injector, protected readonly _dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) private _data: IFileAttributesConfig, + @Inject(MAT_DIALOG_DATA) private _data: { config: IFileAttributesConfig; dossierTemplateId: string }, ) { super(_injector, _dialogRef); this.form = this._getForm(); @@ -49,12 +49,7 @@ export class FileAttributesConfigurationsDialogComponent extends BaseDialogCompo this._configuration.encoding = this.form.get('encodingType').value; try { - await firstValueFrom( - this._fileAttributesService.setFileAttributeConfig( - this._configuration, - this._dossierTemplatesService.activeDossierTemplateId, - ), - ); + await firstValueFrom(this._fileAttributesService.setFileAttributeConfig(this._configuration, this._data.dossierTemplateId)); this._toaster.success(_('file-attributes-configurations.update.success')); } catch (e) { this._toaster.error(_('file-attributes-configurations.update.error')); diff --git a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts index f22841b00..d7ccf394b 100644 --- a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Component, forwardRef, Injector, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, forwardRef, Injector } from '@angular/core'; import { DefaultColorType, IColors } from '@red/domain'; import { AdminDialogService } from '../../services/admin-dialog.service'; import { @@ -15,6 +15,7 @@ import { UserService } from '@services/user.service'; import { DictionaryService } from '@shared/services/dictionary.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { firstValueFrom } from 'rxjs'; +import { ActivatedRoute } from '@angular/router'; interface ListItem extends IListable { readonly key: string; @@ -27,7 +28,7 @@ interface ListItem extends IListable { changeDetection: ChangeDetectionStrategy.OnPush, providers: [...DefaultListingServices, { provide: ListingComponent, useExisting: forwardRef(() => DefaultColorsScreenComponent) }], }) -export class DefaultColorsScreenComponent extends ListingComponent implements OnInit { +export class DefaultColorsScreenComponent extends ListingComponent { readonly circleButtonTypes = CircleButtonTypes; readonly currentUser = this._userService.currentUser; readonly translations = defaultColorsTranslations; @@ -37,6 +38,7 @@ export class DefaultColorsScreenComponent extends ListingComponent imp { label: _('default-colors-screen.table-col-names.color'), class: 'flex-center' }, ]; private _colorsObj: IColors; + readonly #dossierTemplateId: string; constructor( protected readonly _injector: Injector, @@ -45,12 +47,10 @@ export class DefaultColorsScreenComponent extends ListingComponent imp private readonly _dossierTemplatesService: DossierTemplatesService, private readonly _dialogService: AdminDialogService, private readonly _dictionaryService: DictionaryService, + private readonly _route: ActivatedRoute, ) { super(_injector); - } - - async ngOnInit() { - await this._loadColors(); + this.#dossierTemplateId = _route.snapshot.paramMap.get('dossierTemplateId'); } openEditColorDialog($event: MouseEvent, color: { key: DefaultColorType | string; value: string }) { @@ -60,18 +60,17 @@ export class DefaultColorsScreenComponent extends ListingComponent imp { colors: this._colorsObj, colorKey: color.key, - dossierTemplateId: this._dossierTemplatesService.activeDossierTemplateId, + dossierTemplateId: this.#dossierTemplateId, }, async () => { await this._loadColors(); - await this._dictionaryService.refreshDossierTemplate(this._dossierTemplatesService.activeDossierTemplateId); }, ); } private async _loadColors() { this._loadingService.start(); - const data = await firstValueFrom(this._dictionaryService.getColors(this._dossierTemplatesService.activeDossierTemplateId)); + const data = await firstValueFrom(this._dictionaryService.getColors(this.#dossierTemplateId)); this._colorsObj = data; const entities = Object.keys(data) .map(key => ({ diff --git a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts index 3e0da7840..f9fbc51e2 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts @@ -1,4 +1,4 @@ -import { Component, forwardRef, Injector, OnInit } from '@angular/core'; +import { Component, forwardRef, Injector } from '@angular/core'; import { DoughnutChartConfig } from '@shared/components/simple-doughnut-chart/simple-doughnut-chart.component'; import { TranslateService } from '@ngx-translate/core'; import { @@ -26,7 +26,7 @@ import { DictionariesMapService } from '@services/entity-services/dictionaries-m styleUrls: ['./dictionary-listing-screen.component.scss'], providers: [...DefaultListingServices, { provide: ListingComponent, useExisting: forwardRef(() => DictionaryListingScreenComponent) }], }) -export class DictionaryListingScreenComponent extends ListingComponent implements OnInit { +export class DictionaryListingScreenComponent extends ListingComponent { readonly iconButtonTypes = IconButtonTypes; readonly circleButtonTypes = CircleButtonTypes; readonly currentUser = this._userService.currentUser; @@ -38,7 +38,7 @@ export class DictionaryListingScreenComponent extends ListingComponent; - templateStats: DossierTemplateStats; + readonly #dossierTemplateId: string; constructor( protected readonly _injector: Injector, @@ -54,13 +54,10 @@ export class DictionaryListingScreenComponent extends ListingComponent (this.templateStats = stats))); - } - - async ngOnInit(): Promise { - await this._loadDictionaryData(false); + this.#dossierTemplateId = _route.snapshot.paramMap.get('dossierTemplateId'); + this.templateStats$ = this._dossierTemplateStatsService + .watch$(this.#dossierTemplateId) + .pipe(tap(templateStats => this._loadDictionaryData(templateStats))); } openDeleteDictionariesDialog($event?: MouseEvent, types = this.listingService.selected) { @@ -69,46 +66,30 @@ export class DictionaryListingScreenComponent extends ListingComponent t.type), - this._dossierTemplatesService.activeDossierTemplateId, + this.#dossierTemplateId, ), ); - await this._loadDictionaryData(); this._loadingService.stop(); }); } openAddEditDictionaryDialog($event?: MouseEvent, dictionary?: Dictionary) { - this._dialogService.openDialog( - 'addEditDictionary', - $event, - { - dictionary, - dossierTemplateId: this._dossierTemplatesService.activeDossierTemplateId, - }, - async () => { - this._loadingService.start(); - await this._loadDictionaryData(); - this._loadingService.stop(); - }, - ); + this._dialogService.openDialog('addEditDictionary', $event, { + dictionary, + dossierTemplateId: this.#dossierTemplateId, + }); } - private async _loadDictionaryData(refresh = true): Promise { - if (refresh) { - await this._dictionaryService.loadDictionaryData(); - } - - const entities: Dictionary[] = this._dictionariesMapService - .get(this._dossierTemplatesService.activeDossierTemplateId) - .filter(d => !d.virtual); + private _loadDictionaryData(templateStats: DossierTemplateStats): void { + const entities: Dictionary[] = this._dictionariesMapService.get(this.#dossierTemplateId).filter(d => !d.virtual); this.entitiesService.setEntities(entities); - this._calculateData(); + this._calculateData(templateStats); } - private _calculateData(): void { + private _calculateData(templateStats: DossierTemplateStats): void { this.chartData = this.allEntities.map(dict => ({ - value: this.templateStats.dictionarySummary(dict.type).entriesCount ?? 0, + value: templateStats.dictionarySummary(dict.type).entriesCount ?? 0, color: dict.hexColor, label: dict.label, key: dict.type, diff --git a/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.ts index cfc594fdb..60d1e346f 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.ts @@ -7,7 +7,6 @@ import { DictionaryManagerComponent } from '@shared/components/dictionary-manage import { DictionaryService } from '@shared/services/dictionary.service'; import { CircleButtonTypes, LoadingService } from '@iqser/common-ui'; import { UserService } from '@services/user.service'; -import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { Dictionary } from '@red/domain'; import { firstValueFrom, Observable, of } from 'rxjs'; import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service'; @@ -35,7 +34,6 @@ export class DictionaryOverviewScreenComponent { private readonly _userService: UserService, private readonly _activatedRoute: ActivatedRoute, private readonly _loadingService: LoadingService, - private readonly _dossierTemplatesService: DossierTemplatesService, private readonly _dialogService: AdminDialogService, protected readonly _translateService: TranslateService, private readonly _dictionaryService: DictionaryService, @@ -56,19 +54,10 @@ export class DictionaryOverviewScreenComponent { } openEditDictionaryDialog(dictionary: Dictionary, $event: MouseEvent) { - this._dialogService.openDialog( - 'addEditDictionary', - $event, - { - dictionary, - dossierTemplateId: dictionary.dossierTemplateId, - }, - async () => { - this._loadingService.start(); - await this._dictionaryService.loadDictionaryData(); - this._loadingService.stop(); - }, - ); + this._dialogService.openDialog('addEditDictionary', $event, { + dictionary, + dossierTemplateId: dictionary.dossierTemplateId, + }); } openDeleteDictionaryDialog(dictionary: Dictionary, $event?: MouseEvent) { @@ -76,14 +65,7 @@ export class DictionaryOverviewScreenComponent { this._dialogService.openDialog('confirm', $event, null, async () => { await firstValueFrom(this._dictionaryService.deleteDictionaries([dictionary.type], dictionary.dossierTemplateId)); - await this._dictionaryService.loadDictionaryData(); - await this._router.navigate([ - '/main', - 'admin', - 'dossier-templates', - this._dossierTemplatesService.activeDossierTemplateId, - 'dictionaries', - ]); + await this._router.navigate(['/main', 'admin', 'dossier-templates', dictionary.dossierTemplateId, 'dictionaries']); }); } diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts index 15a253d7c..487f69c59 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts @@ -14,9 +14,9 @@ import { dossierAttributeTypesTranslations } from '../../translations/dossier-at import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { UserService } from '@services/user.service'; import { DossierAttributeConfig, IDossierAttributeConfig } from '@red/domain'; -import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { firstValueFrom } from 'rxjs'; import { ReportTemplateService } from '../../../../services/report-template.service'; +import { ActivatedRoute } from '@angular/router'; @Component({ templateUrl: './dossier-attributes-listing-screen.component.html', @@ -38,17 +38,19 @@ export class DossierAttributesListingScreenComponent extends ListingComponent { @@ -56,7 +58,7 @@ export class DossierAttributesListingScreenComponent extends ListingComponent { this._loadingService.start(); const ids = dossierAttribute ? [dossierAttribute.id] : this.listingService.selected.map(item => item.id); - await firstValueFrom(this._dossierAttributesService.delete(ids)); + await firstValueFrom(this._dossierAttributesService.delete(ids, dossierTemplateId)); await this._loadData(); }); } openAddEditAttributeDialog($event: MouseEvent, dossierAttribute?: IDossierAttributeConfig) { - const dossierTemplateId = this._dossierTemplatesService.activeDossierTemplateId; + const dossierTemplateId = this.#dossierTemplateId; this._dialogService.openDialog('addEditDossierAttribute', $event, { dossierAttribute, dossierTemplateId }, async () => this._loadData(), @@ -79,7 +81,7 @@ export class DossierAttributesListingScreenComponent extends ListingComponent d.dossierTemplateId)) { - await firstValueFrom(this._dossierTemplatesService.delete(templateIds)).catch(error => { - if (error.status === HttpStatusCode.Conflict) { - this._toaster.error(_('dossier-templates-listing.error.conflict')); - } else { - this._toaster.error(_('dossier-templates-listing.error.generic')); - } - }); - await this._dictionaryService.loadDictionaryData(); + await firstValueFrom(this._dossierTemplatesService.delete(templateIds)); } } diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts index 6ebf999a8..b7860e4c3 100644 --- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts @@ -14,11 +14,11 @@ import { UserService } from '@services/user.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { FileAttributeConfig, IFileAttributeConfig, IFileAttributesConfig } from '@red/domain'; import { FileAttributesService } from '@services/entity-services/file-attributes.service'; -import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { HttpStatusCode } from '@angular/common/http'; import { firstValueFrom } from 'rxjs'; import { ReportTemplateService } from '../../../../services/report-template.service'; -import { DictionaryService } from '../../../shared/services/dictionary.service'; +import { ActivatedRoute } from '@angular/router'; +import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; @Component({ templateUrl: './file-attributes-listing-screen.component.html', @@ -51,19 +51,21 @@ export class FileAttributesListingScreenComponent extends ListingComponent this._loadData(), @@ -130,13 +132,14 @@ export class FileAttributesListingScreenComponent extends ListingComponent { - await firstValueFrom( - this._fileAttributesService.setFileAttributesConfig(newValue, this._dossierTemplatesService.activeDossierTemplateId), - ).catch(error => { + await firstValueFrom(this._fileAttributesService.setFileAttributesConfig(newValue, this.#dossierTemplateId)).catch(error => { if (error.status === HttpStatusCode.Conflict) { this._toaster.error(_('file-attributes-listing.error.conflict')); } else { @@ -144,7 +147,7 @@ export class FileAttributesListingScreenComponent extends ListingComponent new FileAttributeConfig(item)) || []; this.entitiesService.setEntities(fileAttributeConfig); diff --git a/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.ts index 031bb2306..9045da605 100644 --- a/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.ts @@ -29,6 +29,6 @@ export class DossierTemplateInfoScreenComponent { } openEditDossierTemplateDialog($event: MouseEvent, dossierTemplate: DossierTemplate) { - this._dialogService.openDialog('addEditDossierTemplate', $event, dossierTemplate); + this._dialogService.openDialog('addEditDossierTemplate', $event, dossierTemplate.id); } } diff --git a/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.html b/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.html index 3e36230b7..3a0c5e4c7 100644 --- a/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.html @@ -1,8 +1,8 @@
-
+
- +
diff --git a/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.ts b/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.ts index 41d47bbef..c19723be9 100644 --- a/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.ts @@ -14,7 +14,6 @@ import { firstValueFrom } from 'rxjs'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class AddEditJustificationDialogComponent extends BaseDialogComponent { - constructor( private readonly _formBuilder: FormBuilder, private readonly _justificationService: JustificationsService, @@ -22,7 +21,7 @@ export class AddEditJustificationDialogComponent extends BaseDialogComponent { private readonly _loadingService: LoadingService, protected readonly _injector: Injector, protected readonly _dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public justification: Justification, + @Inject(MAT_DIALOG_DATA) public data: { justification?: Justification; dossierTemplateId: string }, ) { super(_injector, _dialogRef); @@ -31,10 +30,10 @@ export class AddEditJustificationDialogComponent extends BaseDialogComponent { } async save() { - const dossierTemplateId = this._dossierTemplatesService.activeDossierTemplateId; + const dossierTemplateId = this.data.dossierTemplateId; this._loadingService.start(); - await firstValueFrom(this._justificationService.createOrUpdate(this.form.getRawValue(), dossierTemplateId)); + await firstValueFrom(this._justificationService.createOrUpdate(this.form.getRawValue() as Justification, dossierTemplateId)); await firstValueFrom(this._justificationService.loadAll(dossierTemplateId)); this._loadingService.stop(); this._dialogRef.close(true); @@ -42,9 +41,9 @@ export class AddEditJustificationDialogComponent extends BaseDialogComponent { private _getForm(): FormGroup { return this._formBuilder.group({ - name: [{ value: this.justification?.name, disabled: !!this.justification }, Validators.required], - reason: [this.justification?.reason, Validators.required], - description: [this.justification?.description, Validators.required], + name: [{ value: this.data.justification?.name, disabled: !!this.data.justification }, Validators.required], + reason: [this.data.justification?.reason, Validators.required], + description: [this.data.justification?.description, Validators.required], }); } } diff --git a/apps/red-ui/src/app/modules/admin/screens/justifications/justifications-dialog.service.ts b/apps/red-ui/src/app/modules/admin/screens/justifications/justifications-dialog.service.ts index aa8295caa..6fcf1f246 100644 --- a/apps/red-ui/src/app/modules/admin/screens/justifications/justifications-dialog.service.ts +++ b/apps/red-ui/src/app/modules/admin/screens/justifications/justifications-dialog.service.ts @@ -38,7 +38,7 @@ export class JustificationsDialogService extends DialogService { super(_dialog); } - confirmDelete(justifications: Justification[]) { + confirmDelete(justifications: Justification[], dossierTemplateId: string) { const data = new ConfirmationDialogInput({ title: _('confirmation-dialog.delete-justification.title'), titleColor: TitleColors.WARN, @@ -50,7 +50,6 @@ export class JustificationsDialogService extends DialogService { }); this.openDialog('confirm', null, data, async () => { this._loadingService.start(); - const dossierTemplateId = this._dossierTemplatesService.activeDossierTemplateId; const justificationIds = justifications.map(j => j.id); await firstValueFrom(this._justificationService.delete(justificationIds, dossierTemplateId)); await firstValueFrom(this._justificationService.loadAll(dossierTemplateId)); diff --git a/apps/red-ui/src/app/modules/admin/screens/justifications/justifications-screen/justifications-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/justifications/justifications-screen/justifications-screen.component.ts index e002143c6..b39e90662 100644 --- a/apps/red-ui/src/app/modules/admin/screens/justifications/justifications-screen/justifications-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/justifications/justifications-screen/justifications-screen.component.ts @@ -11,11 +11,11 @@ import { } from '@iqser/common-ui'; import { Justification } from '@red/domain'; import { JustificationsService } from '@services/entity-services/justifications.service'; -import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { JustificationsDialogService } from '../justifications-dialog.service'; import { UserService } from '@services/user.service'; import { UserPreferenceService } from '@services/user-preference.service'; import { firstValueFrom } from 'rxjs'; +import { ActivatedRoute } from '@angular/router'; @Component({ selector: 'redaction-justifications-screen', @@ -38,30 +38,32 @@ export class JustificationsScreenComponent extends ListingComponent { this._loadingService.start(); - await firstValueFrom(this._justificationService.loadAll(this._dossierTemplatesService.activeDossierTemplateId)); + await firstValueFrom(this._justificationService.loadAll(this.#dossierTemplateId)); this._loadingService.stop(); } openAddJustificationDialog(): void { - this._dialogService.openDialog('addEditJustification', null, null); + this._dialogService.openDialog('addEditJustification', null, { justification: null, dossierTemplateId: this.#dossierTemplateId }); } openConfirmDeleteDialog() { - this._dialogService.confirmDelete(this.listingService.selected); + this._dialogService.confirmDelete(this.listingService.selected, this.#dossierTemplateId); } } diff --git a/apps/red-ui/src/app/modules/admin/screens/justifications/table-item/table-item.component.ts b/apps/red-ui/src/app/modules/admin/screens/justifications/table-item/table-item.component.ts index e6b32c9ef..55f516cd6 100644 --- a/apps/red-ui/src/app/modules/admin/screens/justifications/table-item/table-item.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/justifications/table-item/table-item.component.ts @@ -4,6 +4,7 @@ import { CircleButtonTypes, ListingService, LoadingService } from '@iqser/common import { JustificationsDialogService } from '../justifications-dialog.service'; import { UserService } from '@services/user.service'; import { UserPreferenceService } from '@services/user-preference.service'; +import { ActivatedRoute } from '@angular/router'; @Component({ selector: 'redaction-table-item', @@ -14,6 +15,7 @@ import { UserPreferenceService } from '@services/user-preference.service'; export class TableItemComponent { readonly circleButtonTypes = CircleButtonTypes; @Input() justification: Justification; + readonly #dossierTemplateId: string; constructor( private readonly _dialogService: JustificationsDialogService, @@ -21,13 +23,19 @@ export class TableItemComponent { private readonly _listingService: ListingService, readonly userPreferenceService: UserPreferenceService, readonly userService: UserService, - ) {} + private readonly _route: ActivatedRoute, + ) { + this.#dossierTemplateId = _route.snapshot.paramMap.get('dossierTemplateId'); + } openEditJustificationDialog() { - this._dialogService.openDialog('addEditJustification', null, this.justification); + this._dialogService.openDialog('addEditJustification', null, { + justification: this.justification, + dossierTemplateId: this.#dossierTemplateId, + }); } openConfirmDeleteDialog() { - this._dialogService.confirmDelete([this.justification]); + this._dialogService.confirmDelete([this.justification], this.#dossierTemplateId); } } diff --git a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.ts index c18dd22c4..117099d40 100644 --- a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.ts @@ -13,6 +13,7 @@ import { AdminDialogService } from '../../../services/admin-dialog.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { ReportTemplateService } from '@services/report-template.service'; import { BehaviorSubject, firstValueFrom } from 'rxjs'; +import { ActivatedRoute } from '@angular/router'; interface Placeholder { placeholder: string; @@ -32,6 +33,7 @@ const placeholderTypes: PlaceholderType[] = ['generalPlaceholders', 'fileAttribu export class ReportsScreenComponent implements OnInit { placeholders$ = new BehaviorSubject([]); availableTemplates$ = new BehaviorSubject([]); + readonly #dossierTemplateId: string; @ViewChild('fileInput') private _fileInput: ElementRef; @@ -41,8 +43,11 @@ export class ReportsScreenComponent implements OnInit { private readonly _dialogService: AdminDialogService, private readonly _toaster: Toaster, private readonly _loadingService: LoadingService, + private readonly _route: ActivatedRoute, readonly permissionsService: PermissionsService, - ) {} + ) { + this.#dossierTemplateId = _route.snapshot.paramMap.get('dossierTemplateId'); + } async ngOnInit() { this._loadingService.start(); @@ -93,8 +98,6 @@ export class ReportsScreenComponent implements OnInit { return; } - const dossierTemplateId = this._dossierTemplatesService.activeDossierTemplateId; - if (this.availableTemplates$.value.some(template => template.fileName === file.name)) { const data = new ConfirmationDialogInput({ title: _('confirmation-dialog.report-template-same-name.title'), @@ -108,17 +111,17 @@ export class ReportsScreenComponent implements OnInit { this._dialogService.openDialog('confirm', null, data, null, async result => { if (result) { - await this._openConfirmationDialog(file, dossierTemplateId); + await this._openConfirmationDialog(file); } }); } else { - await this._openConfirmationDialog(file, dossierTemplateId); + await this._openConfirmationDialog(file); } this._fileInput.nativeElement.value = null; } - private async _openConfirmationDialog(file: File, dossierTemplateId: string) { + private async _openConfirmationDialog(file: File) { if (this._isExcelFile(file)) { const data = new ConfirmationDialogInput({ title: _('confirmation-dialog.upload-report-template.title'), @@ -132,12 +135,12 @@ export class ReportsScreenComponent implements OnInit { }); this._dialogService.openDialog('confirm', null, data, null, async result => { if (result) { - await firstValueFrom(this._reportTemplateService.uploadTemplateForm(dossierTemplateId, result > 1, file)); + await firstValueFrom(this._reportTemplateService.uploadTemplateForm(this.#dossierTemplateId, result > 1, file)); await this._loadReportTemplates(); } }); } else { - await firstValueFrom(this._reportTemplateService.uploadTemplateForm(dossierTemplateId, false, file)); + await firstValueFrom(this._reportTemplateService.uploadTemplateForm(this.#dossierTemplateId, false, file)); await this._loadReportTemplates(); } } @@ -149,15 +152,13 @@ export class ReportsScreenComponent implements OnInit { private async _loadReportTemplates() { this.availableTemplates$.next( - await firstValueFrom( - this._reportTemplateService.getAvailableReportTemplates(this._dossierTemplatesService.activeDossierTemplateId), - ), + await firstValueFrom(this._reportTemplateService.getAvailableReportTemplates(this.#dossierTemplateId)), ); } private async _loadPlaceholders() { const placeholdersResponse: IPlaceholdersResponse = await firstValueFrom( - this._reportTemplateService.getAvailablePlaceholders(this._dossierTemplatesService.activeDossierTemplateId), + this._reportTemplateService.getAvailablePlaceholders(this.#dossierTemplateId), ); this.placeholders$.next( placeholderTypes.flatMap(type => diff --git a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen/rules-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen/rules-screen.component.ts index 17daa1aa7..40e361d53 100644 --- a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen/rules-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen/rules-screen.component.ts @@ -4,9 +4,9 @@ import { Debounce, IconButtonTypes, LoadingService, Toaster } from '@iqser/commo import { TranslateService } from '@ngx-translate/core'; import { saveAs } from 'file-saver'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { RulesService } from '../../../services/rules.service'; import { firstValueFrom } from 'rxjs'; +import { ActivatedRoute } from '@angular/router'; import ICodeEditor = monaco.editor.ICodeEditor; import IModelDeltaDecoration = monaco.editor.IModelDeltaDecoration; import IStandaloneEditorConstructionOptions = monaco.editor.IStandaloneEditorConstructionOptions; @@ -36,16 +36,19 @@ export class RulesScreenComponent implements OnInit { private _codeEditor: ICodeEditor; private _decorations: string[] = []; + readonly #dossierTemplateId: string; constructor( readonly permissionsService: PermissionsService, private readonly _rulesService: RulesService, private readonly _changeDetectorRef: ChangeDetectorRef, - private readonly _dossierTemplatesService: DossierTemplatesService, private readonly _toaster: Toaster, protected readonly _translateService: TranslateService, private readonly _loadingService: LoadingService, - ) {} + private readonly _route: ActivatedRoute, + ) { + this.#dossierTemplateId = _route.snapshot.paramMap.get('dossierTemplateId'); + } set isLeavingPage(isLeaving: boolean) { this.isLeaving = isLeaving; @@ -95,7 +98,7 @@ export class RulesScreenComponent implements OnInit { await firstValueFrom( this._rulesService.uploadRules({ rules: this._codeEditor.getModel().getValue(), - dossierTemplateId: this._dossierTemplatesService.activeDossierTemplateId, + dossierTemplateId: this.#dossierTemplateId, }), ).then( async () => { @@ -125,7 +128,7 @@ export class RulesScreenComponent implements OnInit { } upload($event): void { - const file = $event.target.files[0]; + const file: File = $event.target.files[0]; const fileReader = new FileReader(); if (file) { @@ -152,7 +155,7 @@ export class RulesScreenComponent implements OnInit { private async _initialize() { this._loadingService.start(); - await firstValueFrom(this._rulesService.download(this._dossierTemplatesService.activeDossierTemplateId)).then( + await firstValueFrom(this._rulesService.download(this.#dossierTemplateId)).then( rules => { this.currentLines = this.initialLines = rules.rules.split('\n'); this.revert(); diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts index 19b0b63e5..e58fbfebb 100644 --- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectorRef, Component, ElementRef, Inject, OnInit, ViewChild } from '@angular/core'; +import { ChangeDetectorRef, Component, ElementRef, Inject, ViewChild } from '@angular/core'; import { PermissionsService } from '@services/permissions.service'; import WebViewer, { WebViewerInstance } from '@pdftron/webviewer'; import { environment } from '@environments/environment'; @@ -11,7 +11,9 @@ import { stampPDFPage } from '@utils/page-stamper'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { WatermarkService } from '@shared/services/watermark.service'; -import { firstValueFrom } from 'rxjs'; +import { firstValueFrom, Observable, of, switchMap } from 'rxjs'; +import { catchError, tap } from 'rxjs/operators'; +import { ActivatedRoute } from '@angular/router'; export const DEFAULT_WATERMARK: IWatermark = { text: null, @@ -27,9 +29,10 @@ export const DEFAULT_WATERMARK: IWatermark = { templateUrl: './watermark-screen.component.html', styleUrls: ['./watermark-screen.component.scss'], }) -export class WatermarkScreenComponent implements OnInit { +export class WatermarkScreenComponent { readonly iconButtonTypes = IconButtonTypes; readonly form: FormGroup = this._getForm(); + readonly #dossierTemplateId: string; private _instance: WebViewerInstance; private _watermark: IWatermark = {}; @ViewChild('viewer', { static: true }) @@ -45,8 +48,10 @@ export class WatermarkScreenComponent implements OnInit { private readonly _formBuilder: FormBuilder, private readonly _dossierTemplatesService: DossierTemplatesService, private readonly _loadingService: LoadingService, + private readonly _route: ActivatedRoute, ) { this._loadingService.start(); + this.#dossierTemplateId = this._route.snapshot.paramMap.get('dossierTemplateId'); } get changed(): boolean { @@ -61,8 +66,8 @@ export class WatermarkScreenComponent implements OnInit { return false; } - ngOnInit(): void { - this._loadWatermark(); + async ngOnInit(): Promise { + await firstValueFrom(this._loadWatermark()); } @Debounce() @@ -70,26 +75,27 @@ export class WatermarkScreenComponent implements OnInit { await this._drawWatermark(); } - save() { - const watermark = { - ...this.form.getRawValue(), - }; - - const dossierTemplateId = this._dossierTemplatesService.activeDossierTemplateId; + async save(): Promise { + const watermark: IWatermark = this.form.getRawValue(); const observable = watermark.text - ? this._watermarkService.saveWatermark(watermark, dossierTemplateId) - : this._watermarkService.deleteWatermark(dossierTemplateId); + ? this._watermarkService.saveWatermark(watermark, this.#dossierTemplateId) + : this._watermarkService.deleteWatermark(this.#dossierTemplateId); - firstValueFrom(observable).then( - () => { - this._loadWatermark(); - this._toaster.success( - watermark.text ? _('watermark-screen.action.change-success') : _('watermark-screen.action.delete-success'), - ); - }, - () => this._toaster.error(_('watermark-screen.action.error')), - ); + try { + await firstValueFrom( + observable.pipe( + switchMap(() => this._loadWatermark()), + tap(() => { + this._toaster.success( + watermark.text ? _('watermark-screen.action.change-success') : _('watermark-screen.action.delete-success'), + ); + }), + ), + ); + } catch (error) { + this._toaster.error(_('watermark-screen.action.error')); + } } async revert() { @@ -106,18 +112,14 @@ export class WatermarkScreenComponent implements OnInit { } } - private _loadWatermark() { - this._watermarkService.getWatermark(this._dossierTemplatesService.activeDossierTemplateId).subscribe( - watermark => { + private _loadWatermark(): Observable { + return this._watermarkService.getWatermark(this.#dossierTemplateId).pipe( + catchError(() => of(DEFAULT_WATERMARK)), + tap(watermark => { this._watermark = watermark; - this.form.setValue({ ...this._watermark }); + this.form.setValue({ ...watermark }); this._loadViewer(); - }, - () => { - this._watermark = DEFAULT_WATERMARK; - this.form.setValue({ ...this._watermark }); - this._loadViewer(); - }, + }), ); } @@ -132,7 +134,7 @@ export class WatermarkScreenComponent implements OnInit { isReadOnly: true, backendType: 'ems', }, - this._viewer.nativeElement, + this._viewer.nativeElement as HTMLElement, ).then(instance => { this._instance = instance; @@ -162,12 +164,12 @@ export class WatermarkScreenComponent implements OnInit { const pdfNet = this._instance.Core.PDFNet; const document = await this._instance.Core.documentViewer.getDocument().getPDFDoc(); - const text = this.form.get('text').value || ''; - const fontSize = this.form.get('fontSize').value; - const fontType = this.form.get('fontType').value; + const text: string = this.form.get('text').value || ''; + const fontSize: number = this.form.get('fontSize').value; + const fontType: string = this.form.get('fontType').value; const orientation: WatermarkOrientation = this.form.get('orientation').value; - const opacity = this.form.get('opacity').value; - const color = this.form.get('hexColor').value; + const opacity: number = this.form.get('opacity').value; + const color: string = this.form.get('hexColor').value; await stampPDFPage(document, pdfNet, text, fontSize, fontType, orientation, opacity, color, [1]); this._instance.Core.documentViewer.refreshAll(); diff --git a/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts b/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts index 7e31b7b0d..1ee12ff67 100644 --- a/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts +++ b/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts @@ -11,7 +11,6 @@ import { ConfirmDeleteUsersDialogComponent } from '../dialogs/confirm-delete-use import { FileAttributesCsvImportDialogComponent } from '../dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component'; import { AddEditDossierAttributeDialogComponent } from '../dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component'; import { ConfirmationDialogComponent, DialogConfig, DialogService, largeDialogConfig } from '@iqser/common-ui'; -import { AddEditJustificationDialogComponent } from '../screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component'; import { UploadDictionaryDialogComponent } from '../dialogs/upload-dictionary-dialog/upload-dictionary-dialog.component'; import { FileAttributesConfigurationsDialogComponent } from '../dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component'; @@ -28,7 +27,6 @@ type DialogType = | 'smtpAuthConfig' | 'addEditDossierTemplate' | 'addEditDossierAttribute' - | 'addEditJustification' | 'uploadDictionary'; @Injectable() @@ -81,10 +79,6 @@ export class AdminDialogService extends DialogService { component: AddEditDossierAttributeDialogComponent, dialogConfig: { autoFocus: true }, }, - addEditJustification: { - component: AddEditJustificationDialogComponent, - dialogConfig: { autoFocus: true }, - }, uploadDictionary: { component: UploadDictionaryDialogComponent, }, diff --git a/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.ts b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.ts index 8827b861c..1dd098c20 100644 --- a/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.ts +++ b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.ts @@ -1,11 +1,9 @@ import { Component, Input, OnInit } from '@angular/core'; -import { Router } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { AdminDialogService } from '../../../services/admin-dialog.service'; import { CircleButtonTypes, LoadingService, Toaster } from '@iqser/common-ui'; import { UserService } from '@services/user.service'; -import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; -import { HttpStatusCode } from '@angular/common/http'; import { firstValueFrom } from 'rxjs'; import { DictionaryService } from '../../../../shared/services/dictionary.service'; @@ -22,6 +20,7 @@ export class DossierTemplateActionsComponent implements OnInit { constructor( private readonly _router: Router, + private readonly _route: ActivatedRoute, private readonly _toaster: Toaster, private readonly _userService: UserService, private readonly _loadingService: LoadingService, @@ -30,36 +29,21 @@ export class DossierTemplateActionsComponent implements OnInit { private readonly _dossierTemplatesService: DossierTemplatesService, ) {} - get dossierTemplate() { - return this._dossierTemplatesService.find(this.dossierTemplateId); - } - ngOnInit() { - this.dossierTemplateId ??= this._dossierTemplatesService.activeDossierTemplateId; + this.dossierTemplateId ??= this._route.snapshot.paramMap.get('dossierTemplateId'); } - openEditDossierTemplateDialog($event: any) { - this._dialogService.openDialog('addEditDossierTemplate', $event, this.dossierTemplate); + openEditDossierTemplateDialog($event: MouseEvent) { + this._dialogService.openDialog('addEditDossierTemplate', $event, this.dossierTemplateId); } openDeleteDossierTemplateDialog($event?: MouseEvent) { this._dialogService.openDialog('confirm', $event, null, async () => { this._loadingService.start(); - await firstValueFrom(this._dossierTemplatesService.delete([this.dossierTemplateId])) - .then(async () => { - await firstValueFrom(this._dossierTemplatesService.loadAll()); - await this._dictionaryService.loadDictionaryData(); - await this._router.navigate(['main', 'admin']); - }) - .catch(error => { - if (error.status === HttpStatusCode.Conflict) { - this._toaster.error(_('dossier-templates-listing.error.conflict')); - } else { - this._toaster.error(_('dossier-templates-listing.error.generic')); - } - this._loadingService.stop(); - }); + await firstValueFrom(this._dossierTemplatesService.delete([this.dossierTemplateId])); + await this._router.navigate(['main', 'admin']); + this._loadingService.stop(); }); } diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.ts index 7062c9d41..937093b20 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.ts @@ -34,7 +34,7 @@ export class DocumentInfoDialogComponent extends BaseDialogComponent implements async ngOnInit() { super.ngOnInit(); this.attributes = ( - await firstValueFrom(this._fileAttributesService.getFileAttributesConfig(this._dossier.dossierTemplateId)) + await firstValueFrom(this._fileAttributesService.loadFileAttributesConfig(this._dossier.dossierTemplateId)) ).fileAttributeConfigs.filter(attr => attr.editable); this.form = this._getForm(); this.initialFormValue = this.form.getRawValue(); diff --git a/apps/red-ui/src/app/modules/shared/services/controller-wrappers/dossier-attributes.service.ts b/apps/red-ui/src/app/modules/shared/services/controller-wrappers/dossier-attributes.service.ts index 704301eb3..f41357caa 100644 --- a/apps/red-ui/src/app/modules/shared/services/controller-wrappers/dossier-attributes.service.ts +++ b/apps/red-ui/src/app/modules/shared/services/controller-wrappers/dossier-attributes.service.ts @@ -1,7 +1,6 @@ import { Injectable, Injector } from '@angular/core'; import { Dossier, DossierAttributeConfig, DossierAttributeWithValue, IDossierAttribute, IDossierAttributeConfig } from '@red/domain'; import { firstValueFrom, Observable } from 'rxjs'; -import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { EntitiesService, List, mapEach, RequiredParam, Validate } from '@iqser/common-ui'; import { map, tap } from 'rxjs/operators'; @@ -9,7 +8,7 @@ import { map, tap } from 'rxjs/operators'; providedIn: 'root', }) export class DossierAttributesService extends EntitiesService { - constructor(private readonly _dossierTemplatesService: DossierTemplatesService, protected readonly _injector: Injector) { + constructor(protected readonly _injector: Injector) { super(_injector, DossierAttributeConfig, 'dossier-attributes'); } @@ -32,12 +31,12 @@ export class DossierAttributesService extends EntitiesService { + delete(@RequiredParam() ids: List, dossierTemplateId: string): Observable { const queryParams = ids.map(id => ({ key: 'dossierAttributeIds', value: id })); return this._post(null, `${this._defaultModelPath}/config/delete/${dossierTemplateId}`, queryParams); } - loadAll(dossierTemplateId = this._dossierTemplatesService.activeDossierTemplateId): Observable { + loadAll(dossierTemplateId: string): Observable { return this.getConfig(dossierTemplateId).pipe( map(entities => entities ?? []), mapEach(entity => new DossierAttributeConfig(entity)), @@ -48,7 +47,7 @@ export class DossierAttributesService extends EntitiesService { return this._post(attributeConfig, `${this._defaultModelPath}/config/${dossierTemplateId}`); } diff --git a/apps/red-ui/src/app/modules/shared/services/dictionary.service.ts b/apps/red-ui/src/app/modules/shared/services/dictionary.service.ts index 68acce5b6..275d7e278 100644 --- a/apps/red-ui/src/app/modules/shared/services/dictionary.service.ts +++ b/apps/red-ui/src/app/modules/shared/services/dictionary.service.ts @@ -1,15 +1,15 @@ import { Injectable, Injector } from '@angular/core'; import { firstValueFrom, forkJoin, Observable, of, throwError } from 'rxjs'; import { EntitiesService, List, QueryParam, RequiredParam, Toaster, Validate } from '@iqser/common-ui'; -import { Dictionary, DossierTemplate, IColors, IDictionary, IUpdateDictionary } from '@red/domain'; +import { Dictionary, IColors, IDictionary, IUpdateDictionary } from '@red/domain'; import { catchError, map, mapTo, switchMap, tap } from 'rxjs/operators'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DossierTemplateStatsService } from '@services/entity-services/dossier-template-stats.service'; import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service'; import { FALLBACK_COLOR } from '@utils/constants'; -import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { hexToRgb } from '@utils/functions'; import { FileAttributesService } from '@services/entity-services/file-attributes.service'; +import { HttpErrorResponse, HttpStatusCode } from '@angular/common/http'; const MIN_WORD_LENGTH = 2; @@ -20,7 +20,6 @@ export class DictionaryService extends EntitiesService constructor( private readonly _toaster: Toaster, protected readonly _injector: Injector, - private readonly _dossierTemplatesService: DossierTemplatesService, private readonly _fileAttributesService: FileAttributesService, private readonly _dossierTemplateStatsService: DossierTemplateStatsService, private readonly _dictionariesMapService: DictionariesMapService, @@ -45,7 +44,12 @@ export class DictionaryService extends EntitiesService const queryParams = dossierId ? [{ key: 'dossierId', value: dossierId }] : undefined; const url = `${this._defaultModelPath}/type/${dossierTemplateId}/delete`; return this._post(body, url, queryParams).pipe( - switchMap(dictionaries => this._dossierTemplateStatsService.getFor([dossierTemplateId]).pipe(mapTo(dictionaries))), + switchMap(dictionaries => + forkJoin([ + this._dossierTemplateStatsService.getFor([dossierTemplateId]), + this.loadDictionaryDataForDossierTemplate(dossierTemplateId), + ]).pipe(mapTo(dictionaries)), + ), ); } @@ -90,11 +94,17 @@ export class DictionaryService extends EntitiesService @RequiredParam() dossierTemplateId: string, @RequiredParam() type: string, dossierId?: string, - ) { + ): Observable { const url = `${this._defaultModelPath}/type/${type}/${dossierTemplateId}`; const queryParams = dossierId ? [{ key: 'dossierId', value: dossierId }] : undefined; return this._post(body, url, queryParams).pipe( - switchMap(dictionary => this._dossierTemplateStatsService.getFor([dossierTemplateId]).pipe(mapTo(dictionary))), + catchError((error: HttpErrorResponse) => this.#addUpdateDictionaryErrorToast(error)), + switchMap(dictionary => + forkJoin([ + this._dossierTemplateStatsService.getFor([dossierTemplateId]), + this.loadDictionaryDataForDossierTemplate(dossierTemplateId), + ]).pipe(map(() => this._dictionariesMapService.get(dictionary.dossierTemplateId, dictionary.type))), + ), ); } @@ -102,18 +112,27 @@ export class DictionaryService extends EntitiesService * Set system colors for redaction */ @Validate() - setColors(@RequiredParam() body: IColors, @RequiredParam() dossierTemplateId: string) { - return this._post(body, `color/${dossierTemplateId}`); + setColors(@RequiredParam() body: IColors, @RequiredParam() dossierTemplateId: string): Observable { + return this._post(body, `color/${dossierTemplateId}`).pipe( + switchMap(() => this.loadDictionaryDataForDossierTemplate(dossierTemplateId)), + ); } /** * Creates entry type with colors, hint and caseInsensitive */ @Validate() - addDictionary(@RequiredParam() dictionary: IDictionary, dossierId?: string) { + addDictionary(@RequiredParam() dictionary: IDictionary, dossierId?: string): Observable { const queryParams = dossierId ? [{ key: 'dossierId', value: dossierId }] : undefined; return this._post(dictionary, `${this._defaultModelPath}/type`, queryParams).pipe( - switchMap(() => this._dossierTemplateStatsService.getFor([dictionary.dossierTemplateId])), + catchError((error: HttpErrorResponse) => this.#addUpdateDictionaryErrorToast(error)), + switchMap(() => + forkJoin([ + this._dossierTemplateStatsService.getFor([dictionary.dossierTemplateId]), + this.loadDictionaryDataForDossierTemplate(dictionary.dossierTemplateId), + ]), + ), + map(() => this._dictionariesMapService.get(dictionary.dossierTemplateId, dictionary.type)), ); } @@ -180,71 +199,15 @@ export class DictionaryService extends EntitiesService return possibleDictionaries; } - async loadDictionaryDataIfNecessary() { - if (this._dictionariesMapService.empty) { - await this.loadDictionaryData(); - } - } - - async loadDictionaryData(): Promise { + loadDictionaryData(dossierTemplatesIds: string[]): Observable { const observables: Observable[] = []; - for (const dossierTemplate of this._dossierTemplatesService.all) { - observables.push(this._loadDictionaryDataForDossierTemplate$(dossierTemplate.dossierTemplateId)); + for (const dossierTemplateId of dossierTemplatesIds) { + observables.push(this.loadDictionaryDataForDossierTemplate(dossierTemplateId)); } - await firstValueFrom(forkJoin(observables)); + return forkJoin(observables); } - async refreshDossierTemplateDictionaryData(dossierTemplateId: string): Promise { - await firstValueFrom(this._loadDictionaryDataForDossierTemplate$(dossierTemplateId)); - } - - // TODO: Maybe move this in dossier templates service - async refreshDossierTemplate(dossierTemplateId: string) { - const dossierTemplate = await firstValueFrom(this._dossierTemplatesService.get(dossierTemplateId)); - - await firstValueFrom(this._fileAttributesService.getFileAttributesConfig(dossierTemplateId)); - - const newDossierTemplate = new DossierTemplate(dossierTemplate); - this._dossierTemplatesService.replace(newDossierTemplate); - - await this.refreshDossierTemplateDictionaryData(dossierTemplateId); - } - - /** - * Add dictionary entries with entry type. - */ - @Validate() - private _addEntry( - @RequiredParam() body: List, - @RequiredParam() dossierTemplateId: string, - @RequiredParam() type: string, - dossierId?: string, - removeCurrent?: boolean, - ) { - const queryParams: List = [ - { key: 'dossierId', value: dossierId }, - { key: 'removeCurrent', value: removeCurrent }, - ]; - const url = `${this._defaultModelPath}/${type}/${dossierTemplateId}`; - return this._post(body, url, queryParams); - } - - /** - * Delete dictionary entries with entry type. - */ - @Validate() - private _deleteEntries( - @RequiredParam() body: List, - @RequiredParam() dossierTemplateId: string, - @RequiredParam() type: string, - @RequiredParam() dossierId?: string, - ) { - const queryParams = dossierId ? [{ key: 'dossierId', value: dossierId }] : undefined; - const url = `${this._defaultModelPath}/delete/${type}/${dossierTemplateId}`; - return this._post(body, url, queryParams); - } - - private _loadDictionaryDataForDossierTemplate$(dossierTemplateId: string): Observable { + loadDictionaryDataForDossierTemplate(dossierTemplateId: string): Observable { const types$: Observable = this.getAllDictionaries(dossierTemplateId).pipe( map(typesResponse => typesResponse.types.map(type => new Dictionary(type))), ); @@ -305,4 +268,49 @@ export class DictionaryService extends EntitiesService .pipe(map(([types, virtualTypes]: Dictionary[][]) => [...types, ...virtualTypes])) .pipe(tap(dictionaries => this._dictionariesMapService.set(dossierTemplateId, dictionaries))); } + + #addUpdateDictionaryErrorToast(error: HttpErrorResponse): Observable { + if (error.status === HttpStatusCode.Conflict) { + this._toaster.error(_('add-edit-dictionary.error.dictionary-already-exists')); + } else if (error.status === HttpStatusCode.BadRequest) { + this._toaster.error(_('add-edit-dictionary.error.invalid-color-or-rank')); + } else { + this._toaster.error(_('add-edit-dictionary.error.generic')); + } + return throwError(() => error); + } + + /** + * Add dictionary entries with entry type. + */ + @Validate() + private _addEntry( + @RequiredParam() body: List, + @RequiredParam() dossierTemplateId: string, + @RequiredParam() type: string, + dossierId?: string, + removeCurrent?: boolean, + ) { + const queryParams: List = [ + { key: 'dossierId', value: dossierId }, + { key: 'removeCurrent', value: removeCurrent }, + ]; + const url = `${this._defaultModelPath}/${type}/${dossierTemplateId}`; + return this._post(body, url, queryParams); + } + + /** + * Delete dictionary entries with entry type. + */ + @Validate() + private _deleteEntries( + @RequiredParam() body: List, + @RequiredParam() dossierTemplateId: string, + @RequiredParam() type: string, + @RequiredParam() dossierId?: string, + ) { + const queryParams = dossierId ? [{ key: 'dossierId', value: dossierId }] : undefined; + const url = `${this._defaultModelPath}/delete/${type}/${dossierTemplateId}`; + return this._post(body, url, queryParams); + } } diff --git a/apps/red-ui/src/app/services/entity-services/dossier-templates.service.ts b/apps/red-ui/src/app/services/entity-services/dossier-templates.service.ts index 299578629..768172ced 100644 --- a/apps/red-ui/src/app/services/entity-services/dossier-templates.service.ts +++ b/apps/red-ui/src/app/services/entity-services/dossier-templates.service.ts @@ -1,79 +1,75 @@ -import { EntitiesService, List, mapEach, RequiredParam, Validate } from '@iqser/common-ui'; +import { EntitiesService, List, mapEach, RequiredParam, Toaster, Validate } from '@iqser/common-ui'; import { DossierTemplate, IDossierTemplate } from '@red/domain'; import { Injectable, Injector } from '@angular/core'; -import { BehaviorSubject, forkJoin, Observable } from 'rxjs'; +import { forkJoin, Observable, throwError } from 'rxjs'; import { FileAttributesService } from './file-attributes.service'; -import { ActivationEnd, Router } from '@angular/router'; -import { currentComponentRoute } from '@utils/functions'; -import { mapTo, switchMap, tap } from 'rxjs/operators'; +import { catchError, mapTo, switchMap, tap } from 'rxjs/operators'; import { DossierTemplateStatsService } from '@services/entity-services/dossier-template-stats.service'; +import { HttpErrorResponse, HttpStatusCode } from '@angular/common/http'; +import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; +import { DictionaryService } from '@shared/services/dictionary.service'; + +const DOSSIER_TEMPLATE_CONFLICT_MSG = _('dossier-templates-listing.error.conflict'); +const GENERIC_MSG = _('dossier-templates-listing.error.generic'); @Injectable({ providedIn: 'root', }) export class DossierTemplatesService extends EntitiesService { - readonly activeDossierTemplate$: Observable; - private readonly _activeDossierTemplate$ = new BehaviorSubject(undefined); - constructor( protected readonly _injector: Injector, + private readonly _toaster: Toaster, private readonly _fileAttributesService: FileAttributesService, - private readonly _router: Router, private readonly _dossierTemplateStatsService: DossierTemplateStatsService, + private readonly _dictionaryService: DictionaryService, ) { super(_injector, DossierTemplate, 'dossier-template'); - this.activeDossierTemplate$ = this._activeDossierTemplate$.asObservable(); - - _router.events.pipe(currentComponentRoute).subscribe((event: ActivationEnd) => { - const dossierTemplateId = event.snapshot.paramMap.get('dossierTemplateId'); - const sameIdAsCurrentActive = dossierTemplateId === this._activeDossierTemplate$.getValue()?.dossierTemplateId; - - if (sameIdAsCurrentActive) { - return; - } - - if (dossierTemplateId === null || dossierTemplateId === undefined) { - return this._activeDossierTemplate$.next(undefined); - } - - if (!this.has(dossierTemplateId)) { - this._activeDossierTemplate$.next(undefined); - return this._router.navigate(['/main/admin/dossier-templates']).then(); - } - - this._activeDossierTemplate$.next(this.find(dossierTemplateId)); - }); - } - - get activeDossierTemplate(): DossierTemplate | undefined { - return this._activeDossierTemplate$.value; - } - - get activeDossierTemplateId(): string | undefined { - return this._activeDossierTemplate$.value?.dossierTemplateId; } loadAll(): Observable { - const getAttributes = (entities: DossierTemplate[]) => entities.map(e => this._fileAttributesService.getFileAttributesConfig(e.id)); + const getAttributes = (entities: DossierTemplate[]) => + entities.map(e => this._fileAttributesService.loadFileAttributesConfig(e.id)); const dossierTemplateIds = (templates: DossierTemplate[]) => templates.map(d => d.id); + return this.getAll().pipe( mapEach(entity => new DossierTemplate(entity)), /* Load stats before updating entities */ switchMap(templates => - forkJoin([this._dossierTemplateStatsService.getFor(dossierTemplateIds(templates)), ...getAttributes(templates)]).pipe( - mapTo(templates), - ), + forkJoin([ + this._dossierTemplateStatsService.getFor(dossierTemplateIds(templates)), + ...getAttributes(templates), + this._dictionaryService.loadDictionaryData(dossierTemplateIds(templates)), + ]).pipe(mapTo(templates)), ), tap(templates => this.setEntities(templates)), ); } delete(body: List): Observable { - return super._post(body, `${this._defaultModelPath}/delete`).pipe(switchMap(() => this.loadAll())); + const showToast = (error: HttpErrorResponse) => { + if (error.status === HttpStatusCode.Conflict) { + this._toaster.error(DOSSIER_TEMPLATE_CONFLICT_MSG); + } else { + this._toaster.error(GENERIC_MSG); + } + return throwError(() => error); + }; + + return super._post(body, `${this._defaultModelPath}/delete`).pipe( + catchError(showToast), + switchMap(() => this.loadAll()), + ); } @Validate() createOrUpdate(@RequiredParam() body: IDossierTemplate) { return this._post(body).pipe(switchMap(() => this.loadAll())); } + + refreshDossierTemplate(dossierTemplateId: string): Observable { + return forkJoin([ + this._fileAttributesService.loadFileAttributesConfig(dossierTemplateId), + this._dictionaryService.loadDictionaryDataForDossierTemplate(dossierTemplateId), + ]); + } } diff --git a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts b/apps/red-ui/src/app/services/entity-services/dossiers.service.ts index a406e4350..0babadb88 100644 --- a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts +++ b/apps/red-ui/src/app/services/entity-services/dossiers.service.ts @@ -24,7 +24,7 @@ interface ChangesDetails { } const DOSSIER_EXISTS_MSG = _('add-dossier-dialog.errors.dossier-already-exists'); -const GENERIC_MGS = _('add-dossier-dialog.errors.generic'); +const GENERIC_MSG = _('add-dossier-dialog.errors.generic'); @Injectable({ providedIn: 'root', @@ -72,7 +72,7 @@ export class DossiersService extends EntitiesService { @Validate() createOrUpdate(@RequiredParam() dossier: IDossierRequest): Observable { const showToast = (error: HttpErrorResponse) => { - this._toaster.error(error.status === HttpStatusCode.Conflict ? DOSSIER_EXISTS_MSG : GENERIC_MGS); + this._toaster.error(error.status === HttpStatusCode.Conflict ? DOSSIER_EXISTS_MSG : GENERIC_MSG); return throwError(error); }; diff --git a/apps/red-ui/src/app/services/entity-services/file-attributes.service.ts b/apps/red-ui/src/app/services/entity-services/file-attributes.service.ts index e994f7106..15e982731 100644 --- a/apps/red-ui/src/app/services/entity-services/file-attributes.service.ts +++ b/apps/red-ui/src/app/services/entity-services/file-attributes.service.ts @@ -24,7 +24,7 @@ export class FileAttributesService extends EntitiesService { + loadFileAttributesConfig(@RequiredParam() dossierTemplateId: string): Observable { const request$ = this._getOne(['config', dossierTemplateId]); return request$.pipe( tap(entities => entities.fileAttributeConfigs.sort((c1, c2) => c1.placeholder.localeCompare(c2.placeholder))), diff --git a/apps/red-ui/src/app/state/app-state.guard.ts b/apps/red-ui/src/app/state/app-state.guard.ts index 9fe26f4c4..2dafeb37c 100644 --- a/apps/red-ui/src/app/state/app-state.guard.ts +++ b/apps/red-ui/src/app/state/app-state.guard.ts @@ -25,8 +25,6 @@ export class AppStateGuard implements CanActivate { if (this._userService.currentUser.isUser || this._userService.currentUser.isAdmin) { await firstValueFrom(this._userService.loadAll()); - await this._dossierTemplatesService.loadAllIfEmpty(); - await this._dictionaryService.loadDictionaryDataIfNecessary(); } const { dossierTemplateId, type } = route.params; diff --git a/libs/common-ui b/libs/common-ui index b040815b8..77e227582 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit b040815b8568d8a4fce8faef2afc57fe6fce2e10 +Subproject commit 77e22758239cf564965e82579e662416a6349010