{rows.length === opts.sampleSize ? (
+
+
+
+
+
+
+
+
+
+ Exists in 1 / 2 records
+
+
+
+
+
+
+
+
+`;
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field.scss b/src/plugins/discover/public/application/components/sidebar/discover_field.scss
index 8e1dd41f66ab1..40bc58cef7023 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_field.scss
+++ b/src/plugins/discover/public/application/components/sidebar/discover_field.scss
@@ -1,4 +1,10 @@
.dscSidebarItem__fieldPopoverPanel {
- min-width: 260px;
- max-width: 300px;
+ min-width: $euiSizeXXL * 6.5;
+ max-width: $euiSizeXXL * 7.5;
+}
+
+.dscSidebarItem--multi {
+ .kbnFieldButton__button {
+ padding-left: 0;
+ }
}
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx b/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx
index 0957ee101bd27..d22ef7cdcc28c 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx
+++ b/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx
@@ -82,7 +82,7 @@ function getComponent({
const props = {
indexPattern,
field: finalField,
- getDetails: jest.fn(() => ({ buckets: [], error: '', exists: 1, total: true, columns: [] })),
+ getDetails: jest.fn(() => ({ buckets: [], error: '', exists: 1, total: 2, columns: [] })),
onAddFilter: jest.fn(),
onAddField: jest.fn(),
onRemoveField: jest.fn(),
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field.tsx b/src/plugins/discover/public/application/components/sidebar/discover_field.tsx
index f95e512dfb66e..b885bdab316b5 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_field.tsx
+++ b/src/plugins/discover/public/application/components/sidebar/discover_field.tsx
@@ -19,7 +19,7 @@
import './discover_field.scss';
import React, { useState } from 'react';
-import { EuiPopover, EuiPopoverTitle, EuiButtonIcon, EuiToolTip } from '@elastic/eui';
+import { EuiPopover, EuiPopoverTitle, EuiButtonIcon, EuiToolTip, EuiTitle } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { UiCounterMetricType } from '@kbn/analytics';
import classNames from 'classnames';
@@ -28,6 +28,7 @@ import { FieldIcon, FieldButton } from '../../../../../kibana_react/public';
import { FieldDetails } from './types';
import { IndexPatternField, IndexPattern } from '../../../../../data/public';
import { getFieldTypeName } from './lib/get_field_type_name';
+import { DiscoverFieldDetailsFooter } from './discover_field_details_footer';
export interface DiscoverFieldProps {
/**
@@ -69,6 +70,8 @@ export interface DiscoverFieldProps {
* @param eventName
*/
trackUiMetric?: (metricType: UiCounterMetricType, eventName: string | string[]) => void;
+
+ multiFields?: Array<{ field: IndexPatternField; isSelected: boolean }>;
}
export function DiscoverField({
@@ -81,6 +84,7 @@ export function DiscoverField({
getDetails,
selected,
trackUiMetric,
+ multiFields,
}: DiscoverFieldProps) {
const addLabelAria = i18n.translate('discover.fieldChooser.discoverField.addButtonAriaLabel', {
defaultMessage: 'Add {field} to table',
@@ -96,8 +100,8 @@ export function DiscoverField({
const [infoIsOpen, setOpen] = useState(false);
- const toggleDisplay = (f: IndexPatternField) => {
- if (selected) {
+ const toggleDisplay = (f: IndexPatternField, isSelected: boolean) => {
+ if (isSelected) {
onRemoveField(f.name);
} else {
onAddField(f.name);
@@ -115,72 +119,100 @@ export function DiscoverField({
return str ? str.replace(/\./g, '.\u200B') : '';
}
- const dscFieldIcon = (
-
- );
+ const getDscFieldIcon = (indexPatternField: IndexPatternField) => {
+ return (
+
+ );
+ };
- const title =
- field.displayName !== field.name ? `${field.name} (${field.displayName} )` : field.displayName;
+ const dscFieldIcon = getDscFieldIcon(field);
+
+ const getTitle = (indexPatternField: IndexPatternField) => {
+ return indexPatternField.displayName !== indexPatternField.name
+ ? i18n.translate('discover.field.title', {
+ defaultMessage: '{fieldName} ({fieldDisplayName})',
+ values: {
+ fieldName: indexPatternField.name,
+ fieldDisplayName: indexPatternField.displayName,
+ },
+ })
+ : indexPatternField.displayName;
+ };
+
+ const getFieldName = (indexPatternField: IndexPatternField) => {
+ return (
+
+ {wrapOnDot(indexPatternField.displayName)}
+
+ );
+ };
+ const fieldName = getFieldName(field);
- const fieldName = (
-
- {wrapOnDot(field.displayName)}
-
- );
const actionBtnClassName = classNames('dscSidebarItem__action', {
['dscSidebarItem__mobile']: alwaysShowActionButton,
});
- let actionButton;
- if (field.name !== '_source' && !selected) {
- actionButton = (
-
- ) => {
- if (ev.type === 'click') {
- ev.currentTarget.focus();
- }
- ev.preventDefault();
- ev.stopPropagation();
- toggleDisplay(field);
- }}
- data-test-subj={`fieldToggle-${field.name}`}
- aria-label={addLabelAria}
- />
-
- );
- } else if (field.name !== '_source' && selected) {
- actionButton = (
-
- ) => {
- if (ev.type === 'click') {
- ev.currentTarget.focus();
- }
- ev.preventDefault();
- ev.stopPropagation();
- toggleDisplay(field);
- }}
- data-test-subj={`fieldToggle-${field.name}`}
- aria-label={removeLabelAria}
- />
-
- );
- }
+ const getActionButton = (f: IndexPatternField, isSelected?: boolean) => {
+ if (f.name !== '_source' && !isSelected) {
+ return (
+
+ ) => {
+ if (ev.type === 'click') {
+ ev.currentTarget.focus();
+ }
+ ev.preventDefault();
+ ev.stopPropagation();
+ toggleDisplay(f, false);
+ }}
+ data-test-subj={`fieldToggle-${f.name}`}
+ aria-label={addLabelAria}
+ />
+
+ );
+ } else if (f.name !== '_source' && isSelected) {
+ return (
+
+ ) => {
+ if (ev.type === 'click') {
+ ev.currentTarget.focus();
+ }
+ ev.preventDefault();
+ ev.stopPropagation();
+ toggleDisplay(f, isSelected);
+ }}
+ data-test-subj={`fieldToggle-${f.name}`}
+ aria-label={removeLabelAria}
+ />
+
+ );
+ }
+ };
+
+ const actionButton = getActionButton(field, selected);
if (field.type === '_source') {
return (
@@ -195,6 +227,37 @@ export function DiscoverField({
);
}
+ const shouldRenderMultiFields = !!multiFields;
+ const renderMultiFields = () => {
+ if (!multiFields) {
+ return null;
+ }
+ return (
+
+
+
+ {i18n.translate('discover.fieldChooser.discoverField.multiFields', {
+ defaultMessage: 'Multi fields',
+ })}
+
+
+ {multiFields.map((entry) => (
+ {}}
+ dataTestSubj={`field-${entry.field.name}-showDetails`}
+ fieldIcon={getDscFieldIcon(entry.field)}
+ fieldAction={getActionButton(entry.field, entry.isSelected)}
+ fieldName={getFieldName(entry.field)}
+ key={entry.field.name}
+ />
+ ))}
+
+ );
+ };
+
return (
-
- {' '}
- {i18n.translate('discover.fieldChooser.discoverField.fieldTopValuesLabel', {
- defaultMessage: 'Top 5 values',
- })}
-
+ {field.displayName}
+
+
+ {i18n.translate('discover.fieldChooser.discoverField.fieldTopValuesLabel', {
+ defaultMessage: 'Top 5 values',
+ })}
+
+
{infoIsOpen && (
);
}
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field_details.test.tsx b/src/plugins/discover/public/application/components/sidebar/discover_field_details.test.tsx
index 0618e53d15dbb..8444f11ac912c 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_field_details.test.tsx
+++ b/src/plugins/discover/public/application/components/sidebar/discover_field_details.test.tsx
@@ -38,7 +38,7 @@ const indexPattern = getStubIndexPattern(
describe('discover sidebar field details', function () {
const defaultProps = {
indexPattern,
- details: { buckets: [], error: '', exists: 1, total: true, columns: [] },
+ details: { buckets: [], error: '', exists: 1, total: 2, columns: [] },
onAddFilter: jest.fn(),
};
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field_details.tsx b/src/plugins/discover/public/application/components/sidebar/discover_field_details.tsx
index 740de54ae0cf3..bf24337543037 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_field_details.tsx
+++ b/src/plugins/discover/public/application/components/sidebar/discover_field_details.tsx
@@ -17,7 +17,7 @@
* under the License.
*/
import React, { useState, useEffect } from 'react';
-import { EuiLink, EuiIconTip, EuiText, EuiPopoverFooter, EuiButton, EuiSpacer } from '@elastic/eui';
+import { EuiIconTip, EuiText, EuiButton, EuiSpacer } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
import { METRIC_TYPE, UiCounterMetricType } from '@kbn/analytics';
import { DiscoverFieldBucket } from './discover_field_bucket';
@@ -30,6 +30,7 @@ import {
import { Bucket, FieldDetails } from './types';
import { IndexPatternField, IndexPattern } from '../../../../../data/public';
import './discover_field_details.scss';
+import { DiscoverFieldDetailsFooter } from './discover_field_details_footer';
interface DiscoverFieldDetailsProps {
field: IndexPatternField;
@@ -37,6 +38,7 @@ interface DiscoverFieldDetailsProps {
details: FieldDetails;
onAddFilter: (field: IndexPatternField | string, value: string, type: '+' | '-') => void;
trackUiMetric?: (metricType: UiCounterMetricType, eventName: string | string[]) => void;
+ showFooter?: boolean;
}
export function DiscoverFieldDetails({
@@ -45,6 +47,7 @@ export function DiscoverFieldDetails({
details,
onAddFilter,
trackUiMetric,
+ showFooter = true,
}: DiscoverFieldDetailsProps) {
const warnings = getWarnings(field);
const [showVisualizeLink, setShowVisualizeLink] = useState
(false);
@@ -118,27 +121,13 @@ export function DiscoverFieldDetails({
)}
- {!details.error && (
-
-
- {!indexPattern.metaFields.includes(field.name) && !field.scripted ? (
- onAddFilter('_exists_', field.name, '+')}>
-
- ) : (
- {details.exists}
- )}{' '}
- / {details.total}{' '}
-
-
+ {!details.error && showFooter && (
+
)}
);
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field_details_footer.test.tsx b/src/plugins/discover/public/application/components/sidebar/discover_field_details_footer.test.tsx
new file mode 100644
index 0000000000000..028187569e977
--- /dev/null
+++ b/src/plugins/discover/public/application/components/sidebar/discover_field_details_footer.test.tsx
@@ -0,0 +1,82 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React from 'react';
+import { findTestSubject } from '@elastic/eui/lib/test';
+// @ts-ignore
+import stubbedLogstashFields from 'fixtures/logstash_fields';
+import { mountWithIntl } from '@kbn/test/jest';
+import { coreMock } from '../../../../../../core/public/mocks';
+import { IndexPatternField } from '../../../../../data/public';
+import { getStubIndexPattern } from '../../../../../data/public/test_utils';
+import { DiscoverFieldDetailsFooter } from './discover_field_details_footer';
+
+const indexPattern = getStubIndexPattern(
+ 'logstash-*',
+ (cfg: any) => cfg,
+ 'time',
+ stubbedLogstashFields(),
+ coreMock.createSetup()
+);
+
+describe('discover sidebar field details footer', function () {
+ const onAddFilter = jest.fn();
+ const defaultProps = {
+ indexPattern,
+ details: { buckets: [], error: '', exists: 1, total: 2, columns: [] },
+ onAddFilter,
+ };
+
+ function mountComponent(field: IndexPatternField) {
+ const compProps = { ...defaultProps, field };
+ return mountWithIntl(
);
+ }
+
+ it('renders properly', function () {
+ const visualizableField = new IndexPatternField({
+ name: 'bytes',
+ type: 'number',
+ esTypes: ['long'],
+ count: 10,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ });
+ const component = mountComponent(visualizableField);
+ expect(component).toMatchSnapshot();
+ });
+
+ it('click on addFilter calls the function', function () {
+ const visualizableField = new IndexPatternField({
+ name: 'bytes',
+ type: 'number',
+ esTypes: ['long'],
+ count: 10,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ });
+ const component = mountComponent(visualizableField);
+ const onAddButton = findTestSubject(component, 'onAddFilterButton');
+ onAddButton.simulate('click');
+ expect(onAddFilter).toHaveBeenCalledWith('_exists_', visualizableField.name, '+');
+ });
+});
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field_details_footer.tsx b/src/plugins/discover/public/application/components/sidebar/discover_field_details_footer.tsx
new file mode 100644
index 0000000000000..58e91c85913a1
--- /dev/null
+++ b/src/plugins/discover/public/application/components/sidebar/discover_field_details_footer.tsx
@@ -0,0 +1,70 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React from 'react';
+import { EuiLink, EuiPopoverFooter, EuiText } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { IndexPatternField } from '../../../../../data/common/index_patterns/fields';
+import { IndexPattern } from '../../../../../data/common/index_patterns/index_patterns';
+import { FieldDetails } from './types';
+
+interface DiscoverFieldDetailsFooterProps {
+ field: IndexPatternField;
+ indexPattern: IndexPattern;
+ details: FieldDetails;
+ onAddFilter: (field: IndexPatternField | string, value: string, type: '+' | '-') => void;
+}
+
+export function DiscoverFieldDetailsFooter({
+ field,
+ indexPattern,
+ details,
+ onAddFilter,
+}: DiscoverFieldDetailsFooterProps) {
+ return (
+
+
+ {!indexPattern.metaFields.includes(field.name) && !field.scripted ? (
+ onAddFilter('_exists_', field.name, '+')}
+ data-test-subj="onAddFilterButton"
+ >
+
+ ) : (
+
+
+ );
+}
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx b/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx
index 57cc45b3c3e9f..6c312924fb7b7 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx
+++ b/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx
@@ -100,6 +100,10 @@ export interface DiscoverSidebarProps {
* Callback function to select another index pattern
*/
setIndexPattern: (id: string) => void;
+ /**
+ * If on, fields are read from the fields API, not from source
+ */
+ useNewFieldsApi?: boolean;
/**
* Metric tracking function
* @param metricType
@@ -127,9 +131,11 @@ export function DiscoverSidebar({
setFieldFilter,
setIndexPattern,
trackUiMetric,
+ useNewFieldsApi = false,
useFlyout = false,
}: DiscoverSidebarProps) {
const [fields, setFields] = useState
(null);
+
useEffect(() => {
const newFields = getIndexPatternFieldList(selectedIndexPattern, fieldCounts);
setFields(newFields);
@@ -154,13 +160,10 @@ export function DiscoverSidebar({
selected: selectedFields,
popular: popularFields,
unpopular: unpopularFields,
- } = useMemo(() => groupFields(fields, columns, popularLimit, fieldCounts, fieldFilter), [
- fields,
- columns,
- popularLimit,
- fieldCounts,
- fieldFilter,
- ]);
+ } = useMemo(
+ () => groupFields(fields, columns, popularLimit, fieldCounts, fieldFilter, useNewFieldsApi),
+ [fields, columns, popularLimit, fieldCounts, fieldFilter, useNewFieldsApi]
+ );
const fieldTypes = useMemo(() => {
const result = ['any'];
@@ -174,6 +177,27 @@ export function DiscoverSidebar({
return result;
}, [fields]);
+ const multiFields = useMemo(() => {
+ if (!useNewFieldsApi || !fields) {
+ return undefined;
+ }
+ const map = new Map>();
+ fields.forEach((field) => {
+ const parent = field.spec?.subType?.multi?.parent;
+ if (!parent) {
+ return;
+ }
+ const multiField = {
+ field,
+ isSelected: selectedFields.includes(field),
+ };
+ const value = map.get(parent) ?? [];
+ value.push(multiField);
+ map.set(parent, value);
+ });
+ return map;
+ }, [fields, useNewFieldsApi, selectedFields]);
+
if (!selectedIndexPattern || !fields) {
return null;
}
@@ -278,6 +302,7 @@ export function DiscoverSidebar({
getDetails={getDetailsByField}
selected={true}
trackUiMetric={trackUiMetric}
+ multiFields={multiFields?.get(field.name)}
/>
);
@@ -338,6 +363,7 @@ export function DiscoverSidebar({
onAddFilter={onAddFilter}
getDetails={getDetailsByField}
trackUiMetric={trackUiMetric}
+ multiFields={multiFields?.get(field.name)}
/>
);
@@ -366,6 +392,7 @@ export function DiscoverSidebar({
onAddFilter={onAddFilter}
getDetails={getDetailsByField}
trackUiMetric={trackUiMetric}
+ multiFields={multiFields?.get(field.name)}
/>
);
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_sidebar_responsive.tsx b/src/plugins/discover/public/application/components/sidebar/discover_sidebar_responsive.tsx
index 0413ebd17d71b..3000291fc23bb 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_sidebar_responsive.tsx
+++ b/src/plugins/discover/public/application/components/sidebar/discover_sidebar_responsive.tsx
@@ -103,6 +103,10 @@ export interface DiscoverSidebarResponsiveProps {
* Shows index pattern and a button that displays the sidebar in a flyout
*/
useFlyout?: boolean;
+ /**
+ * Read from the Fields API
+ */
+ useNewFieldsApi?: boolean;
}
/**
diff --git a/src/plugins/discover/public/application/components/sidebar/lib/group_fields.test.ts b/src/plugins/discover/public/application/components/sidebar/lib/group_fields.test.ts
index 22cacae4c3b45..6cbfa03a070db 100644
--- a/src/plugins/discover/public/application/components/sidebar/lib/group_fields.test.ts
+++ b/src/plugins/discover/public/application/components/sidebar/lib/group_fields.test.ts
@@ -69,7 +69,8 @@ describe('group_fields', function () {
['currency'],
5,
fieldCounts,
- fieldFilterState
+ fieldFilterState,
+ false
);
expect(actual).toMatchInlineSnapshot(`
Object {
@@ -118,6 +119,80 @@ describe('group_fields', function () {
}
`);
});
+ it('should group fields in selected, popular, unpopular group if they contain multifields', function () {
+ const category = {
+ name: 'category',
+ type: 'string',
+ esTypes: ['text'],
+ count: 1,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ };
+ const currency = {
+ name: 'currency',
+ displayName: 'currency',
+ kbnFieldType: {
+ esTypes: ['string', 'text', 'keyword', '_type', '_id'],
+ filterable: true,
+ name: 'string',
+ sortable: true,
+ },
+ spec: {
+ esTypes: ['text'],
+ name: 'category',
+ },
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ };
+ const currencyKeyword = {
+ name: 'currency.keyword',
+ displayName: 'currency.keyword',
+ type: 'string',
+ esTypes: ['keyword'],
+ kbnFieldType: {
+ esTypes: ['string', 'text', 'keyword', '_type', '_id'],
+ filterable: true,
+ name: 'string',
+ sortable: true,
+ },
+ spec: {
+ aggregatable: true,
+ esTypes: ['keyword'],
+ name: 'category.keyword',
+ readFromDocValues: true,
+ searchable: true,
+ shortDotsEnable: false,
+ subType: {
+ multi: {
+ parent: 'currency',
+ },
+ },
+ },
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: false,
+ };
+ const fieldsToGroup = [category, currency, currencyKeyword];
+
+ const fieldFilterState = getDefaultFieldFilter();
+
+ const actual = groupFields(
+ fieldsToGroup as any,
+ ['currency'],
+ 5,
+ fieldCounts,
+ fieldFilterState,
+ true
+ );
+ expect(actual.popular).toEqual([category]);
+ expect(actual.selected).toEqual([currency]);
+ expect(actual.unpopular).toEqual([]);
+ });
it('should sort selected fields by columns order ', function () {
const fieldFilterState = getDefaultFieldFilter();
@@ -127,7 +202,8 @@ describe('group_fields', function () {
['customer_birth_date', 'currency', 'unknown'],
5,
fieldCounts,
- fieldFilterState
+ fieldFilterState,
+ false
);
expect(actual1.selected.map((field) => field.name)).toEqual([
'customer_birth_date',
@@ -140,7 +216,8 @@ describe('group_fields', function () {
['currency', 'customer_birth_date', 'unknown'],
5,
fieldCounts,
- fieldFilterState
+ fieldFilterState,
+ false
);
expect(actual2.selected.map((field) => field.name)).toEqual([
'currency',
diff --git a/src/plugins/discover/public/application/components/sidebar/lib/group_fields.tsx b/src/plugins/discover/public/application/components/sidebar/lib/group_fields.tsx
index c34becc97cb93..e6c3d0fe3ea42 100644
--- a/src/plugins/discover/public/application/components/sidebar/lib/group_fields.tsx
+++ b/src/plugins/discover/public/application/components/sidebar/lib/group_fields.tsx
@@ -33,7 +33,8 @@ export function groupFields(
columns: string[],
popularLimit: number,
fieldCounts: Record,
- fieldFilterState: FieldFilterState
+ fieldFilterState: FieldFilterState,
+ useNewFieldsApi: boolean
): GroupedFields {
const result: GroupedFields = {
selected: [],
@@ -62,12 +63,17 @@ export function groupFields(
if (!isFieldFiltered(field, fieldFilterState, fieldCounts)) {
continue;
}
+ const isSubfield = useNewFieldsApi && field.spec?.subType?.multi?.parent;
if (columns.includes(field.name)) {
result.selected.push(field);
} else if (popular.includes(field.name) && field.type !== '_source') {
- result.popular.push(field);
+ if (!isSubfield) {
+ result.popular.push(field);
+ }
} else if (field.type !== '_source') {
- result.unpopular.push(field);
+ if (!isSubfield) {
+ result.unpopular.push(field);
+ }
}
}
// add columns, that are not part of the index pattern, to be removeable
diff --git a/src/plugins/discover/public/application/components/sidebar/types.ts b/src/plugins/discover/public/application/components/sidebar/types.ts
index d80662b65cc7b..4ec731e852ce3 100644
--- a/src/plugins/discover/public/application/components/sidebar/types.ts
+++ b/src/plugins/discover/public/application/components/sidebar/types.ts
@@ -25,7 +25,7 @@ export interface IndexPatternRef {
export interface FieldDetails {
error: string;
exists: number;
- total: boolean;
+ total: number;
buckets: Bucket[];
columns: string[];
}
diff --git a/src/plugins/discover/public/application/helpers/get_switch_index_pattern_app_state.ts b/src/plugins/discover/public/application/helpers/get_switch_index_pattern_app_state.ts
index 458b9b7e066fd..5af4449a63e0b 100644
--- a/src/plugins/discover/public/application/helpers/get_switch_index_pattern_app_state.ts
+++ b/src/plugins/discover/public/application/helpers/get_switch_index_pattern_app_state.ts
@@ -29,7 +29,8 @@ export function getSwitchIndexPatternAppState(
nextIndexPattern: IndexPattern,
currentColumns: string[],
currentSort: SortPairArr[],
- modifyColumns: boolean = true
+ modifyColumns: boolean = true,
+ useNewFieldsApi: boolean = false
) {
const nextColumns = modifyColumns
? currentColumns.filter(
@@ -38,9 +39,11 @@ export function getSwitchIndexPatternAppState(
)
: currentColumns;
const nextSort = getSortArray(currentSort, nextIndexPattern);
+ const defaultColumns = useNewFieldsApi ? [] : ['_source'];
+ const columns = nextColumns.length ? nextColumns : defaultColumns;
return {
index: nextIndexPattern.id,
- columns: nextColumns.length ? nextColumns : ['_source'],
+ columns,
sort: nextSort,
};
}
diff --git a/src/plugins/discover/public/application/helpers/persist_saved_search.ts b/src/plugins/discover/public/application/helpers/persist_saved_search.ts
index 8ec2012b5843e..2f373c34eb17d 100644
--- a/src/plugins/discover/public/application/helpers/persist_saved_search.ts
+++ b/src/plugins/discover/public/application/helpers/persist_saved_search.ts
@@ -49,6 +49,8 @@ export async function persistSavedSearch(
indexPattern,
services,
sort: state.sort as SortOrder[],
+ columns: state.columns || [],
+ useNewFieldsApi: false,
});
savedSearch.columns = state.columns || [];
diff --git a/src/plugins/discover/public/application/helpers/update_search_source.test.ts b/src/plugins/discover/public/application/helpers/update_search_source.test.ts
index 91832325432ef..615a414680469 100644
--- a/src/plugins/discover/public/application/helpers/update_search_source.test.ts
+++ b/src/plugins/discover/public/application/helpers/update_search_source.test.ts
@@ -44,8 +44,37 @@ describe('updateSearchSource', () => {
} as unknown) as IUiSettingsClient,
} as unknown) as DiscoverServices,
sort: [] as SortOrder[],
+ columns: [],
+ useNewFieldsApi: false,
});
expect(result.getField('index')).toEqual(indexPatternMock);
expect(result.getField('size')).toEqual(sampleSize);
+ expect(result.getField('fields')).toBe(undefined);
+ });
+
+ test('updates a given search source with the usage of the new fields api', async () => {
+ const searchSourceMock = createSearchSourceMock({});
+ const sampleSize = 250;
+ const result = updateSearchSource(searchSourceMock, {
+ indexPattern: indexPatternMock,
+ services: ({
+ data: dataPluginMock.createStartContract(),
+ uiSettings: ({
+ get: (key: string) => {
+ if (key === SAMPLE_SIZE_SETTING) {
+ return sampleSize;
+ }
+ return false;
+ },
+ } as unknown) as IUiSettingsClient,
+ } as unknown) as DiscoverServices,
+ sort: [] as SortOrder[],
+ columns: [],
+ useNewFieldsApi: true,
+ });
+ expect(result.getField('index')).toEqual(indexPatternMock);
+ expect(result.getField('size')).toEqual(sampleSize);
+ expect(result.getField('fields')).toEqual(['*']);
+ expect(result.getField('fieldsFromSource')).toBe(undefined);
});
});
diff --git a/src/plugins/discover/public/application/helpers/update_search_source.ts b/src/plugins/discover/public/application/helpers/update_search_source.ts
index 324dc8a48457a..46f1c9f626054 100644
--- a/src/plugins/discover/public/application/helpers/update_search_source.ts
+++ b/src/plugins/discover/public/application/helpers/update_search_source.ts
@@ -31,10 +31,14 @@ export function updateSearchSource(
indexPattern,
services,
sort,
+ columns,
+ useNewFieldsApi,
}: {
indexPattern: IndexPattern;
services: DiscoverServices;
sort: SortOrder[];
+ columns: string[];
+ useNewFieldsApi: boolean;
}
) {
const { uiSettings, data } = services;
@@ -50,5 +54,13 @@ export function updateSearchSource(
.setField('sort', usedSort)
.setField('query', data.query.queryString.getQuery() || null)
.setField('filter', data.query.filterManager.getFilters());
+ if (useNewFieldsApi) {
+ searchSource.removeField('fieldsFromSource');
+ searchSource.setField('fields', ['*']);
+ } else {
+ searchSource.removeField('fields');
+ const fieldNames = indexPattern.fields.map((field) => field.name);
+ searchSource.setField('fieldsFromSource', fieldNames);
+ }
return searchSource;
}
diff --git a/src/plugins/discover/server/ui_settings.ts b/src/plugins/discover/server/ui_settings.ts
index 425928385e64a..673f55c78a506 100644
--- a/src/plugins/discover/server/ui_settings.ts
+++ b/src/plugins/discover/server/ui_settings.ts
@@ -35,6 +35,7 @@ import {
CONTEXT_TIE_BREAKER_FIELDS_SETTING,
DOC_TABLE_LEGACY,
MODIFY_COLUMNS_ON_SWITCH,
+ SEARCH_FIELDS_FROM_SOURCE,
} from '../common';
export const uiSettings: Record = {
@@ -198,4 +199,11 @@ export const uiSettings: Record = {
name: 'discover:modifyColumnsOnSwitchTitle',
},
},
+ [SEARCH_FIELDS_FROM_SOURCE]: {
+ name: 'Read fields from _source',
+ description: `When enabled will load documents directly from \`_source\`. This is soon going to be deprecated. When disabled, will retrieve fields via the new Fields API in the high-level search service.`,
+ value: false,
+ category: ['discover'],
+ schema: schema.boolean(),
+ },
};
diff --git a/test/functional/apps/context/_date_nanos_custom_timestamp.js b/test/functional/apps/context/_date_nanos_custom_timestamp.js
index 8fe08d13af0aa..8772b10a4b8c8 100644
--- a/test/functional/apps/context/_date_nanos_custom_timestamp.js
+++ b/test/functional/apps/context/_date_nanos_custom_timestamp.js
@@ -38,6 +38,7 @@ export default function ({ getService, getPageObjects }) {
await kibanaServer.uiSettings.update({
'context:defaultSize': `${TEST_DEFAULT_CONTEXT_SIZE}`,
'context:step': `${TEST_STEP_SIZE}`,
+ 'discover:searchFieldsFromSource': true,
});
});
diff --git a/test/functional/apps/discover/_data_grid_doc_navigation.ts b/test/functional/apps/discover/_data_grid_doc_navigation.ts
index 92d9893cab0b6..97b8eb564a256 100644
--- a/test/functional/apps/discover/_data_grid_doc_navigation.ts
+++ b/test/functional/apps/discover/_data_grid_doc_navigation.ts
@@ -56,7 +56,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
expect(hasDocHit).to.be(true);
});
- it('add filter should create an exists filter if value is null (#7189)', async function () {
+ // no longer relevant as null field won't be returned in the Fields API response
+ xit('add filter should create an exists filter if value is null (#7189)', async function () {
await PageObjects.discover.waitUntilSearchingHasFinished();
// Filter special document
await filterBar.addFilter('agent', 'is', 'Missing/Fields');
diff --git a/test/functional/apps/discover/_data_grid_field_data.ts b/test/functional/apps/discover/_data_grid_field_data.ts
index 8224f59f7fabf..137c19149d274 100644
--- a/test/functional/apps/discover/_data_grid_field_data.ts
+++ b/test/functional/apps/discover/_data_grid_field_data.ts
@@ -53,7 +53,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
it('the search term should be highlighted in the field data', async function () {
// marks is the style that highlights the text in yellow
const marks = await PageObjects.discover.getMarks();
- expect(marks.length).to.be(25);
+ expect(marks.length).to.be(50);
expect(marks.indexOf('php')).to.be(0);
});
diff --git a/test/functional/apps/discover/_discover_fields_api.ts b/test/functional/apps/discover/_discover_fields_api.ts
new file mode 100644
index 0000000000000..94cb4ed5fa52e
--- /dev/null
+++ b/test/functional/apps/discover/_discover_fields_api.ts
@@ -0,0 +1,71 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import expect from '@kbn/expect';
+import { FtrProviderContext } from './ftr_provider_context';
+
+export default function ({ getService, getPageObjects }: FtrProviderContext) {
+ const log = getService('log');
+ const retry = getService('retry');
+ const esArchiver = getService('esArchiver');
+ const kibanaServer = getService('kibanaServer');
+ const PageObjects = getPageObjects(['common', 'discover', 'header', 'timePicker']);
+ const defaultSettings = {
+ defaultIndex: 'logstash-*',
+ 'discover:searchFieldsFromSource': false,
+ };
+ describe('discover uses fields API test', function describeIndexTests() {
+ before(async function () {
+ log.debug('load kibana index with default index pattern');
+ await esArchiver.load('discover');
+ await esArchiver.loadIfNeeded('logstash_functional');
+ await kibanaServer.uiSettings.replace(defaultSettings);
+ log.debug('discover');
+ await PageObjects.common.navigateToApp('discover');
+ await PageObjects.timePicker.setDefaultAbsoluteRange();
+ });
+
+ after(async () => {
+ await kibanaServer.uiSettings.replace({ 'discover:searchFieldsFromSource': true });
+ });
+
+ it('should correctly display documents', async function () {
+ log.debug('check if Document title exists in the grid');
+ expect(await PageObjects.discover.getDocHeader()).to.have.string('Document');
+ const rowData = await PageObjects.discover.getDocTableIndex(1);
+ log.debug('check the newest doc timestamp in UTC (check diff timezone in last test)');
+ expect(rowData.startsWith('Sep 22, 2015 @ 23:50:13.253')).to.be.ok();
+ const expectedHitCount = '14,004';
+ await retry.try(async function () {
+ expect(await PageObjects.discover.getHitCount()).to.be(expectedHitCount);
+ });
+ });
+
+ it('adding a column removes a default column', async function () {
+ await PageObjects.discover.clickFieldListItemAdd('_score');
+ expect(await PageObjects.discover.getDocHeader()).to.have.string('_score');
+ expect(await PageObjects.discover.getDocHeader()).not.to.have.string('Document');
+ });
+
+ it('removing a column adds a default column', async function () {
+ await PageObjects.discover.clickFieldListItemRemove('_score');
+ expect(await PageObjects.discover.getDocHeader()).not.to.have.string('_score');
+ expect(await PageObjects.discover.getDocHeader()).to.have.string('Document');
+ });
+ });
+}
diff --git a/test/functional/apps/discover/_doc_navigation.ts b/test/functional/apps/discover/_doc_navigation.ts
index 76612b255ac23..79632942cf04a 100644
--- a/test/functional/apps/discover/_doc_navigation.ts
+++ b/test/functional/apps/discover/_doc_navigation.ts
@@ -55,7 +55,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
expect(hasDocHit).to.be(true);
});
- it('add filter should create an exists filter if value is null (#7189)', async function () {
+ // no longer relevant as null field won't be returned in the Fields API response
+ xit('add filter should create an exists filter if value is null (#7189)', async function () {
await PageObjects.discover.waitUntilSearchingHasFinished();
// Filter special document
await filterBar.addFilter('agent', 'is', 'Missing/Fields');
diff --git a/test/functional/apps/discover/_field_data.ts b/test/functional/apps/discover/_field_data.ts
index e08325a81a3e8..3811cde8a6367 100644
--- a/test/functional/apps/discover/_field_data.ts
+++ b/test/functional/apps/discover/_field_data.ts
@@ -36,6 +36,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await esArchiver.load('discover');
await kibanaServer.uiSettings.replace({
defaultIndex: 'logstash-*',
+ 'discover:searchFieldsFromSource': true,
});
await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
await PageObjects.common.navigateToApp('discover');
diff --git a/test/functional/apps/discover/_field_data_with_fields_api.ts b/test/functional/apps/discover/_field_data_with_fields_api.ts
new file mode 100644
index 0000000000000..923a021f5fad6
--- /dev/null
+++ b/test/functional/apps/discover/_field_data_with_fields_api.ts
@@ -0,0 +1,105 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import expect from '@kbn/expect';
+
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default function ({ getService, getPageObjects }: FtrProviderContext) {
+ const retry = getService('retry');
+ const esArchiver = getService('esArchiver');
+ const kibanaServer = getService('kibanaServer');
+ const toasts = getService('toasts');
+ const queryBar = getService('queryBar');
+ const PageObjects = getPageObjects(['common', 'header', 'discover', 'visualize', 'timePicker']);
+
+ describe('discover tab with new fields API', function describeIndexTests() {
+ this.tags('includeFirefox');
+ before(async function () {
+ await esArchiver.loadIfNeeded('logstash_functional');
+ await esArchiver.load('discover');
+ await kibanaServer.uiSettings.replace({
+ defaultIndex: 'logstash-*',
+ 'discover:searchFieldsFromSource': false,
+ });
+ await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
+ await PageObjects.common.navigateToApp('discover');
+ });
+ describe('field data', function () {
+ it('search php should show the correct hit count', async function () {
+ const expectedHitCount = '445';
+ await retry.try(async function () {
+ await queryBar.setQuery('php');
+ await queryBar.submitQuery();
+ const hitCount = await PageObjects.discover.getHitCount();
+ expect(hitCount).to.be(expectedHitCount);
+ });
+ });
+
+ it('the search term should be highlighted in the field data', async function () {
+ // marks is the style that highlights the text in yellow
+ const marks = await PageObjects.discover.getMarks();
+ expect(marks.length).to.be(100);
+ expect(marks.indexOf('php')).to.be(0);
+ });
+
+ it('search type:apache should show the correct hit count', async function () {
+ const expectedHitCount = '11,156';
+ await queryBar.setQuery('type:apache');
+ await queryBar.submitQuery();
+ await retry.try(async function tryingForTime() {
+ const hitCount = await PageObjects.discover.getHitCount();
+ expect(hitCount).to.be(expectedHitCount);
+ });
+ });
+
+ it('doc view should show Time and Document columns', async function () {
+ const expectedHeader = 'Time Document';
+ const Docheader = await PageObjects.discover.getDocHeader();
+ expect(Docheader).to.be(expectedHeader);
+ });
+
+ it('doc view should sort ascending', async function () {
+ const expectedTimeStamp = 'Sep 20, 2015 @ 00:00:00.000';
+ await PageObjects.discover.clickDocSortDown();
+
+ // we don't technically need this sleep here because the tryForTime will retry and the
+ // results will match on the 2nd or 3rd attempt, but that debug output is huge in this
+ // case and it can be avoided with just a few seconds sleep.
+ await PageObjects.common.sleep(2000);
+ await retry.try(async function tryingForTime() {
+ const rowData = await PageObjects.discover.getDocTableIndex(1);
+
+ expect(rowData.startsWith(expectedTimeStamp)).to.be.ok();
+ });
+ });
+
+ it('a bad syntax query should show an error message', async function () {
+ const expectedError =
+ 'Expected ":", "<", "<=", ">", ">=", AND, OR, end of input, ' +
+ 'whitespace but "(" found.';
+ await queryBar.setQuery('xxx(yyy))');
+ await queryBar.submitQuery();
+ const { message } = await toasts.getErrorToast();
+ expect(message).to.contain(expectedError);
+ await toasts.dismissToast();
+ });
+ });
+ });
+}
diff --git a/test/functional/apps/discover/_large_string.ts b/test/functional/apps/discover/_large_string.ts
index fe5613a4e3f19..e8ad6131bcc21 100644
--- a/test/functional/apps/discover/_large_string.ts
+++ b/test/functional/apps/discover/_large_string.ts
@@ -40,7 +40,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
it('verify the large string book present', async function () {
const ExpectedDoc =
- 'mybook:Project Gutenberg EBook of Hamlet, by William Shakespeare' +
+ '_id:1 _type: - _index:testlargestring _score:0' +
+ ' mybook:Project Gutenberg EBook of Hamlet, by William Shakespeare' +
' This eBook is for the use of anyone anywhere in the United States' +
' and most other parts of the world at no cost and with almost no restrictions whatsoever.' +
' You may copy it, give it away or re-use it under the terms of the' +
diff --git a/test/functional/apps/discover/_shared_links.ts b/test/functional/apps/discover/_shared_links.ts
index 51ea5f997e859..b15f5b0aae39f 100644
--- a/test/functional/apps/discover/_shared_links.ts
+++ b/test/functional/apps/discover/_shared_links.ts
@@ -88,7 +88,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
'/app/discover?_t=1453775307251#' +
'/?_g=(filters:!(),refreshInterval:(pause:!t,value:0),time' +
":(from:'2015-09-19T06:31:44.000Z',to:'2015-09" +
- "-23T18:31:44.000Z'))&_a=(columns:!(_source),filters:!(),index:'logstash-" +
+ "-23T18:31:44.000Z'))&_a=(columns:!(),filters:!(),index:'logstash-" +
"*',interval:auto,query:(language:kuery,query:'')" +
",sort:!(!('@timestamp',desc)))";
const actualUrl = await PageObjects.share.getSharedUrl();
diff --git a/test/functional/apps/discover/_source_filters.ts b/test/functional/apps/discover/_source_filters.ts
index 0af7c0ade79ba..d2ae02ef25de4 100644
--- a/test/functional/apps/discover/_source_filters.ts
+++ b/test/functional/apps/discover/_source_filters.ts
@@ -40,6 +40,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
// and load a set of makelogs data
await esArchiver.loadIfNeeded('logstash_functional');
+ await kibanaServer.uiSettings.update({
+ 'discover:searchFieldsFromSource': true,
+ });
+
log.debug('discover');
await PageObjects.common.navigateToApp('discover');
diff --git a/test/functional/apps/discover/ftr_provider_context.d.ts b/test/functional/apps/discover/ftr_provider_context.d.ts
new file mode 100644
index 0000000000000..a4894e024b612
--- /dev/null
+++ b/test/functional/apps/discover/ftr_provider_context.d.ts
@@ -0,0 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { GenericFtrProviderContext } from '@kbn/test/types/ftr';
+import { services } from '../../services';
+import { pageObjects } from '../../page_objects';
+
+export type FtrProviderContext = GenericFtrProviderContext;
diff --git a/test/functional/apps/discover/index.ts b/test/functional/apps/discover/index.ts
index 450049af66abf..5fd49a1d35216 100644
--- a/test/functional/apps/discover/index.ts
+++ b/test/functional/apps/discover/index.ts
@@ -42,6 +42,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
loadTestFile(require.resolve('./_filter_editor'));
loadTestFile(require.resolve('./_errors'));
loadTestFile(require.resolve('./_field_data'));
+ loadTestFile(require.resolve('./_field_data_with_fields_api'));
loadTestFile(require.resolve('./_shared_links'));
loadTestFile(require.resolve('./_sidebar'));
loadTestFile(require.resolve('./_source_filters'));
@@ -51,6 +52,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
loadTestFile(require.resolve('./_date_nanos'));
loadTestFile(require.resolve('./_date_nanos_mixed'));
loadTestFile(require.resolve('./_indexpattern_without_timefield'));
+ loadTestFile(require.resolve('./_discover_fields_api'));
loadTestFile(require.resolve('./_data_grid'));
loadTestFile(require.resolve('./_data_grid_context'));
loadTestFile(require.resolve('./_data_grid_field_data'));
diff --git a/test/functional/fixtures/es_archiver/date_nanos/mappings.json b/test/functional/fixtures/es_archiver/date_nanos/mappings.json
index bea82767f6cbb..f9ef429a0f97c 100644
--- a/test/functional/fixtures/es_archiver/date_nanos/mappings.json
+++ b/test/functional/fixtures/es_archiver/date_nanos/mappings.json
@@ -5,7 +5,8 @@
"mappings": {
"properties": {
"@timestamp": {
- "type": "date_nanos"
+ "type": "date_nanos",
+ "format": "strict_date_optional_time_nanos"
}
}
},
diff --git a/test/functional/fixtures/es_archiver/date_nanos_mixed/mappings.json b/test/functional/fixtures/es_archiver/date_nanos_mixed/mappings.json
index c62918abced58..b29f6b111b06d 100644
--- a/test/functional/fixtures/es_archiver/date_nanos_mixed/mappings.json
+++ b/test/functional/fixtures/es_archiver/date_nanos_mixed/mappings.json
@@ -29,7 +29,8 @@
"mappings": {
"properties": {
"timestamp": {
- "type": "date_nanos"
+ "type": "date_nanos",
+ "format": "strict_date_optional_time_nanos"
}
}
},
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index f8c5d7327d20d..2c553f9b81d7c 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -1510,10 +1510,8 @@
"discover.embeddable.inspectorRequestDescription": "このリクエストはElasticsearchにクエリをかけ、検索データを取得します。",
"discover.embeddable.search.displayName": "検索",
"discover.fieldChooser.detailViews.emptyStringText": "空の文字列",
- "discover.fieldChooser.detailViews.existsText": "存在する",
"discover.fieldChooser.detailViews.filterOutValueButtonAriaLabel": "{field}を除外：\"{value}\"",
"discover.fieldChooser.detailViews.filterValueButtonAriaLabel": "{field}を除外：\"{value}\"",
- "discover.fieldChooser.detailViews.recordsText": "記録",
"discover.fieldChooser.detailViews.visualizeLinkText": "可視化",
"discover.fieldChooser.discoverField.addButtonAriaLabel": "{field}を表に追加",
"discover.fieldChooser.discoverField.addFieldTooltip": "フィールドを列として追加",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 6dbf484150d99..7d0cef70b0930 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -1510,10 +1510,8 @@
"discover.embeddable.inspectorRequestDescription": "此请求将查询 Elasticsearch 以获取搜索的数据。",
"discover.embeddable.search.displayName": "搜索",
"discover.fieldChooser.detailViews.emptyStringText": "空字符串",
- "discover.fieldChooser.detailViews.existsText": "存在于",
"discover.fieldChooser.detailViews.filterOutValueButtonAriaLabel": "筛除 {field}：“{value}”",
"discover.fieldChooser.detailViews.filterValueButtonAriaLabel": "筛留 {field}：“{value}”",
- "discover.fieldChooser.detailViews.recordsText": "个记录",
"discover.fieldChooser.detailViews.visualizeLinkText": "可视化",
"discover.fieldChooser.discoverField.addButtonAriaLabel": "将 {field} 添加到表中",
"discover.fieldChooser.discoverField.addFieldTooltip": "将字段添加为列",
diff --git a/x-pack/test/functional/apps/security/doc_level_security_roles.js b/x-pack/test/functional/apps/security/doc_level_security_roles.js
index 72f463be48fd5..0595322ad2d21 100644
--- a/x-pack/test/functional/apps/security/doc_level_security_roles.js
+++ b/x-pack/test/functional/apps/security/doc_level_security_roles.js
@@ -77,7 +77,7 @@ export default function ({ getService, getPageObjects }) {
});
const rowData = await PageObjects.discover.getDocTableIndex(1);
expect(rowData).to.be(
- 'name:ABC Company region:EAST _id:doc1 _type: - _index:dlstest _score:0'
+ '_id:doc1 _type: - _index:dlstest _score:0 region.keyword:EAST name:ABC Company name.keyword:ABC Company region:EAST'
);
});
after('logout', async () => {
diff --git a/x-pack/test/functional/apps/security/field_level_security.js b/x-pack/test/functional/apps/security/field_level_security.js
index 7b22d72885c9d..3f3984dd05a94 100644
--- a/x-pack/test/functional/apps/security/field_level_security.js
+++ b/x-pack/test/functional/apps/security/field_level_security.js
@@ -112,7 +112,7 @@ export default function ({ getService, getPageObjects }) {
});
const rowData = await PageObjects.discover.getDocTableIndex(1);
expect(rowData).to.be(
- 'customer_ssn:444.555.6666 customer_name:ABC Company customer_region:WEST _id:2 _type: - _index:flstest _score:0'
+ '_id:2 _type: - _index:flstest _score:0 customer_name.keyword:ABC Company customer_ssn:444.555.6666 customer_region.keyword:WEST runtime_customer_ssn:444.555.6666 calculated at runtime customer_region:WEST customer_name:ABC Company customer_ssn.keyword:444.555.6666'
);
});
@@ -126,7 +126,7 @@ export default function ({ getService, getPageObjects }) {
});
const rowData = await PageObjects.discover.getDocTableIndex(1);
expect(rowData).to.be(
- 'customer_name:ABC Company customer_region:WEST _id:2 _type: - _index:flstest _score:0'
+ '_id:2 _type: - _index:flstest _score:0 customer_name.keyword:ABC Company customer_region.keyword:WEST customer_region:WEST customer_name:ABC Company'
);
});
diff --git a/x-pack/test/functional/es_archives/security/flstest/data/mappings.json b/x-pack/test/functional/es_archives/security/flstest/data/mappings.json
index 4f419e4b6ade4..0b970d5a3c1df 100644
--- a/x-pack/test/functional/es_archives/security/flstest/data/mappings.json
+++ b/x-pack/test/functional/es_archives/security/flstest/data/mappings.json
@@ -7,7 +7,8 @@
"runtime_customer_ssn": {
"type": "keyword",
"script": {
- "source": "emit(doc['customer_ssn'].value + ' calculated at runtime')"
+ "lang": "painless",
+ "source": "if (doc['customer_ssn'].size() !== 0) { return emit(doc['customer_ssn'].value + ' calculated at runtime') }"
}
}
},
@@ -37,7 +38,8 @@
"type": "keyword"
}
},
- "type": "text"
+ "type": "text",
+ "fielddata": true
}
}
},