From 6df67a0c06d3fa401eda20044b942ab62e73bf07 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxOLI.org>
Date: Mon, 12 Jul 2021 11:42:24 -0400
Subject: [PATCH] LP#1844169: (follow-up) add validation to entry form

The Search Filter Group Entries modal now enforces
required fields client-side.

Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
---
 .../staff/admin/local/search-filter/query-dialog.component.html  | 9 ++++++---
 .../staff/admin/local/search-filter/query-dialog.component.ts    | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/search-filter/query-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/search-filter/query-dialog.component.html
index 9f2521164c..ad1f0140b4 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/search-filter/query-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/search-filter/query-dialog.component.html
@@ -1,4 +1,5 @@
 <ng-template #dialogContent>
+  <form #queryEditForm="ngForm" role="form" class="form-validated common-form striped-odd">
     <div class="modal-header bg-info">
         <h4 class="modal-title" i18n>New Query</h4>
         <button type="button" class="close"
@@ -11,7 +12,7 @@
         <div class="row">
             <div class="col-lg-3 font-weight-bold" i18n>Query Label</div>
             <div class="col-lg-9">
-                <input type="text" class="form-control" 
+                <input type="text" class="form-control"  name="query_label"
                 placeholder="Query Label"
                 i18n-placeholder required
                 [(ngModel)]="newQueryLabel"/>
@@ -20,7 +21,7 @@
         <div class="row mt-3">
             <div class="col-lg-3 font-weight-bold" i18n>Query Text</div>
             <div class="col-lg-9">
-                <input type="text" class="form-control" 
+                <input type="text" class="form-control"  name="query_text"
                 placeholder="Query Text"
                 i18n-placeholder required
                 [(ngModel)]="newQueryText"/>
@@ -29,7 +30,7 @@
         <div class="row mt-3">
             <div class="col-lg-3 font-weight-bold" i18n>Position</div>
             <div class="col-lg-9">
-                <input type="number" class="form-control" 
+                <input type="number" class="form-control" name="pos"
                 placeholder="Position"
                 i18n-placeholder required
                 [(ngModel)]="newQueryPosition"/>
@@ -40,6 +41,8 @@
         <button type="button" class="btn btn-warning"
             (click)="closeAndReset()" i18n>Cancel</button>
         <button type="button" class="btn btn-success"
+            [disabled]="queryEditForm.invalid"
             (click)="save()" i18n >Save</button>
     </div>
+  </form>
 </ng-template>
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/search-filter/query-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/search-filter/query-dialog.component.ts
index 2aefb4af52..be485e6089 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/search-filter/query-dialog.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/search-filter/query-dialog.component.ts
@@ -5,6 +5,7 @@ import {IdlService, IdlObject} from '@eg/core/idl.service';
 import {AuthService} from '@eg/core/auth.service';
 import {DialogComponent} from '@eg/share/dialog/dialog.component';
 import {NgbModal} from '@ng-bootstrap/ng-bootstrap';
+import {NgForm} from '@angular/forms';
 
 @Component({
   selector: 'eg-query-dialog',
-- 
2.11.0