variables query: ensure query is object

grafadruid · Jan 6, 2021 · 1c73d3d · 1c73d3d
1 parent 58c9448
commit 1c73d3d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/src/QueryEditor.tsx b/src/QueryEditor.tsx
@@ -30,16 +30,24 @@ export class QueryEditor extends PureComponent<Props, State> {
 
   onBuilderOptionsChange = (queryBuilderOptions: QueryBuilderOptions) => {
     const { query, onChange, onRunQuery } = this.props;
+
     //workaround: https://github.com/grafana/grafana/issues/30013
-    query.expr = JSON.stringify({ builder: query.builder, settings: query.settings });
+    if (typeof query === 'object') {
+      query.expr = JSON.stringify({ builder: query.builder, settings: query.settings });
+    }
+
     onChange({ ...query, ...queryBuilderOptions });
     onRunQuery();
   };
 
   onSettingsOptionsChange = (querySettingsOptions: QuerySettingsOptions) => {
     const { query, onChange, onRunQuery } = this.props;
+
     //workaround: https://github.com/grafana/grafana/issues/30013
-    query.expr = JSON.stringify({ builder: query.builder, settings: query.settings });
+    if (typeof query === 'object') {
+      query.expr = JSON.stringify({ builder: query.builder, settings: query.settings });
+    }
+
     onChange({ ...query, ...querySettingsOptions });
     onRunQuery();
   };

diff --git a/src/VariableQueryEditor.tsx b/src/VariableQueryEditor.tsx
@@ -32,15 +32,23 @@ export class VariableQueryEditor extends PureComponent<Props, State> {
 
   onBuilderOptionsChange = (queryBuilderOptions: QueryBuilderOptions) => {
     const { query, onChange } = this.props;
+
     //workaround: https://github.com/grafana/grafana/issues/30013
-    query.expr = JSON.stringify({ builder: query.builder, settings: query.settings });
+    if (typeof query === 'object') {
+      query.expr = JSON.stringify({ builder: query.builder, settings: query.settings });
+    }
+
     onChange({ ...query, ...queryBuilderOptions }, query.expr);
   };
 
   onSettingsOptionsChange = (querySettingsOptions: QuerySettingsOptions) => {
     const { query, onChange } = this.props;
+
     //workaround: https://github.com/grafana/grafana/issues/30013
-    query.expr = JSON.stringify({ builder: query.builder, settings: query.settings });
+    if (typeof query === 'object') {
+      query.expr = JSON.stringify({ builder: query.builder, settings: query.settings });
+    }
+
     onChange({ ...query, ...querySettingsOptions }, query.expr);
   };