From 4aa8f90df9a8020deb231fffd13e9d566e935751 Mon Sep 17 00:00:00 2001
From: Valentin Mihai <Valentin-Gabriel.Mihai.ext@knecon.com>
Date: Wed, 16 Aug 2023 22:15:40 +0300
Subject: [PATCH] RED-6801 - Effective dossier dictionary in Dossier Settings

---
 .../dossiers-listing-actions.component.html   |  8 +++++--
 .../dossiers-listing-actions.component.ts     |  4 ++++
 .../edit-dossier-dictionary.component.html    |  2 +-
 .../edit-dossier-dictionary.component.scss    |  4 ++++
 .../edit-dossier-dictionary.component.ts      | 22 +++++++++++++------
 .../edit-dossier-dialog.component.ts          |  1 +
 .../dictionary-manager.component.ts           |  3 ---
 .../components/editor/editor.component.html   |  8 +------
 .../components/editor/editor.component.ts     |  3 +++
 9 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/apps/red-ui/src/app/modules/shared-dossiers/components/dossiers-listing-actions/dossiers-listing-actions.component.html b/apps/red-ui/src/app/modules/shared-dossiers/components/dossiers-listing-actions/dossiers-listing-actions.component.html
index 1bd1b03b6..b0a335927 100644
--- a/apps/red-ui/src/app/modules/shared-dossiers/components/dossiers-listing-actions/dossiers-listing-actions.component.html
+++ b/apps/red-ui/src/app/modules/shared-dossiers/components/dossiers-listing-actions/dossiers-listing-actions.component.html
@@ -2,9 +2,13 @@
     <iqser-circle-button
         (action)="openEditDossierDialog(dossier.id)"
         *allow="roles.dossiers.read; if: currentUser.isUser"
-        [icon]="(iqserPermissionsService.has$(roles.dossiers.edit) | async) && currentUser.isManager ? 'iqser:edit' : 'red:info'"
+        [icon]="
+            ((iqserPermissionsService.has$(roles.dossiers.edit) | async) && currentUser.isManager) || canEditDossierDictionary
+                ? 'iqser:edit'
+                : 'red:info'
+        "
         [tooltip]="
-            ((iqserPermissionsService.has$(roles.dossiers.edit) | async) && currentUser.isManager
+            (((iqserPermissionsService.has$(roles.dossiers.edit) | async) && currentUser.isManager) || canEditDossierDictionary
                 ? 'dossier-listing.edit.action'
                 : 'dossier-listing.dossier-info.action'
             ) | translate
diff --git a/apps/red-ui/src/app/modules/shared-dossiers/components/dossiers-listing-actions/dossiers-listing-actions.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/components/dossiers-listing-actions/dossiers-listing-actions.component.ts
index 49e2b55a6..8977f30fe 100644
--- a/apps/red-ui/src/app/modules/shared-dossiers/components/dossiers-listing-actions/dossiers-listing-actions.component.ts
+++ b/apps/red-ui/src/app/modules/shared-dossiers/components/dossiers-listing-actions/dossiers-listing-actions.component.ts
@@ -46,6 +46,10 @@ export class DossiersListingActionsComponent implements OnChanges {
         this.analysisForced = !$event.touchEnd && this._userPreferenceService.areDevFeaturesEnabled;
     }
 
+    get canEditDossierDictionary() {
+        return this.permissionsService.canEditDossierDictionary(this.dossier);
+    }
+
     openEditDossierDialog(dossierId: string): void {
         this._dialogService.openDialog('editDossier', { dossierId });
     }
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 74e4e0b8f..19d556c87 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
@@ -52,7 +52,7 @@
                     </div>
                 </div>
             </div>
-            <div class="header-right flex">
+            <div class="header-right flex" [class.read-only]="!canEdit">
                 <iqser-icon-button
                     [label]="'edit-dossier-dialog.dictionary.to-redact' | translate"
                     [active]="activeEntryType === entryTypes.ENTRY"
diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.scss b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.scss
index 935b53aa3..557b958c6 100644
--- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.scss
+++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.scss
@@ -54,6 +54,10 @@
                 }
             }
 
+            .read-only {
+                padding-right: 100px;
+            }
+
             .display-name {
                 display: flex;
                 align-items: center;
diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts
index ba4b859fa..3a4d731eb 100644
--- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts
+++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input, OnInit, ViewChild } from '@angular/core';
 import { Dictionary, DictionaryEntryType, DictionaryEntryTypes, Dossier } from '@red/domain';
-import { EditDossierSaveResult, EditDossierSectionInterface } from '../edit-dossier-section.interface';
+import { EditDossierSaveResult } from '../edit-dossier-section.interface';
 import { PermissionsService } from '@services/permissions.service';
 import { DictionaryManagerComponent } from '@shared/components/dictionary-manager/dictionary-manager.component';
 import { DictionaryService } from '@services/entity-services/dictionary.service';
@@ -14,7 +14,7 @@ import { List } from '@iqser/common-ui/lib/utils';
     templateUrl: './edit-dossier-dictionary.component.html',
     styleUrls: ['./edit-dossier-dictionary.component.scss'],
 })
