Merge pull request #291 from doitintl/feature/lior/bqalert

Migrate to eslint

Author: LiorRacer

package.json

@@ -36,16 +36,19 @@
     "@types/grafana": "https://git@github.com/CorpGlory/types-grafana.git",
     "@types/jest": "^24.0.11",
     "@types/lodash-es": "^4.17.3",
+    "@typescript-eslint/eslint-plugin": "^4.10.0",
+    "@typescript-eslint/parser": "^4.10.0",
     "babel-core": "^6.26.3",
     "babel-jest": "^24.5.0",
     "babel-loader": "^8.0.4",
     "babel-preset-env": "^1.7.0",
     "clean-webpack-plugin": "^1.0.1",
     "codecov": "^3.2.0",
     "copy-webpack-plugin": "^5.1.1",
+    "eslint": "^7.15.0",
     "googleapis": "^49.0.0",
     "grafana-sdk-mocks": "github:grafana/grafana-sdk-mocks",
-    "jest": "^26.0.1",
+    "jest": "^24.0.1",
     "ng-annotate-webpack-plugin": "^0.3.0",
     "plugin-typescript": "^8.0.0",
     "prettier": "^1.19.1",

src/bigquery_query.ts

@@ -323,7 +323,7 @@ export default class BigQueryQuery {
       }
       overParts.push('ORDER BY ' + this.buildTimeColumn(false));
       const over = overParts.join(' ');
