fix conflicts

Author: LiorRacer

doitintl-bigquery-datasource-2.0.1.zip

@@ -27,7 +27,11 @@ Add the below to your values.yaml
 ## Pass the plugins you want installed as a list.
 ##
 plugins:
-  - https://github.com/doitintl/bigquery-grafana/archive/1.0.8.zip;doit-bigquery-datasource
+  - https://github.com/doitintl/bigquery-grafana/archive/2.0.0.zip;doit-bigquery-datasource
+
+grafana.ini:
+  plugins:
+    allow_loading_unsigned_plugins: doitintl-bigquery-datasource
 ...
 ```
 

INSTALL.md

@@ -9,17 +9,17 @@ Hash: SHA512
   "signedByOrgName": "DoiT International",
   "plugin": "doitintl-bigquery-datasource",
   "version": "2.0.1",
-  "time": 1607954553807,
+  "time": 1607956447803,
   "keyId": "7e4d0c6a708866e7",
   "files": {
     "LICENSE.md": "b40d79313086aafb7ab31bf033798850a20ff52daf52f9dba84f6ef169e326b2",
     "doitintl-bigquery-datasource_darwin_amd64": "89d3c1769d56208894555aaeb428d4d81d227d134d521cebdf1a3ea36333f93c",
-    "module.js.map": "fa06a8f81f03b06129bbc093a4c54f28d0d37b6e256134b7959a42cebfc40cc8",
+    "module.js.map": "850a6e4547db7b738abb14f8d40b0ec840ca07734708e087883cf4e597121ceb",
     "doitintl-bigquery-datasource_windows_amd64.exe": "89d3c1769d56208894555aaeb428d4d81d227d134d521cebdf1a3ea36333f93c",
     "plugin.json": "198f8a869a085aefecfd17d3eb40166a54df2ed113fad4408ac67ddb4019f215",
     "README.md": "2c54953a9adbfd16ac4cc4ee4de052dc1895892416713cd9626a0e353e5e2047",
     "img/logo.png": "dcd9277d3dfc4e412dc006a000d0ee5b9ff4d9f126687a01f189cea9987e2bfa",
-    "module.js": "75f602d9feb799add56ae4f597aa9f803bb10ab233abfbd614574f1cadf4a165",
+    "module.js": "e5deffe8848b7c966f55050587f7714f12a4ffa12e987d213a1baa01c61b1db9",
     "partials/annotations.editor.html": "c8b36fe73e7c3b13df4db94153ebd820a9bec4104c1b179db92d64dcdcf04156",
     "partials/query.editor.html": "23a40ae6a4a3e2dfa32bee8f5cc963c447750e9752a46e5aced85e6d7f70d6e5",
     "partials/config.html": "31cadbac85238e8a0cb8e4766fc20329cda9d918b4140e6130626cb3631dbe8d",
@@ -30,9 +30,9 @@ Hash: SHA512
 Version: OpenPGP.js v4.10.1
 Comment: https://openpgpjs.org
 
-wqAEARMKAAYFAl/XcHkACgkQfk0ManCIZufGwAII8P9G86ZgjXW4aMfhKo30
-lCBurUib6jcYHV5z4mIik5FZ97yFnxXG0VqkI+5SpYtVH7nIuh9i+RGILU7S
-iHfTZIkCCI1SaNesvYBKUvDyr/ykgmeiiC0YedAl5ycfJGHJkAnYUnM6/Vyh
-D7424b4HKYdT7ZQMM10VCXDMEkduCTb3uxXP
-=CzU5
+wqEEARMKAAYFAl/Xd98ACgkQfk0ManCIZudNRwIIj0r5euochQC/cihenY8A
+WUocEkHTCgvWHW2klOAQAEFGkW1DQbpjUCEatvXn04CYDGSQrhbDOba4O72t
+/19kAiUCCQGiWfeSMR3bT0uERc/ru2CHVoXasu1weUGKHNusP/cRzLe7Jeuz
+hf0IV415nwN9zEzuOVm1JGKMG1niqloIWx8ttA==
+=8Fzc
 -----END PGP SIGNATURE-----

dist/MANIFEST.txt

@@ -60,27 +60,35 @@ export class BigQueryQueryCtrl extends QueryCtrl {
       { text: 'DESC', value: '2' },
     ];
     this.locations = [
+      // Multi-regional locations
       { text: 'United States (US)', value: 'US' },
       { text: 'European Union (EU)', value: 'EU' },
+      // Americas
+      { text: 'Las Vegas (us-west4)', value: 'us-west4' },
       { text: 'Los Angeles (us-west2)', value: 'us-west2' },
-      {
-        text: 'Montréal (northamerica-northeast1)',
-        value: 'northamerica-northeast1',
-      },
-      { text: 'South Carolina (us-east1)', value: 'us-east1' },
+      { text: 'Montréal (northamerica-northeast1)', value: 'northamerica-northeast1' },
       { text: 'Northern Virginia (us-east4)', value: 'us-east4' },
+      { text: 'Oregon (us-west1)', value: 'us-west1' },
+      { text: 'Salt Lake City (us-west3)', value: 'us-west3' },
       { text: 'São Paulo (southamerica-east1)', value: 'southamerica-east1' },
+      { text: 'South Carolina (us-east1)', value: 'us-east1' },
+      // Europe
+      { text: 'Belgium (europe-west1)', value: 'europe-west1' },
       { text: 'Finland (europe-north1)', value: 'europe-north1' },
-      { text: 'London (europe-west2)', value: 'europe-west2' },
       { text: 'Frankfurt (europe-west3)', value: 'europe-west3' },
+      { text: 'London (europe-west2)', value: 'europe-west2' },
+      { text: 'Netherlands (europe-west4)', value: 'europe-west4' },
       { text: 'Zürich (europe-west6)', value: 'europe-west6' },
+      // Asia Pacific
       { text: 'Hong Kong (asia-east2)', value: 'asia-east2' },
+      { text: 'Jakarta (asia-southeast2)', value: 'asia-southeast2' },
       { text: 'Mumbai (asia-south1)', value: 'asia-south1' },
       { text: 'Osaka (asia-northeast2)', value: 'asia-northeast2' },
-      { text: 'Taiwan (asia-east1)', value: 'asia-east1' },
-      { text: 'Tokyo (asia-northeast1)', value: 'asia-northeast1' },
+      { text: 'Seoul (asia-northeast3)', value: 'asia-northeast3' },
       { text: 'Singapore (asia-southeast1)', value: 'asia-southeast1' },
       { text: 'Sydney (australia-southeast1)', value: 'australia-southeast1' },
+      { text: 'Taiwan (asia-east1)', value: 'asia-east1' },
+      { text: 'Tokyo (asia-northeast1)', value: 'asia-northeast1' },
     ];
     if (!this.target.rawSql) {
       // special handling when in table panel
@@ -126,14 +134,14 @@ export class BigQueryQueryCtrl extends QueryCtrl {
 
   public updateProjection() {
     this.selectParts = _.map(this.target.select, (parts: any) => {
-      return _.map(parts, sqlPart.create).filter((n) => n);
+      return _.map(parts, sqlPart.create).filter(n => n);
     });
-    this.whereParts = _.map(this.target.where, sqlPart.create).filter((n) => n);
-    this.groupParts = _.map(this.target.group, sqlPart.create).filter((n) => n);
+    this.whereParts = _.map(this.target.where, sqlPart.create).filter(n => n);
+    this.groupParts = _.map(this.target.group, sqlPart.create).filter(n => n);
   }
 
   public updatePersistedParts() {
-    this.target.select = _.map(this.selectParts, (selectParts) => {
+    this.target.select = _.map(this.selectParts, selectParts => {
       return _.map(selectParts, (part: any) => {
         return {
           datatype: part.datatype,
@@ -279,8 +287,8 @@ export class BigQueryQueryCtrl extends QueryCtrl {
     this.target.partitioned = false;
     this.target.partitionedField = '';
     this.target.table = this.tableSegment.value;
-    this.tablesDataPromise.then((value) => {
-      value.forEach((v) => {
+    this.tablesDataPromise.then(value => {
+      value.forEach(v => {
         if (v.text === this.target.table) {
           const partitioned = v.value.indexOf('__partitioned');
           if (partitioned > -1) {
@@ -306,7 +314,7 @@ export class BigQueryQueryCtrl extends QueryCtrl {
     this.metricColumnSegment.value = segment.value;
     this.target.metricColumn = 'none';
 
-    const task1 = this.getTimeColumnSegments().then((result) => {
+    const task1 = this.getTimeColumnSegments().then(result => {
       // check if time column is still valid
       if (result.length > 0 && !_.find(result, (r: any) => r.text === this.target.timeColumn)) {
         this.timeColumnSegment.html = this.uiSegmentSrv.newSegment(result[0].text).html;
@@ -315,7 +323,7 @@ export class BigQueryQueryCtrl extends QueryCtrl {
       return this.timeColumnChanged(false);
     });
 
-    const task2 = this.getValueColumnSegments().then((result) => {
+    const task2 = this.getValueColumnSegments().then(result => {
       if (result.length > 0) {
         this.target.select = [[{ type: 'column', params: [result[0].text] }]];
         this.updateProjection();
@@ -377,8 +385,8 @@ export class BigQueryQueryCtrl extends QueryCtrl {
   }
 
   public transformToSegments(config) {
-    return (results) => {
-      const segments = _.map(results, (segment) => {
+    return results => {
+      const segments = _.map(results, segment => {
         return this.uiSegmentSrv.newSegment({
           value: segment.text,
           expandable: segment.expandable,
@@ -449,7 +457,7 @@ export class BigQueryQueryCtrl extends QueryCtrl {
       partModel.params[0] = subItem.value;
     }
     let addAlias = false;
-    const _addAlias = function () {
+    const _addAlias = function() {
       return !_.find(selectParts, (p: any) => p.def.type === 'alias');
     };
     switch (partType) {
@@ -606,13 +614,13 @@ export class BigQueryQueryCtrl extends QueryCtrl {
     this._setGroupParts(partType, value);
     // add aggregates when adding group by
     for (const selectParts of this.selectParts) {
-      if (!selectParts.some((part) => part.def.type === 'aggregate')) {
+      if (!selectParts.some(part => part.def.type === 'aggregate')) {
         const aggregate = sqlPart.create({
           params: ['avg'],
           type: 'aggregate',
         });
         selectParts.splice(1, 0, aggregate);
-        if (!selectParts.some((part) => part.def.type === 'alias')) {
+        if (!selectParts.some(part => part.def.type === 'alias')) {
           const alias = sqlPart.create({
             params: [selectParts[0].part.params[0]],
             type: 'alias',
@@ -725,7 +733,7 @@ export class BigQueryQueryCtrl extends QueryCtrl {
 
   public getGroupOptions() {
     return this.getMetricColumnSegments()
-      .then((tags) => {
+      .then(tags => {
         const options = [];
         if (!this.queryModel.hasTimeGroup()) {
           options.push(
@@ -782,7 +790,7 @@ export class BigQueryQueryCtrl extends QueryCtrl {
     let res = '';
     await this.datasource
       .getTableFields(this.target.project, this.target.dataset, this.target.table, ['DATE', 'TIMESTAMP', 'DATETIME'])
-      .then((result) => {
+      .then(result => {
         for (const f of result) {
           if (f.text === this.target.timeColumn) {
             res = f.value;