-export class EditDossierDictionaryComponent implements EditDossierSectionInterface, OnInit {
+export class EditDossierDictionaryComponent implements OnInit {
     @Input() dossier: Dossier;
 
     canEdit = false;
@@ -76,15 +76,15 @@ export class EditDossierDictionaryComponent implements EditDossierSectionInterfa
         this._dictionaryManager.revert();
     }
 
-    selectDictionary(dictionary: Dictionary, entryType: DictionaryEntryType = DictionaryEntryTypes.ENTRY) {
+    selectDictionary(dictionary: Dictionary, entryType?: DictionaryEntryType) {
         this.selectedDictionary = dictionary;
         this.selectEntryType(entryType);
     }
 
     selectEntryType(selectedEntryType: DictionaryEntryType) {
-        this.activeEntryType = selectedEntryType;
+        this.activeEntryType = selectedEntryType ?? this.activeEntryType;
 
-        switch (selectedEntryType) {
+        switch (this.activeEntryType) {
             case DictionaryEntryTypes.ENTRY: {
                 this.entriesToDisplay = this.selectedDictionary.entries;
                 break;
@@ -98,6 +98,8 @@ export class EditDossierDictionaryComponent implements EditDossierSectionInterfa
                 break;
             }
         }
+
+        this.entriesToDisplay = this.#toString([...this.entriesToDisplay]);
     }
 
     async #updateDossierDictionary() {
@@ -108,9 +110,11 @@ export class EditDossierDictionaryComponent implements EditDossierSectionInterfa
         );
         //TODO remove this when backend will send also the type
         this.#setType(dictionaryTypes);
-        if (!this.selectedDictionary) {
-            this.selectDictionary(this.dictionaries[0], this.activeEntryType);
+        let dictionaryToSelect = this.dictionaries[0];
+        if (this.selectedDictionary) {
+            dictionaryToSelect = this.dictionaries.find(d => d.type === this.selectedDictionary.type);
         }
+        this.selectDictionary(dictionaryToSelect, this.activeEntryType);
     }
 
     //TODO remove this when backend will send also the type
@@ -121,4 +125,8 @@ export class EditDossierDictionaryComponent implements EditDossierSectionInterfa
             this.dictionaries[i] = dictionaryWithType as Dictionary;
         }
     }
+
+    #toString(entries: string[]) {
+        return entries.sort((a, b) => a.localeCompare(b, undefined, { sensitivity: 'accent' }));
+    }
 }
diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts
index 311902349..7c9b336a2 100644
--- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts
@@ -95,6 +95,7 @@ export class EditDossierDialogComponent extends BaseDialogComponent implements A
 
     get showActionButtons(): boolean {
         return (
+            (['dossierDictionary'].includes(this.activeNav) && this._permissionsService.canEditDossierDictionary(this._dossier)) ||
             (['members'].includes(this.activeNav) &&
                 this.#currentUser.isManager &&
                 this.iqserPermissionsService.has(Roles.dossiers.edit)) ||
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 052c6f29a..35f43e23e 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
@@ -205,9 +205,6 @@ export class DictionaryManagerComponent implements OnChanges {
     }
 
     ngOnChanges(changes: SimpleChanges): void {
-        if (!changes.isLeavingPage) {
-            this.revert();
-        }
         if ((changes.selectedDictionaryType || changes.activeEntryType) && this._dossier?.dossierTemplateId && this.dossier?.dossierId) {
             this.#onDossierChanged(this._dossier.dossierTemplateId, this._dossier.dossierId).then(entries => {
                 this.diffEditorText = entries;
diff --git a/apps/red-ui/src/app/modules/shared/components/editor/editor.component.html b/apps/red-ui/src/app/modules/shared/components/editor/editor.component.html
index 201ed93dc..5fa9ba7ee 100644
--- a/apps/red-ui/src/app/modules/shared/components/editor/editor.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/editor/editor.component.html
@@ -7,10 +7,4 @@
     [options]="editorOptions"
 ></ngx-monaco-editor>
 
-<ngx-monaco-diff-editor
-    (init)="onDiffEditorInit($event)"
-    *ngIf="showDiffEditor"
-    [modified]="diffValue"
-    [options]="editorOptions"
-    [original]="diffEditorText"
-></ngx-monaco-diff-editor>
+<ngx-monaco-diff-editor (init)="onDiffEditorInit($event)" *ngIf="showDiffEditor" [options]="editorOptions"></ngx-monaco-diff-editor>
diff --git a/apps/red-ui/src/app/modules/shared/components/editor/editor.component.ts b/apps/red-ui/src/app/modules/shared/components/editor/editor.component.ts
index 97ccc3f9c..e171885b5 100644
--- a/apps/red-ui/src/app/modules/shared/components/editor/editor.component.ts
+++ b/apps/red-ui/src/app/modules/shared/components/editor/editor.component.ts
@@ -84,6 +84,7 @@ export class EditorComponent implements OnInit, OnChanges {
 
     ngOnChanges(changes: SimpleChanges) {
         if (changes.diffEditorText) {
+            this.revert();
             this._diffEditor?.getOriginalEditor().setValue(this.diffEditorText);
         }
     }
@@ -105,6 +106,8 @@ export class EditorComponent implements OnInit, OnChanges {
         this._diffEditor = editor;
         this.codeEditor = editor.getModifiedEditor();
         this.#addMarginButtons();
+        this._diffEditor?.getOriginalEditor().setValue(this.diffEditorText);
+        this._diffEditor?.getModifiedEditor().setValue(this.diffValue);
         this._diffEditor.getOriginalEditor().onMouseDown(event => this.#handleMarginButtonClick(event));
         this._diffEditor.getModifiedEditor().onDidChangeModelContent(() => {
             this.value = this._diffEditor.getModel().modified.getValue();