BUG: pass filtered queries to Go backend

Author: sasaki77

src/DataSource.ts

@@ -36,20 +36,20 @@ export class DataSource extends DataSourceWithBackend<AAQuery, AADataSourceOptio
 
   // Called from Grafana panels to get data
   query(options: DataQueryRequest<AAQuery>): Observable<DataQueryResponse> {
-    // Remove hidden target from query
     const query = { ...options };
-    query.targets = _.filter(query.targets, (t) => !t.hide);
 
     const query_replaced = this.replaceVariables(query);
-    const targets = this.buildQueryParameters(query_replaced);
+    query_replaced.targets = this.filterTargets(query_replaced.targets);
 
     // There're no target query
-    if (targets.length <= 0) {
+    if (query_replaced.targets.length <= 0) {
       return new Observable<DataQueryResponse>((subscriber) => {
         subscriber.next({ data: [] });
       });
     }
 
+    const targets = this.buildQueryParameters(query_replaced);
+
     const stream = _.filter(targets, (t) => t.stream);
 
     // No stream query
@@ -128,12 +128,17 @@ export class DataSource extends DataSourceWithBackend<AAQuery, AADataSourceOptio
     return query;
   }
 
+  filterTargets(targets: AAQuery[]): AAQuery[] {
+    // Remove unnecessary targets
+    // 1) hidden target
+    // 2) placeholder target
+    // 3) undefined target
+    return _.filter(targets, (t) => !t.hide && t.target !== '' && typeof t.target !== 'undefined');
+  }
+
   buildQueryParameters(options: DataQueryRequest<AAQuery>) {
     const query = { ...options };
 
-    // remove placeholder targets and undefined targets
-    query.targets = _.filter(query.targets, (target) => target.target !== '' && typeof target.target !== 'undefined');
-
     if (query.targets.length <= 0) {
       return [];
     }

src/specs/datasource.test.ts

@@ -300,6 +300,22 @@ describe('Archiverappliance Datasource', () => {
     });
   });
 
+  describe('Filter targets tests', () => {
+    it('should return filtered array when target is empty or undefined', (done) => {
+      const t = [
+        { target: 'PV', refId: 'A' },
+        { target: '', refId: 'B' },
+        { target: undefined, refId: 'C' },
+        { target: 'PV', refId: 'C', hide: true },
+      ] as unknown as AAQuery[];
+
+      const targets = ds.filterTargets(t);
+
+      expect(targets).toHaveLength(1);
+      done();
+    });
+  });
+
   describe('Build query parameters tests', () => {
     it('should return valid interval time in integer', (done) => {
       const options = {
@@ -329,23 +345,6 @@ describe('Archiverappliance Datasource', () => {
       done();
     });
 
-    it('should return filtered array when target is empty or undefined', (done) => {
-      const options = {
-        targets: [
-          { target: 'PV', refId: 'A' },
-          { target: '', refId: 'B' },
-          { target: undefined, refId: 'C' },
-        ],
-        range: { from: new Date('2010-01-01T00:00:00.000Z'), to: new Date('2010-01-01T00:00:30.000Z') },
-        maxDataPoints: 1000,
-      } as unknown as DataQueryRequest<AAQuery>;
-
-      const targets = ds.buildQueryParameters(options);
-
-      expect(targets).toHaveLength(1);
-      done();
-    });
-
     it('should return 1 second range when from == to in seconds', (done) => {
       const options = {
         targets: [{ target: 'PV1', refId: 'A' }],