From 061a01df56affa1d714beef8c12bac3d57049284 Mon Sep 17 00:00:00 2001
From: Christiane Heiligers <christiane.heiligers@elastic.co>
Date: Sat, 11 May 2019 12:08:27 -0700
Subject: [PATCH] Adds default empty string to query.query passed into QueryBar

---
 .../public/components/panel_config/gauge.js      |  6 +++---
 .../public/components/panel_config/markdown.js   |  9 ++++-----
 .../public/components/panel_config/metric.js     |  9 ++++-----
 .../public/components/panel_config/table.js      | 16 +++++++++++-----
 .../public/components/panel_config/top_n.js      |  4 ++--
 5 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/legacy/core_plugins/metrics/public/components/panel_config/gauge.js b/src/legacy/core_plugins/metrics/public/components/panel_config/gauge.js
index ed7fce21b4ac6..d469d5b1b7256 100644
--- a/src/legacy/core_plugins/metrics/public/components/panel_config/gauge.js
+++ b/src/legacy/core_plugins/metrics/public/components/panel_config/gauge.js
@@ -97,7 +97,7 @@ class GaugePanelConfigUi extends Component {
     const { intl } = this.props;
     const defaults = {
       gauge_max: '',
-      filter: '',
+      filter: { query: '', language: uiSettingsQueryLanguage },
       gauge_style: 'circle',
       gauge_inner_width: '',
       gauge_width: ''
@@ -169,8 +169,8 @@ class GaugePanelConfigUi extends Component {
                 >
                   <QueryBar
                     query={{
-                      language: model.filter.language ? model.filter.language : this.state.uiQueryLanguage,
-                      query: model.filter.query,
+                      language: model.filter.language ? model.filter.language : uiSettingsQueryLanguage,
+                      query: model.filter.query || '',
                     }}
                     screenTitle={'GaugePanelConfigQuery'}
                     onSubmit={this.handleSubmit}
diff --git a/src/legacy/core_plugins/metrics/public/components/panel_config/markdown.js b/src/legacy/core_plugins/metrics/public/components/panel_config/markdown.js
index 8e75ef71625a7..baccbd19d0c10 100644
--- a/src/legacy/core_plugins/metrics/public/components/panel_config/markdown.js
+++ b/src/legacy/core_plugins/metrics/public/components/panel_config/markdown.js
@@ -58,7 +58,6 @@ class MarkdownPanelConfigUi extends Component {
     this.state = {
       selectedTab: 'markdown',
       indexPatternForQuery: {},
-      uiQueryLanguage: uiSettingsQueryLanguage,
     };
     this.handleCSSChange = this.handleCSSChange.bind(this);
   }
@@ -96,7 +95,7 @@ class MarkdownPanelConfigUi extends Component {
   }
 
   render() {
-    const defaults = { filter: '' };
+    const defaults = { filter: { query: '', language: uiSettingsQueryLanguage } };
     const model = { ...defaults, ...this.props.model };
     const { selectedTab } = this.state;
     const handleSelectChange = createSelectHandler(this.props.onChange);
@@ -178,10 +177,10 @@ class MarkdownPanelConfigUi extends Component {
                 >
                   <QueryBar
                     query={{
-                      language: model.filter.language ? model.filter.language : this.state.uiQueryLanguage,
-                      query: model.filter.query,
+                      language: model.filter.language ? model.filter.language : uiSettingsQueryLanguage,
+                      query: model.filter.query || '',
                     }}
-                    screenTitle={'TimeseriesPanelConfigQuery'}
+                    screenTitle={'MarkdownPanelConfigQuery'}
                     onSubmit={this.handleSubmit}
                     appName={'VisEditor'}
                     indexPatterns={[this.state.indexPatternForQuery]}
diff --git a/src/legacy/core_plugins/metrics/public/components/panel_config/metric.js b/src/legacy/core_plugins/metrics/public/components/panel_config/metric.js
index 1bec5a0bf0d5f..82fe50f3f6c81 100644
--- a/src/legacy/core_plugins/metrics/public/components/panel_config/metric.js
+++ b/src/legacy/core_plugins/metrics/public/components/panel_config/metric.js
@@ -52,8 +52,7 @@ class MetricPanelConfig extends Component {
     super(props);
     this.state = {
       selectedTab: 'data',
-      indexPatternForQuery: {},
-      uiQueryLanguage: uiSettingsQueryLanguage,
+      indexPatternForQuery: {}
     };
   }
 
@@ -88,7 +87,7 @@ class MetricPanelConfig extends Component {
 
   render() {
     const { selectedTab } = this.state;
-    const defaults = { filter: '' };
+    const defaults = { filter: { query: '', language: uiSettingsQueryLanguage } };
     const model = { ...defaults, ...this.props.model };
     const htmlId = htmlIdGenerator();
     let view;
@@ -138,8 +137,8 @@ class MetricPanelConfig extends Component {
                 >
                   <QueryBar
                     query={{
-                      language: model.filter.language ? model.filter.language : this.state.uiQueryLanguage,
-                      query: model.filter.query,
+                      language: model.filter.language ? model.filter.language : uiSettingsQueryLanguage,
+                      query: model.filter.query || '',
                     }}
                     screenTitle={'MetricPanelConfigQuery'}
                     onSubmit={this.handleSubmit}
diff --git a/src/legacy/core_plugins/metrics/public/components/panel_config/table.js b/src/legacy/core_plugins/metrics/public/components/panel_config/table.js
index 27b785659548e..bc93402a5adf2 100644
--- a/src/legacy/core_plugins/metrics/public/components/panel_config/table.js
+++ b/src/legacy/core_plugins/metrics/public/components/panel_config/table.js
@@ -101,7 +101,13 @@ class TablePanelConfig extends Component {
 
   render() {
     const { selectedTab } = this.state;
-    const defaults = { drilldown_url: '', filter: '', pivot_label: '', pivot_rows: 10, pivot_type: '' };
+    const defaults = {
+      drilldown_url: '',
+      filter: { query: '', language: uiSettingsQueryLanguage },
+      pivot_label: '',
+      pivot_rows: 10,
+      pivot_type: '',
+    };
     const model = { ...defaults, ...this.props.model };
     const handleTextChange = createTextHandler(this.props.onChange);
     const htmlId = htmlIdGenerator();
@@ -187,7 +193,7 @@ class TablePanelConfig extends Component {
             visData$={this.props.visData$}
             onChange={this.props.onChange}
             indexPatterns={this.state.indexPatternForQuery}
-            uiQueryLanguage={this.state.uiQueryLanguage}
+            uiQueryLanguage={uiSettingsQueryLanguage}
           />
         </div>
       );
@@ -248,10 +254,10 @@ class TablePanelConfig extends Component {
                 >
                   <QueryBar
                     query={{
-                      language: model.filter.language ? model.filter.language : this.state.uiQueryLanguage,
-                      query: model.filter.query,
+                      language: model.filter.language ? model.filter.language : uiSettingsQueryLanguage,
+                      query: model.filter.query || '',
                     }}
-                    screenTitle={'TimeseriesPanelConfigQuery'}
+                    screenTitle={'TablePanelConfigQuery'}
                     onSubmit={this.handleSubmit}
                     appName={'VisEditor'}
                     indexPatterns={[this.state.indexPatternForQuery]}
diff --git a/src/legacy/core_plugins/metrics/public/components/panel_config/top_n.js b/src/legacy/core_plugins/metrics/public/components/panel_config/top_n.js
index 37182da9c9737..c6389be84d06c 100644
--- a/src/legacy/core_plugins/metrics/public/components/panel_config/top_n.js
+++ b/src/legacy/core_plugins/metrics/public/components/panel_config/top_n.js
@@ -85,7 +85,7 @@ class TopNPanelConfig extends Component {
 
   render() {
     const { selectedTab } = this.state;
-    const defaults = { drilldown_url: '', filter: '' };
+    const defaults = { drilldown_url: '', filter: { query: '', language: uiSettingsQueryLanguage } };
     const model = { ...defaults, ...this.props.model };
     const htmlId = htmlIdGenerator();
     const handleTextChange = createTextHandler(this.props.onChange);
@@ -160,7 +160,7 @@ class TopNPanelConfig extends Component {
                   <QueryBar
                     query={{
                       language: model.filter.language ? model.filter.language : uiSettingsQueryLanguage,
-                      query: model.filter.query,
+                      query: model.filter.query || '',
                     }}
                     screenTitle={'TopNPanelConfigQuery'}
                     onSubmit={this.handleSubmit}