Resolved merge conflict

Author: avivl

dist/README.md

@@ -6,12 +6,12 @@
 [![Issue Count](https://codeclimate.com/github/doitintl/bigquery-grafana/badges/issue_count.svg)](https://codeclimate.com/github/doitintl/bigquery-grafana)
 [![CodeCpv](https://codecov.io/gh/doitintl/bigquery-grafana/branch/master/graph/badge.svg)](https://codecov.io/gh/doitintl/bigquery-grafana/)
 ## Status: Production Ready
-# BigQuery datasource for Grafana
+# BigQuery DataSource for Grafana
 
-BigQuery datasource plugin provide support for [BigQuery](https://cloud.google.com/bigquery/) as a backend database.  
+A BigQuery DataSource plugin provides support for [BigQuery](https://cloud.google.com/bigquery/) as a backend database.  
 
-### Quick start
-There are multiple ways to install bigquery-grafana go to [INSTALL](https://raw.githubusercontent.com/doitintl/bigquery-grafana/master/INSTALL.md) for more infromation. 
+### Quick Start
+There are multiple ways to install bigquery-grafana. See [INSTALL](https://raw.githubusercontent.com/doitintl/bigquery-grafana/master/INSTALL.md) for more information. 
 
 ### Features:
 
@@ -28,17 +28,17 @@ There are multiple ways to install bigquery-grafana go to [INSTALL](https://raw.
 
 ### Limitations:
 
- * Alerts are not supported yet due to [#6841](https://github.com/grafana/grafana/issues/6841)
+ * Alerts are not yet supported due to [#6841](https://github.com/grafana/grafana/issues/6841)
 
  **Plugin Demo:**
 
  ![plugin demo](https://raw.githubusercontent.com/doitintl/bigquery-grafana/master/img/grafana-bigquery-demo.gif)
 
 
-## Adding the data source to Grafana
+## Adding the DataSource to Grafana
 
 1. Open the side menu by clicking the Grafana icon in the top header.
-2. In the side menu under the `Dashboards` link you should find a link named `Data Sources`.
+2. In the side menu under `Dashboards` you should find a link named `Data Sources`.
 3. Click the `+ Add data source` button in the top header.
 4. Select `BigQuery` from the _Type_ dropdown.
 5. Upload or paste in the Service Account Key file. See below for steps on how to create a Service Account Key file.
@@ -51,9 +51,9 @@ There are multiple ways to install bigquery-grafana go to [INSTALL](https://raw.
 | _Default_             | Default datasource means that it will be pre-selected for new panels.               |
 | _Service Account Key_ | Service Account Key File for a GCP Project. Instructions below on how to create it. |
 
-### Example of provisioning file
+### Example of Provisioning a File
 
-It's possible to manage datasource via [provisioning system](https://grafana.com/docs/administration/provisioning/#datasources). See below example of configuration file.
+You can manage DataSource via [provisioning system](https://grafana.com/docs/administration/provisioning/#datasources). See the example below of a configuration file.
 ```
 apiVersion: 1
 
@@ -78,27 +78,22 @@ datasources:
 
 ## Authentication
 
-There are two ways to authenticate the BigQuery plugin - either by uploading a Google JWT file, or by automatically retrieving credentials from Google metadata server. The latter option is only available when running Grafana on GCE virtual machine.
+There are two ways to authenticate the BigQuery plugin - either by uploading a Google JWT file, or by automatically retrieving credentials from Google's metadata server. The latter is only available when running Grafana on a GCE virtual machine.
 
 ### Using a Google Service Account Key File
 
 To authenticate with the BigQuery API, you need to create a Google Cloud Platform (GCP) Service Account for the Project you want to show data for. A Grafana datasource integrates with one GCP Project. If you want to visualize data from multiple GCP Projects then you can give the service account permissions in each project or  create one datasource per GCP Project.
 
 #### Enable APIs
 
-The following APIs need to be enabled first:
-
-* [BigQuery API](https://console.cloud.google.com/apis/library/bigquery-json.googleapis.com)
-
-
-Click on the links above and click the `Enable` button:
+Go to [BigQuery API](https://console.cloud.google.com/apis/library/bigquery-json.googleapis.com) and `Enable` the API:
 
 ![Enable GCP APIs](https://raw.githubusercontent.com/doitintl/bigquery-grafana/master/img/bigquery_enable_api.png)
 
 #### Create a GCP Service Account for a Project
 
 1. Navigate to the [APIs & Services Credentials page](https://console.cloud.google.com/apis/credentials).
-2. Click on the `Create credentials` dropdown/button and choose the `Service account key` option.
+2. Click on `Create credentials` and choose `Service account key`.
 
     ![](https://raw.githubusercontent.com/doitintl/bigquery-grafana/master/img/createserviceaccountbutton.png)
 3. On the `Create service account key` page, choose key type `JSON`. Then in the `Service Account` dropdown, choose the `New service account` option:
@@ -108,7 +103,7 @@ Click on the links above and click the `Enable` button:
 4. Some new fields will appear. Fill in a name for the service account in the `Service account name` field and then choose the `Monitoring Viewer` role from the `Role` dropdown:
 
     ![](https://raw.githubusercontent.com/doitintl/bigquery-grafana/master/img/bq_service_account_choose_role.png)
-5. Click the Create button. A JSON key file will be created and downloaded to your computer. Store this file in a secure place as it allows access to your BigQuery data.
+5. Click the `Create` button. A JSON key file will be created and downloaded to your computer. Store this file in a secure place as it allows access to your BigQuery data.
 6. Upload it to Grafana on the datasource Configuration page. You can either upload the file or paste in the contents of the file.
 
    ![](https://raw.githubusercontent.com/doitintl/bigquery-grafana/master/img/bq__grafana_upload_key.png)
@@ -131,12 +126,12 @@ Read more about creating and enabling service accounts for GCE VM instances [her
 
 The build works with Yarn:
 
-#### Development build
+#### Development Build
 ```
 yarn run build:dev
 ```
 
-#### Production build
+#### Production Build
 ```
 yarn run build:prod
 ```

dist/module.js.map

@@ -170,8 +170,8 @@ export class BigQueryDatasource {
         (await this.getDefaultProject());
     })();
     this.mixpanel = require("mixpanel-browser");
-    this.mixpanel.init("86fa5c838013959cc6867dc884958f7e");
     if (this.jsonData.sendUsageData !== false) {
+      this.mixpanel.init("86fa5c838013959cc6867dc884958f7e");
       this.mixpanel.track("datasource.create");
     }
   }
@@ -478,6 +478,9 @@ export class BigQueryDatasource {
         if (maxRetries > 0) {
           return this.doQueryRequest(query, requestId, maxRetries - 1);
         }
+        if (error.cancelled === true) {
+          return [];
+        }
         return BigQueryDatasource._handleError(error);
       });
   }