From ac5a49f7a6f2c3287d732f7075a53082991fcf18 Mon Sep 17 00:00:00 2001
From: Stephanie Leary <stephanie.leary@equinoxoli.org>
Date: Tue, 14 Mar 2023 21:09:57 +0000
Subject: [PATCH] move basic classes out of callback

Signed-off-by: Stephanie Leary <stephanie.leary@equinoxoli.org>
---
 .../eg2/src/app/share/grid/grid-body-cell.component.html   | 14 ++++++--------
 .../src/eg2/src/app/share/grid/grid-body.component.html    |  6 +++---
 .../src/app/share/grid/grid-filter-control.component.html  |  2 +-
 Open-ILS/src/eg2/src/app/share/grid/grid.component.ts      | 10 +++-------
 .../app/staff/admin/local/standing-penalty.component.ts    |  4 ++--
 .../src/eg2/src/app/staff/circ/patron/bills.component.ts   |  2 +-
 6 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-body-cell.component.html b/Open-ILS/src/eg2/src/app/share/grid/grid-body-cell.component.html
index 912615bf6f..6992aae988 100644
--- a/Open-ILS/src/eg2/src/app/share/grid/grid-body-cell.component.html
+++ b/Open-ILS/src/eg2/src/app/share/grid/grid-body-cell.component.html
@@ -1,9 +1,8 @@
 
-<span *ngIf="!column.cellTemplate"
+<!-- <span *ngIf="!column.cellTemplate"
   [ngbTooltip]="column.disableTooltip ? null : context.getRowColumnValue(row, column)"
   placement="top-left"
-  
-  triggers="mouseenter:mouseleave">
+  triggers="mouseenter:mouseleave"> -->
   <ng-container *ngIf="column.datatype === 'bool'">
     <eg-bool [value]="context.getRowColumnValue(row, column)"
       [ternary]="column.ternaryBool">
@@ -12,16 +11,15 @@
   <ng-container *ngIf="column.datatype !== 'bool'">
     {{context.getRowColumnValue(row, column)}}
   </ng-container>
-</span>
-<span *ngIf="column.cellTemplate" 
-  
+<!-- </span> -->
+<!-- <span *ngIf="column.cellTemplate" 
   [ngbTooltip]="column.disableTooltip ? null : column.cellTemplate"
   placement="top-left"
   #tooltip="ngbTooltip" 
   (mouseenter)="tooltip.open(column.getCellContext(row))"
-  (mouseleave)="tooltip.close()" triggers="manual">
+  (mouseleave)="tooltip.close()" triggers="manual"> -->
   <ng-container #templateContainer
     *ngTemplateOutlet="column.cellTemplate; context: column.getCellContext(row)">
   </ng-container> 
-</span>
+<!-- </span> -->
 
diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.html b/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.html
index e9a27f3505..f59dd139cd 100644
--- a/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.html
+++ b/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.html
@@ -9,7 +9,7 @@
     *ngFor="let row of context.dataSource.getPageOfRows(context.pager); let idx = index">
 
     <ng-container *ngIf="!context.disableSelect">
-      <td class="eg-grid-cell eg-grid-checkbox-cell eg-grid-cell-skinny">
+      <td class="eg-grid-cell eg-grid-checkbox-cell">
         <input type='checkbox' 
           [ngModel]="context.rowSelector.indexes[context.getRowIndex(row)]"
           (ngModelChange)="context.rowSelector.toggle(context.getRowIndex(row))"
@@ -22,7 +22,7 @@
           triggers="manual">
       </td>
     </ng-container>
-    <td class="eg-grid-cell eg-grid-number-cell eg-grid-cell-skinny-2">
+    <td class="eg-grid-cell eg-grid-number-cell">
       {{context.pager.rowNumber(idx)}}
     </td>
     <td *ngIf="context.rowFlairIsEnabled" class="eg-grid-cell eg-grid-flair-cell">
@@ -41,7 +41,7 @@
     <!-- contextMenu applied to cells instead of rows so the position
          of the popover is close to the mouse.  As of writing, no way
          to position the popover at the mouse -->
