Run Prettier

Author: amotl

src/data_formatter.test.ts

@@ -164,43 +164,38 @@ describe('DataFormatter', () => {
   });
 
   describe('when some fields are given in table data', () => {
-
     const data: any[] = [];
 
     beforeEach(() => {
-
       jQuery.extend(ctrl, {
         panel: {
-          tableQueryOptions: {
-          },
+          tableQueryOptions: {},
         },
       });
 
       const tableData = [
         [
           {
-            foo: "42.42",
+            foo: '42.42',
             bar: 42.42,
           },
           {
-            foo: "43.43",
+            foo: '43.43',
             bar: 43.43,
           },
         ],
       ];
 
       const dataFormatter = new DataFormatter(ctrl);
       dataFormatter.setTableValues(tableData, data);
-
     });
 
     it('the fields should be available within transformed data', () => {
-      expect(data[0].__field_foo).toEqual("42.42");
+      expect(data[0].__field_foo).toEqual('42.42');
       expect(data[0].__field_bar).toEqual(42.42);
-      expect(data[1].__field_foo).toEqual("43.43");
+      expect(data[1].__field_foo).toEqual('43.43');
       expect(data[1].__field_bar).toEqual(43.43);
     });
-
   });
 
   describe('when the time series data matches the location', () => {
@@ -345,11 +340,9 @@ describe('DataFormatter', () => {
   });
 
   describe('when elasticsearch geohash query result is in table format', () => {
-
     const data: any[] = [];
 
     beforeEach(() => {
-
       jQuery.extend(ctrl, {
         panel: {
           esGeoPoint: 'geopoint',
@@ -361,52 +354,33 @@ describe('DataFormatter', () => {
 
       const esdata = [
         {
-          'type': 'table',
-          'columns': [
-            {text: 'geopoint'},
-            {text: 'metric'},
-            {text: 'foo'},
-            {text: 'bar'},
-          ],
-          'rows': [
-            [
-              'u0wt6pv2qqhz',
-              123.45,
-              "42.42",
-              42.42,
-            ],
-            [
-              'u33dbm6duz90',
-              67.890,
-              "43.43",
-              43.43,
-            ],
+          type: 'table',
+          columns: [{ text: 'geopoint' }, { text: 'metric' }, { text: 'foo' }, { text: 'bar' }],
+          rows: [
+            ['u0wt6pv2qqhz', 123.45, '42.42', 42.42],
+            ['u33dbm6duz90', 67.89, '43.43', 43.43],
           ],
         },
       ];
 
       const dataFormatter = new DataFormatter(ctrl);
       dataFormatter.setGeohashValues(esdata, data);
-
     });
 
     it('the fields should be available within transformed data', () => {
       expect(data[0].value).toEqual(123.45);
-      expect(data[0].__field_foo).toEqual("42.42");
+      expect(data[0].__field_foo).toEqual('42.42');
       expect(data[0].__field_bar).toEqual(42.42);
-      expect(data[1].value).toEqual(67.890);
-      expect(data[1].__field_foo).toEqual("43.43");
+      expect(data[1].value).toEqual(67.89);
+      expect(data[1].__field_foo).toEqual('43.43');
       expect(data[1].__field_bar).toEqual(43.43);
     });
-
   });
 
   describe('when elasticsearch geohash query result is in timeseries format', () => {
-
     const data: any[] = [];
 
     beforeEach(() => {
-
       jQuery.extend(ctrl, {
         panel: {
           esGeoPoint: 'geopoint',
@@ -418,17 +392,17 @@ describe('DataFormatter', () => {
 
       const esdata = [
         {
-          'datapoints': [
+          datapoints: [
             {
               geopoint: 'u0wt6pv2qqhz',
               metric: 123.45,
-              foo: "42.42",
+              foo: '42.42',
               bar: 42.42,
             },
             {
               geopoint: 'u33dbm6duz90',
-              metric: 67.890,
-              foo: "43.43",
+              metric: 67.89,
+              foo: '43.43',
               bar: 43.43,
             },
           ],
@@ -437,22 +411,19 @@ describe('DataFormatter', () => {
 
       const dataFormatter = new DataFormatter(ctrl);
       dataFormatter.setGeohashValues(esdata, data);
-
     });
 
     it('the fields should be available within transformed data', () => {
       expect(data[0].value).toEqual(123.45);
-      expect(data[0].__field_foo).toEqual("42.42");
+      expect(data[0].__field_foo).toEqual('42.42');
       expect(data[0].__field_bar).toEqual(42.42);
-      expect(data[1].value).toEqual(67.890);
-      expect(data[1].__field_foo).toEqual("43.43");
+      expect(data[1].value).toEqual(67.89);
+      expect(data[1].__field_foo).toEqual('43.43');
       expect(data[1].__field_bar).toEqual(43.43);
     });
-
   });
 
   afterEach(() => {
     formattedData = [];
   });
-
 });

src/data_formatter.ts

@@ -204,7 +204,7 @@ export default class DataFormatter {
             const dataValue = this.createDataValue(encodedGeohash, decodedGeohash, locationName, value, link);
 
             // Add all values from the original datapoint as attributes prefixed with `__field_`.
-            for (let columnName in columnNames) {
+            for (const columnName in columnNames) {
               const value = row[columnNames[columnName]];
               const key = '__field_' + columnName;
               dataValue[key] = value;

src/worldmap.test.ts

@@ -3,7 +3,7 @@ import { createBasicMap } from '../test/map_builder';
 import $ from 'jquery';
 import PluginSettings from './settings';
 import { TemplateSrv } from 'grafana/app/features/templating/template_srv';
-import DataFormatter from "./data_formatter";
+import DataFormatter from './data_formatter';
 
 describe('Worldmap', () => {
   let worldMap;
@@ -462,7 +462,6 @@ describe('WorldmapFoundation', () => {
 });
 
 function setupInteractionMocks() {
-
   // Setup interaction mock for "window.location.assign".
   // https://remarkablemark.org/blog/2018/11/17/mock-window-location/
   Object.defineProperty(window.location, 'assign', {
@@ -471,11 +470,10 @@ function setupInteractionMocks() {
   window.location.assign = jest.fn();
 
   // Setup interaction mock for "window.open".
-  Object.defineProperty(window, 'open',{
+  Object.defineProperty(window, 'open', {
     configurable: true,
   });
   window.open = jest.fn();
-
 }
 
 describe('ClickthroughLinks', () => {
@@ -502,7 +500,7 @@ describe('ClickthroughLinks', () => {
             return value;
           }
         }
-      })
+      });
     },
   } as unknown) as TemplateSrv;
 
@@ -535,15 +533,13 @@ describe('ClickthroughLinks', () => {
     });
 
     it('should do its job when actually clicked', () => {
-
       // Prepare interaction with window object.
       setupInteractionMocks();
 
       // Capture interaction.
       worldMap.circles[0].fire('click');
       expect(window.location.assign).toHaveBeenCalledWith('http://foo.bar');
     });
-
   });
 
   describe('when a Worldmap is created with clickthrough-links enabled to another window', () => {
@@ -565,20 +561,17 @@ describe('ClickthroughLinks', () => {
     });
 
     it('should do its job when actually clicked', () => {
-
       // Prepare interaction with window object.
       setupInteractionMocks();
 
       // Capture interaction.
       worldMap.circles[0].fire('click');
       expect(window.open).toHaveBeenCalledWith('http://foo.bar', 'test');
     });
-
   });
 
   describe('when using fields with clickthrough-links on table data', () => {
     beforeEach(() => {
-
       // Create map.
       ctrl.panel.clickthroughUrl = 'http://foo.bar/?foo=$__field_foo&value=$value';
 
@@ -606,7 +599,7 @@ describe('ClickthroughLinks', () => {
             longitude: 18,
             metric: 123.456,
 
-            foo: "42.42",
+            foo: '42.42',
             bar: 42.42,
           },
           {
@@ -616,7 +609,7 @@ describe('ClickthroughLinks', () => {
             longitude: 8,
             metric: 45.678,
 
-            foo: "43.43",
+            foo: '43.43',
             bar: 43.43,
           },
         ],
@@ -631,7 +624,6 @@ describe('ClickthroughLinks', () => {
       // Draw circles.
       ctrl.data = data;
       worldMap.drawCircles();
-
     });
 
     it('the fields within transformed data should interpolate well into clickthrough links', () => {
@@ -642,7 +634,5 @@ describe('ClickthroughLinks', () => {
       worldMap.circles[0].fire('click');
       expect(window.location.assign).toHaveBeenCalledWith('http://foo.bar/?foo=42.42&value=123.456');
     });
-
   });
-
 });