fix(datagrid): reject strings in the numeric property filter when active

This is a backport of 6973559.
vmware-clarity · Aug 22, 2022 · 8d1faba · 8d1faba
1 parent 0db3363
commit 8d1faba
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/projects/angular/src/data/datagrid/built-in/filters/datagrid-property-numeric-filter.spec.ts b/projects/angular/src/data/datagrid/built-in/filters/datagrid-property-numeric-filter.spec.ts
@@ -21,10 +21,10 @@ export default function (): void {
       expect(this.filter.accepts({ a: 'not a number' }, null, null)).toBe(true);
     });
 
-    // it('rejects strings when active', function () {
-    //   this.filter = new DatagridPropertyNumericFilter('a');
-    //   expect(this.filter.accepts({ a: 'not a number' }, null, 1)).toBe(false);
-    // });
+    it('rejects strings when active', function () {
+      this.filter = new DatagridPropertyNumericFilter('a');
+      expect(this.filter.accepts({ a: 'not a number' }, null, 1)).toBe(false);
+    });
 
     it('always rejects undefined', function () {
       this.filter = new DatagridPropertyNumericFilter('a');

diff --git a/projects/angular/src/data/datagrid/built-in/filters/datagrid-property-numeric-filter.ts b/projects/angular/src/data/datagrid/built-in/filters/datagrid-property-numeric-filter.ts
@@ -19,10 +19,10 @@ export class DatagridPropertyNumericFilter<T = any> implements ClrDatagridNumeri
     if (propValue === undefined) {
       return false;
     }
-    if (low !== null && propValue < low) {
+    if (low !== null && (typeof propValue !== 'number' || propValue < low)) {
       return false;
     }
-    if (high !== null && propValue > high) {
+    if (high !== null && (typeof propValue !== 'number' || propValue > high)) {
       return false;
     }
     return true;