From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Mon, 2 Mar 2020 17:08:04 +0000 (-0500)
Subject: eg-grid: fix disabling filter controls when data is being fetched
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=65c5f6dc8c96d3d4a2e015482259e14d4f9cc95a;p=working%2FEvergreen.git

eg-grid: fix disabling filter controls when data is being fetched

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---

diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-filter-control.component.html b/Open-ILS/src/eg2/src/app/share/grid/grid-filter-control.component.html
index c6440cd1f8..052de1cef7 100644
--- a/Open-ILS/src/eg2/src/app/share/grid/grid-filter-control.component.html
+++ b/Open-ILS/src/eg2/src/app/share/grid/grid-filter-control.component.html
@@ -17,6 +17,7 @@
           </div>
         </div>
         <eg-combobox [asyncSupportsEmptyTermClick]="col.asyncSupportsEmptyTermClick" [idlClass]="col.idlFieldDef.class" (onChange)="applyLinkFilter($event, col)" 
+          [disabled]="col.filterInputDisabled || context.dataSource.requestingData"
           i18n-placeholder placeholder="Enter value to filter by"></eg-combobox>
       </div>
     </div>
@@ -36,7 +37,8 @@
             </div>
           </div>
         </div>
-        <select class="custom-select" [(ngModel)]="col.filterValue" (change)="applyBooleanFilter(col)">
+        <select class="custom-select" [(ngModel)]="col.filterValue" (change)="applyBooleanFilter(col)"
+            [disabled]="col.filterInputDisabled || context.dataSource.requestingData">
           <option value="" i18n>Any</option>
           <option value="t" i18n>True</option>
           <option value="f" i18n>False</option>
@@ -231,6 +233,7 @@
         <div [hidden]="col.filterOperator !== 'between'" class="form-inline form-group">
           <label for="eg-filter-end-date-select-{{col.name}}" style="width: 3em;" i18n>and</label>
           <eg-date-select [hidden]="col.filterOperator !== 'between'" (onChangeAsYmd)="applyDateFilter(datesel.currentAsYmd(), col, $event)"
+                          [disabled]="col.filterInputDisabled || context.dataSource.requestingData"
                           [required]="col.filterOperator == 'between'" #dateendsel></eg-date-select>
         </div>
       </div>
@@ -270,7 +273,8 @@
             </div>
           </div>
         </div>
-        <eg-org-select [applyOrgId]="col.filterValue" (onChange)="applyOrgFilter($event, col)" 
+        <eg-org-select [applyOrgId]="col.filterValue" (onChange)="applyOrgFilter($event, col)"
+          [disabled]="col.filterInputDisabled || context.dataSource.requestingData"
           i18n-placeholder placeholder="Enter library to filter by" #ousel></eg-org-select>
       </div>
     </div>
diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid.ts b/Open-ILS/src/eg2/src/app/share/grid/grid.ts
index 258153a61a..5d8a40955e 100644
--- a/Open-ILS/src/eg2/src/app/share/grid/grid.ts
+++ b/Open-ILS/src/eg2/src/app/share/grid/grid.ts
@@ -1203,7 +1203,8 @@ export class GridDataSource {
             return this.getRows(pager, this.sort).subscribe(
                 row => {
                     this.data[idx++] = row;
-                    this.requestingData = false;
+                    // not updating this.requestingData, as having
+                    // retrieved one row doesn't mean we're done
                     this.retrievalError = false;
                 },
                 err => {