Merge branch '7.x' into ua/7.x/step-completion-state

src/core/server/saved_objects/migrationsv2/integration_tests/batch_size_bytes.test.ts

@@ -67,6 +67,8 @@ describe('migration v2', () => {
     await root.setup();
     await expect(root.start()).resolves.toBeTruthy();
 
+    // After plugins start, some saved objects are deleted/recreated, so we
+    // wait a bit for the count to settle.
     await new Promise((resolve) => setTimeout(resolve, 5000));
 
     const esClient: ElasticsearchClient = esServer.es.getClient();

src/core/server/saved_objects/migrationsv2/test_helpers/retry.test.ts

@@ -8,8 +8,7 @@
 
 import { retryAsync } from './retry_async';
 
-// FLAKY: https://github.com/elastic/kibana/issues/110970
-describe.skip('retry', () => {
+describe('retry', () => {
   it('retries throwing functions until they succeed', async () => {
     let i = 0;
     await expect(
@@ -53,6 +52,8 @@ describe.skip('retry', () => {
       },
       { retryAttempts: 3, retryDelayMs: 100 }
     );
-    expect(Date.now() - now).toBeGreaterThanOrEqual(200);
+    // Would expect it to take 200ms but seems like timing inaccuracies
+    // sometimes causes the duration to be measured as 199ms
+    expect(Date.now() - now).toBeGreaterThanOrEqual(199);
   });
 });

src/plugins/discover/public/application/apps/main/components/chart/discover_chart.test.tsx

@@ -96,7 +96,7 @@ function getProps(timefield?: string) {
   }) as DataCharts$;
 
   return {
-    resetQuery: jest.fn(),
+    resetSavedSearch: jest.fn(),
     savedSearch: savedSearchMock,
     savedSearchDataChart$: charts$,
     savedSearchDataTotalHits$: totalHits$,

src/plugins/discover/public/application/apps/main/components/chart/discover_chart.tsx

@@ -21,7 +21,7 @@ import { DiscoverServices } from '../../../../../build_services';
 const TimechartHeaderMemoized = memo(TimechartHeader);
 const DiscoverHistogramMemoized = memo(DiscoverHistogram);
 export function DiscoverChart({
-  resetQuery,
+  resetSavedSearch,
   savedSearch,
   savedSearchDataChart$,
   savedSearchDataTotalHits$,
@@ -30,7 +30,7 @@ export function DiscoverChart({
   stateContainer,
   timefield,
 }: {
-  resetQuery: () => void;
+  resetSavedSearch: () => void;
   savedSearch: SavedSearch;
   savedSearchDataChart$: DataCharts$;
   savedSearchDataTotalHits$: DataTotalHits$;
@@ -88,7 +88,7 @@ export function DiscoverChart({
             <HitsCounter
               savedSearchData$={savedSearchDataTotalHits$}
               showResetButton={!!(savedSearch && savedSearch.id)}
-              onResetQuery={resetQuery}
+              onResetQuery={resetSavedSearch}
             />
           </EuiFlexItem>
           {!state.hideChart && (

src/plugins/discover/public/application/apps/main/components/layout/discover_layout.test.tsx

@@ -135,7 +135,7 @@ function getProps(indexPattern: IndexPattern): DiscoverLayoutProps {
     navigateTo: jest.fn(),
     onChangeIndexPattern: jest.fn(),
     onUpdateQuery: jest.fn(),
-    resetQuery: jest.fn(),
+    resetSavedSearch: jest.fn(),
     savedSearch: savedSearchMock,
     savedSearchData$,
     savedSearchRefetch$: new Subject(),

src/plugins/discover/public/application/apps/main/components/layout/discover_layout.tsx

@@ -57,7 +57,7 @@ export function DiscoverLayout({
   onChangeIndexPattern,
   onUpdateQuery,
   savedSearchRefetch$,
-  resetQuery,
+  resetSavedSearch,
   savedSearchData$,
   savedSearch,
   searchSource,
@@ -165,6 +165,7 @@ export function DiscoverLayout({
           services={services}
           stateContainer={stateContainer}
           updateQuery={onUpdateQuery}
+          resetSavedSearch={resetSavedSearch}
         />
         <EuiPageBody className="dscPageBody" aria-describedby="savedSearchTitle">
           <h1 id="savedSearchTitle" className="euiScreenReaderOnly">
@@ -246,7 +247,7 @@ export function DiscoverLayout({
                     <EuiFlexItem grow={false}>
                       <DiscoverChartMemoized
                         state={state}
-                        resetQuery={resetQuery}
+                        resetSavedSearch={resetSavedSearch}
                         savedSearch={savedSearch}
                         savedSearchDataChart$={charts$}
                         savedSearchDataTotalHits$={totalHits$}

src/plugins/discover/public/application/apps/main/components/layout/types.ts

@@ -27,7 +27,7 @@ export interface DiscoverLayoutProps {
   navigateTo: (url: string) => void;
   onChangeIndexPattern: (id: string) => void;
   onUpdateQuery: (payload: { dateRange: TimeRange; query?: Query }, isUpdate?: boolean) => void;
-  resetQuery: () => void;
+  resetSavedSearch: () => void;
   savedSearch: SavedSearch;
   savedSearchData$: SavedSearchData;
   savedSearchRefetch$: DataRefetch$;

src/plugins/discover/public/application/apps/main/components/top_nav/discover_topnav.test.tsx

@@ -33,6 +33,7 @@ function getProps(savePermissions = true): DiscoverTopNavProps {
     updateQuery: jest.fn(),
     onOpenInspector: jest.fn(),
     searchSource: {} as ISearchSource,
+    resetSavedSearch: () => {},
   };
 }
 

src/plugins/discover/public/application/apps/main/components/top_nav/discover_topnav.tsx

@@ -5,7 +5,8 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import React, { useMemo } from 'react';
+import React, { useCallback, useMemo } from 'react';
+import { useHistory } from 'react-router-dom';
 import { DiscoverLayoutProps } from '../layout/types';
 import { getTopNavLinks } from './get_top_nav_links';
 import { Query, TimeRange } from '../../../../../../../data/common/query';
@@ -21,6 +22,7 @@ export type DiscoverTopNavProps = Pick<
   savedQuery?: string;
   updateQuery: (payload: { dateRange: TimeRange; query?: Query }, isUpdate?: boolean) => void;
   stateContainer: GetStateReturn;
+  resetSavedSearch: () => void;
 };
 
 export const DiscoverTopNav = ({
@@ -34,9 +36,23 @@ export const DiscoverTopNav = ({
   navigateTo,
   savedSearch,
   services,
+  resetSavedSearch,
 }: DiscoverTopNavProps) => {
+  const history = useHistory();
   const showDatePicker = useMemo(() => indexPattern.isTimeBased(), [indexPattern]);
   const { TopNavMenu } = services.navigation.ui;
+
+  const onOpenSavedSearch = useCallback(
+    (newSavedSearchId: string) => {
+      if (savedSearch.id && savedSearch.id === newSavedSearchId) {
+        resetSavedSearch();
+      } else {
+        history.push(`/view/${encodeURIComponent(newSavedSearchId)}`);
+      }
+    },
+    [history, resetSavedSearch, savedSearch.id]
+  );
+
   const topNavMenu = useMemo(
     () =>
       getTopNavLinks({
@@ -47,8 +63,18 @@ export const DiscoverTopNav = ({
         state: stateContainer,
         onOpenInspector,
         searchSource,
+        onOpenSavedSearch,
       }),
-    [indexPattern, navigateTo, onOpenInspector, searchSource, stateContainer, savedSearch, services]
+    [
+      indexPattern,
+      navigateTo,
+      savedSearch,
+      services,
+      stateContainer,
+      onOpenInspector,
+      searchSource,
+      onOpenSavedSearch,
+    ]
   );
 
   const updateSavedQueryId = (newSavedQueryId: string | undefined) => {

src/plugins/discover/public/application/apps/main/components/top_nav/get_top_nav_links.test.ts

@@ -35,6 +35,7 @@ test('getTopNavLinks result', () => {
     services,
     state,
     searchSource: {} as ISearchSource,
+    onOpenSavedSearch: () => {},
   });
   expect(topNavLinks).toMatchInlineSnapshot(`
     Array [

src/plugins/discover/public/application/apps/main/components/top_nav/get_top_nav_links.ts

@@ -29,6 +29,7 @@ export const getTopNavLinks = ({
   state,
   onOpenInspector,
   searchSource,
+  onOpenSavedSearch,
 }: {
   indexPattern: IndexPattern;
   navigateTo: (url: string) => void;
@@ -37,6 +38,7 @@ export const getTopNavLinks = ({
   state: GetStateReturn;
   onOpenInspector: () => void;
   searchSource: ISearchSource;
+  onOpenSavedSearch: (id: string) => void;
 }) => {
   const options = {
     id: 'options',
@@ -89,7 +91,7 @@ export const getTopNavLinks = ({
     testId: 'discoverOpenButton',
     run: () =>
       showOpenSearchPanel({
-        makeUrl: (searchId) => `#/view/${encodeURIComponent(searchId)}`,
+        onOpenSavedSearch,
         I18nContext: services.core.i18n.Context,
       }),
   };

src/plugins/discover/public/application/apps/main/components/top_nav/open_search_panel.test.tsx

@@ -29,7 +29,9 @@ import { OpenSearchPanel } from './open_search_panel';
 
 describe('OpenSearchPanel', () => {
   test('render', () => {
-    const component = shallow(<OpenSearchPanel onClose={jest.fn()} makeUrl={jest.fn()} />);
+    const component = shallow(
+      <OpenSearchPanel onClose={jest.fn()} onOpenSavedSearch={jest.fn()} />
+    );
     expect(component).toMatchSnapshot();
   });
 
@@ -40,7 +42,9 @@ describe('OpenSearchPanel', () => {
         delete: false,
       },
     });
-    const component = shallow(<OpenSearchPanel onClose={jest.fn()} makeUrl={jest.fn()} />);
+    const component = shallow(
+      <OpenSearchPanel onClose={jest.fn()} onOpenSavedSearch={jest.fn()} />
+    );
     expect(component.find('[data-test-subj="manageSearches"]').exists()).toBe(false);
   });
 });

src/plugins/discover/public/application/apps/main/components/top_nav/open_search_panel.tsx

@@ -27,7 +27,7 @@ const SEARCH_OBJECT_TYPE = 'search';
 
 interface OpenSearchPanelProps {
   onClose: () => void;
-  makeUrl: (id: string) => string;
+  onOpenSavedSearch: (id: string) => void;
 }
 
 export function OpenSearchPanel(props: OpenSearchPanelProps) {
@@ -70,7 +70,7 @@ export function OpenSearchPanel(props: OpenSearchPanelProps) {
             },
           ]}
           onChoose={(id) => {
-            window.location.assign(props.makeUrl(id));
+            props.onOpenSavedSearch(id);
             props.onClose();
           }}
           uiSettings={uiSettings}

src/plugins/discover/public/application/apps/main/components/top_nav/show_open_search_panel.tsx

@@ -14,11 +14,11 @@ import { OpenSearchPanel } from './open_search_panel';
 let isOpen = false;
 
 export function showOpenSearchPanel({
-  makeUrl,
   I18nContext,
+  onOpenSavedSearch,
 }: {
-  makeUrl: (path: string) => string;
   I18nContext: I18nStart['Context'];
+  onOpenSavedSearch: (id: string) => void;
 }) {
   if (isOpen) {
     return;
@@ -35,7 +35,7 @@ export function showOpenSearchPanel({
   document.body.appendChild(container);
   const element = (
     <I18nContext>
-      <OpenSearchPanel onClose={onClose} makeUrl={makeUrl} />
+      <OpenSearchPanel onClose={onClose} onOpenSavedSearch={onOpenSavedSearch} />
     </I18nContext>
   );
   ReactDOM.render(element, container);

src/plugins/discover/public/application/apps/main/discover_main_app.tsx

@@ -92,7 +92,7 @@ export function DiscoverMainApp(props: DiscoverMainProps) {
     addHelpMenuToAppChrome(chrome, docLinks);
   }, [stateContainer, chrome, docLinks]);
 
-  const resetQuery = useCallback(() => {
+  const resetCurrentSavedSearch = useCallback(() => {
     resetSavedSearch(savedSearch.id);
   }, [resetSavedSearch, savedSearch]);
 
@@ -103,7 +103,7 @@ export function DiscoverMainApp(props: DiscoverMainProps) {
       inspectorAdapters={inspectorAdapters}
       onChangeIndexPattern={onChangeIndexPattern}
       onUpdateQuery={onUpdateQuery}
-      resetQuery={resetQuery}
+      resetSavedSearch={resetCurrentSavedSearch}
       navigateTo={navigateTo}
       savedSearch={savedSearch}
       savedSearchData$={data$}

src/plugins/discover/public/application/apps/main/services/use_discover_state.ts

@@ -148,7 +148,8 @@ export function useDiscoverState({
   const resetSavedSearch = useCallback(
     async (id?: string) => {
       const newSavedSearch = await services.getSavedSearchById(id);
-      newSavedSearch.searchSource.setField('index', indexPattern);
+      const newIndexPattern = newSavedSearch.searchSource.getField('index') || indexPattern;
+      newSavedSearch.searchSource.setField('index', newIndexPattern);
       const newAppState = getStateDefaults({
         config,
         data,
@@ -157,7 +158,7 @@ export function useDiscoverState({
       await stateContainer.replaceUrlAppState(newAppState);
       setState(newAppState);
     },
-    [services, indexPattern, config, data, stateContainer]
+    [indexPattern, services, config, data, stateContainer]
   );
 
   /**

src/plugins/vis_type_timeseries/public/application/components/vis_editor.tsx

@@ -12,9 +12,8 @@ import { share } from 'rxjs/operators';
 import { isEqual, isEmpty, debounce } from 'lodash';
 import { EventEmitter } from 'events';
 import type { IUiSettingsClient } from 'kibana/public';
-import {
+import type {
   Vis,
-  PersistedState,
   VisualizeEmbeddableContract,
 } from '../../../../../plugins/visualizations/public';
 import { KibanaContextProvider } from '../../../../../plugins/kibana_react/public';
@@ -31,8 +30,9 @@ import { TIME_RANGE_DATA_MODES, TIME_RANGE_MODE_KEY } from '../../../common/enum
 import { VisPicker } from './vis_picker';
 import { fetchFields, VisFields } from '../lib/fetch_fields';
 import { getDataStart, getCoreStart } from '../../services';
-import { TimeseriesVisParams } from '../../types';
+import type { TimeseriesVisParams } from '../../types';
 import { UseIndexPatternModeCallout } from './use_index_patter_mode_callout';
+import type { EditorRenderProps } from '../../../../visualize/public';
 
 const VIS_STATE_DEBOUNCE_DELAY = 200;
 const APP_NAME = 'VisEditor';
@@ -42,7 +42,9 @@ export interface TimeseriesEditorProps {
   embeddableHandler: VisualizeEmbeddableContract;
   eventEmitter: EventEmitter;
   timeRange: TimeRange;
-  uiState: PersistedState;
+  filters: EditorRenderProps['filters'];
+  query: EditorRenderProps['query'];
+  uiState: EditorRenderProps['uiState'];
   vis: Vis<TimeseriesVisParams>;
 }
 
@@ -189,6 +191,8 @@ export class VisEditor extends Component<TimeseriesEditorProps, TimeseriesEditor
             eventEmitter={this.props.eventEmitter}
             vis={this.props.vis}
             timeRange={this.props.timeRange}
+            filters={this.props.filters}
+            query={this.props.query}
             uiState={this.props.uiState}
             onCommit={this.handleCommit}
             onToggleAutoApply={this.handleAutoApplyToggle}

src/plugins/vis_type_timeseries/public/application/components/vis_editor_visualization.js

@@ -98,11 +98,8 @@ class VisEditorVisualizationUI extends Component {
 
   componentDidUpdate() {
     if (this._handler) {
-      this._handler.updateInput({
-        timeRange: this.props.timeRange,
-        filters: this.props.filters || [],
-        query: this.props.query,
-      });
+      const { timeRange, filters, query } = this.props;
+      this._handler.updateInput({ timeRange, filters, query });
     }
   }
 

src/plugins/vis_type_timeseries/public/application/editor_controller.tsx

@@ -26,7 +26,7 @@ export class EditorController implements IEditorController {
     private embeddableHandler: VisualizeEmbeddableContract
   ) {}
 
-  render({ timeRange, uiState }: EditorRenderProps) {
+  render({ timeRange, uiState, filters, query }: EditorRenderProps) {
     const I18nContext = getI18n().Context;
 
     render(
@@ -38,6 +38,8 @@ export class EditorController implements IEditorController {
           embeddableHandler={this.embeddableHandler}
           eventEmitter={this.eventEmitter}
           uiState={uiState}
+          filters={filters}
+          query={query}
         />
       </I18nContext>,
       this.el