-    <td class="eg-grid-cell eg-grid-body-cell  {{context.cellClassCallback(row, col)}}"
+    <td class="eg-grid-cell eg-grid-body-cell eg-grid-col-{{col.name}} eg-grid-type-{{col.datatype}} eg-grid-class-{{context.idlClass}} {{context.cellClassCallback(row, col)}}"
       [ngClass]="{'eg-grid-cell-overflow': context.overflowCells}"
       (dblclick)="onRowDblClick(row)"
       (click)="onRowClick($event, row, idx)"
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 96669e3b10..0d117d2aca 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
@@ -3,7 +3,7 @@
 <ng-template #dropdownToggle>
   <span i18n>Filter</span>
   <ng-container *ngIf="!col.isFiltered">
-    <span class="material-icons mat-icon-in-button">filter_list</span>
+    <span class="material-icons mat-icon-in-button">filter_alt</span>
   </ng-container>
   <ng-container *ngIf="col.isFiltered">
     <span class="material-icons mat-icon-in-button">create</span>
diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid.component.ts b/Open-ILS/src/eg2/src/app/share/grid/grid.component.ts
index f36dd1c67b..0f8dc55393 100644
--- a/Open-ILS/src/eg2/src/app/share/grid/grid.component.ts
+++ b/Open-ILS/src/eg2/src/app/share/grid/grid.component.ts
@@ -207,10 +207,6 @@ export class GridComponent implements OnInit, AfterViewInit, OnDestroy {
         this.context.cellClassCallback =
             this.cellClassCallback ||
             function (row: any, col: GridColumn) {
-                const classNames = ['eg-grid-type-'+col.datatype, 'eg-grid-class-'+col.idlClass, 'eg-grid-col-'+col.name];
-                if (col.path)
-                    classNames.push('eg-grid-path-'+col.path);
-
                 if (col.datatype === 'money') {
                     // get raw value
                     let val;
@@ -220,11 +216,11 @@ export class GridComponent implements OnInit, AfterViewInit, OnDestroy {
                         val = this.getObjectFieldValue(row, col.name);
                     }
                     if (Number(val) < 0) {
-                        classNames.push('negative-money-amount');
+                        return 'negative-money-amount';
                     }
                 }
-                return classNames.join(' ');
-            };
+                return '';
+            }
 
         this.context.rowSelector.selectionChange.subscribe(
             keys => this.rowSelectionChange.emit(keys)
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/standing-penalty.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/standing-penalty.component.ts
index 3bd1d7550b..87f567d474 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/standing-penalty.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/standing-penalty.component.ts
@@ -74,7 +74,7 @@ export class StandingPenaltyComponent implements OnInit {
 
         this.cspRowFlairCallback = (row: any): GridRowFlairEntry => {
             const flair = {icon: null, title: null};
-            if (row.id() < 100) {
+            if (row && (row.id() < 100)) {
                 flair.icon = 'not_interested';
                 flair.title = this.cspFlairTooltip.text;
             }
@@ -111,7 +111,7 @@ export class StandingPenaltyComponent implements OnInit {
     }
 
     cspGridCellClassCallback = (row: any, col: GridColumn): string => {
-        if (col.name === 'id' && row.a[0] < 100) {
+        if (row && col.name === 'id' && row.a[0] < 100) {
             return 'text-danger';
         }
         return '';
diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/bills.component.ts b/Open-ILS/src/eg2/src/app/staff/circ/patron/bills.component.ts
index 3f8b11def0..a116ef032a 100644
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/bills.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/bills.component.ts
@@ -12,7 +12,7 @@ import {AuthService} from '@eg/core/auth.service';
 import {ServerStoreService} from '@eg/core/server-store.service';
 import {PatronService} from '@eg/staff/share/patron/patron.service';
 import {PatronContextService} from './patron.service';
-import {GridDataSource, GridColumn, GridCellTextGenerator, GridRowFlairEntry} from '@eg/share/grid/grid';
+import {GridContext, GridDataSource, GridColumn, GridCellTextGenerator, GridRowFlairEntry} from '@eg/share/grid/grid';
 import {GridComponent} from '@eg/share/grid/grid.component';
 import {Pager} from '@eg/share/util/pager';
 import {CircService, CircDisplayInfo} from '@eg/staff/share/circ/circ.service';
-- 
2.11.0