Merge pull request #56 from doitintl/issue-51-take-3

Fixes #51

Author: avivl

dist/module.js

@@ -34079,7 +34079,6 @@ function () {
       key: "gce",
       value: "GCE Default Service Account"
     }];
-    console.log("current", this.current);
   }
 
   BigQueryConfigCtrl.prototype.onUpload = function (json) {
@@ -34237,11 +34236,36 @@ function () {
     this.url = instanceSettings.url;
     this.interval = (instanceSettings.jsonData || {}).timeInterval || "1m";
     this.authenticationType = instanceSettings.jsonData.authenticationType || "jwt";
-    var prj = "";
-    this.getDefaultProject().then(function (res) {
-      prj = res;
-      _this.projectName = instanceSettings.jsonData.defaultProject || prj;
-    });
+
+    (function () {
+      return tslib_1.__awaiter(_this, void 0, void 0, function () {
+        var _a, _b;
+
+        return tslib_1.__generator(this, function (_c) {
+          switch (_c.label) {
+            case 0:
+              _a = this;
+              _b = instanceSettings.jsonData.defaultProject;
+              if (_b) return [3
+              /*break*/
+              , 2];
+              return [4
+              /*yield*/
+              , this.getDefaultProject()];
+
+            case 1:
+              _b = _c.sent();
+              _c.label = 2;
+
+            case 2:
+              _a.projectName = _b;
+              return [2
+              /*return*/
+              ];
+          }
+        });
+      });
+    })();
   }
 
   BigQueryDatasource.formatBigqueryError = function (error) {
@@ -34500,7 +34524,7 @@ function () {
             this.projectName = data[0].value;
             return [2
             /*return*/
-            , this.projectName];
+            , data[0].value];
 
           case 2:
             return [2

dist/module.js.map

@@ -25,7 +25,6 @@ export class BigQueryConfigCtrl {
       { key: this.defaultAuthenticationType, value: "Google JWT File" },
       { key: "gce", value: "GCE Default Service Account" }
     ];
-    console.log("current", this.current)
   }
 
   public onUpload(json) {

src/config_ctrl.ts

@@ -69,11 +69,11 @@ export class BigQueryDatasource {
     this.interval = (instanceSettings.jsonData || {}).timeInterval || "1m";
     this.authenticationType =
       instanceSettings.jsonData.authenticationType || "jwt";
-    let prj = "";
-    this.getDefaultProject().then(res => {
-      prj = res;
-      this.projectName = instanceSettings.jsonData.defaultProject || prj;
-    });
+    (async () => {
+      this.projectName =
+        instanceSettings.jsonData.defaultProject ||
+        (await this.getDefaultProject());
+    })();
   }
 
   public async query(options) {
@@ -179,13 +179,14 @@ export class BigQueryDatasource {
     return ResponseParser.parseTableFields(data, filter);
   }
 
-  public async getDefaultProject() {
+
+  public  async getDefaultProject(){
     try {
       if (this.authenticationType === "gce" || !this.projectName) {
         let data;
         data = await this.getProjects();
         this.projectName = data[0].value;
-        return this.projectName;
+        return data[0].value;
       } else {
         return this.projectName;
       }