From 46df05fd9dc7117800f7b5784fe3e21e5d9935be Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Mon, 22 Jun 2020 16:36:58 -0700
Subject: [PATCH] InfluxDB: flux query editor cleanup (#25753)

---
 .../influxdb/components/FluxQueryEditor.tsx          | 12 ++++++------
 .../datasource/influxdb/partials/query.editor.html   | 10 +++++++---
 public/app/plugins/datasource/influxdb/query_ctrl.ts | 11 +++++++++++
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/public/app/plugins/datasource/influxdb/components/FluxQueryEditor.tsx b/public/app/plugins/datasource/influxdb/components/FluxQueryEditor.tsx
index 1a8e84e42b2..feb3c1ada9c 100644
--- a/public/app/plugins/datasource/influxdb/components/FluxQueryEditor.tsx
+++ b/public/app/plugins/datasource/influxdb/components/FluxQueryEditor.tsx
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import coreModule from 'app/core/core_module';
 import { InfluxQuery } from '../types';
 import { SelectableValue } from '@grafana/data';
-import { InlineFormLabel, LinkButton, Select, TextArea } from '@grafana/ui';
+import { InlineFormLabel, LinkButton, Segment, TextArea } from '@grafana/ui';
 
 interface Props {
   target: InfluxQuery;
@@ -16,7 +16,7 @@ const samples: Array<SelectableValue<string>> = [
     label: 'Simple query',
     description: 'filter by measurment and field',
     value: `from(bucket: "db/rp")
-  |> range(start: v.timeRangeStart, stop:timeRangeStop)
+  |> range(start: v.timeRangeStart, stop:v.timeRangeStop)
   |> filter(fn: (r) =>
     r._measurement == "example-measurement" and
     r._field == "example-field"
@@ -51,7 +51,7 @@ v1.measurements(bucket: v.bucket)`,
     label: 'Schema Exploration: (fields)',
     description: 'Return every possible key in a single table',
     value: `from(bucket: v.bucket)
-  |> range(start: -30m)
+  |> range(start: v.timeRangeStart, stop:timeRangeStop)
   |> keys()
   |> keep(columns: ["_value"])
   |> group()
@@ -112,10 +112,10 @@ export class FluxQueryEditor extends Component<Props> {
         </div>
         <div className="gf-form-inline">
           <div className="gf-form">
-            <InlineFormLabel width={6} tooltip="This supports queries copied from chronograph">
+            <InlineFormLabel width={5} tooltip="Queries can be copied from chronograph">
               Help
             </InlineFormLabel>
-            <Select width={20} options={samples} placeholder="Sample Query" onChange={this.onSampleChange} />
+            <Segment options={samples} value="Sample Query" onChange={this.onSampleChange} />
             <LinkButton
               icon="external-link-alt"
               variant="secondary"
@@ -137,6 +137,6 @@ export class FluxQueryEditor extends Component<Props> {
 coreModule.directive('fluxQueryEditor', [
   'reactDirective',
   (reactDirective: any) => {
-    return reactDirective(FluxQueryEditor, ['target', 'change']);
+    return reactDirective(FluxQueryEditor, ['target', 'change', 'refresh']);
   },
 ]);
diff --git a/public/app/plugins/datasource/influxdb/partials/query.editor.html b/public/app/plugins/datasource/influxdb/partials/query.editor.html
index 48d075bb91c..1a462d8e22c 100644
--- a/public/app/plugins/datasource/influxdb/partials/query.editor.html
+++ b/public/app/plugins/datasource/influxdb/partials/query.editor.html
@@ -1,6 +1,10 @@
 
-<query-editor-row ng-if="ctrl.datasource.is2x" query-ctrl="ctrl" can-collapse="true" has-text-edit-mode="false">
-  <flux-query-editor target="ctrl.target" change="ctrl.onChange" refresh="ctrl.refresh"></flux-query-editor>
+<query-editor-row ng-if="ctrl.datasource.is2x" query-ctrl="ctrl" can-collapse="true" has-text-edit-mode="true">
+  <flux-query-editor 
+    target="ctrl.target" 
+    change="ctrl.onChange" 
+    refresh="ctrl.onRunQuery"
+  ></flux-query-editor>
 </query-editor-row>
 
 <query-editor-row ng-if="!ctrl.datasource.is2x" query-ctrl="ctrl" can-collapse="true" has-text-edit-mode="true">
@@ -233,4 +237,4 @@
       </div>
     </div>
   </div>
-</query-editor-row>
+</query-editor-row>
\ No newline at end of file
diff --git a/public/app/plugins/datasource/influxdb/query_ctrl.ts b/public/app/plugins/datasource/influxdb/query_ctrl.ts
index 3a24dcf71e9..e68d5830ee8 100644
--- a/public/app/plugins/datasource/influxdb/query_ctrl.ts
+++ b/public/app/plugins/datasource/influxdb/query_ctrl.ts
@@ -75,10 +75,17 @@ export class InfluxQueryCtrl extends QueryCtrl {
     });
   }
 
+  /**
+   * Only called for flux
+   */
   onChange = (target: InfluxQuery) => {
     this.target.query = target.query;
   };
 
+  onRunQuery = () => {
+    this.panelCtrl.refresh();
+  };
+
   removeOrderByTime() {
     this.target.orderByTime = 'ASC';
   }
@@ -247,6 +254,10 @@ export class InfluxQueryCtrl extends QueryCtrl {
 
   // Only valid for InfluxQL queries
   toggleEditorMode() {
+    if (this.datasource.is2x) {
+      return; // nothing
+    }
+
     try {
       this.target.query = this.queryModel.render(false);
     } catch (err) {