From 2af045eca58a7480510a31ec4a2d0709c23a5b87 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Sun, 7 Feb 2021 14:20:40 -0500
Subject: [PATCH] LP1904036 Prompt dialog focus input; submit on enter

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
---
 .../src/eg2/src/app/share/dialog/prompt.component.html    |  4 ++--
 Open-ILS/src/eg2/src/app/share/dialog/prompt.component.ts | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/share/dialog/prompt.component.html b/Open-ILS/src/eg2/src/app/share/dialog/prompt.component.html
index a44a601949..1d6df6778d 100644
--- a/Open-ILS/src/eg2/src/app/share/dialog/prompt.component.html
+++ b/Open-ILS/src/eg2/src/app/share/dialog/prompt.component.html
@@ -9,10 +9,10 @@
   <div class="modal-body">
     <p>{{dialogBody}}</p>
     <div class="text-center">
-        <input type="{{promptType}}" class="form-control" 
+        <input type="{{promptType}}" class="form-control" id="{{inputDomId}}"
           [attr.min]="promptType == 'number' ? promptMin : ''"
           [attr.max]="promptType == 'number' ? promptMax : ''"
-          [(ngModel)]="promptValue"/>
+          (keyup.enter)="close(promptValue)" [(ngModel)]="promptValue"/>
     </div>
   </div>
   <div class="modal-footer">
diff --git a/Open-ILS/src/eg2/src/app/share/dialog/prompt.component.ts b/Open-ILS/src/eg2/src/app/share/dialog/prompt.component.ts
index 82f0999df1..68ca8b1531 100644
--- a/Open-ILS/src/eg2/src/app/share/dialog/prompt.component.ts
+++ b/Open-ILS/src/eg2/src/app/share/dialog/prompt.component.ts
@@ -1,4 +1,4 @@
-import {Component, Input, ViewChild, TemplateRef} from '@angular/core';
+import {Component, Input, ViewChild, OnInit, TemplateRef} from '@angular/core';
 import {DialogComponent} from '@eg/share/dialog/dialog.component';
 
 @Component({
@@ -9,7 +9,11 @@ import {DialogComponent} from '@eg/share/dialog/dialog.component';
 /**
  * Promptation dialog that requests user input.
  */
-export class PromptDialogComponent extends DialogComponent {
+export class PromptDialogComponent extends DialogComponent implements OnInit {
+    static domId = 0;
+
+    @Input() inputDomId = 'eg-prompt-dialog-' + PromptDialogComponent.domId++;
+
     // What question are we asking?
     @Input() public dialogBody: string;
     // Value to return to the caller
@@ -20,6 +24,13 @@ export class PromptDialogComponent extends DialogComponent {
     // May be used when promptType == 'number'
     @Input() promptMin: number = null;
     @Input() promptMax: number = null;
+
+    ngOnInit() {
+        this.onOpen$.subscribe(_ => {
+            const node = document.getElementById(this.inputDomId);
+            if (node) { node.focus(); node.select(); }
+        });
+    }
 }
 
 
-- 
2.11.0