Merge pull request #208 from doitintl/issue-207

Fixes #207
doitintl · Feb 23, 2020 · 8c56173 · 8c56173
2 parents cb124f3 + b7b1f8d
commit 8c56173
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/dist/module.js b/dist/module.js
@@ -60111,8 +60111,8 @@ function () {
     query.rawSql = this.queryModel.expend_macros(options);
     return this.backendSrv.datasourceRequest({
       data: {
-        query: query.rawSql,
         from: options.range.from.valueOf().toString(),
+        query: query.rawSql,
         to: options.range.to.valueOf().toString(),
         useLegacySql: false,
         useQueryCache: true
@@ -61876,9 +61876,8 @@ function () {
       list.push({
         annotation: options.annotation,
         tags: row.f[tagsColumnIndex].v ? row.f[tagsColumnIndex].v.trim().split(/\s*,\s*/) : [],
-        text: row.f[textColumnIndex],
-        time: Number(Math.floor(Number(row.f[timeColumnIndex].v))) * 1000,
-        title: row.f[titleColumnIndex]
+        text: row.f[textColumnIndex].v ? row.f[textColumnIndex].v.toString() : "",
+        time: Number(Math.floor(Number(row.f[timeColumnIndex].v))) * 1000
       });
     }
 

diff --git a/dist/module.js.map b/dist/module.js.map
diff --git a/src/datasource.ts b/src/datasource.ts
@@ -433,8 +433,8 @@ export class BigQueryDatasource {
     return this.backendSrv
       .datasourceRequest({
         data: {
-          query: query.rawSql,
           from: options.range.from.valueOf().toString(),
+          query: query.rawSql,
           to: options.range.to.valueOf().toString(),
           useLegacySql: false,
           useQueryCache: true

diff --git a/src/module.ts b/src/module.ts
@@ -15,7 +15,7 @@ WHERE
 class BigQueryAnnotationsQueryCtrl {
   static templateUrl = 'partials/annotations.editor.html';
 
-  annotation: any;
+  public annotation: any;
 
   /** @ngInject */
   constructor() {

diff --git a/src/response_parser.ts b/src/response_parser.ts
@@ -295,9 +295,8 @@ export default class ResponseParser {
         tags: row.f[tagsColumnIndex].v
           ? row.f[tagsColumnIndex].v.trim().split(/\s*,\s*/)
           : [],
-        text: row.f[textColumnIndex],
-        time: Number(Math.floor(Number(row.f[timeColumnIndex].v))) * 1000,
-        title: row.f[titleColumnIndex]
+        text: row.f[textColumnIndex].v ? row.f[textColumnIndex].v.toString() : "",
+        time: Number(Math.floor(Number(row.f[timeColumnIndex].v))) * 1000
       });
     }
     return list;