From 93e1dcd1c18c53489a0dda48ab9404f73609ee34 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Sat, 11 Nov 2023 16:33:58 +0200 Subject: [PATCH] RED-7887 - UI saves the last saved dictionary in compare and no longer updates itself after selecting another template --- .../edit-dossier-dictionary.component.html | 1 + .../dictionary-manager.component.ts | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html index 12c0d2330..ebd5c366a 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html @@ -85,6 +85,7 @@ [activeEntryType]="activeEntryType" [hint]="selectedDictionary.hint" [currentDossierId]="dossier.dossierId" + [currentDossierTemplateId]="dossier.dossierTemplateId" > diff --git a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts index 0a3e6dc8c..6306cd453 100644 --- a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, Output, SimpleChanges, ViewChild } from '@angular/core'; +import { ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core'; import { IconButtonTypes, LoadingService } from '@iqser/common-ui'; import { Dictionary, @@ -34,12 +34,13 @@ const HELP_MODE_KEYS = { templateUrl: './dictionary-manager.component.html', styleUrls: ['./dictionary-manager.component.scss'], }) -export class DictionaryManagerComponent implements OnChanges { +export class DictionaryManagerComponent implements OnChanges, OnInit { private _searchDecorations: string[] = []; readonly #currentTab = window.location.href.split('/').pop(); @Input() type: DictionaryType = 'dictionary'; @Input() entityType?: string; @Input() currentDossierId: string; + @Input() currentDossierTemplateId: string; @Input() withFloatingActions = true; @Input() filterByDossierTemplate = false; @Input() initialEntries: List; @@ -72,15 +73,18 @@ export class DictionaryManagerComponent implements OnChanges { private readonly _dictionariesMapService: DictionariesMapService, protected readonly _loadingService: LoadingService, private readonly _changeRef: ChangeDetectorRef, - readonly activeDossiersService: ActiveDossiersService, + private readonly _activeDossiersService: ActiveDossiersService, readonly dossierTemplatesService: DossierTemplatesService, ) { - this.dossiers = activeDossiersService.all; + this.dossiers = _activeDossiersService.all; + } + + ngOnInit() { const templateDictionary = { id: 'template', dossierId: 'template', dossierName: 'Template Dictionary', - dossierTemplateId: this.dossiers[0]?.dossierTemplateId, + dossierTemplateId: this.currentDossierTemplateId, } as Dossier; this.dossiers.push(templateDictionary); }