Merge pull request #34 from grafadruid/grafana74

updates for grafana 4.0
grafadruid · Feb 7, 2021 · 783e02d · 783e02d
2 parents 631823e + 6dfe907
commit 783e02d
Show file tree

Hide file tree

Showing 68 changed files with 1,867 additions and 2,420 deletions.
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -1,3 +1,3 @@
 module.exports = {
-  ...require("./node_modules/@grafana/toolkit/src/config/prettier.plugin.config.json"),
-};
+  ...require('./node_modules/@grafana/toolkit/src/config/prettier.plugin.config.json'),
+};
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -120,7 +120,7 @@ services:
     restart: always
 
   grafana:
-    image: grafana/grafana:7.3.6
+    image: grafana/grafana:7.4.0
     container_name: grafana
     user: root
     volumes:

diff --git a/package.json b/package.json
@@ -11,10 +11,10 @@
   "author": "Grafadruid",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@grafana/data": "7.3.6",
-    "@grafana/runtime": "7.3.6",
-    "@grafana/toolkit": "7.3.6",
-    "@grafana/ui": "7.3.6",
+    "@grafana/data": "7.4.0",
+    "@grafana/runtime": "7.4.0",
+    "@grafana/toolkit": "7.4.0",
+    "@grafana/ui": "7.4.0",
     "@types/lodash": "latest"
   },
   "engines": {

diff --git a/src/ConfigEditor.tsx b/src/ConfigEditor.tsx
@@ -26,7 +26,7 @@ export class ConfigEditor extends PureComponent<Props, State> {
 
   normalizeData = (data: Record<string, any>, namespaced: boolean, namespace: string): object => {
     const keyPrefix = namespace + '.';
-    const keys = Object.keys(data).filter(key => {
+    const keys = Object.keys(data).filter((key) => {
       if (namespaced) {
         return !key.includes('.');
       } else {
@@ -60,9 +60,11 @@ export class ConfigEditor extends PureComponent<Props, State> {
     const jsonData = { ...options.jsonData, ...connectionSettings };
     const connectionSecretSettings = this.normalizeData(secretSettings, true, 'connection');
     const secureJsonData = { ...options.secureJsonData, ...connectionSecretSettings };
-    const connectionSecretSettingsFields = this.normalizeData(secretSettingsFields, true, 'connection') as KeyValue<
-      boolean
-    >;
+    const connectionSecretSettingsFields = this.normalizeData(
+      secretSettingsFields,
+      true,
+      'connection'
+    ) as KeyValue<boolean>;
     const secureJsonFields = { ...options.secureJsonFields, ...connectionSecretSettingsFields };
     onOptionsChange({ ...options, jsonData, secureJsonData, secureJsonFields });
   };
@@ -114,7 +116,7 @@ export class ConfigEditor extends PureComponent<Props, State> {
     return (
       <>
         <TabsBar>
-          {tabs.map(t => (
+          {tabs.map((t) => (
             <Tab
               key={t.value}
               label={t.label}
@@ -124,7 +126,7 @@ export class ConfigEditor extends PureComponent<Props, State> {
             />
           ))}
         </TabsBar>
-        <TabContent>{tabs.find(t => t.value === activeTab)?.content}</TabContent>
+        <TabContent>{tabs.find((t) => t.value === activeTab)?.content}</TabContent>
       </>
     );
   }

diff --git a/src/DruidDataSource.ts b/src/DruidDataSource.ts
@@ -20,7 +20,7 @@ export class DruidDataSource extends DataSourceWithBackend<DruidQuery, DruidSett
     });
   }
   async metricFindQuery(query: DruidQuery, options?: any): Promise<MetricFindValue[]> {
-    return this.postResource('query-variable', this.applyTemplateVariables(query)).then(response => {
+    return this.postResource('query-variable', this.applyTemplateVariables(query)).then((response) => {
       return response;
     });
   }

diff --git a/src/QueryEditor.tsx b/src/QueryEditor.tsx
@@ -90,7 +90,7 @@ export class QueryEditor extends PureComponent<Props, State> {
     return (
       <>
         <TabsBar>
-          {tabs.map(t => (
+          {tabs.map((t) => (
             <Tab
               key={t.value}
               label={t.label}
@@ -100,7 +100,7 @@ export class QueryEditor extends PureComponent<Props, State> {
             />
           ))}
         </TabsBar>
-        <TabContent>{tabs.find(t => t.value === activeTab)?.content}</TabContent>
+        <TabContent>{tabs.find((t) => t.value === activeTab)?.content}</TabContent>
       </>
     );
   }

diff --git a/src/VariableQueryEditor.tsx b/src/VariableQueryEditor.tsx
@@ -85,7 +85,7 @@ export class VariableQueryEditor extends PureComponent<Props, State> {
     return (
       <>
         <TabsBar>
-          {tabs.map(t => (
+          {tabs.map((t) => (
             <Tab
               key={t.value}
               label={t.label}
@@ -95,7 +95,7 @@ export class VariableQueryEditor extends PureComponent<Props, State> {
             />
           ))}
         </TabsBar>
-        <TabContent>{tabs.find(t => t.value === activeTab)?.content}</TabContent>
+        <TabContent>{tabs.find((t) => t.value === activeTab)?.content}</TabContent>
       </>
     );
   }

diff --git a/src/builder/aggregation/Aggregation.tsx b/src/builder/aggregation/Aggregation.tsx
@@ -131,7 +131,7 @@ export class Aggregation extends PureComponent<QueryBuilderProps, State> {
   };
 
   selectOptionByValue = (value: string): SelectableValue<string> | null => {
-    const options = this.selectOptions.filter(option => option.value === value.toLowerCase());
+    const options = this.selectOptions.filter((option) => option.value === value.toLowerCase());
     if (options.length > 0) {
       return options[0];
     }

diff --git a/src/builder/aggregation/Cardinality.tsx b/src/builder/aggregation/Cardinality.tsx
@@ -42,7 +42,7 @@ const ComponentRow: FC<ComponentRowProps> = ({ index, component, props, onRemove
   return (
     <div className={styles.layout}>
       <Component {...props} />
-      <Button variant="secondary" size="xs" onClick={_e => onRemove(index)}>
+      <Button variant="secondary" size="xs" onClick={(_e) => onRemove(index)}>
         <Icon name="trash-alt" />
       </Button>
     </div>

diff --git a/src/builder/aggregation/Histogram.tsx b/src/builder/aggregation/Histogram.tsx
@@ -64,7 +64,7 @@ export class Histogram extends PureComponent<QueryBuilderProps> {
   selectOptions = (component: string, opts: Array<SelectableValue<number>>) => {
     const { options, onOptionsChange } = this.props;
     const { builder } = options;
-    builder[component] = opts.map(o => o.value);
+    builder[component] = opts.map((o) => o.value);
     this.multiSelectOptions[component] = this.buildMultiSelectOptions(builder[component]);
     onOptionsChange({ ...options, builder });
   };

diff --git a/src/builder/aggregation/Javascript.tsx b/src/builder/aggregation/Javascript.tsx
@@ -60,7 +60,7 @@ export class Javascript extends PureComponent<QueryBuilderProps> {
   selectOptions = (opts: Array<SelectableValue<string>>) => {
     const { options, onOptionsChange } = this.props;
     const { builder } = options;
-    builder.fieldNames = opts.map(o => o.value);
+    builder.fieldNames = opts.map((o) => o.value);
     this.multiSelectOptions = this.buildMultiSelectOptions(builder.fieldNames);
     onOptionsChange({ ...options, builder });
   };

diff --git a/src/builder/bound/Bound.tsx b/src/builder/bound/Bound.tsx
@@ -69,7 +69,7 @@ export class Bound extends PureComponent<QueryBuilderProps, State> {
   };
 
   selectOptionByValue = (value: string): SelectableValue<string> | null => {
-    const options = this.selectOptions.filter(option => option.value === value.toLowerCase());
+    const options = this.selectOptions.filter((option) => option.value === value.toLowerCase());
     if (options.length > 0) {
       return options[0];
     }

diff --git a/src/builder/bound/Radius.tsx b/src/builder/bound/Radius.tsx
@@ -64,7 +64,7 @@ export class Radius extends PureComponent<QueryBuilderProps> {
   selectOptions = (component: string, opts: Array<SelectableValue<number>>) => {
     const { options, onOptionsChange } = this.props;
     const { builder } = options;
-    builder[component] = opts.map(o => o.value);
+    builder[component] = opts.map((o) => o.value);
     this.multiSelectOptions[component] = this.buildMultiSelectOptions(builder[component]);
     onOptionsChange({ ...options, builder });
   };

diff --git a/src/builder/bound/Rectangular.tsx b/src/builder/bound/Rectangular.tsx
@@ -56,7 +56,7 @@ export class Rectangular extends PureComponent<QueryBuilderProps> {
   selectOptions = (component: string, opts: Array<SelectableValue<number>>) => {
     const { options, onOptionsChange } = this.props;
     const { builder } = options;
-    builder[component] = opts.map(o => o.value);
+    builder[component] = opts.map((o) => o.value);
     this.multiSelectOptions[component] = this.buildMultiSelectOptions(builder[component]);
     onOptionsChange({ ...options, builder });
   };

diff --git a/src/builder/datasource/DataSource.tsx b/src/builder/datasource/DataSource.tsx
@@ -76,7 +76,7 @@ export class DataSource extends PureComponent<QueryBuilderProps, State> {
   };
 
   selectOptionByValue = (value: string): SelectableValue<string> | null => {
-    const options = this.selectOptions.filter(option => option.value === value.toLowerCase());
+    const options = this.selectOptions.filter((option) => option.value === value.toLowerCase());
     if (options.length > 0) {
       return options[0];
     }

diff --git a/src/builder/datasource/Join.tsx b/src/builder/datasource/Join.tsx
@@ -52,7 +52,7 @@ export class Join extends PureComponent<QueryBuilderProps> {
     if (undefined === value) {
       return undefined;
     }
-    const options = this.selectOptions.filter(option => option.value === value);
+    const options = this.selectOptions.filter((option) => option.value === value);
     if (options.length > 0) {
       return options[0];
     }

diff --git a/src/builder/datasource/Union.tsx b/src/builder/datasource/Union.tsx
@@ -47,7 +47,7 @@ export class Union extends PureComponent<QueryBuilderProps> {
   selectOptions = (opts: Array<SelectableValue<string>>) => {
     const { options, onOptionsChange } = this.props;
     const { builder } = options;
-    builder.dataSources = opts.map(o => o.value);
+    builder.dataSources = opts.map((o) => o.value);
     this.multiSelectOptions = this.buildMultiSelectOptions(builder.dataSources);
     onOptionsChange({ ...options, builder });
   };

diff --git a/src/builder/dimension/Default.tsx b/src/builder/dimension/Default.tsx
@@ -40,7 +40,7 @@ export class Default extends PureComponent<QueryBuilderProps> {
     if (undefined === value) {
       return undefined;
     }
-    const options = this.selectOptions.filter(option => option.value === value);
+    const options = this.selectOptions.filter((option) => option.value === value);
     if (options.length > 0) {
       return options[0];
     }

diff --git a/src/builder/dimension/Dimension.tsx b/src/builder/dimension/Dimension.tsx
@@ -76,7 +76,7 @@ export class Dimension extends PureComponent<QueryBuilderProps, State> {
   };
 
   selectOptionByValue = (value: string): SelectableValue<string> | null => {
-    const options = this.selectOptions.filter(option => option.value === value.toLowerCase());
+    const options = this.selectOptions.filter((option) => option.value === value.toLowerCase());
     if (options.length > 0) {
       return options[0];
     }

diff --git a/src/builder/dimension/Extraction.tsx b/src/builder/dimension/Extraction.tsx
@@ -41,7 +41,7 @@ export class Extraction extends PureComponent<QueryBuilderProps> {
     if (undefined === value) {
       return undefined;
     }
-    const options = this.selectOptions.filter(option => option.value === value);
+    const options = this.selectOptions.filter((option) => option.value === value);
     if (options.length > 0) {
       return options[0];
     }

diff --git a/src/builder/dimension/ListFiltered.tsx b/src/builder/dimension/ListFiltered.tsx
@@ -55,7 +55,7 @@ export class ListFiltered extends PureComponent<QueryBuilderProps> {
   selectOptions = (opts: Array<SelectableValue<string>>) => {
     const { options, onOptionsChange } = this.props;
     const { builder } = options;
-    builder.values = opts.map(o => o.value);
+    builder.values = opts.map((o) => o.value);
     this.multiSelectOptions = this.buildMultiSelectOptions(builder.values);
     onOptionsChange({ ...options, builder });
   };

diff --git a/src/builder/extractionfn/Cascade.tsx b/src/builder/extractionfn/Cascade.tsx
@@ -40,7 +40,7 @@ const ComponentRow: FC<ComponentRowProps> = ({ index, component, props, onRemove
   return (
     <div className={styles.layout}>
       <Component {...props} />
-      <Button variant="secondary" size="xs" onClick={_e => onRemove(index)}>
+      <Button variant="secondary" size="xs" onClick={(_e) => onRemove(index)}>
         <Icon name="trash-alt" />
       </Button>
     </div>

diff --git a/src/builder/extractionfn/ExtractionFn.tsx b/src/builder/extractionfn/ExtractionFn.tsx
@@ -101,7 +101,7 @@ export class ExtractionFn extends PureComponent<QueryBuilderProps, State> {
   };
 
   selectOptionByValue = (value: string): SelectableValue<string> | null => {
-    const options = this.selectOptions.filter(option => option.value === value.toLowerCase());
+    const options = this.selectOptions.filter((option) => option.value === value.toLowerCase());
     if (options.length > 0) {
       return options[0];
     }

diff --git a/src/builder/extractionfn/StringFormat.tsx b/src/builder/extractionfn/StringFormat.tsx
@@ -44,7 +44,7 @@ export class StringFormat extends PureComponent<QueryBuilderProps> {
     if (undefined === value) {
       return undefined;
     }
-    const options = this.selectOptions.filter(option => option.value === value);
+    const options = this.selectOptions.filter((option) => option.value === value);
     if (options.length > 0) {
       return options[0];
     }

diff --git a/src/builder/filter/And.tsx b/src/builder/filter/And.tsx
@@ -40,7 +40,7 @@ const ComponentRow: FC<ComponentRowProps> = ({ index, component, props, onRemove
   return (
     <div className={styles.layout}>
       <Component {...props} />
-      <Button variant="secondary" size="xs" onClick={_e => onRemove(index)}>
+      <Button variant="secondary" size="xs" onClick={(_e) => onRemove(index)}>
         <Icon name="trash-alt" />
       </Button>
     </div>

diff --git a/src/builder/filter/Bound.tsx b/src/builder/filter/Bound.tsx
@@ -73,7 +73,7 @@ export class Bound extends PureComponent<QueryBuilderProps> {
     if (undefined === value) {
       return undefined;
     }
-    const options = this.selectOptions[component].filter(option => option.value === value);
+    const options = this.selectOptions[component].filter((option) => option.value === value);
     if (options.length > 0) {
       return options[0];
     }

diff --git a/src/builder/filter/ColumnComparison.tsx b/src/builder/filter/ColumnComparison.tsx
@@ -40,7 +40,7 @@ const ComponentRow: FC<ComponentRowProps> = ({ index, component, props, onRemove
   return (
     <div className={styles.layout}>
       <Component {...props} />
-      <Button variant="secondary" size="xs" onClick={_e => onRemove(index)}>
+      <Button variant="secondary" size="xs" onClick={(_e) => onRemove(index)}>
         <Icon name="trash-alt" />
       </Button>
     </div>

diff --git a/src/builder/filter/Filter.tsx b/src/builder/filter/Filter.tsx
@@ -107,7 +107,7 @@ export class Filter extends PureComponent<QueryBuilderProps, State> {
   };
 
   selectOptionByValue = (value: string): SelectableValue<string> | null => {
-    const options = this.selectOptions.filter(option => option.value === value.toLowerCase());
+    const options = this.selectOptions.filter((option) => option.value === value.toLowerCase());
     if (options.length > 0) {
       return options[0];
     }

diff --git a/src/builder/filter/FilterTuning.tsx b/src/builder/filter/FilterTuning.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { QueryBuilderProps } from '../types';
 
-export const FilterTuning: React.FunctionComponent<QueryBuilderProps> = props => {
+export const FilterTuning: React.FunctionComponent<QueryBuilderProps> = (props) => {
   return <div>FilterTuning</div>;
 };
diff --git a/src/builder/filter/In.tsx b/src/builder/filter/In.tsx
@@ -70,7 +70,7 @@ export class In extends PureComponent<QueryBuilderProps> {
   selectOptions = (opts: Array<SelectableValue<string>>) => {
     const { options, onOptionsChange } = this.props;
     const { builder } = options;
-    builder.values = opts.map(o => o.value);
+    builder.values = opts.map((o) => o.value);
     this.multiSelectOptions = this.buildMultiSelectOptions(builder.values);
     onOptionsChange({ ...options, builder });
   };

diff --git a/src/builder/filter/Interval.tsx b/src/builder/filter/Interval.tsx
@@ -43,7 +43,7 @@ const ComponentRow: FC<ComponentRowProps> = ({ index, component, props, onRemove
   return (
     <div className={styles.layout}>
       <Component {...props} />
-      <Button variant="secondary" size="xs" onClick={_e => onRemove(index)}>
+      <Button variant="secondary" size="xs" onClick={(_e) => onRemove(index)}>
         <Icon name="trash-alt" />
       </Button>
     </div>

diff --git a/src/builder/filter/Or.tsx b/src/builder/filter/Or.tsx
@@ -40,7 +40,7 @@ const ComponentRow: FC<ComponentRowProps> = ({ index, component, props, onRemove
   return (
     <div className={styles.layout}>
       <Component {...props} />
-      <Button variant="secondary" size="xs" onClick={_e => onRemove(index)}>
+      <Button variant="secondary" size="xs" onClick={(_e) => onRemove(index)}>
         <Icon name="trash-alt" />
       </Button>
     </div>

diff --git a/src/builder/granularity/Granularity.tsx b/src/builder/granularity/Granularity.tsx
@@ -69,7 +69,7 @@ export class Granularity extends PureComponent<QueryBuilderProps, State> {
   };
 
   selectOptionByValue = (value: string): SelectableValue<string> | null => {
-    const options = this.selectOptions.filter(option => option.value === value.toLowerCase());
+    const options = this.selectOptions.filter((option) => option.value === value.toLowerCase());
     if (options.length > 0) {
       return options[0];
     }

diff --git a/src/builder/granularity/Simple.tsx b/src/builder/granularity/Simple.tsx
@@ -42,7 +42,7 @@ export class Simple extends PureComponent<QueryBuilderProps> {
     if (undefined === value) {
       return undefined;
     }
-    const options = this.selectOptions.filter(option => option.value === value);
+    const options = this.selectOptions.filter((option) => option.value === value);
     if (options.length > 0) {
       return options[0];
     }

diff --git a/src/builder/havingspec/And.tsx b/src/builder/havingspec/And.tsx
@@ -40,7 +40,7 @@ const ComponentRow: FC<ComponentRowProps> = ({ index, component, props, onRemove
   return (
     <div className={styles.layout}>
       <Component {...props} />
-      <Button variant="secondary" size="xs" onClick={_e => onRemove(index)}>
+      <Button variant="secondary" size="xs" onClick={(_e) => onRemove(index)}>
         <Icon name="trash-alt" />
       </Button>
     </div>

diff --git a/src/builder/havingspec/HavingSpec.tsx b/src/builder/havingspec/HavingSpec.tsx
@@ -76,7 +76,7 @@ export class HavingSpec extends PureComponent<QueryBuilderProps, State> {
   };
 
   selectOptionByValue = (value: string): SelectableValue<string> | null => {
-    const options = this.selectOptions.filter(option => option.value === value.toLowerCase());
+    const options = this.selectOptions.filter((option) => option.value === value.toLowerCase());
     if (options.length > 0) {
       return options[0];
     }

diff --git a/src/builder/havingspec/Or.tsx b/src/builder/havingspec/Or.tsx
@@ -40,7 +40,7 @@ const ComponentRow: FC<ComponentRowProps> = ({ index, component, props, onRemove
   return (
     <div className={styles.layout}>
       <Component {...props} />
-      <Button variant="secondary" size="xs" onClick={_e => onRemove(index)}>
+      <Button variant="secondary" size="xs" onClick={(_e) => onRemove(index)}>
         <Icon name="trash-alt" />
       </Button>
     </div>