-      let curr = query;
+      const curr = query;
       let prev: string;
       const tmpval = query;
       switch (windows.type) {

src/datasource.ts

@@ -478,8 +478,8 @@ export class BigQueryDatasource {
   private setUpPartition(query, isPartitioned, partitionedField, options) {
     partitionedField = partitionedField ? partitionedField : '_PARTITIONTIME';
     if (isPartitioned && !query.match(partitionedField)) {
-      let fromD = BigQueryQuery.convertToUtc(options.range.from._d);
-      let toD = BigQueryQuery.convertToUtc(options.range.to._d);
+      const fromD = BigQueryQuery.convertToUtc(options.range.from._d);
+      const toD = BigQueryQuery.convertToUtc(options.range.to._d);
       const from = `${partitionedField} >= '${BigQueryQuery.formatDateToString(fromD, '-', true)}'`;
       const to = `${partitionedField} < '${BigQueryQuery.formatDateToString(toD, '-', true)}'`;
       const partition = `where ${from} AND ${to} AND `;

src/query_ctrl.ts

@@ -345,8 +345,7 @@ export class BigQueryQueryCtrl extends QueryCtrl {
   public async timeColumnChanged(refresh?: boolean) {
     this.target.timeColumn = this.timeColumnSegment.value;
     this.target.timeColumnType = await this._getDateFieldType();
-    let partModel;
-    partModel = sqlPart.create({
+    const partModel = sqlPart.create({
       name: '$__timeFilter',
       params: [],
       type: 'macro',

src/response_parser.ts

@@ -197,9 +197,9 @@ export default class ResponseParser {
       });
     }
     const rows = [];
-    each(results.rows, (ser) => {
+    each(results.rows, ser => {
       const r = [];
-      each(ser, (v) => {
+      each(ser, v => {
         for (let i = 0; i < v.length; i++) {
           const val = v[i].v ? ResponseParser._convertValues(v[i].v, columns[i].type) : '';
           r.push(val);
@@ -220,7 +220,7 @@ export default class ResponseParser {
       res.push(row.f[0].v);
     }
 
-    return _.map(res, (value) => {
+    return _.map(res, value => {
       return { text: value };
     });
   }

src/specs/bigquery_query.test.ts

@@ -49,9 +49,9 @@ describe('BigQueryQuery', () => {
     const query = new BigQueryQuery({}, templateSrv);
     expect(query.buildMetricColumn()).toBe('');
     query.target.metricColumn = 'host';
-    expect(query.buildMetricColumn()).toBe('CAST (`host` AS String ) AS metric');
+    expect(query.buildMetricColumn()).toBe('`host` AS metric');
     query.target.metricColumn = '"host"';
-    expect(query.buildMetricColumn()).toBe('CAST (`"host"` AS String ) AS metric');
+    expect(query.buildMetricColumn()).toBe('`"host"` AS metric');
   });
 
   describe('When generating value column SQL', () => {
@@ -225,7 +225,7 @@ describe('BigQueryQuery', () => {
 
     query.target.metricColumn = 'm';
     result =
-      '#standardSQL\nSELECT\n `t` AS time,\n  CAST (`m` AS String ) AS metric,\n  `value`\nFROM `undefined.undefined.table`\nGROUP BY 1,2,3 \nORDER BY 1,2';
+      '#standardSQL\nSELECT\n `t` AS time,\n  `m` AS metric,\n  `value`\nFROM `undefined.undefined.table`\nGROUP BY 1,2,3 \nORDER BY 1,2';
     expect(query.buildQuery()).toBe(result);
   });
 

src/specs/datasource.test.ts

@@ -136,15 +136,15 @@ describe('BigQueryDatasource', () => {
     });
 
     it('should return expected data batch api', async () => {
-      let priority = 'BATCH';
+      const priority = 'BATCH';
       await ctx.ds.doQuery('select * from table', 'id-1', priority).then(data => {
         results = data;
       });
       expect(results.rows.length).toBe(3);
       expect(results.schema.fields.length).toBe(2);
     });
     it('should return expected data interactive', async () => {
-      let priority = 'INTERACTIVE';
+      const priority = 'INTERACTIVE';
       await ctx.ds.doQuery('select * from table', 'id-1', priority).then(data => {
         results = data;
       });
@@ -153,7 +153,7 @@ describe('BigQueryDatasource', () => {
     });
 
     it('should return expected data interactive', async () => {
-      let priority = 'INTERACTIVE';
+      const priority = 'INTERACTIVE';
       await ctx.ds.doQueryRequest('select * from table', 'id-1', priority).then(data => {
         results = data;
       });
@@ -868,11 +868,11 @@ describe('BigQueryDatasource', () => {
           mode: 'NULLABLE',
         },
       ];
-      let options = { annotation: {} };
-      let data = { data: { schema: { fields } } };
-      let p = new Promise((reject, resolve) => {});
-      let rp = new ResponseParser(p);
-      let list = rp.transformAnnotationResponse(options, data);
+      const options = { annotation: {} };
+      const data = { data: { schema: { fields } } };
+      const p = new Promise((reject, resolve) => { });
+      const rp = new ResponseParser(p);
+      const list = rp.transformAnnotationResponse(options, data);
       expect(list.length).toBe(0);
     });
     it('transformAnnotationResponse empty results without rows', () => {
@@ -893,55 +893,55 @@ describe('BigQueryDatasource', () => {
           mode: 'NULLABLE',
         },
       ];
-      let options = { annotation: {} };
-      let data = { data: { schema: { fields } } };
-      let p = new Promise((reject, resolve) => {});
-      let rp = new ResponseParser(p);
-      let list = rp.transformAnnotationResponse(options, data);
+      const options = { annotation: {} };
+      const data = { data: { schema: { fields } } };
+      const p = new Promise((reject, resolve) => { });
+      const rp = new ResponseParser(p);
+      const list = rp.transformAnnotationResponse(options, data);
       expect(list.length).toBe(0);
     });
     it('transformAnnotationResponse results with 3 rows', () => {
       const rows = [
-          {
-            f: [
-              {
-                v: '1.521578851E9',
-              },
-              {
-                v: '37.7753058',
-              },
-              {
-                v: '42.7753058',
-              },
-            ],
-          },
-          {
-            f: [
-              {
-                v: '1.521578916E9',
-              },
-              {
-                v: '37.3322326',
-              },
-              {
-                v: '42.7753058',
-              },
-            ],
-          },
-          {
-            f: [
-              {
-                v: '1.521578927E9',
-              },
-              {
-                v: '37.781752',
-              },
-              {
-                v: '42.7753058',
-              },
-            ],
-          },
-        ],
+        {
+          f: [
+            {
+              v: '1.521578851E9',
+            },
+            {
+              v: '37.7753058',
+            },
+            {
+              v: '42.7753058',
+            },
+          ],
+        },
+        {
+          f: [
+            {
+              v: '1.521578916E9',
+            },
+            {
+              v: '37.3322326',
+            },
+            {
+              v: '42.7753058',
+            },
+          ],
+        },
+        {
+          f: [
+            {
+              v: '1.521578927E9',
+            },
+            {
+              v: '37.781752',
+            },
+            {
+              v: '42.7753058',
+            },
+          ],
+        },
+      ],
         fields = [
           {
             name: 'time',
@@ -959,11 +959,11 @@ describe('BigQueryDatasource', () => {
             mode: 'NULLABLE',
           },
         ];
-      let options = { annotation: {} };
-      let data = { data: { schema: { fields }, rows } };
-      let p = new Promise((reject, resolve) => {});
-      let rp = new ResponseParser(p);
-      let list = rp.transformAnnotationResponse(options, data);
+      const options = { annotation: {} };
+      const data = { data: { schema: { fields }, rows } };
+      const p = new Promise((reject, resolve) => { });
+      const rp = new ResponseParser(p);
+      const list = rp.transformAnnotationResponse(options, data);
       expect(list.length).toBe(3);
     });
   });

src/sql_part.ts

@@ -17,6 +17,7 @@ export class SqlPartDef {
     } else {
       this.label = this.type[0].toUpperCase() + this.type.substring(1) + ':';
     }
+    
     this.style = options.style;
     if (this.style === 'function') {
       this.wrapOpen = '(';