Merge branch '7.x' into backport/7.x/pr-57490

elastic · Feb 13, 2020 · c7e1eb5 · c7e1eb5
2 parents bf894f6 + e96f0f4
commit c7e1eb5
Show file tree

Hide file tree

Showing 18 changed files with 268 additions and 67 deletions.
diff --git a/docs/release-notes/highlights-7.2.0.asciidoc b/docs/release-notes/highlights-7.2.0.asciidoc
@@ -175,7 +175,7 @@ pivoting the data. There is also a preview of the transform for reviewing the co
 image::release-notes/images/7.2-data-frames.png[{dataframes-cap}]
 
 {transforms-cap} are managed on a new list page, displaying the details and 
-status of each {tranform}, and controls for starting, stopping, or deleting {transforms}.
+status of each {transform}, and controls for starting, stopping, or deleting {transforms}.
 
 [role="screenshot"]
 image::release-notes/images/7.2-data-frames-list-view.png[{dataframes-cap}]

diff --git a/src/core/MIGRATION.md b/src/core/MIGRATION.md
@@ -1163,6 +1163,7 @@ import { setup, start } from '../core_plugins/visualizations/public/legacy';
 
 | Legacy Platform                                   | New Platform                                                 | Notes                                                                                                                                |
 | ------------------------------------------------- | ------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------ |
+| `import 'ui/management'`                          | `management.sections`                                        |                                                                                                                                      |
 | `import 'ui/apply_filters'`                       | N/A. Replaced by triggering an APPLY_FILTER_TRIGGER trigger. | Directive is deprecated.                                                                                                             |
 | `import 'ui/filter_bar'`                          | `import { FilterBar } from '../data/public'`                 | Directive is deprecated.                                                                                                             |
 | `import 'ui/query_bar'`                           | `import { QueryStringInput } from '../data/public'`          | Directives are deprecated.                                                                                                           |
@@ -1240,7 +1241,7 @@ This table shows where these uiExports have moved to in the New Platform. In mos
 | `inspectorViews`             |                                                                                                                           | Should be an API on the data (?) plugin.                                                                                              |
 | `interpreter`                |                                                                                                                           | Should be an API on the interpreter plugin.                                                                                           |
 | `links`                      | n/a                                                                                                                       | Not necessary, just register your app via `core.application.register`                                                                 |
