From d3d8b16f8e0ae0a7659532b98e2e5997c064bcb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Mon, 14 Feb 2022 12:16:24 +0200 Subject: [PATCH] Entity url param constant --- apps/red-ui/src/app/guards/dossier-files-guard.ts | 3 ++- apps/red-ui/src/app/guards/file-preview.guard.ts | 5 +++-- .../admin/admin-side-nav/admin-side-nav.component.ts | 3 ++- .../dossier-template-breadcrumbs.component.ts | 5 +++-- .../default-colors/default-colors-screen.component.ts | 5 +++-- .../dictionary-listing-screen.component.ts | 3 ++- .../dictionary-overview-screen.component.ts | 3 ++- .../dossier-attributes-listing-screen.component.ts | 3 ++- .../file-attributes-listing-screen.component.ts | 3 ++- .../info-screen/dossier-template-info-screen.component.ts | 3 ++- .../justifications-screen.component.ts | 3 ++- .../justifications/table-item/table-item.component.ts | 3 ++- .../reports/reports-screen/reports-screen.component.ts | 3 ++- .../screens/rules/rules-screen/rules-screen.component.ts | 3 ++- .../watermark-screen/watermark-screen.component.ts | 3 ++- .../dossier-template-actions.component.ts | 3 ++- .../add-dossier-dialog/add-dossier-dialog.component.ts | 3 ++- .../general-info/edit-dossier-general-info.component.ts | 3 ++- .../dossier-details/dossier-details.component.ts | 3 ++- .../screen/dossier-overview-screen.component.ts | 3 ++- .../services/file-preview-state.service.ts | 5 +++-- apps/red-ui/src/app/services/breadcrumbs.service.ts | 7 ++++--- .../services/entity-services/dictionaries-map.service.ts | 3 ++- .../app/services/entity-services/dossier-stats.service.ts | 3 ++- .../entity-services/dossier-template-stats.service.ts | 3 ++- .../src/app/services/entity-services/files-map.service.ts | 3 ++- apps/red-ui/src/app/utils/constants.ts | 4 ++++ 27 files changed, 62 insertions(+), 32 deletions(-) diff --git a/apps/red-ui/src/app/guards/dossier-files-guard.ts b/apps/red-ui/src/app/guards/dossier-files-guard.ts index bf08f4737..2b5a353b4 100644 --- a/apps/red-ui/src/app/guards/dossier-files-guard.ts +++ b/apps/red-ui/src/app/guards/dossier-files-guard.ts @@ -4,6 +4,7 @@ import { DossiersService } from '@services/entity-services/dossiers.service'; import { FilesMapService } from '@services/entity-services/files-map.service'; import { FilesService } from '@services/entity-services/files.service'; import { firstValueFrom } from 'rxjs'; +import { DOSSIER_ID } from '@utils/constants'; @Injectable({ providedIn: 'root' }) export class DossierFilesGuard implements CanActivate { @@ -15,7 +16,7 @@ export class DossierFilesGuard implements CanActivate { ) {} async canActivate(route: ActivatedRouteSnapshot): Promise { - const dossierId = route.paramMap.get('dossierId'); + const dossierId = route.paramMap.get(DOSSIER_ID); if (!this._dossiersService.has(dossierId)) { await this._router.navigate(['/main', 'dossiers']); diff --git a/apps/red-ui/src/app/guards/file-preview.guard.ts b/apps/red-ui/src/app/guards/file-preview.guard.ts index 294ed782d..6db6c56d3 100644 --- a/apps/red-ui/src/app/guards/file-preview.guard.ts +++ b/apps/red-ui/src/app/guards/file-preview.guard.ts @@ -2,6 +2,7 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router'; import { FilesMapService } from '@services/entity-services/files-map.service'; import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DOSSIER_ID, FILE_ID } from '@utils/constants'; @Injectable({ providedIn: 'root' }) export class FilePreviewGuard implements CanActivate { @@ -12,8 +13,8 @@ export class FilePreviewGuard implements CanActivate { ) {} async canActivate(route: ActivatedRouteSnapshot): Promise { - const dossierId = route.paramMap.get('dossierId'); - const fileId = route.paramMap.get('fileId'); + const dossierId = route.paramMap.get(DOSSIER_ID); + const fileId = route.paramMap.get(FILE_ID); const dossier = this._dossiersService.find(dossierId); diff --git a/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts index 599c319e2..7578ddd03 100644 --- a/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts +++ b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts @@ -4,6 +4,7 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { adminSideNavTranslations } from '../translations/admin-side-nav-translations'; import { UserService } from '@services/user.service'; import { ActivatedRoute } from '@angular/router'; +import { DICTIONARY_TYPE } from '@utils/constants'; type Type = 'settings' | 'dossierTemplates'; @@ -77,6 +78,6 @@ export class AdminSideNavComponent implements OnInit { } ngOnInit(): void { - this.prefix = this._route.snapshot.paramMap.get('dictionary') ? '../../' : '../'; + this.prefix = this._route.snapshot.paramMap.get(DICTIONARY_TYPE) ? '../../' : '../'; } } 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 a93501e80..f77417356 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 @@ -5,6 +5,7 @@ import { map, switchMap } from 'rxjs/operators'; import { ActivatedRoute } from '@angular/router'; import { Dictionary, DossierTemplate } from '@red/domain'; import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service'; +import { DOSSIER_TEMPLATE_ID } from '@utils/constants'; @Component({ selector: 'redaction-dossier-template-breadcrumbs', @@ -22,11 +23,11 @@ export class DossierTemplateBreadcrumbsComponent { private readonly _route: ActivatedRoute, ) { this.dossierTemplate$ = _route.paramMap.pipe( - map(params => params.get('dossierTemplateId')), + map(params => params.get(DOSSIER_TEMPLATE_ID)), switchMap((dossierTemplateId: string) => this._dossierTemplatesService.getEntityChanged$(dossierTemplateId)), ); this.activeDictionary$ = _route.paramMap.pipe( - map(params => [params.get('dossierTemplateId'), params.get('dictionary')]), + map(params => [params.get(DOSSIER_TEMPLATE_ID), params.get('dictionary')]), switchMap(([dossierTemplateId, dictionary]: [string, string]) => dictionary ? this._dictionariesMapService.watch$(dossierTemplateId, dictionary) : of(undefined), ), 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 d7ccf394b..01b68220f 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 @@ -16,6 +16,7 @@ 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'; +import { DOSSIER_TEMPLATE_ID } from '@utils/constants'; interface ListItem extends IListable { readonly key: string; @@ -50,7 +51,7 @@ export class DefaultColorsScreenComponent extends ListingComponent { private readonly _route: ActivatedRoute, ) { super(_injector); - this.#dossierTemplateId = _route.snapshot.paramMap.get('dossierTemplateId'); + this.#dossierTemplateId = _route.snapshot.paramMap.get(DOSSIER_TEMPLATE_ID); } openEditColorDialog($event: MouseEvent, color: { key: DefaultColorType | string; value: string }) { @@ -79,7 +80,7 @@ export class DefaultColorsScreenComponent extends ListingComponent { searchKey: key, value: data[key], })) - .filter(entry => entry.id !== 'dossierTemplateId'); + .filter(entry => entry.id !== DOSSIER_TEMPLATE_ID); this.entitiesService.setEntities(entities); this._loadingService.stop(); } 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 f9fbc51e2..f4cf0426c 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 @@ -20,6 +20,7 @@ import { DossierTemplateStatsService } from '@services/entity-services/dossier-t import { ActivatedRoute } from '@angular/router'; import { tap } from 'rxjs/operators'; import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service'; +import { DOSSIER_TEMPLATE_ID } from '@utils/constants'; @Component({ templateUrl: './dictionary-listing-screen.component.html', @@ -54,7 +55,7 @@ export class DictionaryListingScreenComponent extends ListingComponent this._loadDictionaryData(templateStats))); 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 60d1e346f..48de2b29f 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 @@ -11,6 +11,7 @@ import { Dictionary } from '@red/domain'; import { firstValueFrom, Observable, of } from 'rxjs'; import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service'; import { map, switchMap } from 'rxjs/operators'; +import { DOSSIER_TEMPLATE_ID } from '@utils/constants'; @Component({ templateUrl: './dictionary-overview-screen.component.html', @@ -41,7 +42,7 @@ export class DictionaryOverviewScreenComponent { private readonly _route: ActivatedRoute, ) { this.dictionary$ = _route.paramMap.pipe( - map(params => [params.get('dossierTemplateId'), params.get('dictionary')]), + map(params => [params.get(DOSSIER_TEMPLATE_ID), params.get('dictionary')]), switchMap(([dossierTemplateId, dictionary]: [string, string]) => dossierTemplateId ? this._dictionariesMapService.watch$(dossierTemplateId, dictionary) : of(undefined), ), 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 487f69c59..c495415a3 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 @@ -17,6 +17,7 @@ import { DossierAttributeConfig, IDossierAttributeConfig } from '@red/domain'; import { firstValueFrom } from 'rxjs'; import { ReportTemplateService } from '../../../../services/report-template.service'; import { ActivatedRoute } from '@angular/router'; +import { DOSSIER_TEMPLATE_ID } from '@utils/constants'; @Component({ templateUrl: './dossier-attributes-listing-screen.component.html', @@ -50,7 +51,7 @@ export class DossierAttributesListingScreenComponent extends ListingComponent { 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 b7860e4c3..7f82f08cc 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 @@ -19,6 +19,7 @@ import { firstValueFrom } from 'rxjs'; import { ReportTemplateService } from '../../../../services/report-template.service'; import { ActivatedRoute } from '@angular/router'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; +import { DOSSIER_TEMPLATE_ID } from '@utils/constants'; @Component({ templateUrl: './file-attributes-listing-screen.component.html', @@ -65,7 +66,7 @@ export class FileAttributesListingScreenComponent extends ListingComponent { 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 55f516cd6..a03b711f2 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 @@ -5,6 +5,7 @@ import { JustificationsDialogService } from '../justifications-dialog.service'; import { UserService } from '@services/user.service'; import { UserPreferenceService } from '@services/user-preference.service'; import { ActivatedRoute } from '@angular/router'; +import { DOSSIER_TEMPLATE_ID } from '@utils/constants'; @Component({ selector: 'redaction-table-item', @@ -25,7 +26,7 @@ export class TableItemComponent { readonly userService: UserService, private readonly _route: ActivatedRoute, ) { - this.#dossierTemplateId = _route.snapshot.paramMap.get('dossierTemplateId'); + this.#dossierTemplateId = _route.snapshot.paramMap.get(DOSSIER_TEMPLATE_ID); } openEditJustificationDialog() { 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 117099d40..04ddca911 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 @@ -14,6 +14,7 @@ import { DossierTemplatesService } from '@services/entity-services/dossier-templ import { ReportTemplateService } from '@services/report-template.service'; import { BehaviorSubject, firstValueFrom } from 'rxjs'; import { ActivatedRoute } from '@angular/router'; +import { DOSSIER_TEMPLATE_ID } from '@utils/constants'; interface Placeholder { placeholder: string; @@ -46,7 +47,7 @@ export class ReportsScreenComponent implements OnInit { private readonly _route: ActivatedRoute, readonly permissionsService: PermissionsService, ) { - this.#dossierTemplateId = _route.snapshot.paramMap.get('dossierTemplateId'); + this.#dossierTemplateId = _route.snapshot.paramMap.get(DOSSIER_TEMPLATE_ID); } async ngOnInit() { 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 40e361d53..5551bfb1d 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 @@ -7,6 +7,7 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { RulesService } from '../../../services/rules.service'; import { firstValueFrom } from 'rxjs'; import { ActivatedRoute } from '@angular/router'; +import { DOSSIER_TEMPLATE_ID } from '@utils/constants'; import ICodeEditor = monaco.editor.ICodeEditor; import IModelDeltaDecoration = monaco.editor.IModelDeltaDecoration; import IStandaloneEditorConstructionOptions = monaco.editor.IStandaloneEditorConstructionOptions; @@ -47,7 +48,7 @@ export class RulesScreenComponent implements OnInit { private readonly _loadingService: LoadingService, private readonly _route: ActivatedRoute, ) { - this.#dossierTemplateId = _route.snapshot.paramMap.get('dossierTemplateId'); + this.#dossierTemplateId = _route.snapshot.paramMap.get(DOSSIER_TEMPLATE_ID); } set isLeavingPage(isLeaving: boolean) { 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 e58fbfebb..02340d9d6 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 @@ -14,6 +14,7 @@ import { WatermarkService } from '@shared/services/watermark.service'; import { firstValueFrom, Observable, of, switchMap } from 'rxjs'; import { catchError, tap } from 'rxjs/operators'; import { ActivatedRoute } from '@angular/router'; +import { DOSSIER_TEMPLATE_ID } from '@utils/constants'; export const DEFAULT_WATERMARK: IWatermark = { text: null, @@ -51,7 +52,7 @@ export class WatermarkScreenComponent { private readonly _route: ActivatedRoute, ) { this._loadingService.start(); - this.#dossierTemplateId = this._route.snapshot.paramMap.get('dossierTemplateId'); + this.#dossierTemplateId = this._route.snapshot.paramMap.get(DOSSIER_TEMPLATE_ID); } get changed(): boolean { 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 1dd098c20..ad648ebec 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 @@ -6,6 +6,7 @@ import { UserService } from '@services/user.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { firstValueFrom } from 'rxjs'; import { DictionaryService } from '../../../../shared/services/dictionary.service'; +import { DOSSIER_TEMPLATE_ID } from '@utils/constants'; @Component({ selector: 'redaction-dossier-template-actions', @@ -30,7 +31,7 @@ export class DossierTemplateActionsComponent implements OnInit { ) {} ngOnInit() { - this.dossierTemplateId ??= this._route.snapshot.paramMap.get('dossierTemplateId'); + this.dossierTemplateId ??= this._route.snapshot.paramMap.get(DOSSIER_TEMPLATE_ID); } openEditDossierTemplateDialog($event: MouseEvent) { diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts index 7ee0c1cd7..7b28b0b7a 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts @@ -9,6 +9,7 @@ import { DossiersService } from '@services/entity-services/dossiers.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { ReportTemplateService } from '@services/report-template.service'; import { firstValueFrom } from 'rxjs'; +import { DOSSIER_TEMPLATE_ID } from '@utils/constants'; @Component({ templateUrl: './add-dossier-dialog.component.html', @@ -129,7 +130,7 @@ export class AddDossierDialogComponent extends BaseDialogComponent { dossierName: this.form.get('dossierName').value, description: this.form.get('description').value, dueDate: this.hasDueDate ? this.form.get('dueDate').value : undefined, - dossierTemplateId: this.form.get('dossierTemplateId').value, + dossierTemplateId: this.form.get(DOSSIER_TEMPLATE_ID).value, downloadFileTypes: this.form.get('downloadFileTypes').value, reportTemplateIds: this.form.get('reportTemplateIds').value, watermarkEnabled: this.form.get('watermarkEnabled').value, diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts index 55bc3065e..8b9d48bf1 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts @@ -14,6 +14,7 @@ import { DossiersService } from '@services/entity-services/dossiers.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; import { firstValueFrom } from 'rxjs'; +import { DOSSIER_TEMPLATE_ID } from '@utils/constants'; @Component({ selector: 'redaction-edit-dossier-general-info', @@ -94,7 +95,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti watermarkEnabled: this.form.get('watermarkEnabled').value, watermarkPreviewEnabled: this.form.get('watermarkPreviewEnabled').value, dueDate: this.hasDueDate ? this.form.get('dueDate').value : undefined, - dossierTemplateId: this.form.get('dossierTemplateId').value, + dossierTemplateId: this.form.get(DOSSIER_TEMPLATE_ID).value, } as IDossierRequest; try { await firstValueFrom(this._dossiersService.createOrUpdate(dossier)); diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts index dfc632cef..7ef3f991a 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts @@ -13,6 +13,7 @@ import { DossierStatsService } from '@services/entity-services/dossier-stats.ser import { pluck, switchMap } from 'rxjs/operators'; import { DossiersDialogService } from '../../../../services/dossiers-dialog.service'; import { FilesService } from '@services/entity-services/files.service'; +import { DOSSIER_ID } from '@utils/constants'; @Component({ selector: 'redaction-dossier-details', @@ -45,7 +46,7 @@ export class DossierDetailsComponent { private readonly _dialogService: DossiersDialogService, activatedRoute: ActivatedRoute, ) { - this.dossierId = activatedRoute.snapshot.paramMap.get('dossierId'); + this.dossierId = activatedRoute.snapshot.paramMap.get(DOSSIER_ID); this.dossier$ = this.dossiersService.getEntityChanged$(this.dossierId).pipe(shareLast()); this.dossierStats$ = this.dossier$.pipe( pluck('dossierId'), diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts index ccf776a8f..00cb0711f 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts @@ -44,6 +44,7 @@ import { LongPressEvent } from '@shared/directives/long-press.directive'; import { UserPreferenceService } from '@services/user-preference.service'; import { FilesMapService } from '@services/entity-services/files-map.service'; import { FilesService } from '@services/entity-services/files.service'; +import { DOSSIER_ID } from '@utils/constants'; @Component({ templateUrl: './dossier-overview-screen.component.html', @@ -93,7 +94,7 @@ export class DossierOverviewScreenComponent extends ListingComponent imple readonly activatedRoute: ActivatedRoute, ) { super(_injector); - this.dossierId = activatedRoute.snapshot.paramMap.get('dossierId'); + this.dossierId = activatedRoute.snapshot.paramMap.get(DOSSIER_ID); this.dossier$ = this._dossiersService .getEntityChanged$(this.dossierId) .pipe(tap(dossier => (this.dossierTemplateId = dossier.dossierTemplateId))); diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts index 8536469e4..961597d46 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts @@ -9,6 +9,7 @@ import { PermissionsService } from '../../../../../services/permissions.service' import { boolFactory, shareLast } from '@iqser/common-ui'; import { filter, startWith } from 'rxjs/operators'; import { FileManagementService } from '@services/entity-services/file-management.service'; +import { DOSSIER_ID, FILE_ID } from '@utils/constants'; @Injectable() export class FilePreviewStateService { @@ -32,8 +33,8 @@ export class FilePreviewStateService { activatedRoute: ActivatedRoute, private readonly _fileManagementService: FileManagementService, ) { - this.fileId = activatedRoute.snapshot.paramMap.get('fileId'); - this.dossierId = activatedRoute.snapshot.paramMap.get('dossierId'); + this.fileId = activatedRoute.snapshot.paramMap.get(FILE_ID); + this.dossierId = activatedRoute.snapshot.paramMap.get(DOSSIER_ID); this.dossierTemplateId = dossiersService.find(this.dossierId).dossierTemplateId; this.dossier$ = dossiersService.getEntityChanged$(this.dossierId); diff --git a/apps/red-ui/src/app/services/breadcrumbs.service.ts b/apps/red-ui/src/app/services/breadcrumbs.service.ts index 118d0a754..aa3ad5b50 100644 --- a/apps/red-ui/src/app/services/breadcrumbs.service.ts +++ b/apps/red-ui/src/app/services/breadcrumbs.service.ts @@ -7,6 +7,7 @@ import { FilesMapService } from '@services/entity-services/files-map.service'; import { DossiersService } from '@services/entity-services/dossiers.service'; import { TranslateService } from '@ngx-translate/core'; import { BreadcrumbTypes } from '@red/domain'; +import { DOSSIER_ID, FILE_ID } from '@utils/constants'; export type RouterLinkActiveOptions = { exact: boolean } | IsActiveMatchOptions; @@ -82,7 +83,7 @@ export class BreadcrumbsService { } private _addDossierBreadcrumb(route: ActivatedRouteSnapshot): void { - const dossierId = route.paramMap.get('dossierId'); + const dossierId = route.paramMap.get(DOSSIER_ID); this._append({ name$: this._dossiersService.getEntityChanged$(dossierId).pipe(pluck('dossierName')), routerLink: ['/main', 'dossiers', dossierId], @@ -91,8 +92,8 @@ export class BreadcrumbsService { } private _addFileBreadcrumb(route: ActivatedRouteSnapshot): void { - const dossierId = route.paramMap.get('dossierId'); - const fileId = route.paramMap.get('fileId'); + const dossierId = route.paramMap.get(DOSSIER_ID); + const fileId = route.paramMap.get(FILE_ID); this._append({ name$: this._filesMapService.watch$(dossierId, fileId).pipe(pluck('filename')), routerLink: ['/main', 'dossiers', dossierId, 'file', fileId], diff --git a/apps/red-ui/src/app/services/entity-services/dictionaries-map.service.ts b/apps/red-ui/src/app/services/entity-services/dictionaries-map.service.ts index 5031a3f67..bd7f8cd45 100644 --- a/apps/red-ui/src/app/services/entity-services/dictionaries-map.service.ts +++ b/apps/red-ui/src/app/services/entity-services/dictionaries-map.service.ts @@ -1,11 +1,12 @@ import { Injectable } from '@angular/core'; import { Dictionary, IDictionary } from '@red/domain'; import { EntitiesMapService } from '@iqser/common-ui'; +import { DOSSIER_TEMPLATE_ID } from '@utils/constants'; @Injectable({ providedIn: 'root' }) export class DictionariesMapService extends EntitiesMapService { constructor() { - super('dossierTemplateId'); + super(DOSSIER_TEMPLATE_ID); } /** If the type is not found, it returns the 'default' type. */ diff --git a/apps/red-ui/src/app/services/entity-services/dossier-stats.service.ts b/apps/red-ui/src/app/services/entity-services/dossier-stats.service.ts index a475edf96..f49e77cc0 100644 --- a/apps/red-ui/src/app/services/entity-services/dossier-stats.service.ts +++ b/apps/red-ui/src/app/services/entity-services/dossier-stats.service.ts @@ -1,12 +1,13 @@ import { Injectable, Injector } from '@angular/core'; import { StatsService } from '@iqser/common-ui'; import { DossierStats, IDossierStats } from '@red/domain'; +import { DOSSIER_ID } from '@utils/constants'; @Injectable({ providedIn: 'root', }) export class DossierStatsService extends StatsService { constructor(protected readonly _injector: Injector) { - super(_injector, 'dossierId', DossierStats, 'dossier-stats'); + super(_injector, DOSSIER_ID, DossierStats, 'dossier-stats'); } } diff --git a/apps/red-ui/src/app/services/entity-services/dossier-template-stats.service.ts b/apps/red-ui/src/app/services/entity-services/dossier-template-stats.service.ts index 94f63af75..c368cf2db 100644 --- a/apps/red-ui/src/app/services/entity-services/dossier-template-stats.service.ts +++ b/apps/red-ui/src/app/services/entity-services/dossier-template-stats.service.ts @@ -1,12 +1,13 @@ import { Injectable, Injector } from '@angular/core'; import { StatsService } from '@iqser/common-ui'; import { DossierTemplateStats, IDossierTemplateStats } from '@red/domain'; +import { DOSSIER_TEMPLATE_ID } from '@utils/constants'; @Injectable({ providedIn: 'root', }) export class DossierTemplateStatsService extends StatsService { constructor(protected readonly _injector: Injector) { - super(_injector, 'dossierTemplateId', DossierTemplateStats, 'dossier-template-stats'); + super(_injector, DOSSIER_TEMPLATE_ID, DossierTemplateStats, 'dossier-template-stats'); } } diff --git a/apps/red-ui/src/app/services/entity-services/files-map.service.ts b/apps/red-ui/src/app/services/entity-services/files-map.service.ts index 82741b35f..d71f717d1 100644 --- a/apps/red-ui/src/app/services/entity-services/files-map.service.ts +++ b/apps/red-ui/src/app/services/entity-services/files-map.service.ts @@ -1,11 +1,12 @@ import { Injectable } from '@angular/core'; import { File, IFile } from '@red/domain'; import { EntitiesMapService } from '@iqser/common-ui'; +import { DOSSIER_ID } from '@utils/constants'; @Injectable({ providedIn: 'root' }) export class FilesMapService extends EntitiesMapService { constructor() { - super('dossierId'); + super(DOSSIER_ID); } replaceFiles(files: File[], property: keyof IFile, generateValue: Function) { diff --git a/apps/red-ui/src/app/utils/constants.ts b/apps/red-ui/src/app/utils/constants.ts index 7f912541c..37387b622 100644 --- a/apps/red-ui/src/app/utils/constants.ts +++ b/apps/red-ui/src/app/utils/constants.ts @@ -1,2 +1,6 @@ export const CHANGED_CHECK_INTERVAL = 5000; export const FALLBACK_COLOR = '#CCCCCC'; +export const DOSSIER_ID = 'dossierId'; +export const FILE_ID = 'fileId'; +export const DOSSIER_TEMPLATE_ID = 'dossierTemplateId'; +export const DICTIONARY_TYPE = 'dictionary';