can navigate Autoplay Settings 2`] = `
data-focus-lock-disabled="disabled"
>
can navigate Toolbar Settings, closes when activated 1`] =
data-focus-lock-disabled="disabled"
>
can navigate Toolbar Settings, closes when activated 1`] =
`;
-exports[`
can navigate Toolbar Settings, closes when activated 2`] = `"
"`;
+exports[`
can navigate Toolbar Settings, closes when activated 2`] = `"
"`;
-exports[`
can navigate Toolbar Settings, closes when activated 3`] = `"
"`;
+exports[`
can navigate Toolbar Settings, closes when activated 3`] = `"
"`;
diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/settings.test.tsx b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/settings.test.tsx
index 78fefead027e5..5ebb30d79e046 100644
--- a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/settings.test.tsx
+++ b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/settings.test.tsx
@@ -18,6 +18,11 @@ import { Settings } from '../settings';
jest.mock('../../../../supported_renderers');
jest.mock(`@elastic/eui/lib/components/form/form_row/make_id`, () => () => `generated-id`);
+jest.mock('@elastic/eui/lib/services/accessibility', () => {
+ return {
+ htmlIdGenerator: () => () => `generated-id`,
+ };
+});
jest.mock('@elastic/eui/lib/components/portal/portal', () => {
// eslint-disable-next-line no-shadow
const React = require.requireActual('react');
diff --git a/x-pack/legacy/plugins/graph/public/angular/templates/index.html b/x-pack/legacy/plugins/graph/public/angular/templates/index.html
index 686f0f590a19c..b3f5bce7ea6ec 100644
--- a/x-pack/legacy/plugins/graph/public/angular/templates/index.html
+++ b/x-pack/legacy/plugins/graph/public/angular/templates/index.html
@@ -61,7 +61,7 @@
initial-query="initialQuery"
plugin-data-start="pluginDataStart"
core-start="coreStart"
- store="store"
+ storage="storage"
no-index-patterns="noIndexPatterns"
>
diff --git a/x-pack/legacy/plugins/graph/public/app.js b/x-pack/legacy/plugins/graph/public/app.js
index 41e5819bcbf37..ab83815457981 100644
--- a/x-pack/legacy/plugins/graph/public/app.js
+++ b/x-pack/legacy/plugins/graph/public/app.js
@@ -100,7 +100,7 @@ export function initGraphApp(angularModule, deps) {
app.directive('graphApp', function (reactDirective) {
return reactDirective(GraphApp, [
- ['store', { watchDepth: 'reference' }],
+ ['storage', { watchDepth: 'reference' }],
['isInitialized', { watchDepth: 'reference' }],
['currentIndexPattern', { watchDepth: 'reference' }],
['indexPatternProvider', { watchDepth: 'reference' }],
@@ -310,7 +310,7 @@ export function initGraphApp(angularModule, deps) {
// register things on scope passed down to react components
$scope.pluginDataStart = npData;
- $scope.store = new Storage(window.localStorage);
+ $scope.storage = new Storage(window.localStorage);
$scope.coreStart = coreStart;
$scope.loading = false;
$scope.reduxStore = store;
diff --git a/x-pack/legacy/plugins/graph/public/components/app.tsx b/x-pack/legacy/plugins/graph/public/components/app.tsx
index aa2221441793f..5ff7fc2e5da93 100644
--- a/x-pack/legacy/plugins/graph/public/components/app.tsx
+++ b/x-pack/legacy/plugins/graph/public/components/app.tsx
@@ -10,8 +10,8 @@ import { DataPublicPluginStart } from 'src/plugins/data/public';
import { Provider } from 'react-redux';
import React, { useState } from 'react';
import { I18nProvider } from '@kbn/i18n/react';
-import { Storage } from 'ui/storage';
import { CoreStart } from 'kibana/public';
+import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
import { FieldManager } from './field_manager';
import { SearchBarProps, SearchBar } from './search_bar';
import { GraphStore } from '../state_management';
@@ -23,7 +23,7 @@ export interface GraphAppProps extends SearchBarProps {
coreStart: CoreStart;
// This is not named dataStart because of Angular treating data- prefix differently
pluginDataStart: DataPublicPluginStart;
- store: Storage;
+ storage: IStorageWrapper;
reduxStore: GraphStore;
isInitialized: boolean;
noIndexPatterns: boolean;
@@ -34,7 +34,7 @@ export function GraphApp(props: GraphAppProps) {
const {
coreStart,
pluginDataStart,
- store,
+ storage,
reduxStore,
noIndexPatterns,
...searchBarProps
@@ -45,7 +45,7 @@ export function GraphApp(props: GraphAppProps) {
{},
},
};
diff --git a/x-pack/legacy/plugins/graph/public/components/settings/blacklist_form.tsx b/x-pack/legacy/plugins/graph/public/components/settings/blacklist_form.tsx
index b321ea3a0d8ed..f7ae04ef9dbcc 100644
--- a/x-pack/legacy/plugins/graph/public/components/settings/blacklist_form.tsx
+++ b/x-pack/legacy/plugins/graph/public/components/settings/blacklist_form.tsx
@@ -39,7 +39,7 @@ export function BlacklistForm({
}}
+ values={{ stopSign: }}
/>
}
/>
diff --git a/x-pack/legacy/plugins/graph/public/index.ts b/x-pack/legacy/plugins/graph/public/index.ts
index 0249ca74035d6..5e500367ccdc5 100644
--- a/x-pack/legacy/plugins/graph/public/index.ts
+++ b/x-pack/legacy/plugins/graph/public/index.ts
@@ -14,11 +14,11 @@ import chrome from 'ui/chrome';
import { IPrivate } from 'ui/private';
// @ts-ignore
import { xpackInfo } from 'plugins/xpack_main/services/xpack_info';
-import { Storage } from 'ui/storage';
// @ts-ignore
import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry';
import { npSetup, npStart } from 'ui/new_platform';
+import { Storage } from '../../../../../src/plugins/kibana_utils/public';
import { start as data } from '../../../../../src/legacy/core_plugins/data/public/legacy';
import { GraphPlugin } from './plugin';
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/__jest__/components/policy_table.test.js b/x-pack/legacy/plugins/index_lifecycle_management/__jest__/components/policy_table.test.js
index e96fc79967316..31d8337857911 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/__jest__/components/policy_table.test.js
+++ b/x-pack/legacy/plugins/index_lifecycle_management/__jest__/components/policy_table.test.js
@@ -111,7 +111,7 @@ describe('policy table', () => {
});
test('should show more when per page value is increased', () => {
const rendered = mountWithIntl(component);
- const perPageButton = rendered.find('#customizablePagination').find('button');
+ const perPageButton = rendered.find('EuiTablePagination EuiPopover').find('button');
perPageButton.simulate('click');
rendered.update();
const fiftyButton = rendered.find('.euiContextMenuItem').at(1);
diff --git a/x-pack/legacy/plugins/index_management/__jest__/components/index_table.test.js b/x-pack/legacy/plugins/index_management/__jest__/components/index_table.test.js
index d6a53eefcdc95..278ec918100d9 100644
--- a/x-pack/legacy/plugins/index_management/__jest__/components/index_table.test.js
+++ b/x-pack/legacy/plugins/index_management/__jest__/components/index_table.test.js
@@ -155,7 +155,7 @@ describe('index table', () => {
});
test('should show more when per page value is increased', () => {
const rendered = mountWithIntl(component);
- const perPageButton = rendered.find('#customizablePagination').find('button');
+ const perPageButton = rendered.find('EuiTablePagination EuiPopover').find('button');
perPageButton.simulate('click');
rendered.update();
const fiftyButton = rendered.find('.euiContextMenuItem').at(1);
diff --git a/x-pack/legacy/plugins/index_management/public/sections/home/template_list/template_details/tabs/tab_aliases.tsx b/x-pack/legacy/plugins/index_management/public/sections/home/template_list/template_details/tabs/tab_aliases.tsx
index d1ed816bebd45..3a1dcbc7e762d 100644
--- a/x-pack/legacy/plugins/index_management/public/sections/home/template_list/template_details/tabs/tab_aliases.tsx
+++ b/x-pack/legacy/plugins/index_management/public/sections/home/template_list/template_details/tabs/tab_aliases.tsx
@@ -34,6 +34,6 @@ export const TabAliases: React.FunctionComponent = ({ templateDetails })
}
iconType="pin"
data-test-subj="noAliasesCallout"
- >
+ />
);
};
diff --git a/x-pack/legacy/plugins/index_management/public/sections/home/template_list/template_details/tabs/tab_mappings.tsx b/x-pack/legacy/plugins/index_management/public/sections/home/template_list/template_details/tabs/tab_mappings.tsx
index 91f84a5ecf726..9439b0e31ae84 100644
--- a/x-pack/legacy/plugins/index_management/public/sections/home/template_list/template_details/tabs/tab_mappings.tsx
+++ b/x-pack/legacy/plugins/index_management/public/sections/home/template_list/template_details/tabs/tab_mappings.tsx
@@ -34,6 +34,6 @@ export const TabMappings: React.FunctionComponent = ({ templateDetails })
}
iconType="pin"
data-test-subj="noMappingsCallout"
- >
+ />
);
};
diff --git a/x-pack/legacy/plugins/index_management/public/sections/home/template_list/template_details/tabs/tab_settings.tsx b/x-pack/legacy/plugins/index_management/public/sections/home/template_list/template_details/tabs/tab_settings.tsx
index 6a83b714519d7..0370a89850721 100644
--- a/x-pack/legacy/plugins/index_management/public/sections/home/template_list/template_details/tabs/tab_settings.tsx
+++ b/x-pack/legacy/plugins/index_management/public/sections/home/template_list/template_details/tabs/tab_settings.tsx
@@ -34,6 +34,6 @@ export const TabSettings: React.FunctionComponent = ({ templateDetails })
}
iconType="pin"
data-test-subj="noSettingsCallout"
- >
+ />
);
};
diff --git a/x-pack/legacy/plugins/infra/public/components/autocomplete_field/suggestion_item.tsx b/x-pack/legacy/plugins/infra/public/components/autocomplete_field/suggestion_item.tsx
index ca67aec9642ac..d7c9876a07a8d 100644
--- a/x-pack/legacy/plugins/infra/public/components/autocomplete_field/suggestion_item.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/autocomplete_field/suggestion_item.tsx
@@ -11,36 +11,30 @@ import React from 'react';
import { AutocompleteSuggestion } from '../../../../../../../src/plugins/data/public';
import euiStyled from '../../../../../common/eui_styled_components';
-interface SuggestionItemProps {
+interface Props {
isSelected?: boolean;
onClick?: React.MouseEventHandler;
onMouseEnter?: React.MouseEventHandler;
suggestion: AutocompleteSuggestion;
}
-export class SuggestionItem extends React.Component {
- public static defaultProps: Partial = {
- isSelected: false,
- };
+export const SuggestionItem: React.SFC = props => {
+ const { isSelected, onClick, onMouseEnter, suggestion } = props;
- public render() {
- const { isSelected, onClick, onMouseEnter, suggestion } = this.props;
+ return (
+
+
+
+
+ {suggestion.text}
+ {suggestion.description}
+
+ );
+};
- return (
-
-
-
-
- {suggestion.text}
- {suggestion.description}
-
- );
- }
-}
+SuggestionItem.defaultProps = {
+ isSelected: false,
+};
const SuggestionItemContainer = euiStyled.div<{
isSelected?: boolean;
diff --git a/x-pack/legacy/plugins/infra/public/components/loading_overlay_wrapper.tsx b/x-pack/legacy/plugins/infra/public/components/loading_overlay_wrapper.tsx
new file mode 100644
index 0000000000000..0f70c40059c93
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/components/loading_overlay_wrapper.tsx
@@ -0,0 +1,45 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiLoadingSpinner } from '@elastic/eui';
+import { transparentize } from 'polished';
+import React from 'react';
+
+import { euiStyled } from '../../../../common/eui_styled_components';
+
+export const LoadingOverlayWrapper: React.FC<
+ React.HTMLAttributes & {
+ isLoading: boolean;
+ loadingChildren?: React.ReactNode;
+ }
+> = ({ children, isLoading, loadingChildren, ...rest }) => {
+ return (
+
+ {children}
+ {isLoading ? {loadingChildren} : null}
+
+ );
+};
+
+const Overlay: React.FC = ({ children }) => (
+ {children ? children : }
+);
+
+const RelativeDiv = euiStyled.div`
+ position: relative;
+`;
+
+const OverlayDiv = euiStyled.div`
+ align-items: center;
+ background-color: ${props => transparentize(0.3, props.theme.eui.euiColorEmptyShade)};
+ display: flex;
+ height: 100%;
+ justify-content: center;
+ left: 0;
+ position: absolute;
+ top: 0;
+ width: 100%;
+`;
diff --git a/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/loading_item_view.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/loading_item_view.tsx
index 218b42b48c9b9..752a0d6e27a7f 100644
--- a/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/loading_item_view.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/loading_item_view.tsx
@@ -114,29 +114,28 @@ interface ProgressEntryProps {
isLoading: boolean;
}
-class ProgressEntry extends React.PureComponent {
- public render() {
- const { alignment, children, className, color, isLoading } = this.props;
- // NOTE: styled-components seems to make all props in EuiProgress required, so this
- // style attribute hacking replaces styled-components here for now until that can be fixed
- // see: https://github.com/elastic/eui/issues/1655
- const alignmentStyle =
- alignment === 'top' ? { top: 0, bottom: 'initial' } : { top: 'initial', bottom: 0 };
+const ProgressEntry: React.SFC = props => {
+ const { alignment, children, className, color, isLoading } = props;
- return (
-
-
- {children}
-
- );
- }
-}
+ // NOTE: styled-components seems to make all props in EuiProgress required, so this
+ // style attribute hacking replaces styled-components here for now until that can be fixed
+ // see: https://github.com/elastic/eui/issues/1655
+ const alignmentStyle =
+ alignment === 'top' ? { top: 0, bottom: 'initial' } : { top: 'initial', bottom: 0 };
+
+ return (
+
+
+ {children}
+
+ );
+};
const ProgressEntryWrapper = euiStyled.div`
align-items: center;
diff --git a/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx
index d439308194d18..fc3c8b3bf2b31 100644
--- a/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx
@@ -102,6 +102,14 @@ export class ScrollableLogTextStreamView extends React.PureComponent<
targetId: null,
items: [],
};
+ } else if (
+ hasItems &&
+ (nextItems.length !== prevState.items.length || nextItems[0] !== prevState.items[0])
+ ) {
+ return {
+ ...prevState,
+ items: nextItems,
+ };
}
return null;
@@ -180,6 +188,7 @@ export class ScrollableLogTextStreamView extends React.PureComponent<
hideScrollbar={true}
data-test-subj={'logStream'}
isLocked={scrollLock.isEnabled}
+ entriesCount={items.length}
>
{registerChild => (
<>
diff --git a/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/vertical_scroll_panel.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/vertical_scroll_panel.tsx
index 7ff4a2cacee09..dd368ef4d8f92 100644
--- a/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/vertical_scroll_panel.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/vertical_scroll_panel.tsx
@@ -30,6 +30,7 @@ interface VerticalScrollPanelProps {
hideScrollbar?: boolean;
'data-test-subj'?: string;
isLocked: boolean;
+ entriesCount: number;
}
interface VerticalScrollPanelSnapshot {
@@ -226,7 +227,7 @@ export class VerticalScrollPanel extends React.PureComponent<
if (
prevProps.height !== this.props.height ||
prevProps.target !== this.props.target ||
- React.Children.count(prevProps.children) !== React.Children.count(this.props.children)
+ prevProps.entriesCount !== this.props.entriesCount
) {
this.handleUpdatedChildren(snapshot.scrollTarget, snapshot.scrollOffset);
}
diff --git a/x-pack/legacy/plugins/infra/public/components/metrics/sections/chart_section.tsx b/x-pack/legacy/plugins/infra/public/components/metrics/sections/chart_section.tsx
index cf148eefe8e8f..6d8503b333c0b 100644
--- a/x-pack/legacy/plugins/infra/public/components/metrics/sections/chart_section.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/metrics/sections/chart_section.tsx
@@ -127,7 +127,7 @@ export const ChartSection = ({
key={`series-${section.id}-${series.id}`}
id={`series-${section.id}-${series.id}`}
series={series}
- name={getChartName(section, series.id, series.label)}
+ name={getChartName(section, series.id, series.id)}
type={getChartType(section, series.id)}
color={getChartColor(section, series.id)}
stack={visConfig.stacked}
diff --git a/x-pack/legacy/plugins/infra/public/components/metrics/sections/series_chart.tsx b/x-pack/legacy/plugins/infra/public/components/metrics/sections/series_chart.tsx
index 9fd1f3eadfb49..b75f669a6d1ec 100644
--- a/x-pack/legacy/plugins/infra/public/components/metrics/sections/series_chart.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/metrics/sections/series_chart.tsx
@@ -45,12 +45,6 @@ export const AreaChart = ({ id, color, series, name, type, stack }: Props) => {
strokeWidth: 'area' === type ? 1 : 2,
visible: true,
},
- point: {
- visible: true,
- radius: 1,
- strokeWidth: 2,
- opacity: 1,
- },
};
const colors: DataSeriesColorsValues = {
colorValues: [],
diff --git a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/series_chart.tsx b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/series_chart.tsx
index 5b70b0cef083a..8c3c80e0a3852 100644
--- a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/series_chart.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/series_chart.tsx
@@ -63,12 +63,6 @@ export const MetricsExplorerAreaChart = ({ metric, id, series, type, stack }: Pr
opacity: 0.5,
visible: type === MetricsExplorerChartType.area,
},
- point: {
- visible: true,
- radius: 2,
- strokeWidth: 2,
- opacity: 1,
- },
};
return (
{
+export const MetricsExplorerBarChart = ({ metric, id, series, stack }: Props) => {
const color =
(metric.color && colorTransformer(metric.color)) ||
colorTransformer(MetricsExplorerColor.color0);
diff --git a/x-pack/legacy/plugins/infra/public/pages/link_to/link_to.tsx b/x-pack/legacy/plugins/infra/public/pages/link_to/link_to.tsx
index abb3aa6b26b15..1318e9ca6c2c5 100644
--- a/x-pack/legacy/plugins/infra/public/pages/link_to/link_to.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/link_to/link_to.tsx
@@ -16,27 +16,21 @@ interface LinkToPageProps {
match: RouteMatch<{}>;
}
-export class LinkToPage extends React.Component {
- public render() {
- const { match } = this.props;
-
- return (
-
-
-
-
-
-
-
- );
- }
-}
+export const LinkToPage: React.SFC = props => (
+
+
+
+
+
+
+
+);
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/page_results_content.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/page_results_content.tsx
index ffc48a0af9de9..e740689da50f6 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/page_results_content.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/page_results_content.tsx
@@ -6,23 +6,23 @@
import datemath from '@elastic/datemath';
import {
+ EuiBadge,
EuiFlexGroup,
EuiFlexItem,
EuiPage,
EuiPanel,
EuiSuperDatePicker,
- EuiBadge,
EuiText,
} from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
import numeral from '@elastic/numeral';
import { FormattedMessage } from '@kbn/i18n/react';
import moment from 'moment';
import React, { useCallback, useContext, useMemo, useState } from 'react';
+
import euiStyled from '../../../../../../common/eui_styled_components';
import { TimeRange } from '../../../../common/http_api/shared/time_range';
import { bucketSpan } from '../../../../common/log_analysis';
-import { LoadingPage } from '../../../components/loading_page';
+import { LoadingOverlayWrapper } from '../../../components/loading_overlay_wrapper';
import {
LogAnalysisJobs,
StringTimeRange,
@@ -162,89 +162,77 @@ export const AnalysisResultsContent = ({
);
return (
- <>
- {isLoading && !logEntryRate ? (
-
- ) : (
- <>
-
-
+
+
+
+
+
-
-
-
- {!isLoading && logEntryRate ? (
-
-
-
- {numeral(logEntryRate.totalNumberOfLogEntries).format('0.00a')}
-
-
- ),
- startTime: (
- {moment(queryTimeRange.value.startTime).format(dateFormat)}
- ),
- endTime: (
- {moment(queryTimeRange.value.endTime).format(dateFormat)}
- ),
- }}
- />
-
- ) : null}
-
-
-
+
+
+
+ {numeral(logEntryRate.totalNumberOfLogEntries).format('0.00a')}
+
+
+ ),
+ startTime: (
+ {moment(queryTimeRange.value.startTime).format(dateFormat)}
+ ),
+ endTime: {moment(queryTimeRange.value.endTime).format(dateFormat)},
+ }}
/>
-
-
-
-
-
-
- {isFirstUse && !hasResults ? : null}
-
-
+
+
+ ) : null}
-
-
-
+
-
-
- )}
-
+
+
+
+
+ {isFirstUse && !hasResults ? : null}
+
+
+
+
+
+
+
+
+
+
);
};
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/anomalies/index.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/anomalies/index.tsx
index 5aa5891d7981d..c340de4ad3848 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/anomalies/index.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/anomalies/index.tsx
@@ -8,10 +8,10 @@ import {
EuiEmptyPrompt,
EuiFlexGroup,
EuiFlexItem,
- EuiLoadingChart,
EuiSpacer,
EuiStat,
EuiTitle,
+ EuiLoadingSpinner,
} from '@elastic/eui';
import numeral from '@elastic/numeral';
import { i18n } from '@kbn/i18n';
@@ -31,6 +31,7 @@ import { AnomaliesChart } from './chart';
import { AnomaliesTable } from './table';
import { LogAnalysisJobProblemIndicator } from '../../../../../components/logging/log_analysis_job_status';
import { AnalyzeInMlButton } from '../analyze_in_ml_button';
+import { LoadingOverlayWrapper } from '../../../../../components/loading_overlay_wrapper';
export const AnomaliesResults: React.FunctionComponent<{
isLoading: boolean;
@@ -53,15 +54,6 @@ export const AnomaliesResults: React.FunctionComponent<{
viewSetupForUpdate,
jobId,
}) => {
- const title = i18n.translate('xpack.infra.logs.analysis.anomaliesSectionTitle', {
- defaultMessage: 'Anomalies',
- });
-
- const loadingAriaLabel = i18n.translate(
- 'xpack.infra.logs.analysis.anomaliesSectionLoadingAriaLabel',
- { defaultMessage: 'Loading anomalies' }
- );
-
const hasAnomalies = useMemo(() => {
return results && results.histogramBuckets
? results.histogramBuckets.some(bucket => {
@@ -117,90 +109,91 @@ export const AnomaliesResults: React.FunctionComponent<{
onRecreateMlJobForUpdate={viewSetupForUpdate}
/>
- {isLoading ? (
-
-
-
-
-
- ) : !results || (results && results.histogramBuckets && !results.histogramBuckets.length) ? (
-
- {i18n.translate('xpack.infra.logs.analysis.anomalySectionNoDataTitle', {
- defaultMessage: 'There is no data to display.',
- })}
-
- }
- titleSize="m"
- body={
-
- {i18n.translate('xpack.infra.logs.analysis.anomalySectionNoDataBody', {
- defaultMessage: 'You may want to adjust your time range.',
- })}
-
- }
- />
- ) : !hasAnomalies ? (
-
- {i18n.translate('xpack.infra.logs.analysis.anomalySectionNoAnomaliesTitle', {
- defaultMessage: 'No anomalies were detected.',
- })}
-
- }
- titleSize="m"
- />
- ) : (
- <>
-
-
-
-
-
-
-
-
-
-
- }>
+ {!results || (results && results.histogramBuckets && !results.histogramBuckets.length) ? (
+
+ {i18n.translate('xpack.infra.logs.analysis.anomalySectionNoDataTitle', {
+ defaultMessage: 'There is no data to display.',
+ })}
+
+ }
+ titleSize="m"
+ body={
+
+ {i18n.translate('xpack.infra.logs.analysis.anomalySectionNoDataBody', {
+ defaultMessage: 'You may want to adjust your time range.',
+ })}
+
+ }
+ />
+ ) : !hasAnomalies ? (
+
+ {i18n.translate('xpack.infra.logs.analysis.anomalySectionNoAnomaliesTitle', {
+ defaultMessage: 'No anomalies were detected.',
+ })}
+
+ }
+ titleSize="m"
/>
-
- )}
+ ) : (
+ <>
+
+
+
+
+
+
+
+
+
+
+
+
+ )}
+
);
};
+const title = i18n.translate('xpack.infra.logs.analysis.anomaliesSectionTitle', {
+ defaultMessage: 'Anomalies',
+});
+
interface ParsedAnnotationDetails {
anomalyScoresByPartition: Array<{ partitionId: string; maximumAnomalyScore: number }>;
}
@@ -211,6 +204,7 @@ const overallAnomalyScoreLabel = i18n.translate(
defaultMessage: 'Max anomaly scores:',
}
);
+
const AnnotationTooltip: React.FunctionComponent<{ details: string }> = ({ details }) => {
const parsedDetails: ParsedAnnotationDetails = JSON.parse(details);
return (
@@ -237,7 +231,7 @@ const AnnotationTooltip: React.FunctionComponent<{ details: string }> = ({ detai
const renderAnnotationTooltip = (details?: string) => {
// Note: Seems to be necessary to get things typed correctly all the way through to elastic-charts components
if (!details) {
- return ;
+ return ;
}
return ;
};
@@ -245,3 +239,10 @@ const renderAnnotationTooltip = (details?: string) => {
const TooltipWrapper = euiStyled('div')`
white-space: nowrap;
`;
+
+const loadingAriaLabel = i18n.translate(
+ 'xpack.infra.logs.analysis.anomaliesSectionLoadingAriaLabel',
+ { defaultMessage: 'Loading anomalies' }
+);
+
+const LoadingOverlayContent = () => ;
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/log_rate/index.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/log_rate/index.tsx
index d4ddd14bfaa28..682eb23fa4774 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/log_rate/index.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/log_rate/index.tsx
@@ -4,15 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import {
- EuiEmptyPrompt,
- EuiFlexGroup,
- EuiFlexItem,
- EuiLoadingChart,
- EuiSpacer,
- EuiTitle,
- EuiText,
-} from '@elastic/eui';
+import { EuiEmptyPrompt, EuiLoadingSpinner, EuiSpacer, EuiTitle, EuiText } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import React, { useMemo } from 'react';
@@ -20,6 +12,7 @@ import { GetLogEntryRateSuccessResponsePayload } from '../../../../../../common/
import { TimeRange } from '../../../../../../common/http_api/shared/time_range';
import { LogEntryRateBarChart } from './bar_chart';
import { getLogEntryRatePartitionedSeries } from '../helpers/data_formatters';
+import { LoadingOverlayWrapper } from '../../../../../components/loading_overlay_wrapper';
export const LogRateResults = ({
isLoading,
@@ -32,15 +25,6 @@ export const LogRateResults = ({
setTimeRange: (timeRange: TimeRange) => void;
timeRange: TimeRange;
}) => {
- const title = i18n.translate('xpack.infra.logs.analysis.logRateSectionTitle', {
- defaultMessage: 'Log entries',
- });
-
- const loadingAriaLabel = i18n.translate(
- 'xpack.infra.logs.analysis.logRateSectionLoadingAriaLabel',
- { defaultMessage: 'Loading log rate results' }
- );
-
const logEntryRateSeries = useMemo(
() => (results && results.histogramBuckets ? getLogEntryRatePartitionedSeries(results) : []),
[results]
@@ -51,57 +35,61 @@ export const LogRateResults = ({
{title}
- {isLoading ? (
- <>
-
-
-
-
-
-
-
- ) : !results || (results && results.histogramBuckets && !results.histogramBuckets.length) ? (
- <>
-
-
- {i18n.translate('xpack.infra.logs.analysis.logRateSectionNoDataTitle', {
- defaultMessage: 'There is no data to display.',
- })}
-
- }
- titleSize="m"
- body={
+ }>
+ {!results || (results && results.histogramBuckets && !results.histogramBuckets.length) ? (
+ <>
+
+
+ {i18n.translate('xpack.infra.logs.analysis.logRateSectionNoDataTitle', {
+ defaultMessage: 'There is no data to display.',
+ })}
+
+ }
+ titleSize="m"
+ body={
+
+ {i18n.translate('xpack.infra.logs.analysis.logRateSectionNoDataBody', {
+ defaultMessage: 'You may want to adjust your time range.',
+ })}
+
+ }
+ />
+
+ ) : (
+ <>
+
- {i18n.translate('xpack.infra.logs.analysis.logRateSectionNoDataBody', {
- defaultMessage: 'You may want to adjust your time range.',
+
+ {i18n.translate('xpack.infra.logs.analysis.logRateSectionBucketSpanLabel', {
+ defaultMessage: 'Bucket span: ',
+ })}
+
+ {i18n.translate('xpack.infra.logs.analysis.logRateSectionBucketSpanValue', {
+ defaultMessage: '15 minutes',
})}
- }
- />
-
- ) : (
- <>
-
-
-
- {i18n.translate('xpack.infra.logs.analysis.logRateSectionBucketSpanLabel', {
- defaultMessage: 'Bucket span: ',
- })}
-
- {i18n.translate('xpack.infra.logs.analysis.logRateSectionBucketSpanValue', {
- defaultMessage: '15 minutes',
- })}
-
-
-
-
- )}
+
+
+
+ )}
+
);
};
+
+const title = i18n.translate('xpack.infra.logs.analysis.logRateSectionTitle', {
+ defaultMessage: 'Log entries',
+});
+
+const loadingAriaLabel = i18n.translate(
+ 'xpack.infra.logs.analysis.logRateSectionLoadingAriaLabel',
+ { defaultMessage: 'Loading log rate results' }
+);
+
+const LoadingOverlayContent = () => ;
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/setup/initial_configuration_step/analysis_setup_timerange_form.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/setup/initial_configuration_step/analysis_setup_timerange_form.tsx
index e966336567e59..17f1aa48c87a2 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/setup/initial_configuration_step/analysis_setup_timerange_form.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/setup/initial_configuration_step/analysis_setup_timerange_form.tsx
@@ -4,18 +4,20 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import React, { useMemo } from 'react';
-import moment, { Moment } from 'moment';
-
-import { i18n } from '@kbn/i18n';
import {
- EuiDescribedFormGroup,
- EuiFormRow,
EuiDatePicker,
+ EuiDatePickerProps,
+ EuiDescribedFormGroup,
EuiFlexGroup,
EuiFormControlLayout,
+ EuiFormRow,
} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n/react';
+import moment, { Moment } from 'moment';
+import React, { useMemo } from 'react';
+
+import { euiStyled } from '../../../../../../../../common/eui_styled_components';
const startTimeLabel = i18n.translate('xpack.infra.analysisSetup.startTimeLabel', {
defaultMessage: 'Start time',
@@ -84,7 +86,7 @@ export const AnalysisSetupTimerangeForm: React.FunctionComponent<{
setStartTime(undefined) } : undefined}
>
- setStartTime(selectedDateToParam(date))}
@@ -105,7 +107,7 @@ export const AnalysisSetupTimerangeForm: React.FunctionComponent<{
setEndTime(undefined) } : undefined}
>
- setEndTime(selectedDateToParam(date))}
@@ -129,3 +131,18 @@ export const AnalysisSetupTimerangeForm: React.FunctionComponent<{
);
};
+
+const FixedDatePicker = euiStyled(
+ ({
+ className,
+ inputClassName,
+ ...datePickerProps
+ }: {
+ className?: string;
+ inputClassName?: string;
+ } & EuiDatePickerProps) => (
+
+ )
+)`
+ z-index: 3 !important;
+`;
diff --git a/x-pack/legacy/plugins/lens/public/app_plugin/app.test.tsx b/x-pack/legacy/plugins/lens/public/app_plugin/app.test.tsx
index 87f0872c52343..a1710d67b31db 100644
--- a/x-pack/legacy/plugins/lens/public/app_plugin/app.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/app_plugin/app.test.tsx
@@ -10,7 +10,7 @@ import { act } from 'react-dom/test-utils';
import { buildExistsFilter } from '@kbn/es-query';
import { App } from './app';
import { EditorFrameInstance } from '../types';
-import { Storage } from 'ui/storage';
+import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
import { Document, SavedObjectStore } from '../persistence';
import { mount } from 'enzyme';
@@ -80,7 +80,7 @@ describe('Lens App', () => {
data: typeof dataStartMock;
core: typeof core;
dataShim: DataStart;
- store: Storage;
+ storage: Storage;
docId?: string;
docStorage: SavedObjectStore;
redirectTo: (id?: string) => void;
@@ -97,6 +97,11 @@ describe('Lens App', () => {
},
},
},
+ data: {
+ query: {
+ filterManager: createMockFilterManager(),
+ },
+ },
dataShim: {
indexPatterns: {
indexPatterns: {
@@ -106,11 +111,8 @@ describe('Lens App', () => {
},
},
timefilter: { history: {} },
- filter: {
- filterManager: createMockFilterManager(),
- },
},
- store: {
+ storage: {
get: jest.fn(),
},
docStorage: {
@@ -123,7 +125,7 @@ describe('Lens App', () => {
data: typeof dataStartMock;
core: typeof core;
dataShim: DataStart;
- store: Storage;
+ storage: Storage;
docId?: string;
docStorage: SavedObjectStore;
redirectTo: (id?: string) => void;
@@ -592,7 +594,7 @@ describe('Lens App', () => {
const instance = mount();
- args.dataShim.filter.filterManager.setFilters([
+ args.data.query.filterManager.setFilters([
buildExistsFilter({ name: 'myfield' }, { id: 'index1' }),
]);
@@ -723,7 +725,7 @@ describe('Lens App', () => {
query: { query: 'new', language: 'lucene' },
});
- args.dataShim.filter.filterManager.setFilters([
+ args.data.query.filterManager.setFilters([
buildExistsFilter({ name: 'myfield' }, { id: 'index1' }),
]);
instance.update();
diff --git a/x-pack/legacy/plugins/lens/public/app_plugin/app.tsx b/x-pack/legacy/plugins/lens/public/app_plugin/app.tsx
index bd75198714dc3..a95e0450f614c 100644
--- a/x-pack/legacy/plugins/lens/public/app_plugin/app.tsx
+++ b/x-pack/legacy/plugins/lens/public/app_plugin/app.tsx
@@ -8,7 +8,6 @@ import _ from 'lodash';
import React, { useState, useEffect, useCallback } from 'react';
import { I18nProvider } from '@kbn/i18n/react';
import { i18n } from '@kbn/i18n';
-import { Storage } from 'ui/storage';
import { DataPublicPluginStart } from 'src/plugins/data/public';
import { SavedObjectSaveModal } from 'ui/saved_objects/components/saved_object_save_modal';
import { CoreStart, NotificationsStart } from 'src/core/public';
@@ -20,6 +19,7 @@ import {
Query,
} from 'src/legacy/core_plugins/data/public';
import { Filter } from '@kbn/es-query';
+import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
import { start as navigation } from '../../../../../../src/legacy/core_plugins/navigation/public/legacy';
import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
import { Document, SavedObjectStore } from '../persistence';
@@ -49,7 +49,7 @@ export function App({
data,
dataShim,
core,
- store,
+ storage,
docId,
docStorage,
redirectTo,
@@ -58,14 +58,14 @@ export function App({
data: DataPublicPluginStart;
core: CoreStart;
dataShim: DataStart;
- store: Storage;
+ storage: IStorageWrapper;
docId?: string;
docStorage: SavedObjectStore;
redirectTo: (id?: string) => void;
}) {
const timeDefaults = core.uiSettings.get('timepicker:timeDefaults');
const language =
- store.get('kibana.userQueryLanguage') || core.uiSettings.get('search:queryLanguage');
+ storage.get('kibana.userQueryLanguage') || core.uiSettings.get('search:queryLanguage');
const [state, setState] = useState({
isLoading: !!docId,
@@ -82,10 +82,9 @@ export function App({
const { lastKnownDoc } = state;
useEffect(() => {
- const subscription = dataShim.filter.filterManager.getUpdates$().subscribe({
+ const subscription = data.query.filterManager.getUpdates$().subscribe({
next: () => {
- setState(s => ({ ...s, filters: dataShim.filter.filterManager.getFilters() }));
-
+ setState(s => ({ ...s, filters: data.query.filterManager.getFilters() }));
trackUiEvent('app_filters_updated');
},
});
@@ -171,7 +170,7 @@ export function App({
services={{
appName: 'lens',
data,
- store,
+ storage,
...core,
}}
>
@@ -227,9 +226,7 @@ export function App({
setState(s => ({ ...s, savedQuery }));
}}
onSavedQueryUpdated={savedQuery => {
- dataShim.filter.filterManager.setFilters(
- savedQuery.attributes.filters || state.filters
- );
+ data.query.filterManager.setFilters(savedQuery.attributes.filters || state.filters);
setState(s => ({
...s,
savedQuery: { ...savedQuery }, // Shallow query for reference issues
@@ -242,7 +239,7 @@ export function App({
}));
}}
onClearSavedQuery={() => {
- dataShim.filter.filterManager.removeAll();
+ data.query.filterManager.removeAll();
setState(s => ({
...s,
savedQuery: undefined,
@@ -250,7 +247,7 @@ export function App({
query: {
query: '',
language:
- store.get('kibana.userQueryLanguage') ||
+ storage.get('kibana.userQueryLanguage') ||
core.uiSettings.get('search:queryLanguage'),
},
}));
diff --git a/x-pack/legacy/plugins/lens/public/app_plugin/plugin.tsx b/x-pack/legacy/plugins/lens/public/app_plugin/plugin.tsx
index b7960b23651c6..56c19ea2bb9f2 100644
--- a/x-pack/legacy/plugins/lens/public/app_plugin/plugin.tsx
+++ b/x-pack/legacy/plugins/lens/public/app_plugin/plugin.tsx
@@ -8,12 +8,12 @@ import React from 'react';
import { I18nProvider, FormattedMessage } from '@kbn/i18n/react';
import { HashRouter, Switch, Route, RouteComponentProps } from 'react-router-dom';
import chrome from 'ui/chrome';
-import { Storage } from 'ui/storage';
import { CoreSetup, CoreStart } from 'src/core/public';
import { npSetup, npStart } from 'ui/new_platform';
import { DataPublicPluginStart } from 'src/plugins/data/public';
import { DataStart } from '../../../../../../src/legacy/core_plugins/data/public';
import { start as dataShimStart } from '../../../../../../src/legacy/core_plugins/data/public/legacy';
+import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
import { editorFrameSetup, editorFrameStart, editorFrameStop } from '../editor_frame_plugin';
import { indexPatternDatasourceSetup, indexPatternDatasourceStop } from '../indexpattern_plugin';
import { SavedObjectIndexStore } from '../persistence';
@@ -84,7 +84,7 @@ export class AppPlugin {
data={data}
dataShim={dataShim}
editorFrame={this.instance!}
- store={new Storage(localStorage)}
+ storage={new Storage(localStorage)}
docId={routeProps.match.params.id}
docStorage={store}
redirectTo={id => {
diff --git a/x-pack/legacy/plugins/lens/public/datatable_visualization_plugin/visualization.test.tsx b/x-pack/legacy/plugins/lens/public/datatable_visualization_plugin/visualization.test.tsx
index 083ceff3bb444..25d88fbae5b34 100644
--- a/x-pack/legacy/plugins/lens/public/datatable_visualization_plugin/visualization.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/datatable_visualization_plugin/visualization.test.tsx
@@ -12,7 +12,7 @@ import {
DataTableLayer,
} from './visualization';
import { mount } from 'enzyme';
-import { Operation, DataType, FramePublicAPI } from '../types';
+import { Operation, DataType, FramePublicAPI, TableSuggestionColumn } from '../types';
import { generateId } from '../id_generator';
jest.mock('../id_generator');
@@ -72,6 +72,112 @@ describe('Datatable Visualization', () => {
});
});
+ describe('#getSuggestions', () => {
+ function numCol(columnId: string): TableSuggestionColumn {
+ return {
+ columnId,
+ operation: {
+ dataType: 'number',
+ label: `Avg ${columnId}`,
+ isBucketed: false,
+ },
+ };
+ }
+
+ function strCol(columnId: string): TableSuggestionColumn {
+ return {
+ columnId,
+ operation: {
+ dataType: 'string',
+ label: `Top 5 ${columnId}`,
+ isBucketed: true,
+ },
+ };
+ }
+
+ it('should accept a single-layer suggestion', () => {
+ const suggestions = datatableVisualization.getSuggestions({
+ state: {
+ layers: [{ layerId: 'first', columns: ['col1'] }],
+ },
+ table: {
+ isMultiRow: true,
+ layerId: 'first',
+ changeType: 'initial',
+ columns: [numCol('col1'), strCol('col2')],
+ },
+ keptLayerIds: [],
+ });
+
+ expect(suggestions.length).toBeGreaterThan(0);
+ });
+
+ it('should not make suggestions when the table is unchanged', () => {
+ const suggestions = datatableVisualization.getSuggestions({
+ state: {
+ layers: [{ layerId: 'first', columns: ['col1'] }],
+ },
+ table: {
+ isMultiRow: true,
+ layerId: 'first',
+ changeType: 'unchanged',
+ columns: [numCol('col1')],
+ },
+ keptLayerIds: ['first'],
+ });
+
+ expect(suggestions).toEqual([]);
+ });
+
+ it('should not make suggestions when multiple layers are involved', () => {
+ const suggestions = datatableVisualization.getSuggestions({
+ state: {
+ layers: [{ layerId: 'first', columns: ['col1'] }],
+ },
+ table: {
+ isMultiRow: true,
+ layerId: 'first',
+ changeType: 'unchanged',
+ columns: [numCol('col1')],
+ },
+ keptLayerIds: ['first', 'second'],
+ });
+
+ expect(suggestions).toEqual([]);
+ });
+
+ it('should not make suggestions when the suggestion keeps a different layer', () => {
+ const suggestions = datatableVisualization.getSuggestions({
+ state: {
+ layers: [{ layerId: 'older', columns: ['col1'] }],
+ },
+ table: {
+ isMultiRow: true,
+ layerId: 'newer',
+ changeType: 'initial',
+ columns: [numCol('col1'), strCol('col2')],
+ },
+ keptLayerIds: ['older'],
+ });
+
+ expect(suggestions).toEqual([]);
+ });
+
+ it('should suggest unchanged tables when the state is not passed in', () => {
+ const suggestions = datatableVisualization.getSuggestions({
+ table: {
+ isMultiRow: true,
+ layerId: 'first',
+ changeType: 'unchanged',
+ columns: [numCol('col1')],
+ },
+ keptLayerIds: ['first'],
+ });
+
+ expect(suggestions.length).toBeGreaterThan(0);
+ });
+ });
+
describe('DataTableLayer', () => {
it('allows all kinds of operations', () => {
const setState = jest.fn();
diff --git a/x-pack/legacy/plugins/lens/public/datatable_visualization_plugin/visualization.tsx b/x-pack/legacy/plugins/lens/public/datatable_visualization_plugin/visualization.tsx
index 65f97b6d4e4b5..f9a7ec419a9b9 100644
--- a/x-pack/legacy/plugins/lens/public/datatable_visualization_plugin/visualization.tsx
+++ b/x-pack/legacy/plugins/lens/public/datatable_visualization_plugin/visualization.tsx
@@ -134,10 +134,15 @@ export const datatableVisualization: Visualization<
getSuggestions({
table,
state,
+ keptLayerIds,
}: SuggestionRequest): Array<
VisualizationSuggestion
> {
- if (state && table.changeType === 'unchanged') {
+ if (
+ keptLayerIds.length > 1 ||
+ (keptLayerIds.length && table.layerId !== keptLayerIds[0]) ||
+ (state && table.changeType === 'unchanged')
+ ) {
return [];
}
const title =
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/chart_switch.test.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/chart_switch.test.tsx
index 298b25b5090c4..0a540334f2cad 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/chart_switch.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/chart_switch.test.tsx
@@ -94,6 +94,7 @@ describe('chart_switch', () => {
layerId: 'a',
changeType: 'unchanged',
},
+ keptLayerIds: ['a'],
},
]);
return {
@@ -180,6 +181,8 @@ describe('chart_switch', () => {
switchTo('subvisB', component);
+ expect(frame.removeLayers).toHaveBeenCalledWith(['a']);
+
expect(dispatch).toHaveBeenCalledWith({
initialState: 'visB initial state',
newVisualizationId: 'visB',
@@ -219,6 +222,7 @@ describe('chart_switch', () => {
isMultiRow: true,
changeType: 'unchanged',
},
+ keptLayerIds: [],
},
]);
datasourceMap.testDatasource.publicAPIMock.getTableSpec.mockReturnValue([
@@ -307,11 +311,7 @@ describe('chart_switch', () => {
it('should not indicate data loss if visualization is not changed', () => {
const dispatch = jest.fn();
- const removeLayers = jest.fn();
- const frame = {
- ...mockFrame(['a', 'b', 'c']),
- removeLayers,
- };
+ const frame = mockFrame(['a', 'b', 'c']);
const visualizations = mockVisualizations();
const switchVisualizationType = jest.fn(() => 'therebedragons');
@@ -332,30 +332,6 @@ describe('chart_switch', () => {
expect(getMenuItem('subvisC2', component).prop('betaBadgeIconType')).toBeUndefined();
});
- it('should remove unused layers', () => {
- const removeLayers = jest.fn();
- const frame = {
- ...mockFrame(['a', 'b', 'c']),
- removeLayers,
- };
- const component = mount(
-
- );
-
- switchTo('subvisB', component);
-
- expect(removeLayers).toHaveBeenCalledTimes(1);
- expect(removeLayers).toHaveBeenCalledWith(['b', 'c']);
- });
-
it('should remove all layers if there is no suggestion', () => {
const dispatch = jest.fn();
const visualizations = mockVisualizations();
@@ -378,15 +354,24 @@ describe('chart_switch', () => {
expect(frame.removeLayers).toHaveBeenCalledTimes(1);
expect(frame.removeLayers).toHaveBeenCalledWith(['a', 'b', 'c']);
+
+ expect(visualizations.visB.getSuggestions).toHaveBeenCalledWith(
+ expect.objectContaining({
+ keptLayerIds: ['a'],
+ })
+ );
+
+ expect(dispatch).toHaveBeenCalledWith(
+ expect.objectContaining({
+ type: 'SWITCH_VISUALIZATION',
+ initialState: 'visB initial state',
+ })
+ );
});
it('should not remove layers if the visualization is not changing', () => {
const dispatch = jest.fn();
- const removeLayers = jest.fn();
- const frame = {
- ...mockFrame(['a', 'b', 'c']),
- removeLayers,
- };
+ const frame = mockFrame(['a', 'b', 'c']);
const visualizations = mockVisualizations();
const switchVisualizationType = jest.fn(() => 'therebedragons');
@@ -405,7 +390,6 @@ describe('chart_switch', () => {
);
switchTo('subvisC2', component);
- expect(removeLayers).not.toHaveBeenCalled();
expect(switchVisualizationType).toHaveBeenCalledWith('subvisC2', 'therebegriffins');
expect(dispatch).toHaveBeenCalledWith(
expect.objectContaining({
@@ -447,6 +431,7 @@ describe('chart_switch', () => {
isMultiRow: true,
changeType: 'unchanged',
},
+ keptLayerIds: [],
},
]);
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/chart_switch.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/chart_switch.tsx
index 2e95aa10bf4db..8b67646edded9 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/chart_switch.tsx
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/chart_switch.tsx
@@ -88,6 +88,10 @@ export function ChartSwitch(props: Props) {
},
'SWITCH_VISUALIZATION'
);
+
+ if (!selection.datasourceId || selection.dataLoss === 'everything') {
+ props.framePublicAPI.removeLayers(Object.keys(props.framePublicAPI.datasourceLayers));
+ }
};
function getSelection(
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/editor_frame.test.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/editor_frame.test.tsx
index fb3f8774be92a..1e8f50f4ddb1f 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/editor_frame.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/editor_frame.test.tsx
@@ -35,6 +35,7 @@ function generateSuggestion(state = {}): DatasourceSuggestion {
layerId: 'first',
changeType: 'unchanged',
},
+ keptLayerIds: ['first'],
};
}
@@ -807,30 +808,38 @@ describe('editor_frame', () => {
await waitForPromises();
expect(mockDatasource.getPublicAPI).toHaveBeenCalledWith(
- datasource1State,
- expect.anything(),
- 'first'
+ expect.objectContaining({
+ state: datasource1State,
+ setState: expect.anything(),
+ layerId: 'first',
+ })
);
expect(mockDatasource2.getPublicAPI).toHaveBeenCalledWith(
- datasource2State,
- expect.anything(),
- 'second'
+ expect.objectContaining({
+ state: datasource2State,
+ setState: expect.anything(),
+ layerId: 'second',
+ })
);
expect(mockDatasource2.getPublicAPI).toHaveBeenCalledWith(
- datasource2State,
- expect.anything(),
- 'third'
+ expect.objectContaining({
+ state: datasource2State,
+ setState: expect.anything(),
+ layerId: 'third',
+ })
);
});
it('should give access to the datasource state in the datasource factory function', async () => {
const datasourceState = {};
+ const dateRange = { fromDate: 'now-1w', toDate: 'now' };
mockDatasource.initialize.mockResolvedValue(datasourceState);
mockDatasource.getLayers.mockReturnValue(['first']);
mount(
{
await waitForPromises();
- expect(mockDatasource.getPublicAPI).toHaveBeenCalledWith(
- datasourceState,
- expect.any(Function),
- 'first'
- );
+ expect(mockDatasource.getPublicAPI).toHaveBeenCalledWith({
+ dateRange,
+ state: datasourceState,
+ setState: expect.any(Function),
+ layerId: 'first',
+ });
});
it('should re-create the public api after state has been set', async () => {
@@ -872,15 +882,17 @@ describe('editor_frame', () => {
await waitForPromises();
const updatedState = {};
- const setDatasourceState = mockDatasource.getPublicAPI.mock.calls[0][1];
+ const setDatasourceState = mockDatasource.getPublicAPI.mock.calls[0][0].setState;
act(() => {
setDatasourceState(updatedState);
});
expect(mockDatasource.getPublicAPI).toHaveBeenLastCalledWith(
- updatedState,
- expect.any(Function),
- 'first'
+ expect.objectContaining({
+ state: updatedState,
+ setState: expect.any(Function),
+ layerId: 'first',
+ })
);
});
});
@@ -917,6 +929,7 @@ describe('editor_frame', () => {
layerId: 'first',
changeType: 'unchanged',
},
+ keptLayerIds: [],
},
]);
@@ -1062,6 +1075,7 @@ describe('editor_frame', () => {
isMultiRow: true,
layerId: 'first',
},
+ keptLayerIds: [],
},
]);
mount(
@@ -1509,7 +1523,7 @@ describe('editor_frame', () => {
query: { query: '', language: 'lucene' },
filters: [],
},
- title: 'New visualization',
+ title: '',
type: 'lens',
visualizationType: 'testVis',
},
@@ -1528,7 +1542,7 @@ describe('editor_frame', () => {
query: { query: '', language: 'lucene' },
filters: [],
},
- title: 'New visualization',
+ title: '',
type: 'lens',
visualizationType: 'testVis',
},
@@ -1585,7 +1599,7 @@ describe('editor_frame', () => {
query: { query: 'new query', language: 'lucene' },
filters: [],
},
- title: 'New visualization',
+ title: '',
type: 'lens',
visualizationType: 'testVis',
},
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/editor_frame.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/editor_frame.tsx
index 04c0b22c378d7..8e89d8edc9f23 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/editor_frame.tsx
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/editor_frame.tsx
@@ -89,9 +89,9 @@ export function EditorFrame(props: EditorFrameProps) {
const layers = datasource.getLayers(datasourceState);
layers.forEach(layer => {
- const publicAPI = props.datasourceMap[id].getPublicAPI(
- datasourceState,
- (newState: unknown) => {
+ const publicAPI = props.datasourceMap[id].getPublicAPI({
+ state: datasourceState,
+ setState: (newState: unknown) => {
dispatch({
type: 'UPDATE_DATASOURCE_STATE',
datasourceId: id,
@@ -99,8 +99,9 @@ export function EditorFrame(props: EditorFrameProps) {
clearStagedPreview: true,
});
},
- layer
- );
+ layerId: layer,
+ dateRange: props.dateRange,
+ });
datasourceLayers[layer] = publicAPI;
});
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/state_management.ts b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/state_management.ts
index 5104ace7c79a3..78a9a13f48d6a 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/state_management.ts
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/state_management.ts
@@ -4,7 +4,6 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { i18n } from '@kbn/i18n';
import { EditorFrameProps } from '../editor_frame';
import { Document } from '../../persistence/saved_object_store';
@@ -113,7 +112,7 @@ export const getInitialState = (props: EditorFrameProps): EditorFrameState => {
}
return {
- title: i18n.translate('xpack.lens.chartTitle', { defaultMessage: 'New visualization' }),
+ title: '',
datasourceStates,
activeDatasourceId: getInitialDatasourceId(props),
visualization: {
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_helpers.test.ts b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_helpers.test.ts
index 7b3e4454a5e39..487a91c22b5d5 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_helpers.test.ts
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_helpers.test.ts
@@ -16,6 +16,7 @@ const generateSuggestion = (state = {}, layerId: string = 'first'): DatasourceSu
layerId,
changeType: 'unchanged',
},
+ keptLayerIds: [layerId],
});
let datasourceMap: Record;
@@ -235,8 +236,8 @@ describe('suggestion helpers', () => {
changeType: 'unchanged',
};
datasourceMap.mock.getDatasourceSuggestionsFromCurrentState.mockReturnValue([
- { state: {}, table: table1 },
- { state: {}, table: table2 },
+ { state: {}, table: table1, keptLayerIds: ['first'] },
+ { state: {}, table: table2, keptLayerIds: ['first'] },
]);
getSuggestions({
visualizationMap: {
@@ -343,45 +344,4 @@ describe('suggestion helpers', () => {
})
);
});
-
- it('should drop other layers only on visualization switch', () => {
- const mockVisualization1 = createMockVisualization();
- const mockVisualization2 = createMockVisualization();
- datasourceMap.mock.getDatasourceSuggestionsFromCurrentState.mockReturnValue([
- generateSuggestion(),
- ]);
- datasourceMap.mock.getLayers.mockReturnValue(['first', 'second']);
- const suggestions = getSuggestions({
- visualizationMap: {
- vis1: {
- ...mockVisualization1,
- getSuggestions: () => [
- {
- score: 0.8,
- title: 'Test2',
- state: {},
- previewIcon: 'empty',
- },
- ],
- },
- vis2: {
- ...mockVisualization2,
- getSuggestions: () => [
- {
- score: 0.6,
- title: 'Test3',
- state: {},
- previewIcon: 'empty',
- },
- ],
- },
- },
- activeVisualizationId: 'vis1',
- visualizationState: {},
- datasourceMap,
- datasourceStates,
- });
- expect(suggestions[0].keptLayerIds).toEqual(['first', 'second']);
- expect(suggestions[1].keptLayerIds).toEqual(['first']);
- });
});
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_helpers.ts b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_helpers.ts
index d3e768a1932dc..173f64c6292a8 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_helpers.ts
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_helpers.ts
@@ -13,6 +13,7 @@ import {
FramePublicAPI,
TableChangeType,
TableSuggestion,
+ DatasourceSuggestion,
} from '../../types';
import { Action } from './state_management';
@@ -20,7 +21,6 @@ export interface Suggestion {
visualizationId: string;
datasourceState?: unknown;
datasourceId?: string;
- keptLayerIds: string[];
columns: number;
score: number;
title: string;
@@ -29,6 +29,7 @@ export interface Suggestion {
previewIcon: IconType;
hide?: boolean;
changeType: TableChangeType;
+ keptLayerIds: string[];
}
/**
@@ -64,12 +65,6 @@ export function getSuggestions({
([datasourceId]) => datasourceStates[datasourceId] && !datasourceStates[datasourceId].isLoading
);
- const allLayerIds = _.flatten(
- datasources.map(([datasourceId, datasource]) =>
- datasource.getLayers(datasourceStates[datasourceId].state)
- )
- );
-
// Collect all table suggestions from available datasources
const datasourceTableSuggestions = _.flatten(
datasources.map(([datasourceId, datasource]) => {
@@ -90,17 +85,12 @@ export function getSuggestions({
const table = datasourceSuggestion.table;
const currentVisualizationState =
visualizationId === activeVisualizationId ? visualizationState : undefined;
- const keptLayerIds =
- visualizationId !== activeVisualizationId
- ? [datasourceSuggestion.table.layerId]
- : allLayerIds;
return getVisualizationSuggestions(
visualization,
table,
visualizationId,
datasourceSuggestion,
- currentVisualizationState,
- keptLayerIds
+ currentVisualizationState
);
})
)
@@ -118,20 +108,20 @@ function getVisualizationSuggestions(
visualization: Visualization,
table: TableSuggestion,
visualizationId: string,
- datasourceSuggestion: { datasourceId: string; state: unknown; table: TableSuggestion },
- currentVisualizationState: unknown,
- keptLayerIds: string[]
+ datasourceSuggestion: DatasourceSuggestion & { datasourceId: string },
+ currentVisualizationState: unknown
) {
return visualization
.getSuggestions({
table,
state: currentVisualizationState,
+ keptLayerIds: datasourceSuggestion.keptLayerIds,
})
.map(({ state, ...visualizationSuggestion }) => ({
...visualizationSuggestion,
visualizationId,
visualizationState: state,
- keptLayerIds,
+ keptLayerIds: datasourceSuggestion.keptLayerIds,
datasourceState: datasourceSuggestion.state,
datasourceId: datasourceSuggestion.datasourceId,
columns: table.columns.length,
@@ -144,7 +134,7 @@ export function switchToSuggestion(
dispatch: (action: Action) => void,
suggestion: Pick<
Suggestion,
- 'visualizationId' | 'visualizationState' | 'datasourceState' | 'datasourceId' | 'keptLayerIds'
+ 'visualizationId' | 'visualizationState' | 'datasourceState' | 'datasourceId'
>,
type: 'SWITCH_VISUALIZATION' | 'SELECT_SUGGESTION' = 'SELECT_SUGGESTION'
) {
@@ -156,10 +146,4 @@ export function switchToSuggestion(
datasourceId: suggestion.datasourceId!,
};
dispatch(action);
- const layerIds = Object.keys(frame.datasourceLayers).filter(id => {
- return !suggestion.keptLayerIds.includes(id);
- });
- if (layerIds.length > 0) {
- frame.removeLayers(layerIds);
- }
}
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_panel.test.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_panel.test.tsx
index 8840f7dfd3b78..e32fe5f1f866d 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_panel.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_panel.test.tsx
@@ -218,36 +218,6 @@ describe('suggestion_panel', () => {
);
});
- it('should remove unused layers if suggestion is clicked', () => {
- defaultProps.frame.datasourceLayers.a = mockDatasource.publicAPIMock;
- defaultProps.frame.datasourceLayers.b = mockDatasource.publicAPIMock;
- const wrapper = mount(
-
- );
-
- act(() => {
- wrapper
- .find('button[data-test-subj="lnsSuggestion"]')
- .at(1)
- .simulate('click');
- });
-
- wrapper.update();
-
- act(() => {
- wrapper
- .find('[data-test-subj="lensSubmitSuggestion"]')
- .first()
- .simulate('click');
- });
-
- expect(defaultProps.frame.removeLayers).toHaveBeenCalledWith(['b']);
- });
-
it('should render preview expression if there is one', () => {
mockDatasource.getLayers.mockReturnValue(['first']);
(getSuggestions as jest.Mock).mockReturnValue([
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_panel.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_panel.tsx
index 6aee215d11591..e29ac84486d0b 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_panel.tsx
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_panel.tsx
@@ -367,7 +367,12 @@ function getPreviewExpression(
const changedLayers = datasource.getLayers(visualizableState.datasourceState);
changedLayers.forEach(layerId => {
if (updatedLayerApis[layerId]) {
- updatedLayerApis[layerId] = datasource.getPublicAPI(datasourceState, () => {}, layerId);
+ updatedLayerApis[layerId] = datasource.getPublicAPI({
+ layerId,
+ dateRange: frame.dateRange,
+ state: datasourceState,
+ setState: () => {},
+ });
}
});
}
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/workspace_panel.test.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/workspace_panel.test.tsx
index 9cf59f69c0cc2..3b79172ea6572 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/workspace_panel.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/workspace_panel.test.tsx
@@ -574,6 +574,7 @@ describe('workspace_panel', () => {
{
state: {},
table: expectedTable,
+ keptLayerIds: [],
},
]);
mockVisualization.getSuggestions.mockReturnValueOnce([
@@ -613,6 +614,7 @@ describe('workspace_panel', () => {
columns: [],
changeType: 'unchanged',
},
+ keptLayerIds: [],
},
]);
mockVisualization.getSuggestions.mockReturnValueOnce([
@@ -639,6 +641,7 @@ describe('workspace_panel', () => {
columns: [],
changeType: 'unchanged',
},
+ keptLayerIds: [],
},
]);
mockVisualization2.getSuggestions.mockReturnValueOnce([
@@ -665,6 +668,7 @@ describe('workspace_panel', () => {
columns: [],
changeType: 'unchanged',
},
+ keptLayerIds: [],
},
]);
mockVisualization.getSuggestions.mockReturnValueOnce([
@@ -694,6 +698,7 @@ describe('workspace_panel', () => {
layerId: '1',
changeType: 'unchanged',
},
+ keptLayerIds: [],
},
{
state: {},
@@ -703,6 +708,7 @@ describe('workspace_panel', () => {
layerId: '1',
changeType: 'unchanged',
},
+ keptLayerIds: [],
},
]);
mockVisualization.getSuggestions.mockReturnValueOnce([
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/workspace_panel_wrapper.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/workspace_panel_wrapper.tsx
index 18d5feac4edbe..cc91510146f35 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/workspace_panel_wrapper.tsx
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/workspace_panel_wrapper.tsx
@@ -15,9 +15,11 @@ interface Props {
export function WorkspacePanelWrapper({ children, title }: Props) {
return (
-
- {title}
-
+ {title && (
+
+ {title}
+
+ )}
{children}
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/mocks.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/mocks.tsx
index f349585ce88a4..c3e91c9debcd0 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/mocks.tsx
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/mocks.tsx
@@ -53,7 +53,7 @@ export function createMockDatasource(): DatasourceMock {
getDatasourceSuggestionsForField: jest.fn((_state, item) => []),
getDatasourceSuggestionsFromCurrentState: jest.fn(_state => []),
getPersistableState: jest.fn(),
- getPublicAPI: jest.fn((_state, _setState, _layerId) => publicAPIMock),
+ getPublicAPI: jest.fn().mockReturnValue(publicAPIMock),
initialize: jest.fn((_state?) => Promise.resolve()),
renderDataPanel: jest.fn(),
toExpression: jest.fn((_frame, _state) => null),
diff --git a/x-pack/legacy/plugins/lens/public/help_menu_util.tsx b/x-pack/legacy/plugins/lens/public/help_menu_util.tsx
index 3865f08862e1c..30a05dbc38537 100644
--- a/x-pack/legacy/plugins/lens/public/help_menu_util.tsx
+++ b/x-pack/legacy/plugins/lens/public/help_menu_util.tsx
@@ -12,7 +12,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
import { render, unmountComponentAtNode } from 'react-dom';
import { Chrome } from 'ui/chrome';
-const docsPage = undefined;
+const docsPage = 'lens';
export function addHelpMenuToAppChrome(chrome: Chrome) {
chrome.helpExtension.set(domElement => {
@@ -47,7 +47,7 @@ function HelpMenu() {
-
+
{i18n.translate('xpack.lens.helpMenu.feedbackLinkText', {
defaultMessage: 'Provide feedback for the Lens application',
})}
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/auto_date.ts b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/auto_date.ts
index 359c6d7c35c3a..566e5bece096d 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/auto_date.ts
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/auto_date.ts
@@ -10,25 +10,38 @@ import {
ExpressionFunction,
KibanaContext,
} from '../../../../../../src/plugins/expressions/common';
+import { DateRange } from '../../common';
interface LensAutoDateProps {
aggConfigs: string;
}
-export function getAutoInterval(ctx?: KibanaContext | null) {
- if (!ctx || !ctx.timeRange) {
- return;
+export function autoIntervalFromDateRange(dateRange?: DateRange, defaultValue: string = '1h') {
+ if (!dateRange) {
+ return defaultValue;
}
- const { timeRange } = ctx;
const buckets = new TimeBuckets();
buckets.setInterval('auto');
buckets.setBounds({
- min: dateMath.parse(timeRange.from),
- max: dateMath.parse(timeRange.to, { roundUp: true }),
+ min: dateMath.parse(dateRange.fromDate),
+ max: dateMath.parse(dateRange.toDate, { roundUp: true }),
});
- return buckets.getInterval();
+ return buckets.getInterval().expression;
+}
+
+function autoIntervalFromContext(ctx?: KibanaContext | null) {
+ if (!ctx || !ctx.timeRange) {
+ return;
+ }
+
+ const { timeRange } = ctx;
+
+ return autoIntervalFromDateRange({
+ fromDate: timeRange.from,
+ toDate: timeRange.to,
+ });
}
/**
@@ -56,7 +69,7 @@ export const autoDate: ExpressionFunction<
},
},
fn(ctx: KibanaContext, args: LensAutoDateProps) {
- const interval = getAutoInterval(ctx);
+ const interval = autoIntervalFromContext(ctx);
if (!interval) {
return args.aggConfigs;
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/datapanel.test.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/datapanel.test.tsx
index ec933d8e82876..11294bedbfff0 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/datapanel.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/datapanel.test.tsx
@@ -14,6 +14,7 @@ import { IndexPatternPrivateState } from './types';
import { mountWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
import { ChangeIndexPattern } from './change_indexpattern';
import { EuiProgress } from '@elastic/eui';
+import { documentField } from './document_field';
jest.mock('ui/new_platform');
jest.mock('../../../../../../src/legacy/ui/public/registry/field_formats');
@@ -121,6 +122,7 @@ const initialState: IndexPatternPrivateState = {
aggregatable: true,
searchable: true,
},
+ documentField,
],
},
'2': {
@@ -174,6 +176,7 @@ const initialState: IndexPatternPrivateState = {
},
},
},
+ documentField,
],
},
'3': {
@@ -199,6 +202,7 @@ const initialState: IndexPatternPrivateState = {
aggregatable: true,
searchable: true,
},
+ documentField,
],
},
},
@@ -565,6 +569,7 @@ describe('IndexPattern Data Panel', () => {
);
expect(wrapper.find(FieldItem).map(fieldItem => fieldItem.prop('field').name)).toEqual([
+ 'Records',
'bytes',
'client',
'memory',
@@ -630,6 +635,7 @@ describe('IndexPattern Data Panel', () => {
.simulate('click');
expect(wrapper.find(FieldItem).map(fieldItem => fieldItem.prop('field').name)).toEqual([
+ 'Records',
'bytes',
'client',
'memory',
@@ -698,6 +704,7 @@ describe('IndexPattern Data Panel', () => {
const wrapper = shallowWithIntl();
expect(wrapper.find(FieldItem).map(fieldItem => fieldItem.prop('field').name)).toEqual([
+ 'Records',
'bytes',
'memory',
]);
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/datapanel.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/datapanel.tsx
index 35bb3d2de0192..8fc80e14dc166 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/datapanel.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/datapanel.tsx
@@ -18,12 +18,13 @@ import {
EuiPopoverTitle,
EuiPopoverFooter,
EuiCallOut,
- EuiText,
EuiFormControlLayout,
EuiSwitch,
EuiFacetButton,
EuiIcon,
- EuiButton,
+ EuiButtonEmpty,
+ EuiSpacer,
+ EuiFormLabel,
} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n/react';
@@ -60,10 +61,11 @@ function sortFields(fieldA: IndexPatternField, fieldB: IndexPatternField) {
return fieldA.name.localeCompare(fieldB.name, undefined, { sensitivity: 'base' });
}
-const supportedFieldTypes = new Set(['string', 'number', 'boolean', 'date', 'ip']);
+const supportedFieldTypes = new Set(['string', 'number', 'boolean', 'date', 'ip', 'document']);
const PAGINATION_SIZE = 50;
const fieldTypeNames: Record = {
+ document: i18n.translate('xpack.lens.datatypes.record', { defaultMessage: 'record' }),
string: i18n.translate('xpack.lens.datatypes.string', { defaultMessage: 'string' }),
number: i18n.translate('xpack.lens.datatypes.number', { defaultMessage: 'number' }),
boolean: i18n.translate('xpack.lens.datatypes.boolean', { defaultMessage: 'boolean' }),
@@ -255,7 +257,8 @@ export const InnerIndexPatternDataPanel = function InnerIndexPatternDataPanel({
if (!showEmptyFields) {
const indexField = currentIndexPattern && fieldByName[field.name];
const exists =
- indexField && fieldExists(existingFields, currentIndexPattern.title, indexField.name);
+ field.type === 'document' ||
+ (indexField && fieldExists(existingFields, currentIndexPattern.title, indexField.name));
if (localState.typeFilter.length > 0) {
return exists && localState.typeFilter.includes(field.type as DataType);
}
@@ -270,7 +273,12 @@ export const InnerIndexPatternDataPanel = function InnerIndexPatternDataPanel({
return true;
});
- const paginatedFields = displayedFields.sort(sortFields).slice(0, pageSize);
+ const specialFields = displayedFields.filter(f => f.type === 'document');
+ const paginatedFields = displayedFields
+ .filter(f => f.type !== 'document')
+ .sort(sortFields)
+ .slice(0, pageSize);
+ const hilight = localState.nameFilter.toLowerCase();
return (
@@ -320,7 +328,7 @@ export const InnerIndexPatternDataPanel = function InnerIndexPatternDataPanel({
className="euiFieldText euiFieldText--fullWidth lnsInnerIndexPatternDataPanel__textField"
data-test-subj="lnsIndexPatternFieldSearch"
placeholder={i18n.translate('xpack.lens.indexPatterns.filterByNameLabel', {
- defaultMessage: 'Search for fields',
+ defaultMessage: 'Search field names',
description:
'Search the list of fields in the index pattern for the provided text',
})}
@@ -339,7 +347,7 @@ export const InnerIndexPatternDataPanel = function InnerIndexPatternDataPanel({
id="dataPanelTypeFilter"
panelClassName="euiFilterGroup__popoverPanel"
panelPaddingSize="none"
- anchorPosition="downLeft"
+ anchorPosition="rightDown"
display="block"
isOpen={localState.isTypeFilterOpen}
closePopover={() => setLocalState(() => ({ ...localState, isTypeFilterOpen: false }))}
@@ -418,6 +426,31 @@ export const InnerIndexPatternDataPanel = function InnerIndexPatternDataPanel({
onScroll={lazyScroll}
>
+ {specialFields.map(field => (
+
0}
+ dateRange={dateRange}
+ query={query}
+ filters={filters}
+ hideDetails={true}
+ />
+ ))}
+ {specialFields.length > 0 && (
+ <>
+
+
+ {i18n.translate('xpack.lens.indexPattern.individualFieldsLabel', {
+ defaultMessage: 'Individual fields',
+ })}
+
+
+
+ )}
{paginatedFields.map(field => {
const overallField = fieldByName[field.name];
return (
@@ -426,7 +459,7 @@ export const InnerIndexPatternDataPanel = function InnerIndexPatternDataPanel({
indexPattern={currentIndexPattern}
key={field.name}
field={field}
- highlight={localState.nameFilter.toLowerCase()}
+ highlight={hilight}
exists={
overallField &&
fieldExists(existingFields, currentIndexPattern.title, overallField.name)
@@ -439,9 +472,11 @@ export const InnerIndexPatternDataPanel = function InnerIndexPatternDataPanel({
})}
{paginatedFields.length === 0 && (
-
-
- {showEmptyFields
+
-
+ })
+ }
+ >
{(!showEmptyFields ||
localState.typeFilter.length ||
localState.nameFilter.length) && (
- {
trackUiEvent('indexpattern_show_all_fields_clicked');
clearLocalState();
@@ -471,9 +508,9 @@ export const InnerIndexPatternDataPanel = function InnerIndexPatternDataPanel({
{i18n.translate('xpack.lens.indexPatterns.showAllFields.buttonText', {
defaultMessage: 'Show all fields',
})}
-
+
)}
-
+
)}
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/dimension_panel.test.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/dimension_panel.test.tsx
index 49a04e59b7cc9..d4cf4f7ffbaa6 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/dimension_panel.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/dimension_panel.test.tsx
@@ -18,13 +18,13 @@ import {
SavedObjectsClientContract,
HttpServiceBase,
} from 'src/core/public';
-import { Storage } from 'ui/storage';
+import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
import { IndexPatternPrivateState } from '../types';
+import { documentField } from '../document_field';
jest.mock('ui/new_platform');
jest.mock('../loader');
jest.mock('../state_helpers');
-jest.mock('../operations');
// Used by indexpattern plugin, which is a dependency of a dependency
jest.mock('ui/chrome');
@@ -67,6 +67,7 @@ const expectedIndexPatterns = {
searchable: true,
exists: true,
},
+ documentField,
],
},
};
@@ -129,11 +130,12 @@ describe('IndexPatternDimensionPanel', () => {
dragDropContext,
state,
setState,
+ dateRange: { fromDate: 'now-1d', toDate: 'now' },
columnId: 'col1',
layerId: 'first',
uniqueLabel: 'stuff',
filterOperations: () => true,
- storage: {} as Storage,
+ storage: {} as IStorageWrapper,
uiSettings: {} as UiSettingsClientContract,
savedObjectsClient: {} as SavedObjectsClientContract,
http: {} as HttpServiceBase,
@@ -199,7 +201,7 @@ describe('IndexPatternDimensionPanel', () => {
expect(options).toHaveLength(2);
- expect(options![0].label).toEqual('Document');
+ expect(options![0].label).toEqual('Records');
expect(options![1].options!.map(({ label }) => label)).toEqual([
'timestamp',
@@ -231,7 +233,7 @@ describe('IndexPatternDimensionPanel', () => {
expect(options![1].options!.map(({ label }) => label)).toEqual(['timestamp', 'source']);
});
- it('should indicate fields which are imcompatible for the operation of the current column', () => {
+ it('should indicate fields which are incompatible for the operation of the current column', () => {
wrapper = mount(