log an malformed filter

grafana · Jul 17, 2023 · 6186c19 · 6186c19
1 parent 7d3d7d2
commit 6186c19
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/src/data/adHocFilter.test.ts b/src/data/adHocFilter.test.ts
@@ -172,4 +172,17 @@ describe('AdHocManager', () => {
     ]);
     expect(val).toEqual(`SELECT foo.stuff FROM foo`);
   });
+
+  it('log a malformed filter', () => {
+    const warn = jest.spyOn(console, "error");
+    const value = { key: 'foo.key', operator: '=', value: undefined }
+    const ahm = new AdHocFilter();
+    ahm.setTargetTableFromQuery('SELECT * FROM foo');
+    ahm.apply('SELECT foo.stuff FROM foo', [
+      // @ts-expect-error
+      value,
+    ]);
+    expect(warn).toHaveBeenCalledTimes(1);
+    expect(warn).toHaveBeenCalledWith("Invalid adhoc filter will be ignored:", value)
+  });
 });
diff --git a/src/data/adHocFilter.ts b/src/data/adHocFilter.ts
@@ -28,7 +28,13 @@ export class AdHocFilter {
     }
 
     const filters = adHocFilters
-      .filter(validate)
+      .filter((filter: AdHocVariableFilter) => {
+        const valid = isValid(filter);
+        if(!valid) {
+          console.error('Invalid adhoc filter will be ignored:', filter);
+        }
+        return valid;
+      })
       .map((f, i) => {
         const key = f.key.includes('.') ? f.key.split('.')[1] : f.key;
         const value = isNaN(Number(f.value)) ? `\\'${f.value}\\'` : Number(f.value);
@@ -47,7 +53,7 @@ export class AdHocFilter {
   }
 }
 
-function validate(filter: AdHocVariableFilter): boolean {
+function isValid(filter: AdHocVariableFilter): boolean {
   return filter.key !== undefined && filter.operator !== undefined && filter.value !== undefined;
 }