From dd3b0915e646ac33ed8ccafa8404fa4670ad414d Mon Sep 17 00:00:00 2001
From: Dan Percic <dan@devplant.ro>
Date: Tue, 5 Oct 2021 11:23:57 +0300
Subject: [PATCH] fix dossier template dictionary compare & editor line click

---
 .../dictionary-manager.component.html         | 12 +++----
 .../dictionary-manager.component.ts           | 33 ++++++++++++++++++-
 apps/red-ui/src/assets/i18n/de.json           |  3 +-
 apps/red-ui/src/assets/i18n/en.json           |  3 +-
 apps/red-ui/src/assets/styles/red-editor.scss |  3 --
 5 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html
index c7dcdb041..64a7db0ee 100644
--- a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html
@@ -31,17 +31,17 @@
                 </mat-checkbox>
             </div>
             <div *ngIf="filterByDossierTemplate" class="iqser-input-group w-200 mt-0 mr-8">
-                <mat-select [(ngModel)]="dossier" [disabled]="!compare">
-                    <mat-option [value]="selectDossier">{{ selectDossier.dossierName | translate }}</mat-option>
-                    <mat-option *ngFor="let dossier of dossiersService.all$ | async" [value]="dossier">
-                        {{ dossier.dossierName }}
+                <mat-select [(ngModel)]="dossierTemplate" [disabled]="!compare">
+                    <mat-option [value]="selectDossierTemplate">{{ selectDossierTemplate.name | translate }}</mat-option>
+                    <mat-option *ngFor="let dossierTemplate of dossierTemplatesService.all$ | async" [value]="dossierTemplate">
+                        {{ dossierTemplate.name }}
                     </mat-option>
                 </mat-select>
             </div>
             <div class="iqser-input-group w-200 mt-0">
-                <mat-select [(ngModel)]="dossier" [disabled]="!compare">
+                <mat-select [(ngModel)]="dossier" [disabled]="!compare || dossierTemplateIsNotSelected">
                     <mat-option [value]="selectDossier">{{ selectDossier.dossierName | translate }}</mat-option>
-                    <mat-option *ngFor="let dossier of dossiersService.all$ | async" [value]="dossier">
+                    <mat-option *ngFor="let dossier of dossiers" [value]="dossier">
                         {{ dossier.dossierName }}
                     </mat-option>
                 </mat-select>
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 659227060..d621d20ef 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
@@ -6,6 +6,8 @@ import { Dossier } from '@state/model/dossier';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { DictionaryService } from '@shared/services/dictionary.service';
 import { DossiersService } from '../../../dossier/services/dossiers.service';
+import { DossierTemplatesService } from '../../../dossier/services/dossier-templates.service';
+import { DossierTemplate } from '@models/file/dossier-template';
 import ICodeEditor = monaco.editor.ICodeEditor;
 import IDiffEditor = monaco.editor.IDiffEditor;
 import IModelDeltaDecoration = monaco.editor.IModelDeltaDecoration;
@@ -38,14 +40,32 @@ export class DictionaryManagerComponent implements OnChanges, OnInit {
     searchText = '';
 
     selectDossier = { dossierName: _('dictionary-overview.compare.select-dossier') };
+    selectDossierTemplate = { name: _('dictionary-overview.compare.select-dossier-template') };
     compare: false;
+    dossiers: List<Dossier> = this._dossiers;
 
     private _codeEditor: ICodeEditor;
     private _diffEditor: IDiffEditor;
     private _decorations: string[] = [];
     private _searchDecorations: string[] = [];
 
-    constructor(private readonly _dictionaryService: DictionaryService, readonly dossiersService: DossiersService) {}
+    constructor(
+        private readonly _dictionaryService: DictionaryService,
+        readonly dossiersService: DossiersService,
+        readonly dossierTemplatesService: DossierTemplatesService
+    ) {}
+
+    private _dossierTemplate: DossierTemplate = this.selectDossierTemplate as DossierTemplate;
+
+    get dossierTemplate() {
+        return this._dossierTemplate;
+    }
+
+    set dossierTemplate(value) {
+        this._dossierTemplate = value;
+        this.dossier = this.selectDossier as Dossier;
+        this.dossiers = this._dossiers;
+    }
 
     private _dossier: Dossier = this.selectDossier as Dossier;
 
@@ -86,6 +106,17 @@ export class DictionaryManagerComponent implements OnChanges, OnInit {
         return this.currentEntries.toString() !== this.initialEntries.toString();
     }
 
+    get _dossiers() {
+        if (this.filterByDossierTemplate) {
+            return this.dossiersService.all.filter(dossier => dossier.dossierTemplateId === this.dossierTemplate.dossierTemplateId);
+        }
+        return this.dossiersService.all;
+    }
+
+    get dossierTemplateIsNotSelected() {
+        return this.filterByDossierTemplate && this._dossierTemplate.name === this.selectDossierTemplate.name;
+    }
+
     ngOnInit(): void {
         this.currentEntries = [...this.initialEntries];
 
diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json
index 16ad8a22d..6769d6015 100644
--- a/apps/red-ui/src/assets/i18n/de.json
+++ b/apps/red-ui/src/assets/i18n/de.json
@@ -434,7 +434,8 @@
     },
     "compare": {
       "compare": "Vergleichen Sie",
-      "select-dossier": "Wählen Sie Dossiervorlage"
+      "select-dossier": "Wählen Sie Dossiervorlage",
+      "select-dossier-template": ""
     },
     "dictionary-details": {
       "description": "Beschreibung"
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index 3bc887fcb..7bfc55b26 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -474,7 +474,8 @@
     },
     "compare": {
       "compare": "Compare",
-      "select-dossier": "Select Dossier"
+      "select-dossier": "Select Dossier",
+      "select-dossier-template": "Select Dossier Template"
     },
     "dictionary-details": {
       "description": "Description"
diff --git a/apps/red-ui/src/assets/styles/red-editor.scss b/apps/red-ui/src/assets/styles/red-editor.scss
index ed2c1dc9e..1150600de 100644
--- a/apps/red-ui/src/assets/styles/red-editor.scss
+++ b/apps/red-ui/src/assets/styles/red-editor.scss
@@ -2,17 +2,14 @@
 
 .changed-row-marker {
     background: rgba(variables.$primary, 0.1);
-    z-index: 20;
 }
 
 .too-short-marker {
     background: rgba(variables.$primary, 0.5);
-    z-index: 30;
 }
 
 .search-marker {
     background: rgba(variables.$blue-5, 0.3);
-    z-index: 40;
 }
 
 .editor-container {