diff --git a/public/app/plugins/datasource/influxdb/components/FluxQueryEditor.tsx b/public/app/plugins/datasource/influxdb/components/FluxQueryEditor.tsx
index c1563727c56..0036dc5405d 100644
--- a/public/app/plugins/datasource/influxdb/components/FluxQueryEditor.tsx
+++ b/public/app/plugins/datasource/influxdb/components/FluxQueryEditor.tsx
@@ -1,7 +1,7 @@
 import React, { PureComponent } from 'react';
 import coreModule from 'app/core/core_module';
 import { InfluxQuery } from '../types';
-import { SelectableValue, QueryEditorProps } from '@grafana/data';
+import { SelectableValue } from '@grafana/data';
 import { cx, css } from 'emotion';
 import {
   InlineFormLabel,
@@ -14,8 +14,16 @@ import {
 import { getTemplateSrv } from '@grafana/runtime';
 import InfluxDatasource from '../datasource';
 
-// @ts-ignore -- complicated since the datasource is not really reactified yet!
-type Props = QueryEditorProps<InfluxDatasource, InfluxQuery>;
+type Props = {
+  onChange: (query: InfluxQuery) => void;
+  onRunQuery: () => void;
+  query: InfluxQuery;
+  // `datasource` is not used internally, but this component is used at some places
+  // directly, where the `datasource` prop has to exist. later, when the whole
+  // query-editor gets converted to react we can stop using this component directly
+  // and then we can probably remove the datasource attribute.
+  datasource: InfluxDatasource;
+};
 
 const samples: Array<SelectableValue<string>> = [
   { label: 'Show buckets', description: 'List the available buckets (table)', value: 'buckets()' },
diff --git a/public/app/plugins/datasource/influxdb/partials/query.editor.html b/public/app/plugins/datasource/influxdb/partials/query.editor.html
index e3bb0b68805..fe70eb3a115 100644
--- a/public/app/plugins/datasource/influxdb/partials/query.editor.html
+++ b/public/app/plugins/datasource/influxdb/partials/query.editor.html
@@ -2,7 +2,7 @@
 <query-editor-row ng-if="ctrl.datasource.isFlux" query-ctrl="ctrl" can-collapse="true" has-text-edit-mode="true">
   <flux-query-editor 
     query="ctrl.target" 
-    onChange="ctrl.onChange" 
+    on-change="ctrl.onChange" 
     onRunQuery="ctrl.onRunQuery"
   ></flux-query-editor>
 </query-editor-row>
@@ -237,4 +237,4 @@
       </div>
     </div>
   </div>
-</query-editor-row>
\ No newline at end of file
+</query-editor-row>