Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

RED-6960 - Enter should always confirm a modal window

Browse Source
This commit is contained in:
Valentin Mihai 2023-12-19 16:45:56 +02:00
parent 78d41402f1
commit f9f899a636
5 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component.html
View File

@ -1,5 +1,5 @@
<section class="dialog"> <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"> <form [formGroup]="form">
<div class="dialog-content"> <div class="dialog-content">
@ -148,6 +148,7 @@
[disabled]="disabled" [disabled]="disabled"
[label]="'add-edit-clone-dossier-template.save' | translate" [label]="'add-edit-clone-dossier-template.save' | translate"
[type]="iconButtonTypes.primary" [type]="iconButtonTypes.primary"
[buttonId]="'saveButton'"
></iqser-icon-button> ></iqser-icon-button>
<iqser-help-button <iqser-help-button

4
apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html
View File

@ -1,6 +1,6 @@
<section *ngIf="dossier$ | async as dossier" class="dialog"> <section *ngIf="dossier$ | async as dossier" class="dialog">
<div <div
[innerHTML]="'edit-dossier-dialog.header' | translate : { dossierName: dossier.dossierName }" [innerHTML]="'edit-dossier-dialog.header' | translate: { dossierName: dossier.dossierName }"
class="dialog-header heading-l" class="dialog-header heading-l"
id="editDossierHeader" id="editDossierHeader"
></div> ></div>
@ -61,7 +61,7 @@
[disabled]="disabled || !valid || !changed" [disabled]="disabled || !valid || !changed"
[label]="'edit-dossier-dialog.actions.save' | translate" [label]="'edit-dossier-dialog.actions.save' | translate"
[type]="iconButtonTypes.primary" [type]="iconButtonTypes.primary"
buttonId="editDossierSaveButton" [buttonId]="'saveButton'"
></iqser-icon-button> ></iqser-icon-button>
<iqser-icon-button <iqser-icon-button

10
apps/red-ui/src/app/modules/shared/components/select/select.component.ts
View File

@ -41,7 +41,10 @@ export class SelectComponent implements AfterViewInit, ControlValueAccessor, OnC
@Input() multiple = true; @Input() multiple = true;
@ViewChild(MatChipListbox) chipList: MatChipListbox; @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; private _height?: number;
@ -87,6 +90,11 @@ export class SelectComponent implements AfterViewInit, ControlValueAccessor, OnC
} }
this._propagateChange([...new Set(this._value)]); this._propagateChange([...new Set(this._value)]);
setTimeout(() => {
const saveButton = document.getElementById('saveButton') as HTMLElement;
saveButton?.focus();
}, 50);
} }
} }

2
apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.html
View File

@ -109,7 +109,7 @@
[disabled]="disabled" [disabled]="disabled"
[label]="'add-dossier-dialog.actions.save' | translate" [label]="'add-dossier-dialog.actions.save' | translate"
[type]="iconButtonTypes.primary" [type]="iconButtonTypes.primary"
buttonId="createDossierSaveButton" [buttonId]="'saveButton'"
></iqser-icon-button> ></iqser-icon-button>
<iqser-icon-button <iqser-icon-button

5
apps/red-ui/src/app/modules/shared/dialogs/download-dialog/download-dialog.component.html
View File

@ -9,7 +9,7 @@
<div class="dialog-content"> <div class="dialog-content">
<redaction-select <redaction-select
*ngIf="availableReportTypes | async as reportTypes" *ngIf="availableReportTypes | async as reportTypes"
[label]="'report-type.label' | translate : { length: reportTypesLength }" [label]="'report-type.label' | translate: { length: reportTypesLength }"
[optionTemplate]="reportTemplateOptionTemplate" [optionTemplate]="reportTemplateOptionTemplate"
[options]="reportTypes" [options]="reportTypes"
[valueMapper]="reportTemplateValueMapper" [valueMapper]="reportTemplateValueMapper"
@ -19,7 +19,7 @@
<redaction-select <redaction-select
*ngIf="!isDocumine" *ngIf="!isDocumine"
[label]="'download-type.label' | translate : { length: downloadFileTypesLength }" [label]="'download-type.label' | translate: { length: downloadFileTypesLength }"
[options]="downloadTypes" [options]="downloadTypes"
formControlName="downloadFileTypes" formControlName="downloadFileTypes"
></redaction-select> ></redaction-select>
@ -54,6 +54,7 @@
[disabled]="!valid" [disabled]="!valid"
[label]="'download-dialog.actions.save' | translate" [label]="'download-dialog.actions.save' | translate"
[type]="iconButtonTypes.primary" [type]="iconButtonTypes.primary"
[buttonId]="'saveButton'"
></iqser-icon-button> ></iqser-icon-button>
</div> </div>
</form> </form>