-| `managementSections`         | [`plugins.management.sections.register`](/rfcs/text/0006_management_section_service.md)                                   | API finalized, implementation in progress.                                                                                            |
+| `managementSections`         | [`plugins.management.sections.register`](/rfcs/text/0006_management_section_service.md)                                   |                                                                                                                                       |
 | `mappings`                   |                                                                                                                           | Part of SavedObjects, see [#33587](https://github.com/elastic/kibana/issues/33587)                                                    |
 | `migrations`                 |                                                                                                                           | Part of SavedObjects, see [#33587](https://github.com/elastic/kibana/issues/33587)                                                    |
 | `navbarExtensions`           | n/a                                                                                                                       | Deprecated                                                                                                                            |

diff --git a/src/plugins/console/server/lib/spec_definitions/es_6_0/mappings.js b/src/plugins/console/server/lib/spec_definitions/es_6_0/mappings.js
@@ -96,6 +96,7 @@ export default function(api) {
           doc_values: BOOLEAN,
           eager_global_ordinals: BOOLEAN,
           norms: BOOLEAN,
+          coerce: BOOLEAN,
 
           // Not actually available in V6 of ES. Add when updating the autocompletion system.
           // index_phrases: BOOLEAN,

diff --git a/x-pack/legacy/plugins/maps/public/kibana_services.js b/x-pack/legacy/plugins/maps/public/kibana_services.js
@@ -14,6 +14,7 @@ import { npStart } from 'ui/new_platform';
 export const SPATIAL_FILTER_TYPE = esFilters.FILTERS.SPATIAL_FILTER;
 export { SearchSource } from '../../../../../src/plugins/data/public';
 export const indexPatternService = npStart.plugins.data.indexPatterns;
+export const autocompleteService = npStart.plugins.data.autocomplete;
 
 let licenseId;
 export const setLicenseId = latestLicenseId => (licenseId = latestLicenseId);

diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_source.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_source.js
@@ -6,6 +6,7 @@
 
 import { AbstractVectorSource } from './vector_source';
 import {
+  autocompleteService,
   fetchSearchSourceAndRecordWithInspector,
   indexPatternService,
   SearchSource,
@@ -344,4 +345,25 @@ export class AbstractESSource extends AbstractVectorSource {
 
     return resp.aggregations;
   }
+
+  getValueSuggestions = async (fieldName, query) => {
+    if (!fieldName) {
+      return [];
+    }
+
+    try {
+      const indexPattern = await this.getIndexPattern();
+      const field = indexPattern.fields.getByName(fieldName);
+      return await autocompleteService.getValueSuggestions({
+        indexPattern,
+        field,
+        query,
+      });
+    } catch (error) {
+      console.warn(
+        `Unable to fetch suggestions for field: ${fieldName}, query: ${query}, error: ${error.message}`
+      );
+      return [];
+    }
+  };
 }
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/source.js b/x-pack/legacy/plugins/maps/public/layers/sources/source.js
@@ -139,4 +139,8 @@ export class AbstractSource {
   async loadStylePropsMeta() {
     throw new Error(`Source#loadStylePropsMeta not implemented`);
   }
+
+  async getValueSuggestions(/* fieldName, query */) {
+    return [];
+  }
 }
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/color_map_select.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/color_map_select.js
@@ -72,6 +72,8 @@ export class ColorMapSelect extends Component {
         <EuiSpacer size="s" />
         <ColorStopsCategorical
           colorStops={this.state.customColorMap}
+          field={this.props.styleProperty.getField()}
+          getValueSuggestions={this.props.styleProperty.getValueSuggestions}
           onChange={this._onCustomColorMapChange}
         />
       </Fragment>

diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/color_stops.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/color_stops.js
@@ -59,26 +59,23 @@ export const ColorStops = ({
   onChange,
   colorStops,
   isStopsInvalid,
-  sanitizeStopInput,
   getStopError,
   renderStopInput,
   addNewRow,
   canDeleteStop,
 }) => {
   function getStopInput(stop, index) {
-    const onStopChange = e => {
+    const onStopChange = newStopValue => {
       const newColorStops = _.cloneDeep(colorStops);
-      newColorStops[index].stop = sanitizeStopInput(e.target.value);
-      const invalid = isStopsInvalid(newColorStops);
+      newColorStops[index].stop = newStopValue;
       onChange({
         colorStops: newColorStops,
-        isInvalid: invalid,
+        isInvalid: isStopsInvalid(newColorStops),
       });
     };
 
-    const error = getStopError(stop, index);
     return {
-      stopError: error,
+      stopError: getStopError(stop, index),
       stopInput: renderStopInput(stop, onStopChange, index),
     };
   }

diff --git a/...gacy/plugins/maps/public/layers/styles/vector/components/color/color_stops_categorical.js b/...gacy/plugins/maps/public/layers/styles/vector/components/color/color_stops_categorical.js
@@ -17,18 +17,17 @@ import {
 import { i18n } from '@kbn/i18n';
 import { ColorStops } from './color_stops';
 import { getOtherCategoryLabel } from '../../style_util';
+import { StopInput } from '../stop_input';
 
 export const ColorStopsCategorical = ({
   colorStops = [
     { stop: null, color: DEFAULT_CUSTOM_COLOR }, //first stop is the "other" color
     { stop: '', color: DEFAULT_NEXT_COLOR },
   ],
+  field,
   onChange,
+  getValueSuggestions,
 }) => {
-  const sanitizeStopInput = value => {
-    return value;
-  };
-
   const getStopError = (stop, index) => {
     let count = 0;
     for (let i = 1; i < colorStops.length; i++) {
@@ -49,34 +48,23 @@ export const ColorStopsCategorical = ({
     if (index === 0) {
       return (
         <EuiFieldText
-          aria-label={i18n.translate(
-            'xpack.maps.styles.colorStops.categoricalStop.defaultCategoryAriaLabel',
-            {
-              defaultMessage: 'Default stop',
-            }
-          )}
-          value={stopValue}
+          aria-label={getOtherCategoryLabel()}
           placeholder={getOtherCategoryLabel()}
           disabled
-          onChange={onStopChange}
-          compressed
-        />
-      );
-    } else {
-      return (
-        <EuiFieldText
-          aria-label={i18n.translate(
-            'xpack.maps.styles.colorStops.categoricalStop.categoryAriaLabel',
-            {
-              defaultMessage: 'Category',
-            }
-          )}
-          value={stopValue}
-          onChange={onStopChange}
           compressed
         />
       );
     }
+
+    return (
+      <StopInput
+        key={field.getName()} // force new component instance when field changes
+        field={field}
+        getValueSuggestions={getValueSuggestions}
+        value={stopValue}
+        onChange={onStopChange}
+      />
+    );
   };
 
   const canDeleteStop = (colorStops, index) => {
@@ -88,7 +76,6 @@ export const ColorStopsCategorical = ({
       onChange={onChange}
       colorStops={colorStops}
       isStopsInvalid={isCategoricalStopsInvalid}
-      sanitizeStopInput={sanitizeStopInput}
       getStopError={getStopError}
       renderStopInput={renderStopInput}
       canDeleteStop={canDeleteStop}
@@ -114,4 +101,8 @@ ColorStopsCategorical.propTypes = {
    * Callback for when the color stops changes. Called with { colorStops, isInvalid }
    */
   onChange: PropTypes.func.isRequired,
+  /**
+   * Callback for fetching stop value suggestions. Called with query.
+   */
+  getValueSuggestions: PropTypes.func.isRequired,
 };
diff --git a/...k/legacy/plugins/maps/public/layers/styles/vector/components/color/color_stops_ordinal.js b/...k/legacy/plugins/maps/public/layers/styles/vector/components/color/color_stops_ordinal.js
@@ -21,11 +21,6 @@ export const ColorStopsOrdinal = ({
   colorStops = [{ stop: 0, color: DEFAULT_CUSTOM_COLOR }],
   onChange,
 }) => {
-  const sanitizeStopInput = value => {
-    const sanitizedValue = parseFloat(value);
-    return isNaN(sanitizedValue) ? '' : sanitizedValue;
-  };
-
   const getStopError = (stop, index) => {
     let error;
     if (isOrdinalStopInvalid(stop)) {
@@ -44,13 +39,18 @@ export const ColorStopsOrdinal = ({
   };
 
   const renderStopInput = (stop, onStopChange) => {
+    function handleOnChangeEvent(event) {
+      const sanitizedValue = parseFloat(event.target.value);
+      const newStopValue = isNaN(sanitizedValue) ? '' : sanitizedValue;
+      onStopChange(newStopValue);
+    }
     return (
       <EuiFieldNumber
         aria-label={i18n.translate('xpack.maps.styles.colorStops.ordinalStop.stopLabel', {
           defaultMessage: 'Stop',
         })}
         value={stop}
-        onChange={onStopChange}
+        onChange={handleOnChangeEvent}
         compressed
       />
     );
@@ -65,7 +65,6 @@ export const ColorStopsOrdinal = ({
       onChange={onChange}
       colorStops={colorStops}
       isStopsInvalid={isOrdinalStopsInvalid}
-      sanitizeStopInput={sanitizeStopInput}
       getStopError={getStopError}
       renderStopInput={renderStopInput}
       canDeleteStop={canDeleteStop}

diff --git a/...ck/legacy/plugins/maps/public/layers/styles/vector/components/color/dynamic_color_form.js b/...ck/legacy/plugins/maps/public/layers/styles/vector/components/color/dynamic_color_form.js
@@ -67,7 +67,7 @@ export function DynamicColorForm({
           color={styleOptions.color}
           customColorMap={styleOptions.customColorRamp}
           useCustomColorMap={_.get(styleOptions, 'useCustomColorRamp', false)}
-          compressed
+          styleProperty={styleProperty}
         />
       );
     }
@@ -83,7 +83,7 @@ export function DynamicColorForm({
         color={styleOptions.colorCategory}
         customColorMap={styleOptions.customColorPalette}
         useCustomColorMap={_.get(styleOptions, 'useCustomColorPalette', false)}
-        compressed
+        styleProperty={styleProperty}
       />
     );
   };