boolean | a flag indicating that value cannot be changed |
| [requiresPageReload](./kibana-plugin-core-public.uisettingsparams.requirespagereload.md) | boolean | a flag indicating whether new value applying requires page reloading |
| [schema](./kibana-plugin-core-public.uisettingsparams.schema.md) | Type<T> | |
+| [sensitive](./kibana-plugin-core-public.uisettingsparams.sensitive.md) | boolean | a flag indicating that value might contain user sensitive data. used by telemetry to mask the value of the setting when sent. |
| [type](./kibana-plugin-core-public.uisettingsparams.type.md) | UiSettingsType | defines a type of UI element [UiSettingsType](./kibana-plugin-core-public.uisettingstype.md) |
| [validation](./kibana-plugin-core-public.uisettingsparams.validation.md) | ImageValidation | StringValidation | |
| [value](./kibana-plugin-core-public.uisettingsparams.value.md) | T | default value to fall back to if a user doesn't provide any |
diff --git a/docs/development/core/public/kibana-plugin-core-public.uisettingsparams.sensitive.md b/docs/development/core/public/kibana-plugin-core-public.uisettingsparams.sensitive.md
new file mode 100644
index 0000000000000..e12f3c5649f17
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.uisettingsparams.sensitive.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-core-public](./kibana-plugin-core-public.md) > [UiSettingsParams](./kibana-plugin-core-public.uisettingsparams.md) > [sensitive](./kibana-plugin-core-public.uisettingsparams.sensitive.md)
+
+## UiSettingsParams.sensitive property
+
+a flag indicating that value might contain user sensitive data. used by telemetry to mask the value of the setting when sent.
+
+Signature:
+
+```typescript
+sensitive?: boolean;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.iuisettingsclient.issensitive.md b/docs/development/core/server/kibana-plugin-core-server.iuisettingsclient.issensitive.md
new file mode 100644
index 0000000000000..a6f263e0b0f55
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.iuisettingsclient.issensitive.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-core-server](./kibana-plugin-core-server.md) > [IUiSettingsClient](./kibana-plugin-core-server.iuisettingsclient.md) > [isSensitive](./kibana-plugin-core-server.iuisettingsclient.issensitive.md)
+
+## IUiSettingsClient.isSensitive property
+
+Shows whether the uiSetting is a sensitive value. Used by telemetry to not send sensitive values.
+
+Signature:
+
+```typescript
+isSensitive: (key: string) => boolean;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.iuisettingsclient.md b/docs/development/core/server/kibana-plugin-core-server.iuisettingsclient.md
index af99b5e5bb215..dd4a69c13a2d9 100644
--- a/docs/development/core/server/kibana-plugin-core-server.iuisettingsclient.md
+++ b/docs/development/core/server/kibana-plugin-core-server.iuisettingsclient.md
@@ -21,6 +21,7 @@ export interface IUiSettingsClient
| [getRegistered](./kibana-plugin-core-server.iuisettingsclient.getregistered.md) | () => Readonly<Record<string, PublicUiSettingsParams>> | Returns registered uiSettings values [UiSettingsParams](./kibana-plugin-core-server.uisettingsparams.md) |
| [getUserProvided](./kibana-plugin-core-server.iuisettingsclient.getuserprovided.md) | <T = any>() => Promise<Record<string, UserProvidedValues<T>>> | Retrieves a set of all uiSettings values set by the user. |
| [isOverridden](./kibana-plugin-core-server.iuisettingsclient.isoverridden.md) | (key: string) => boolean | Shows whether the uiSettings value set by the user. |
+| [isSensitive](./kibana-plugin-core-server.iuisettingsclient.issensitive.md) | (key: string) => boolean | Shows whether the uiSetting is a sensitive value. Used by telemetry to not send sensitive values. |
| [remove](./kibana-plugin-core-server.iuisettingsclient.remove.md) | (key: string) => Promise<void> | Removes uiSettings value by key. |
| [removeMany](./kibana-plugin-core-server.iuisettingsclient.removemany.md) | (keys: string[]) => Promise<void> | Removes multiple uiSettings values by keys. |
| [set](./kibana-plugin-core-server.iuisettingsclient.set.md) | (key: string, value: any) => Promise<void> | Writes uiSettings value and marks it as set by the user. |
diff --git a/docs/development/core/server/kibana-plugin-core-server.kibanaresponsefactory.md b/docs/development/core/server/kibana-plugin-core-server.kibanaresponsefactory.md
index b488baacaff25..d7eafdce017e4 100644
--- a/docs/development/core/server/kibana-plugin-core-server.kibanaresponsefactory.md
+++ b/docs/development/core/server/kibana-plugin-core-server.kibanaresponsefactory.md
@@ -10,7 +10,7 @@ Set of helpers used to create `KibanaResponse` to form HTTP response on an incom
```typescript
kibanaResponseFactory: {
- custom: boolean | a flag indicating that value cannot be changed |
| [requiresPageReload](./kibana-plugin-core-server.uisettingsparams.requirespagereload.md) | boolean | a flag indicating whether new value applying requires page reloading |
| [schema](./kibana-plugin-core-server.uisettingsparams.schema.md) | Type<T> | |
+| [sensitive](./kibana-plugin-core-server.uisettingsparams.sensitive.md) | boolean | a flag indicating that value might contain user sensitive data. used by telemetry to mask the value of the setting when sent. |
| [type](./kibana-plugin-core-server.uisettingsparams.type.md) | UiSettingsType | defines a type of UI element [UiSettingsType](./kibana-plugin-core-server.uisettingstype.md) |
| [validation](./kibana-plugin-core-server.uisettingsparams.validation.md) | ImageValidation | StringValidation | |
| [value](./kibana-plugin-core-server.uisettingsparams.value.md) | T | default value to fall back to if a user doesn't provide any |
diff --git a/docs/development/core/server/kibana-plugin-core-server.uisettingsparams.sensitive.md b/docs/development/core/server/kibana-plugin-core-server.uisettingsparams.sensitive.md
new file mode 100644
index 0000000000000..f2c7de19dde1a
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.uisettingsparams.sensitive.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-core-server](./kibana-plugin-core-server.md) > [UiSettingsParams](./kibana-plugin-core-server.uisettingsparams.md) > [sensitive](./kibana-plugin-core-server.uisettingsparams.sensitive.md)
+
+## UiSettingsParams.sensitive property
+
+a flag indicating that value might contain user sensitive data. used by telemetry to mask the value of the setting when sent.
+
+Signature:
+
+```typescript
+sensitive?: boolean;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs._constructor_.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs._constructor_.md
index c9e08b9712480..6ca7a1a88b30e 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs._constructor_.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs._constructor_.md
@@ -15,11 +15,11 @@ constructor(indexPattern: IndexPattern, configStates: PickPick<Pick<{ type: string; enabled?: boolean | undefined; id?: string | undefined; params?: {} | import("./agg_config").SerializableState | undefined; schema?: string | undefined; }, "enabled" | "schema" | "id" | "params"> & Pick<{ type: string | IAggType; }, "type"> & Pick<{ type: string | IAggType; }, never>, "enabled" | "type" | "schema" | "id" | "params">[] | undefined | |
+| configStates | Pick<Pick<{ type: string; enabled?: boolean | undefined; id?: string | undefined; params?: {} | import("./agg_config").SerializableState | undefined; schema?: string | undefined; }, "schema" | "enabled" | "id" | "params"> & Pick<{ type: string | IAggType; }, "type"> & Pick<{ type: string | IAggType; }, never>, "schema" | "type" | "enabled" | "id" | "params">[] | undefined | |
| opts | AggConfigsOptions | |
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
index 65a722868b37f..4bbc76b78ba03 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
@@ -125,6 +125,7 @@
| [isPartialResponse](./kibana-plugin-plugins-data-public.ispartialresponse.md) | |
| [isQuery](./kibana-plugin-plugins-data-public.isquery.md) | |
| [isTimeRange](./kibana-plugin-plugins-data-public.istimerange.md) | |
+| [noSearchSessionStorageCapabilityMessage](./kibana-plugin-plugins-data-public.nosearchsessionstoragecapabilitymessage.md) | Message to display in case storing session session is disabled due to turned off capability |
| [parseSearchSourceJSON](./kibana-plugin-plugins-data-public.parsesearchsourcejson.md) | |
| [QueryStringInput](./kibana-plugin-plugins-data-public.querystringinput.md) | |
| [search](./kibana-plugin-plugins-data-public.search.md) | |
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.nosearchsessionstoragecapabilitymessage.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.nosearchsessionstoragecapabilitymessage.md
new file mode 100644
index 0000000000000..2bb0a0db8f9b3
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.nosearchsessionstoragecapabilitymessage.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [noSearchSessionStorageCapabilityMessage](./kibana-plugin-plugins-data-public.nosearchsessionstoragecapabilitymessage.md)
+
+## noSearchSessionStorageCapabilityMessage variable
+
+Message to display in case storing session session is disabled due to turned off capability
+
+Signature:
+
+```typescript
+noSearchSessionStorageCapabilityMessage: string
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md
index 2fd84730957b6..83fbc00860ca5 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md
@@ -7,7 +7,7 @@
Signature:
```typescript
-SearchBar: React.ComponentClass
+
+ {renderProps.rows.length === renderProps.sampleSize ? (
+
+ );
}
diff --git a/src/plugins/discover/public/application/components/create_discover_directive.ts b/src/plugins/discover/public/application/components/create_discover_directive.ts
index 42b99b635a791..10439488f4bc7 100644
--- a/src/plugins/discover/public/application/components/create_discover_directive.ts
+++ b/src/plugins/discover/public/application/components/create_discover_directive.ts
@@ -17,18 +17,21 @@ export function createDiscoverDirective(reactDirective: any) {
['histogramData', { watchDepth: 'reference' }],
['hits', { watchDepth: 'reference' }],
['indexPattern', { watchDepth: 'reference' }],
+ ['minimumVisibleRows', { watchDepth: 'reference' }],
['onAddColumn', { watchDepth: 'reference' }],
['onAddFilter', { watchDepth: 'reference' }],
['onChangeInterval', { watchDepth: 'reference' }],
+ ['onMoveColumn', { watchDepth: 'reference' }],
['onRemoveColumn', { watchDepth: 'reference' }],
['onSetColumns', { watchDepth: 'reference' }],
+ ['onSkipBottomButtonClick', { watchDepth: 'reference' }],
['onSort', { watchDepth: 'reference' }],
['opts', { watchDepth: 'reference' }],
['resetQuery', { watchDepth: 'reference' }],
['resultState', { watchDepth: 'reference' }],
['rows', { watchDepth: 'reference' }],
+ ['savedSearch', { watchDepth: 'reference' }],
['searchSource', { watchDepth: 'reference' }],
- ['setColumns', { watchDepth: 'reference' }],
['setIndexPattern', { watchDepth: 'reference' }],
['showSaveQuery', { watchDepth: 'reference' }],
['state', { watchDepth: 'reference' }],
diff --git a/src/plugins/discover/public/application/components/create_discover_legacy_directive.ts b/src/plugins/discover/public/application/components/create_discover_legacy_directive.ts
deleted file mode 100644
index b2b9fd38f73b1..0000000000000
--- a/src/plugins/discover/public/application/components/create_discover_legacy_directive.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * and the Server Side Public License, v 1; you may not use this file except in
- * compliance with, at your election, the Elastic License or the Server Side
- * Public License, v 1.
- */
-
-import { DiscoverLegacy } from './discover_legacy';
-
-export function createDiscoverLegacyDirective(reactDirective: any) {
- return reactDirective(DiscoverLegacy, [
- ['fetch', { watchDepth: 'reference' }],
- ['fetchCounter', { watchDepth: 'reference' }],
- ['fetchError', { watchDepth: 'reference' }],
- ['fieldCounts', { watchDepth: 'reference' }],
- ['histogramData', { watchDepth: 'reference' }],
- ['hits', { watchDepth: 'reference' }],
- ['indexPattern', { watchDepth: 'reference' }],
- ['minimumVisibleRows', { watchDepth: 'reference' }],
- ['onAddColumn', { watchDepth: 'reference' }],
- ['onAddFilter', { watchDepth: 'reference' }],
- ['onChangeInterval', { watchDepth: 'reference' }],
- ['onMoveColumn', { watchDepth: 'reference' }],
- ['onRemoveColumn', { watchDepth: 'reference' }],
- ['onSetColumns', { watchDepth: 'reference' }],
- ['onSkipBottomButtonClick', { watchDepth: 'reference' }],
- ['onSort', { watchDepth: 'reference' }],
- ['opts', { watchDepth: 'reference' }],
- ['resetQuery', { watchDepth: 'reference' }],
- ['resultState', { watchDepth: 'reference' }],
- ['rows', { watchDepth: 'reference' }],
- ['savedSearch', { watchDepth: 'reference' }],
- ['searchSource', { watchDepth: 'reference' }],
- ['setIndexPattern', { watchDepth: 'reference' }],
- ['showSaveQuery', { watchDepth: 'reference' }],
- ['state', { watchDepth: 'reference' }],
- ['timefilterUpdateHandler', { watchDepth: 'reference' }],
- ['timeRange', { watchDepth: 'reference' }],
- ['topNavMenu', { watchDepth: 'reference' }],
- ['updateQuery', { watchDepth: 'reference' }],
- ['updateSavedQueryId', { watchDepth: 'reference' }],
- ['useNewFieldsApi', { watchDepth: 'reference' }],
- ]);
-}
diff --git a/src/plugins/discover/public/application/components/discover_legacy.test.tsx b/src/plugins/discover/public/application/components/discover.test.tsx
similarity index 89%
rename from src/plugins/discover/public/application/components/discover_legacy.test.tsx
rename to src/plugins/discover/public/application/components/discover.test.tsx
index 04f294912d49e..3088ca45f7941 100644
--- a/src/plugins/discover/public/application/components/discover_legacy.test.tsx
+++ b/src/plugins/discover/public/application/components/discover.test.tsx
@@ -8,7 +8,7 @@
import React from 'react';
import { shallowWithIntl } from '@kbn/test/jest';
-import { DiscoverLegacy } from './discover_legacy';
+import { Discover } from './discover';
import { inspectorPluginMock } from '../../../../inspector/public/mocks';
import { esHits } from '../../__mocks__/es_hits';
import { indexPatternMock } from '../../__mocks__/index_pattern';
@@ -19,7 +19,7 @@ import { savedSearchMock } from '../../__mocks__/saved_search';
import { createSearchSourceMock } from '../../../../data/common/search/search_source/mocks';
import { dataPluginMock } from '../../../../data/public/mocks';
import { createFilterManagerMock } from '../../../../data/public/query/filter_manager/filter_manager.mock';
-import { uiSettingsMock } from '../../__mocks__/ui_settings';
+import { uiSettingsMock as mockUiSettings } from '../../__mocks__/ui_settings';
import { IndexPattern, IndexPatternAttributes } from '../../../../data/common/index_patterns';
import { SavedObject } from '../../../../../core/types';
import { navigationPluginMock } from '../../../../navigation/public/mocks';
@@ -40,6 +40,7 @@ jest.mock('../../kibana_services', () => {
},
},
navigation: mockNavigation,
+ uiSettings: mockUiSettings,
}),
};
});
@@ -53,6 +54,7 @@ function getProps(indexPattern: IndexPattern) {
save: true,
},
},
+ uiSettings: mockUiSettings,
} as unknown) as DiscoverServices;
return {
@@ -72,7 +74,7 @@ function getProps(indexPattern: IndexPattern) {
onSkipBottomButtonClick: jest.fn(),
onSort: jest.fn(),
opts: {
- config: uiSettingsMock,
+ config: mockUiSettings,
data: dataPluginMock.createStartContract(),
fixedScroll: jest.fn(),
filterManager: createFilterManagerMock(),
@@ -105,15 +107,13 @@ function getProps(indexPattern: IndexPattern) {
};
}
-describe('Descover legacy component', () => {
+describe('Discover component', () => {
test('selected index pattern without time field displays no chart toggle', () => {
- const component = shallowWithIntl(
+
+
+
+ ) : (
+
+
+
+ )}
+
+
{
+ if (scrollableDesktop && scrollableDesktop.current) {
+ scrollableDesktop.current.focus();
+ }
+ // Only the desktop one needs to target a specific container
+ if (!isMobile() && scrollableDesktop.current) {
+ scrollableDesktop.current.scrollTo(0, 0);
+ } else if (window) {
+ window.scrollTo(0, 0);
+ }
+ }}
+ onFilter={onAddFilter}
+ onMoveColumn={onMoveColumn}
+ onRemoveColumn={onRemoveColumn}
+ onSort={onSort}
+ sampleSize={opts.sampleSize}
+ useNewFieldsApi={useNewFieldsApi}
+ />
+ )}
+ {!isLegacy && rows && rows.length && (
{
export const DiscoverGrid = ({
ariaLabelledBy,
columns,
- defaultColumns,
indexPattern,
onAddColumn,
onFilter,
@@ -144,6 +137,7 @@ export const DiscoverGrid = ({
sort,
}: DiscoverGridProps) => {
const [expanded, setExpanded] = useState(undefined);
+ const defaultColumns = columns.includes('_source');
/**
* Pagination
diff --git a/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.tsx b/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.tsx
index 481d308cf88a9..6a247ad951c9b 100644
--- a/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.tsx
+++ b/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.tsx
@@ -48,7 +48,12 @@ export function buildEuiGridColumn(
id: columnName,
schema: getSchemaByKbnType(indexPatternField?.type),
isSortable: indexPatternField?.sortable,
- display: indexPatternField?.displayName,
+ display:
+ columnName === '_source'
+ ? i18n.translate('discover.grid.documentHeader', {
+ defaultMessage: 'Document',
+ })
+ : indexPatternField?.displayName,
actions: {
showHide:
defaultColumns || columnName === indexPattern.timeFieldName
diff --git a/src/plugins/discover/public/application/components/discover_legacy.tsx b/src/plugins/discover/public/application/components/discover_legacy.tsx
deleted file mode 100644
index 1b90b845a8fff..0000000000000
--- a/src/plugins/discover/public/application/components/discover_legacy.tsx
+++ /dev/null
@@ -1,517 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * and the Server Side Public License, v 1; you may not use this file except in
- * compliance with, at your election, the Elastic License or the Server Side
- * Public License, v 1.
- */
-
-import './discover.scss';
-
-import React, { useState, useRef } from 'react';
-import {
- EuiButtonEmpty,
- EuiButtonIcon,
- EuiFlexGroup,
- EuiFlexItem,
- EuiHideFor,
- EuiPage,
- EuiPageBody,
- EuiPageContent,
-} from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage, I18nProvider } from '@kbn/i18n/react';
-import { IUiSettingsClient, MountPoint } from 'kibana/public';
-import classNames from 'classnames';
-import { HitsCounter } from './hits_counter';
-import { TimechartHeader } from './timechart_header';
-import { getServices, IndexPattern } from '../../kibana_services';
-import { DiscoverUninitialized, DiscoverHistogram } from '../angular/directives';
-import { DiscoverNoResults } from './no_results';
-import { LoadingSpinner } from './loading_spinner/loading_spinner';
-import { DocTableLegacy, DocTableLegacyProps } from '../angular/doc_table/create_doc_table_react';
-import { SkipBottomButton } from './skip_bottom_button';
-import {
- search,
- ISearchSource,
- TimeRange,
- Query,
- IndexPatternAttributes,
- DataPublicPluginStart,
- AggConfigs,
- FilterManager,
-} from '../../../../data/public';
-import { Chart } from '../angular/helpers/point_series';
-import { AppState } from '../angular/discover_state';
-import { SavedSearch } from '../../saved_searches';
-import { SavedObject } from '../../../../../core/types';
-import { TopNavMenuData } from '../../../../navigation/public';
-import {
- DiscoverSidebarResponsive,
- DiscoverSidebarResponsiveProps,
-} from './sidebar/discover_sidebar_responsive';
-import { DocViewFilterFn, ElasticSearchHit } from '../doc_views/doc_views_types';
-
-export interface DiscoverProps {
- /**
- * Function to fetch documents from Elasticsearch
- */
- fetch: () => void;
- /**
- * Counter how often data was fetched (used for testing)
- */
- fetchCounter: number;
- /**
- * Error in case of a failing document fetch
- */
- fetchError?: Error;
- /**
- * Statistics by fields calculated using the fetched documents
- */
- fieldCounts: Record;
- /**
- * Histogram aggregation data
- */
- histogramData?: Chart;
- /**
- * Number of documents found by recent fetch
- */
- hits: number;
- /**
- * Current IndexPattern
- */
- indexPattern: IndexPattern;
- /**
- * Value needed for legacy "infinite" loading functionality
- * Determins how much records are rendered using the legacy table
- * Increased when scrolling down
- */
- minimumVisibleRows: number;
- /**
- * Function to add a column to state
- */
- onAddColumn: (column: string) => void;
- /**
- * Function to add a filter to state
- */
- onAddFilter: DocViewFilterFn;
- /**
- * Function to change the used time interval of the date histogram
- */
- onChangeInterval: (interval: string) => void;
- /**
- * Function to move a given column to a given index, used in legacy table
- */
- onMoveColumn: (columns: string, newIdx: number) => void;
- /**
- * Function to remove a given column from state
- */
- onRemoveColumn: (column: string) => void;
- /**
- * Function to replace columns in state
- */
- onSetColumns: (columns: string[]) => void;
- /**
- * Function to scroll down the legacy table to the bottom
- */
- onSkipBottomButtonClick: () => void;
- /**
- * Function to change sorting of the table, triggers a fetch
- */
- onSort: (sort: string[][]) => void;
- opts: {
- /**
- * Date histogram aggregation config
- */
- chartAggConfigs?: AggConfigs;
- /**
- * Client of uiSettings
- */
- config: IUiSettingsClient;
- /**
- * Data plugin
- */
- data: DataPublicPluginStart;
- /**
- * Data plugin filter manager
- */
- filterManager: FilterManager;
- /**
- * List of available index patterns
- */
- indexPatternList: Array>;
- /**
- * The number of documents that can be displayed in the table/grid
- */
- sampleSize: number;
- /**
- * Current instance of SavedSearch
- */
- savedSearch: SavedSearch;
- /**
- * Function to set the header menu
- */
- setHeaderActionMenu: (menuMount: MountPoint | undefined) => void;
- /**
- * Timefield of the currently used index pattern
- */
- timefield: string;
- /**
- * Function to set the current state
- */
- setAppState: (state: Partial) => void;
- };
- /**
- * Function to reset the current query
- */
- resetQuery: () => void;
- /**
- * Current state of the actual query, one of 'uninitialized', 'loading' ,'ready', 'none'
- */
- resultState: string;
- /**
- * Array of document of the recent successful search request
- */
- rows: ElasticSearchHit[];
- /**
- * Instance of SearchSource, the high level search API
- */
- searchSource: ISearchSource;
- /**
- * Function to change the current index pattern
- */
- setIndexPattern: (id: string) => void;
- /**
- * Determines whether the user should be able to use the save query feature
- */
- showSaveQuery: boolean;
- /**
- * Current app state of URL
- */
- state: AppState;
- /**
- * Function to update the time filter
- */
- timefilterUpdateHandler: (ranges: { from: number; to: number }) => void;
- /**
- * Currently selected time range
- */
- timeRange?: { from: string; to: string };
- /**
- * Menu data of top navigation (New, save ...)
- */
- topNavMenu: TopNavMenuData[];
- /**
- * Function to update the actual query
- */
- updateQuery: (payload: { dateRange: TimeRange; query?: Query }, isUpdate?: boolean) => void;
- /**
- * Function to update the actual savedQuery id
- */
- updateSavedQueryId: (savedQueryId?: string) => void;
- useNewFieldsApi?: boolean;
-}
-
-export const DocTableLegacyMemoized = React.memo((props: DocTableLegacyProps) => (
- (null);
- const collapseIcon = useRef(null);
- const isMobile = () => {
- // collapse icon isn't displayed in mobile view, use it to detect which view is displayed
- return collapseIcon && !collapseIcon.current;
- };
-
- const [toggleOn, toggleChart] = useState(true);
- const [isSidebarClosed, setIsSidebarClosed] = useState(false);
- const services = getServices();
- const { TopNavMenu } = services.navigation.ui;
- const { trackUiMetric } = services;
- const { savedSearch, indexPatternList } = opts;
- const bucketAggConfig = opts.chartAggConfigs?.aggs[1];
- const bucketInterval =
- bucketAggConfig && search.aggs.isDateHistogramBucketAggConfig(bucketAggConfig)
- ? bucketAggConfig.buckets?.getInterval()
- : undefined;
- const contentCentered = resultState === 'uninitialized';
-
- const getDisplayColumns = () => {
- if (!state.columns) {
- return [];
- }
- const columns = [...state.columns];
- if (useNewFieldsApi) {
- return columns.filter((column) => column !== '_source');
- }
- return columns.length === 0 ? ['_source'] : columns;
- };
-
- return (
-
-
-
-
-
-
-
-
- setIsSidebarClosed(!isSidebarClosed)}
- data-test-subj="collapseSideBarButton"
- aria-controls="discover-sidebar"
- aria-expanded={isSidebarClosed ? 'false' : 'true'}
- aria-label="Toggle sidebar"
- buttonRef={collapseIcon}
- />
-
-
-
-
- {resultState === 'none' && (
-
-
-
-
- 0 ? hits : 0}
- showResetButton={!!(savedSearch && savedSearch.id)}
- onResetQuery={resetQuery}
- />
-
- {toggleOn && (
-
-
- )}
- {opts.timefield && (
-
- {
- toggleChart(!toggleOn);
- }}
- data-test-subj="discoverChartToggle"
- >
- {toggleOn
- ? i18n.translate('discover.hideChart', {
- defaultMessage: 'Hide chart',
- })
- : i18n.translate('discover.showChart', {
- defaultMessage: 'Show chart',
- })}
-
-
- )}
-
-
- {toggleOn && opts.timefield && (
-
-
- {opts.chartAggConfigs && rows.length !== 0 && histogramData && (
-
-
- )}
-
-
-
-
-
- {rows && rows.length && (
-
-
-
- )}
-
-
-
-
-
-
- );
-}
diff --git a/src/plugins/discover/public/application/components/doc_viewer/doc_viewer.scss b/src/plugins/discover/public/application/components/doc_viewer/doc_viewer.scss
index 5bae3d64a6b69..95a50b54b5364 100644
--- a/src/plugins/discover/public/application/components/doc_viewer/doc_viewer.scss
+++ b/src/plugins/discover/public/application/components/doc_viewer/doc_viewer.scss
@@ -19,6 +19,14 @@
padding-top: $euiSizeS;
}
+ .kbnDocViewer__multifield_row:hover td {
+ background-color: transparent;
+ }
+
+ .kbnDocViewer__multifield_title {
+ font-family: $euiFontFamily;
+ }
+
.dscFieldName {
color: $euiColorDarkShade;
}
diff --git a/src/plugins/discover/public/application/components/table/table.test.tsx b/src/plugins/discover/public/application/components/table/table.test.tsx
index 1ffc0e5af95ac..ac074cf229c77 100644
--- a/src/plugins/discover/public/application/components/table/table.test.tsx
+++ b/src/plugins/discover/public/application/components/table/table.test.tsx
@@ -167,30 +167,6 @@ describe('DocViewTable at Discover', () => {
});
});
-describe('DocViewTable at Discover Doc', () => {
- const hit = {
- _index: 'logstash-2014.09.09',
- _score: 1,
- _type: 'doc',
- _id: 'id123',
- _source: {
- extension: 'html',
- not_mapped: 'yes',
- },
- };
- // here no action buttons are rendered
- const props = {
- hit,
- indexPattern,
- };
- const component = mount(;
+ Object.keys(hit).forEach((key) => {
+ if (key !== 'fields') {
+ result[key] = hit[key];
+ } else {
+ Object.keys(hit.fields).forEach((field) => {
+ result[field] = hit.fields[field];
+ });
+ }
+ });
+ return result;
+ }),
+ formatHit: jest.fn((hit) => {
+ const result = {} as Record;
+ Object.keys(hit).forEach((key) => {
+ if (key !== 'fields') {
+ result[key] = hit[key];
+ } else {
+ Object.keys(hit.fields).forEach((field) => {
+ result[field] = hit.fields[field];
+ });
+ }
+ });
+ return result;
+ }),
+ } as unknown) as IndexPattern;
+
+ indexPatterneCommerce.fields.getByName = (name: string) => {
+ return indexPatterneCommerce.fields.getAll().find((field) => field.name === name);
+ };
+
+ const fieldsHit = {
+ _index: 'logstash-2014.09.09',
+ _type: 'doc',
+ _id: 'id123',
+ _score: null,
+ fields: {
+ category: "Women's Clothing",
+ 'category.keyword': "Women's Clothing",
+ customer_first_name: 'Betty',
+ 'customer_first_name.keyword': 'Betty',
+ 'customer_first_name.nickname': 'Betsy',
+ },
+ };
+ const props = {
+ hit: fieldsHit,
+ columns: ['Document'],
+ indexPattern: indexPatterneCommerce,
+ filter: jest.fn(),
+ onAddColumn: jest.fn(),
+ onRemoveColumn: jest.fn(),
+ };
+ // @ts-ignore
+ const component = mount();
+ const [multiFields, setMultiFields] = useState({} as Record);
+ const [fieldsWithParents, setFieldsWithParents] = useState([] as string[]);
+
+ useEffect(() => {
+ if (!indexPattern) {
+ return;
+ }
+ const mapping = indexPattern.fields.getByName;
+ const flattened = indexPattern.flattenHit(hit);
+ const map: Record = {};
+ const arr: string[] = [];
+
+ Object.keys(flattened).forEach((key) => {
+ const field = mapping(key);
+
+ if (field && field.spec?.subType?.multi?.parent) {
+ const parent = field.spec.subType.multi.parent;
+ if (!map[parent]) {
+ map[parent] = [] as string[];
+ }
+ const value = map[parent];
+ value.push(key);
+ map[parent] = value;
+ arr.push(key);
+ }
+ });
+ setMultiFields(map);
+ setFieldsWithParents(arr);
+ }, [indexPattern, hit]);
+
if (!indexPattern) {
return null;
}
@@ -34,11 +64,13 @@ export function DocViewTable({
fieldRowOpen[field] = !fieldRowOpen[field];
setFieldRowOpen({ ...fieldRowOpen });
}
-
return (
{Object.keys(flattened)
+ .filter((field) => {
+ return !fieldsWithParents.includes(field);
+ })
.sort((fieldA, fieldB) => {
const mappingA = mapping(fieldA);
const mappingB = mapping(fieldB);
@@ -67,23 +99,60 @@ export function DocViewTable({
const fieldType = isNestedFieldParent(field, indexPattern)
? 'nested'
: indexPattern.fields.getByName(field)?.type;
-
return (
-
- {savedSearch.title} -
-
-
- )}
-
-
- {rows && rows.length && (
-
-
- )}
-
- {
- if (scrollableDesktop && scrollableDesktop.current) {
- scrollableDesktop.current.focus();
- }
- // Only the desktop one needs to target a specific container
- if (!isMobile() && scrollableDesktop.current) {
- scrollableDesktop.current.scrollTo(0, 0);
- } else if (window) {
- window.scrollTo(0, 0);
- }
- }}
- >
-
-
- ) : (
-
-
-
- )}
- | + | + + {i18n.translate('discover.fieldChooser.discoverField.multiFields', { + defaultMessage: 'Multi fields', + })} + + | +
|
- |
{isCollapsible && (
{key}: }
void;
+ /**
+ * Counter how often data was fetched (used for testing)
+ */
+ fetchCounter: number;
+ /**
+ * Error in case of a failing document fetch
+ */
+ fetchError?: Error;
+ /**
+ * Statistics by fields calculated using the fetched documents
+ */
+ fieldCounts: Record News feed content will be retrieved from this URL ', + }), + category: [APP_ID], + requiresPageReload: true, + schema: schema.string(), + }, +}), +``` + +The value of any UI setting marked as `sensitive` will be reported as a keyword `[REDACTED]` instead of the actual value. This hides the actual sensitive information while giving us some intelligence over which fields the users are interactive with the most. diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/__snapshots__/index.test.ts.snap b/src/plugins/kibana_usage_collection/server/collectors/management/__snapshots__/index.test.ts.snap deleted file mode 100644 index def230dea8d70..0000000000000 --- a/src/plugins/kibana_usage_collection/server/collectors/management/__snapshots__/index.test.ts.snap +++ /dev/null @@ -1,7 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`telemetry_application_usage_collector fetch() 1`] = ` -Object { - "my-key": "my-value", -} -`; diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/index.test.ts b/src/plugins/kibana_usage_collection/server/collectors/management/index.test.ts deleted file mode 100644 index 38baf02d6fe1b..0000000000000 --- a/src/plugins/kibana_usage_collection/server/collectors/management/index.test.ts +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * and the Server Side Public License, v 1; you may not use this file except in - * compliance with, at your election, the Elastic License or the Server Side - * Public License, v 1. - */ - -import { loggingSystemMock, uiSettingsServiceMock } from '../../../../../core/server/mocks'; -import { - Collector, - createUsageCollectionSetupMock, - createCollectorFetchContextMock, -} from '../../../../usage_collection/server/usage_collection.mock'; - -import { registerManagementUsageCollector } from './'; - -const logger = loggingSystemMock.createLogger(); - -describe('telemetry_application_usage_collector', () => { - let collector: Collector+ {i18n.translate('xpack.apm.fetcher.error.url', { + defaultMessage: `URL`, + })} ++ {error.response?.url} + + ); +} + // fetcher functions can return undefined OR a promise. Previously we had a more simple type // but it led to issues when using object destructuring with default values type InferResponseType- {i18n.translate('xpack.apm.fetcher.error.url', { - defaultMessage: `URL`, - })} -- {err.response?.url} - - ) : ( - err.message - ); + 'response' in err ? getDetailsFromErrorResponse(err) : err.message; if (showToastOnError) { - notifications.toasts.addWarning({ + notifications.toasts.addDanger({ title: i18n.translate('xpack.apm.fetcher.error.title', { defaultMessage: `Error while fetching resource`, }), + text: toMountPoint(
diff --git a/x-pack/plugins/apm/scripts/upload-telemetry-data/index.ts b/x-pack/plugins/apm/scripts/upload-telemetry-data/index.ts
index 8c64c37d9b7f7..e3221c17f3f2a 100644
--- a/x-pack/plugins/apm/scripts/upload-telemetry-data/index.ts
+++ b/x-pack/plugins/apm/scripts/upload-telemetry-data/index.ts
@@ -17,6 +17,8 @@ import { argv } from 'yargs';
import { Logger } from 'kibana/server';
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
import { CollectTelemetryParams } from '../../server/lib/apm_telemetry/collect_data_telemetry';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { unwrapEsResponse } from '../../../observability/server/utils/unwrap_es_response';
import { downloadTelemetryTemplate } from '../shared/download-telemetry-template';
import { mergeApmTelemetryMapping } from '../../common/apm_telemetry';
import { generateSampleDocuments } from './generate-sample-documents';
@@ -80,18 +82,18 @@ async function uploadData() {
apmAgentConfigurationIndex: '.apm-agent-configuration',
},
search: (body) => {
- return client.search(body as any).then((res) => res.body as any);
+ return unwrapEsResponse(client.search |