adding index pattern option to series

elastic · Jan 17, 2017 · 1e64c7c · 1e64c7c
1 parent 16b7469
commit 1e64c7c
Show file tree

Hide file tree

Showing 28 changed files with 137 additions and 75 deletions.
diff --git a/src/core_plugins/metrics/public/components/vis_editor/aggs/calculation.js b/src/core_plugins/metrics/public/components/vis_editor/aggs/calculation.js
@@ -21,7 +21,7 @@ export default React.createClass({
   },
 
   render() {
-    const { model, panelType, siblings } = this.props;
+    const { model, panel, siblings } = this.props;
     const handleChange = createChangeHandler(this.props.onChange, model);
     const handleSelectChange = createSelectHandler(handleChange);
     const handleTextChange = createTextHandler(handleChange, this.refs);
@@ -33,7 +33,7 @@ export default React.createClass({
             <div className="vis_editor__label">Aggregation</div>
             <AggSelect
               siblings={this.props.siblings}
-              panelType={panelType}
+              panelType={panel.type}
               value={model.type}
               onChange={handleSelectChange('type')}/>
             <div className="vis_editor__row_item" style={{ margin: '10px 0' }}>

diff --git a/src/core_plugins/metrics/public/components/vis_editor/aggs/cumulative_sum.js b/src/core_plugins/metrics/public/components/vis_editor/aggs/cumulative_sum.js
@@ -6,7 +6,7 @@ import createChangeHandler from '../lib/create_change_handler';
 import createSelectHandler from '../../../lib/create_select_handler';
 export default React.createClass({
   render() {
-    const { model, panelType, siblings } = this.props;
+    const { model, panel, siblings } = this.props;
     const handleChange = createChangeHandler(this.props.onChange, model);
     const handleSelectChange = createSelectHandler(handleChange);
     return (
@@ -15,7 +15,7 @@ export default React.createClass({
           <div className="vis_editor__label">Aggregation</div>
           <AggSelect
             siblings={this.props.siblings}
-            panelType={panelType}
+            panelType={panel.type}
             value={model.type}
             onChange={handleSelectChange('type')}/>
         </div>

diff --git a/src/core_plugins/metrics/public/components/vis_editor/aggs/derivative.js b/src/core_plugins/metrics/public/components/vis_editor/aggs/derivative.js
@@ -9,7 +9,7 @@ import createTextHandler from '../../../lib/create_text_handler';
 export default React.createClass({
 
   render() {
-    const { model, siblings, panelType } = this.props;
+    const { model, siblings, panel } = this.props;
 
     const handleChange = createChangeHandler(this.props.onChange, model);
     const handleSelectChange = createSelectHandler(handleChange);
@@ -21,7 +21,7 @@ export default React.createClass({
           <div className="vis_editor__label">Aggregation</div>
           <AggSelect
             siblings={this.props.siblings}
-            panelType={panelType}
+            panelType={panel.type}
             value={model.type}
             onChange={handleSelectChange('type')}/>
         </div>

diff --git a/src/core_plugins/metrics/public/components/vis_editor/aggs/field_select.js b/src/core_plugins/metrics/public/components/vis_editor/aggs/field_select.js
@@ -7,15 +7,20 @@ import generateByTypeFilter from '../../../lib/generate_by_type_filter';
 export default React.createClass({
 
   getDefaultProps() {
-    return { restrict: 'none', style: {} };
+    return {
+      indexPattern: '*',
+      disabled: false,
+      restrict: 'none',
+      style: {}
+    };
   },
 
   render() {
-    const { type, fields } = this.props;
+    const { type, fields, indexPattern } = this.props;
     if (type === 'count') {
       return (<div style={{ display: 'none' }}/>);
     }
-    const options = fields
+    const options = (fields[indexPattern] || [])
     .filter(generateByTypeFilter(this.props.restrict))
     .map(field => {
       return { label: field.name, value: field.name };
@@ -24,6 +29,7 @@ export default React.createClass({
     return (
       <Select
         placeholder="Select field..."
+        disabled={this.props.disabled}
         options={options}
         value={this.props.value}
         onChange={this.props.onChange}/>

diff --git a/src/core_plugins/metrics/public/components/vis_editor/aggs/moving_average.js b/src/core_plugins/metrics/public/components/vis_editor/aggs/moving_average.js
@@ -9,7 +9,7 @@ import createTextHandler from '../../../lib/create_text_handler';
 import createNumberHandler from '../../../lib/create_number_handler';
 export default React.createClass({
   render() {
-    const { model, panelType, siblings } = this.props;
+    const { model, panel, siblings } = this.props;
     const handleChange = createChangeHandler(this.props.onChange, model);
     const handleSelectChange = createSelectHandler(handleChange);
     const handleTextChange = createTextHandler(handleChange, this.refs);
@@ -33,7 +33,7 @@ export default React.createClass({
               <div className="vis_editor__label">Aggregation</div>
               <AggSelect
                 siblings={this.props.siblings}
-                panelType={panelType}
+                panelType={panel.type}
                 value={model.type}
                 onChange={handleSelectChange('type')}/>
             </div>

diff --git a/src/core_plugins/metrics/public/components/vis_editor/aggs/percentile.js b/src/core_plugins/metrics/public/components/vis_editor/aggs/percentile.js
@@ -114,11 +114,12 @@ export default React.createClass({
   },
 
   render() {
-    const { model, panelType, fields } = this.props;
+    const { model, panel, fields } = this.props;
 
     const handleChange = createChangeHandler(this.props.onChange, model);
     const handleSelectChange = createSelectHandler(handleChange);
     const handleNumberChange = createNumberHandler(handleChange);
+    const indexPattern = model.override_index_pattern && model.series_index_pattern || panel.index_pattern;
 
     return (
       <AggRow {...this.props}>
@@ -128,7 +129,7 @@ export default React.createClass({
               <div className="vis_editor__label">Aggregation</div>
               <AggSelect
                 siblings={this.props.siblings}
-                panelType={panelType}
+                panelType={panel.type}
                 value={model.type}
                 onChange={handleSelectChange('type')}/>
             </div>
@@ -138,6 +139,7 @@ export default React.createClass({
                 fields={fields}
                 type={model.type}
                 restrict="numeric"
+                indexPattern={indexPattern}
                 value={model.field}
                 onChange={handleSelectChange('field')}/>
             </div>

diff --git a/src/core_plugins/metrics/public/components/vis_editor/aggs/series_agg.js b/src/core_plugins/metrics/public/components/vis_editor/aggs/series_agg.js
@@ -8,7 +8,7 @@ import createSelectHandler from '../../../lib/create_select_handler';
 export default React.createClass({
 
   render() {
-    const { model, panelType, fields } = this.props;
+    const { model, panel, fields } = this.props;
 
     const handleChange = createChangeHandler(this.props.onChange, model);
     const handleSelectChange = createSelectHandler(handleChange);
@@ -31,7 +31,7 @@ export default React.createClass({
           <div className="vis_editor__label">Aggregation</div>
           <AggSelect
             siblings={this.props.siblings}
-            panelType={panelType}
+            panelType={panel.type}
             value={model.type}
             onChange={handleSelectChange('type')}/>
         </div>

diff --git a/src/core_plugins/metrics/public/components/vis_editor/aggs/std_agg.js b/src/core_plugins/metrics/public/components/vis_editor/aggs/std_agg.js
@@ -8,7 +8,7 @@ import createSelectHandler from '../../../lib/create_select_handler';
 export default React.createClass({
 
   render() {
-    const { model, panelType, fields } = this.props;
+    const { model, panel, fields } = this.props;
 
     const handleChange = createChangeHandler(this.props.onChange, model);
     const handleSelectChange = createSelectHandler(handleChange);
@@ -17,13 +17,15 @@ export default React.createClass({
       restrict = 'string';
     }
 
+    const indexPattern = model.override_index_pattern || model.series_index_pattern || panel.index_pattern;
+
     return (
       <AggRow {...this.props}>
         <div className="vis_editor__item">
           <div className="vis_editor__label">Aggregation</div>
           <AggSelect
             siblings={this.props.siblings}
-            panelType={panelType}
+            panelType={panel.type}
             value={model.type}
             onChange={handleSelectChange('type')}/>
         </div>
@@ -33,6 +35,7 @@ export default React.createClass({
             fields={fields}
             type={model.type}
             restrict={restrict}
+            indexPattern={indexPattern}
             value={model.field}
             onChange={handleSelectChange('field')}/>
         </div>) : (<div style={{ display: 'none' }}/>) }

diff --git a/src/core_plugins/metrics/public/components/vis_editor/aggs/std_deviation.js b/src/core_plugins/metrics/public/components/vis_editor/aggs/std_deviation.js
@@ -11,7 +11,7 @@ import createTextHandler from '../../../lib/create_text_handler';
 export default React.createClass({
 
   render() {
-    const { model, panelType, fields } = this.props;
+    const { model, panel, fields } = this.props;
 
     const modeOptions = [
       { label: 'Raw', value: 'raw' },
@@ -24,13 +24,15 @@ export default React.createClass({
     const handleSelectChange = createSelectHandler(handleChange);
     const handleTextChange = createTextHandler(handleChange, this.refs);
 
+    const indexPattern = model.override_index_pattern && model.series_index_pattern || panel.index_pattern;
+
     return (
       <AggRow {...this.props}>
         <div className="vis_editor__row_item">
           <div className="vis_editor__label">Aggregation</div>
           <AggSelect
             siblings={this.props.siblings}
-            panelType={panelType}
+            panelType={panel.type}
             value={model.type}
             onChange={handleSelectChange('type')}/>
         </div>
@@ -40,6 +42,7 @@ export default React.createClass({
             fields={fields}
             type={model.type}
             restrict="numeric"
+            indexPattern={indexPattern}
             value={model.field}
             onChange={handleSelectChange('field')}/>
         </div>

diff --git a/src/core_plugins/metrics/public/components/vis_editor/aggs/std_sibling.js b/src/core_plugins/metrics/public/components/vis_editor/aggs/std_sibling.js
@@ -11,7 +11,7 @@ import createTextHandler from '../../../lib/create_text_handler';
 
 export default React.createClass({
   render() {
-    const { model, siblings, panelType } = this.props;
+    const { model, siblings, panel } = this.props;
 
     const handleChange = createChangeHandler(this.props.onChange, model);
     const handleSelectChange = createSelectHandler(handleChange);
@@ -54,7 +54,7 @@ export default React.createClass({
           <div className="vis_editor__label">Aggregation</div>
           <AggSelect
             siblings={this.props.siblings}
-            panelType={panelType}
+            panelType={panel.type}
             value={model.type}
             onChange={handleSelectChange('type')}/>
         </div>

diff --git a/src/core_plugins/metrics/public/components/vis_editor/index_pattern.js b/src/core_plugins/metrics/public/components/vis_editor/index_pattern.js
@@ -5,32 +5,47 @@ import createSelectHandler from '../../lib/create_select_handler';
 import createTextHandler from '../../lib/create_text_handler';
 export default React.createClass({
 
+  getDefaultProps() {
+    return {
+      prefix: '',
+      disabled: false,
+      className: 'vis_editor__row'
+    };
+  },
+
   render() {
-    const { model, fields } = this.props;
+    const { model, fields, prefix } = this.props;
     const handleSelectChange = createSelectHandler(this.props.onChange);
     const handleTextChange = createTextHandler(this.props.onChange, this.refs);
+    const timeFieldName = `${prefix}time_field`;
+    const indexPatternName = `${prefix}index_pattern`;
+    const intervalName = `${prefix}interval`;
     return (
-      <div className="vis_editor__row">
+      <div className={this.props.className}>
         <div className="vis_editor__label">Index Pattern</div>
         <input
           className="vis_editor__input"
-          ref="index_pattern"
-          onChange={handleTextChange('index_pattern', '*')}
-          defaultValue={model.index_pattern || '*'}/>
+          ref={indexPatternName}
+          disabled={this.props.disabled}
+          onChange={handleTextChange(indexPatternName, '*')}
+          defaultValue={model[indexPatternName] || '*'}/>
         <div className="vis_editor__label">Time Field</div>
         <div className="vis_editor__index_pattern-fields">
           <FieldSelect
             restrict="date"
-            value={model.time_field}
-            onChange={handleSelectChange('time_field')}
+            value={model[timeFieldName]}
+            disabled={this.props.disabled}
+            onChange={handleSelectChange(timeFieldName)}
+            indexPattern={model[indexPatternName]}
             fields={fields}/>
         </div>
         <div className="vis_editor__label">Interval (auto, 1m, 1d, 1w, 1y)</div>
         <input
           className="vis_editor__input"
-          ref="interval"
-          onChange={handleTextChange('interval', 'auto')}
-          defaultValue={model.interval || 'auto'}/>
+          ref={intervalName}
+          disabled={this.props.disabled}
+          onChange={handleTextChange(intervalName, 'auto')}
+          defaultValue={model[intervalName] || 'auto'}/>
       </div>
     );
   }

diff --git a/src/core_plugins/metrics/public/components/vis_editor/series.js b/src/core_plugins/metrics/public/components/vis_editor/series.js
@@ -47,8 +47,8 @@ export default sortable(React.createClass({
   },
 
   render() {
-    const { panelType } = this.props;
-    const Component = lookup[panelType];
+    const { panel } = this.props;
+    const Component = lookup[panel.type];
     if (Component) {
       const params = {
         switchTab: this.switchTab,
@@ -59,6 +59,6 @@ export default sortable(React.createClass({
       };
       return (<Component {...params}/>);
     }
-    return (<div>Missing Series component for panel type: {panelType}</div>);
+    return (<div>Missing Series component for panel type: {panel.type}</div>);
   }
 }));
diff --git a/src/core_plugins/metrics/public/components/vis_editor/series/gauge/series.js b/src/core_plugins/metrics/public/components/vis_editor/series/gauge/series.js
@@ -18,12 +18,12 @@ export default React.createClass({
 
   renderRow(row, index, items) {
     const { props } = this;
-    const { model, fields } = props;
+    const { panel, model, fields } = props;
     return (
       <Agg
         key={row.id}
         sortData={row.id}
-        panelType={model.type}
+        panel={panel}
         siblings={items}
         model={row}
         onAdd={handleAdd.bind(null, props, newMetricAggFn)}
@@ -36,6 +36,7 @@ export default React.createClass({
 
   render() {
     const {
+      panel,
       model,
       fields,
       onAdd,
@@ -86,6 +87,7 @@ export default React.createClass({
                 <Split
                   onChange={this.props.handleChange}
                   fields={fields}
+                  panel={panel}
                   model={model}/>
               </div>
             </div>

diff --git a/src/core_plugins/metrics/public/components/vis_editor/series/markdown/series.js b/src/core_plugins/metrics/public/components/vis_editor/series/markdown/series.js
@@ -19,12 +19,12 @@ export default React.createClass({
 
   renderRow(row, index, items) {
     const { props } = this;
-    const { model, fields } = props;
+    const { panel, model, fields } = props;
     return (
       <Agg
         key={row.id}
         sortData={row.id}
-        panelType={model.type}
+        panel={panel}
         siblings={items}
         model={row}
         onAdd={handleAdd.bind(null, props, newMetricAggFn)}
@@ -37,6 +37,7 @@ export default React.createClass({
 
   render() {
     const {
+      panel,
       model,
       fields,
       onAdd,
@@ -87,6 +88,7 @@ export default React.createClass({
                 <Split
                   onChange={this.props.handleChange}
                   fields={fields}
+                  panel={panel}
                   model={model}/>
               </div>
             </div>