Fixes timeseries

elastic · May 11, 2019 · 6ef641f · 6ef641f
1 parent 57c4ce6
commit 6ef641f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/src/legacy/core_plugins/metrics/public/components/panel_config/timeseries.js b/src/legacy/core_plugins/metrics/public/components/panel_config/timeseries.js
@@ -211,7 +211,7 @@ class TimeseriesPanelConfigUi extends Component {
                   <QueryBar
                     query={{
                       language: model.filter.language ? model.filter.language : 'kuery',
-                      query: model.filter.query,
+                      query: model.filter.query || '',
                     }}
                     screenTitle={'TimeseriesPanelConfigQuery'}
                     onSubmit={this.handleSubmit}

diff --git a/src/legacy/core_plugins/metrics/public/components/splits/filter.js b/src/legacy/core_plugins/metrics/public/components/splits/filter.js
@@ -33,7 +33,7 @@ const uiSettingsQueryLanguage = uiSettings.get('search:queryLanguage');
 
 export const SplitByFilter = props => {
   const { onChange, uiRestrictions } = props;
-  const defaults = { filter: '' };
+  const defaults = { filter: { query: '', language: uiSettingsQueryLanguage } };
   const model = { ...defaults, ...props.model };
   const htmlId = htmlIdGenerator();
   const handleSelectChange = createSelectHandler(onChange);

diff --git a/src/legacy/core_plugins/metrics/public/components/splits/filter_items.js b/src/legacy/core_plugins/metrics/public/components/splits/filter_items.js
@@ -39,9 +39,6 @@ class FilterItemsUi extends Component {
   constructor(props) {
     super(props);
     this.renderRow = this.renderRow.bind(this);
-    this.state = {
-      uiQuerylanguage: uiSettingsQueryLanguage,
-    };
   }
 
   handleChange(item, name) {
@@ -68,7 +65,7 @@ class FilterItemsUi extends Component {
     const newFilter = () => ({
       color: this.props.model.color,
       id: uuid.v1(),
-      filter: { language: model.filter.language ? model.filter.language : 'kuery', query: '' },
+      filter: { language: model.filter.language ? model.filter.language : uiSettingsQueryLanguage, query: '' },
     });
     const handleAdd = collectionActions.handleAdd
       .bind(null, this.props, newFilter);
@@ -88,7 +85,7 @@ class FilterItemsUi extends Component {
         </EuiFlexItem>
         <EuiFlexItem>
           <QueryBar
-            query={{ language: model.filter.language ? model.filter.language : this.state.uiQuerylanguage, query: model.filter.query }}
+            query={{ language: model.filter.language ? model.filter.language : uiSettingsQueryLanguage, query: model.filter.query || '' }}
             screenTitle={'DataMetricsGroupByFiltersFilter'}
             placeholder={intl.formatMessage({ id: 'tsvb.splits.filterItems.filterPlaceholder', defaultMessage: 'Filter' })}
             aria-label={intl.formatMessage({ id: 'tsvb.splits.filterItems.filterAriaLabel', defaultMessage: 'Filter' })}