Merge branch 'main' into puppeteer-3

src/plugins/console/public/application/models/legacy_core_editor/mode/output_highlight_rules.ts

@@ -12,8 +12,8 @@ import { addXJsonToRules } from '@kbn/ace';
 
 const JsonHighlightRules = ace.acequire('ace/mode/json_highlight_rules').JsonHighlightRules;
 
-export const mapStatusCodeToBadge = (value: string) => {
-  const regExpMatchArray = value.match(/\d+/);
+export const mapStatusCodeToBadge = (value?: string) => {
+  const regExpMatchArray = value?.match(/\d+/);
   if (regExpMatchArray) {
     const status = parseInt(regExpMatchArray[0], 10);
     if (status <= 199) {
@@ -44,11 +44,15 @@ export class OutputJsonHighlightRules extends JsonHighlightRules {
       },
       {
         token: 'comment',
-        regex: /#(.*?)(?=\d+\s(?:[\sA-Za-z]+)|$)/,
+        // match a comment starting with a hash at the start of the line
+        // ignore status codes and status texts at the end of the line (e.g. # GET _search/foo 200, # GET _search/foo 200 OK)
+        regex: /#(.*?)(?=[1-5][0-9][0-9]\s(?:[\sA-Za-z]+)|(?:[1-5][0-9][0-9])|$)/,
       },
       {
         token: mapStatusCodeToBadge,
-        regex: /(\d+\s[\sA-Za-z]+$)/,
+        // match status codes and status texts at the end of the line (e.g. # GET _search/foo 200, # GET _search/foo 200 OK)
+        // this rule allows us to highlight them with the corresponding badge color (e.g. 200 OK -> badge.badge--success)
+        regex: /([1-5][0-9][0-9]\s?[\sA-Za-z]+$)/,
       }
     );
 

src/plugins/discover/public/__mocks__/data_view.ts

@@ -46,6 +46,7 @@ const fields = [
     scripted: false,
     filterable: true,
     aggregatable: true,
+    sortable: true,
   },
   {
     name: 'scripted',

src/plugins/discover/public/__mocks__/saved_search.ts

@@ -20,3 +20,11 @@ export const savedSearchMockWithTimeField = {
   id: 'the-saved-search-id-with-timefield',
   searchSource: createSearchSourceMock({ index: dataViewWithTimefieldMock }),
 } as unknown as SavedSearch;
+
+export const savedSearchMockWithSQL = {
+  id: 'the-saved-search-id-sql',
+  searchSource: createSearchSourceMock({
+    index: dataViewWithTimefieldMock,
+    query: { sql: 'SELECT * FROM "the-saved-search-id-sql"' },
+  }),
+} as unknown as SavedSearch;

src/plugins/discover/public/__mocks__/services.ts

@@ -63,7 +63,7 @@ export const discoverServiceMock = {
       if (key === 'fields:popularLimit') {
         return 5;
       } else if (key === DEFAULT_COLUMNS_SETTING) {
-        return [];
+        return ['default_column'];
       } else if (key === UI_SETTINGS.META_FIELDS) {
         return [];
       } else if (key === DOC_HIDE_TIME_COLUMN_SETTING) {

src/plugins/discover/public/application/main/components/top_nav/on_save_search.tsx

@@ -53,7 +53,7 @@ async function saveDataSource({
           navigateTo(`/view/${encodeURIComponent(id)}`);
         } else {
           // Update defaults so that "reload saved query" functions correctly
-          state.resetAppState();
+          state.resetAppState(savedSearch);
           services.chrome.docTitle.change(savedSearch.title!);
 
           setBreadcrumbsTitle(

src/plugins/discover/public/application/main/discover_main_route.tsx

@@ -8,7 +8,6 @@
 import React, { useEffect, useState, memo, useCallback } from 'react';
 import { useParams, useHistory } from 'react-router-dom';
 import { DataViewListItem } from '@kbn/data-plugin/public';
-import { ISearchSource } from '@kbn/data-plugin/public';
 import { DataViewSavedObjectConflictError } from '@kbn/data-views-plugin/public';
 import { redirectWhenMissing } from '@kbn/kibana-utils-plugin/public';
 import { useExecutionContext } from '@kbn/kibana-react-plugin/public';
@@ -70,7 +69,7 @@ export function DiscoverMainRoute(props: Props) {
   });
 
   const loadDefaultOrCurrentDataView = useCallback(
-    async (searchSource: ISearchSource) => {
+    async (nextSavedSearch: SavedSearch) => {
       try {
         const hasUserDataViewValue = await data.dataViews.hasData
           .hasUserDataView()
@@ -92,12 +91,12 @@ export function DiscoverMainRoute(props: Props) {
           return;
         }
 
-        const { appStateContainer } = getState({ history, uiSettings: config });
+        const { appStateContainer } = getState({ history, savedSearch: nextSavedSearch, services });
         const { index } = appStateContainer.getState();
         const ip = await loadDataView(data.dataViews, config, index);
 
         const ipList = ip.list;
-        const dataViewData = resolveDataView(ip, searchSource, toastNotifications);
+        const dataViewData = resolveDataView(ip, nextSavedSearch.searchSource, toastNotifications);
         await data.dataViews.refreshFields(dataViewData);
         setDataViewList(ipList);
 
@@ -106,7 +105,7 @@ export function DiscoverMainRoute(props: Props) {
         setError(e);
       }
     },
-    [config, data.dataViews, history, isDev, toastNotifications]
+    [config, data.dataViews, history, isDev, toastNotifications, services]
   );
 
   const loadSavedSearch = useCallback(async () => {
@@ -118,7 +117,7 @@ export function DiscoverMainRoute(props: Props) {
         savedObjectsTagging: services.savedObjectsTagging,
       });
 
-      const currentDataView = await loadDefaultOrCurrentDataView(currentSavedSearch.searchSource);
+      const currentDataView = await loadDefaultOrCurrentDataView(currentSavedSearch);
 
       if (!currentDataView) {
         return;

src/plugins/discover/public/application/main/hooks/use_discover_state.ts

@@ -44,7 +44,7 @@ export function useDiscoverState({
   setExpandedDoc: (doc?: DataTableRecord) => void;
   dataViewList: DataViewListItem[];
 }) {
-  const { uiSettings, data, filterManager, dataViews, storage } = services;
+  const { uiSettings, data, filterManager, dataViews } = services;
   const useNewFieldsApi = useMemo(() => !uiSettings.get(SEARCH_FIELDS_FROM_SOURCE), [uiSettings]);
   const { timefilter } = data.query.timefilter;
 
@@ -60,19 +60,11 @@ export function useDiscoverState({
   const stateContainer = useMemo(
     () =>
       getState({
-        getStateDefaults: () =>
-          getStateDefaults({
-            config: uiSettings,
-            data,
-            savedSearch,
-            storage,
-          }),
-        storeInSessionStorage: uiSettings.get('state:storeInSessionStorage'),
         history,
-        toasts: services.core.notifications.toasts,
-        uiSettings,
+        savedSearch,
+        services,
       }),
-    [uiSettings, data, history, savedSearch, services.core.notifications.toasts, storage]
+    [history, savedSearch, services]
   );
 
   const { appStateContainer } = stateContainer;
@@ -231,10 +223,8 @@ export function useDiscoverState({
       const newDataView = newSavedSearch.searchSource.getField('index') || dataView;
       newSavedSearch.searchSource.setField('index', newDataView);
       const newAppState = getStateDefaults({
-        config: uiSettings,
-        data,
         savedSearch: newSavedSearch,
-        storage,
+        services,
       });
 
       restoreStateFromSavedSearch({
@@ -245,7 +235,7 @@ export function useDiscoverState({
       await stateContainer.replaceUrlAppState(newAppState);
       setState(newAppState);
     },
-    [services, dataView, uiSettings, data, storage, stateContainer]
+    [services, dataView, stateContainer]
   );
 
   /**

src/plugins/discover/public/application/main/hooks/use_saved_search.test.ts

@@ -9,10 +9,9 @@ import { Subject } from 'rxjs';
 import { renderHook } from '@testing-library/react-hooks';
 import { createSearchSessionMock } from '../../../__mocks__/search_session';
 import { discoverServiceMock } from '../../../__mocks__/services';
-import { savedSearchMock } from '../../../__mocks__/saved_search';
+import { savedSearchMock, savedSearchMockWithSQL } from '../../../__mocks__/saved_search';
 import { RecordRawType, useSavedSearch } from './use_saved_search';
-import { getState, AppState } from '../services/discover_state';
-import { uiSettingsMock } from '../../../__mocks__/ui_settings';
+import { getState } from '../services/discover_state';
 import { useDiscoverState } from './use_discover_state';
 import { FetchStatus } from '../../types';
 import { dataViewMock } from '../../../__mocks__/data_view';
@@ -25,9 +24,9 @@ describe('test useSavedSearch', () => {
   test('useSavedSearch return is valid', async () => {
     const { history, searchSessionManager } = createSearchSessionMock();
     const stateContainer = getState({
-      getStateDefaults: () => ({ index: 'the-data-view-id' }),
+      savedSearch: savedSearchMock,
+      services: discoverServiceMock,
       history,
-      uiSettings: uiSettingsMock,
     });
 
     const { result } = renderHook(() => {
@@ -51,9 +50,9 @@ describe('test useSavedSearch', () => {
   test('refetch$ triggers a search', async () => {
     const { history, searchSessionManager } = createSearchSessionMock();
     const stateContainer = getState({
-      getStateDefaults: () => ({ index: 'the-data-view-id' }),
+      savedSearch: savedSearchMock,
+      services: discoverServiceMock,
       history,
-      uiSettings: uiSettingsMock,
     });
 
     discoverServiceMock.data.query.timefilter.timefilter.getTime = jest.fn(() => {
@@ -95,9 +94,9 @@ describe('test useSavedSearch', () => {
   test('reset sets back to initial state', async () => {
     const { history, searchSessionManager } = createSearchSessionMock();
     const stateContainer = getState({
-      getStateDefaults: () => ({ index: 'the-data-view-id' }),
+      savedSearch: savedSearchMock,
+      services: discoverServiceMock,
       history,
-      uiSettings: uiSettingsMock,
     });
 
     discoverServiceMock.data.query.timefilter.timefilter.getTime = jest.fn(() => {
@@ -139,21 +138,17 @@ describe('test useSavedSearch', () => {
   test('useSavedSearch returns plain record raw type', async () => {
     const { history, searchSessionManager } = createSearchSessionMock();
     const stateContainer = getState({
-      getStateDefaults: () =>
-        ({
-          index: 'the-index-pattern-id',
-          query: { sql: 'SELECT * FROM test' },
-        } as unknown as AppState),
+      savedSearch: savedSearchMockWithSQL,
+      services: discoverServiceMock,
       history,
-      uiSettings: uiSettingsMock,
     });
 
     const { result } = renderHook(() => {
       return useSavedSearch({
         initialFetchStatus: FetchStatus.LOADING,
-        savedSearch: savedSearchMock,
+        savedSearch: savedSearchMockWithSQL,
         searchSessionManager,
-        searchSource: savedSearchMock.searchSource.createCopy(),
+        searchSource: savedSearchMockWithSQL.searchSource.createCopy(),
         services: discoverServiceMock,
         stateContainer,
         useNewFieldsApi: true,

src/plugins/discover/public/application/main/hooks/use_search_session.test.ts

@@ -12,15 +12,14 @@ import { createSearchSessionMock } from '../../../__mocks__/search_session';
 import { discoverServiceMock } from '../../../__mocks__/services';
 import { savedSearchMock } from '../../../__mocks__/saved_search';
 import { getState } from '../services/discover_state';
-import { uiSettingsMock } from '../../../__mocks__/ui_settings';
 
 describe('test useSearchSession', () => {
   test('getting the next session id', async () => {
     const { history } = createSearchSessionMock();
     const stateContainer = getState({
-      getStateDefaults: () => ({ index: 'test' }),
+      savedSearch: savedSearchMock,
       history,
-      uiSettings: uiSettingsMock,
+      services: discoverServiceMock,
     });
 
     const nextId = 'id';