From f9f899a6366d59f11552b0e31f22be906fef7afb Mon Sep 17 00:00:00 2001
From: Valentin Mihai <Valentin-Gabriel.Mihai.ext@knecon.com>
Date: Tue, 19 Dec 2023 16:45:56 +0200
Subject: [PATCH] RED-6960 - Enter should always confirm a modal window

---
 ...d-edit-clone-dossier-template-dialog.component.html |  3 ++-
 .../edit-dossier-dialog.component.html                 |  4 ++--
 .../shared/components/select/select.component.ts       | 10 +++++++++-
 .../add-dossier-dialog.component.html                  |  2 +-
 .../download-dialog/download-dialog.component.html     |  5 +++--
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component.html
index a34df2dec..e48d987f3 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component.html
@@ -1,5 +1,5 @@
 <section class="dialog">
-    <div [innerHTML]="'add-edit-clone-dossier-template.title' | translate : translateParams" class="dialog-header heading-l"></div>
+    <div [innerHTML]="'add-edit-clone-dossier-template.title' | translate: translateParams" class="dialog-header heading-l"></div>
 
     <form [formGroup]="form">
         <div class="dialog-content">
@@ -148,6 +148,7 @@
                 [disabled]="disabled"
                 [label]="'add-edit-clone-dossier-template.save' | translate"
                 [type]="iconButtonTypes.primary"
+                [buttonId]="'saveButton'"
             ></iqser-icon-button>
 
             <iqser-help-button
diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html
index a522b2842..b8160faad 100644
--- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html
+++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html
@@ -1,6 +1,6 @@
 <section *ngIf="dossier$ | async as dossier" class="dialog">
     <div
-        [innerHTML]="'edit-dossier-dialog.header' | translate : { dossierName: dossier.dossierName }"
+        [innerHTML]="'edit-dossier-dialog.header' | translate: { dossierName: dossier.dossierName }"
         class="dialog-header heading-l"
         id="editDossierHeader"
     ></div>
@@ -61,7 +61,7 @@
                     [disabled]="disabled || !valid || !changed"
                     [label]="'edit-dossier-dialog.actions.save' | translate"
                     [type]="iconButtonTypes.primary"
-                    buttonId="editDossierSaveButton"
+                    [buttonId]="'saveButton'"
                 ></iqser-icon-button>
 
                 <iqser-icon-button
diff --git a/apps/red-ui/src/app/modules/shared/components/select/select.component.ts b/apps/red-ui/src/app/modules/shared/components/select/select.component.ts
index 6507c44b7..e70a75335 100644
--- a/apps/red-ui/src/app/modules/shared/components/select/select.component.ts
+++ b/apps/red-ui/src/app/modules/shared/components/select/select.component.ts
@@ -41,7 +41,10 @@ export class SelectComponent implements AfterViewInit, ControlValueAccessor, OnC
     @Input() multiple = true;
     @ViewChild(MatChipListbox) chipList: MatChipListbox;
 
-    constructor(private readonly _changeDetector: ChangeDetectorRef, private readonly _elementRef: ElementRef) {}
+    constructor(
+        private readonly _changeDetector: ChangeDetectorRef,
+        private readonly _elementRef: ElementRef,
+    ) {}
 
     private _height?: number;
 
@@ -87,6 +90,11 @@ export class SelectComponent implements AfterViewInit, ControlValueAccessor, OnC
             }
 
             this._propagateChange([...new Set(this._value)]);
+
+            setTimeout(() => {
+                const saveButton = document.getElementById('saveButton') as HTMLElement;
+                saveButton?.focus();
+            }, 50);
         }
     }
 
diff --git a/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.html b/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.html
index 7863f8f8e..cbeb27b99 100644
--- a/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.html
+++ b/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.html
@@ -109,7 +109,7 @@
                 [disabled]="disabled"
                 [label]="'add-dossier-dialog.actions.save' | translate"
                 [type]="iconButtonTypes.primary"
-                buttonId="createDossierSaveButton"
+                [buttonId]="'saveButton'"
             ></iqser-icon-button>
 
             <iqser-icon-button
diff --git a/apps/red-ui/src/app/modules/shared/dialogs/download-dialog/download-dialog.component.html b/apps/red-ui/src/app/modules/shared/dialogs/download-dialog/download-dialog.component.html
index d15d33200..e532119af 100644
--- a/apps/red-ui/src/app/modules/shared/dialogs/download-dialog/download-dialog.component.html
+++ b/apps/red-ui/src/app/modules/shared/dialogs/download-dialog/download-dialog.component.html
@@ -9,7 +9,7 @@
         <div class="dialog-content">
             <redaction-select
                 *ngIf="availableReportTypes | async as reportTypes"
-                [label]="'report-type.label' | translate : { length: reportTypesLength }"
+                [label]="'report-type.label' | translate: { length: reportTypesLength }"
                 [optionTemplate]="reportTemplateOptionTemplate"
                 [options]="reportTypes"
                 [valueMapper]="reportTemplateValueMapper"
@@ -19,7 +19,7 @@
 
             <redaction-select
                 *ngIf="!isDocumine"
-                [label]="'download-type.label' | translate : { length: downloadFileTypesLength }"
+                [label]="'download-type.label' | translate: { length: downloadFileTypesLength }"
                 [options]="downloadTypes"
                 formControlName="downloadFileTypes"
             ></redaction-select>
@@ -54,6 +54,7 @@
                 [disabled]="!valid"
                 [label]="'download-dialog.actions.save' | translate"
                 [type]="iconButtonTypes.primary"
+                [buttonId]="'saveButton'"
             ></iqser-icon-button>
         </div>
     </form>