better save eligibility testing

Signed-off-by: Jason Etheridge <phasefx@gmail.com>

diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-manage-filters-dialog.component.html b/Open-ILS/src/eg2/src/app/share/grid/grid-manage-filters-dialog.component.html
index 21b0fc8..adfb483 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/grid/grid-manage-filters-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/share/grid/grid-manage-filters-dialog.component.html
@@ -20,6 +20,7 @@
                 type="text" pattern="[\s\S]*\S[\s\S]*"
                 placeholder="Name..." i18n-placeholder
                 required="false"
+                [disabled]="disableSaveNameTest()"
                 (ngModelChange)="saveFilterNameModelChanged.next($event)"
                 [ngModel]="saveFilterName"/>
                 <div *ngIf="nameCollision" class="alert alert-warning" i18n>
@@ -31,7 +32,7 @@
             <div class="col-lg-3">
             </div>
             <div class="col-lg-9">
-                <button type="button" class="btn btn-success" [disabled]="saveFilterName === ''"
+              <button type="button" class="btn btn-success" [disabled]="disableSaveButtonTest()"
                     (click)="saveFilters()" i18n>
                     Save Active Filters</button>
             </div>

diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-manage-filters-dialog.component.ts b/Open-ILS/src/eg2/src/app/share/grid/grid-manage-filters-dialog.component.ts
index 2015a18..c614def 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/grid/grid-manage-filters-dialog.component.ts
+++ b/Open-ILS/src/eg2/src/app/share/grid/grid-manage-filters-dialog.component.ts
@@ -85,6 +85,24 @@ export class GridManageFiltersDialogComponent extends DialogComponent implements
         close();
     }
 
+       disableSaveNameTest(): boolean {
+         const isEmpty = (obj: any): boolean => {
+        console.log('Name: isEmpty',obj);
+               return obj && Object.keys(obj).length === 0;
+         };
+
+         return isEmpty(this.gridContext?.dataSource?.filters);
+       }
+
+       disableSaveButtonTest(): boolean {
+         const isEmpty = (obj: any): boolean => {
+        console.log('Button: isEmpty',obj);
+               return obj && Object.keys(obj).length === 0;
+         };
+
+         return this.nameCollision || this.saveFilterName === '' || isEmpty(this.gridContext?.dataSource?.filters);
+       }
+
     refreshEntries() {
         this.filterSetEntries = [];
         this.store.getItem('eg.grid.filters.' + this.gridContext.persistKey).then( setting => {