Fix query util to return search source's results right away. Fix texts.

Author: qn895

src/plugins/discover/public/plugin.tsx

@@ -351,7 +351,6 @@ export class DiscoverPlugin
 
         // FIXME: Temporarily hide overflow-y in Discover app when Field Stats table is shown
         // due to EUI bug https://github.com/elastic/eui/pull/5152
-        // until EUI is bumped to 38.0.0
         params.element.classList.add('dscAppWrapper');
 
         const unmount = renderApp(params.element);

src/plugins/discover/server/ui_settings.ts

@@ -210,7 +210,7 @@ export const getUiSettings: () => Record<string, UiSettingsParams> = () => ({
     description: i18n.translate(
       'discover.advancedSettings.discover.showFieldStatisticsDescription',
       {
-        defaultMessage: `Enable Field statistics table in Discover.`,
+        defaultMessage: `Enable "Field statistics" table in Discover.`,
       }
     ),
     value: false,

x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/grid_embeddable/grid_embeddable.tsx

@@ -170,7 +170,7 @@ export const IndexDataVisualizerViewWrapper = (props: {
           <p>
             <FormattedMessage
               id="xpack.dataVisualizer.index.embeddableErrorDescription"
-              defaultMessage="There was an error loading the embeddable. Please check if all the input required is valid."
+              defaultMessage="There was an error loading the embeddable. Please check if all the required input is valid."
             />
           </p>
         }

x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.test.ts

@@ -6,7 +6,7 @@
  */
 
 import {
-  getQueryFromSavedSearch,
+  getQueryFromSavedSearchObject,
   createMergedEsQuery,
   getEsQueryFromSavedSearch,
 } from './saved_search_utils';
@@ -82,9 +82,9 @@ const kqlSavedSearch: SavedSearch = {
   },
 };
 
-describe('getQueryFromSavedSearch()', () => {
+describe('getQueryFromSavedSearchObject()', () => {
   it('should return parsed searchSourceJSON with query and filter', () => {
-    expect(getQueryFromSavedSearch(luceneSavedSearchObj)).toEqual({
+    expect(getQueryFromSavedSearchObject(luceneSavedSearchObj)).toEqual({
       filter: [
         {
           $state: { store: 'appState' },
@@ -106,7 +106,7 @@ describe('getQueryFromSavedSearch()', () => {
       query: { language: 'lucene', query: 'responsetime:>50' },
       version: true,
     });
-    expect(getQueryFromSavedSearch(kqlSavedSearch)).toEqual({
+    expect(getQueryFromSavedSearchObject(kqlSavedSearch)).toEqual({
       filter: [
         {
           $state: { store: 'appState' },
@@ -130,7 +130,7 @@ describe('getQueryFromSavedSearch()', () => {
     });
   });
   it('should return undefined if invalid searchSourceJSON', () => {
-    expect(getQueryFromSavedSearch(luceneInvalidSavedSearchObj)).toEqual(undefined);
+    expect(getQueryFromSavedSearchObject(luceneInvalidSavedSearchObj)).toEqual(undefined);
   });
 });
 

x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.ts

@@ -16,17 +16,31 @@ import {
   Filter,
 } from '@kbn/es-query';
 import { isSavedSearchSavedObject, SavedSearchSavedObject } from '../../../../common/types';
-import { IndexPattern } from '../../../../../../../src/plugins/data/common';
+import { IndexPattern, SearchSource } from '../../../../../../../src/plugins/data/common';
 import { SEARCH_QUERY_LANGUAGE, SearchQueryLanguage } from '../types/combined_query';
 import { SavedSearch } from '../../../../../../../src/plugins/discover/public';
 import { getEsQueryConfig } from '../../../../../../../src/plugins/data/common';
 import { FilterManager } from '../../../../../../../src/plugins/data/public';
 
+const DEFAULT_QUERY = {
+  bool: {
+    must: [
+      {
+        match_all: {},
+      },
+    ],
+  },
+};
+
+export function getDefaultQuery() {
+  return cloneDeep(DEFAULT_QUERY);
+}
+
 /**
  * Parse the stringified searchSourceJSON
  * from a saved search or saved search object
  */
-export function getQueryFromSavedSearch(savedSearch: SavedSearchSavedObject | SavedSearch) {
+export function getQueryFromSavedSearchObject(savedSearch: SavedSearchSavedObject | SavedSearch) {
   const search = isSavedSearchSavedObject(savedSearch)
     ? savedSearch?.attributes?.kibanaSavedObjectMeta
     : // @ts-expect-error kibanaSavedObjectMeta does exist
@@ -117,10 +131,31 @@ export function getEsQueryFromSavedSearch({
 }) {
   if (!indexPattern || !savedSearch) return;
 
-  const savedSearchData = getQueryFromSavedSearch(savedSearch);
   const userQuery = query;
   const userFilters = filters;
 
+  // If saved search has a search source with nested parent
+  // e.g. a search coming from Dashboard saved search embeddable
+  // which already combines both the saved search's original query/filters and the Dashboard's
+  // then no need to process any further
+  if (
+    savedSearch &&
+    'searchSource' in savedSearch &&
+    savedSearch?.searchSource instanceof SearchSource &&
+    savedSearch.searchSource.getParent() !== undefined &&
+    userQuery
+  ) {
+    return {
+      searchQuery: savedSearch.searchSource.getSearchRequestBody()?.query ?? getDefaultQuery(),
+      searchString: userQuery.query,
+      queryLanguage: userQuery.language as SearchQueryLanguage,
+    };
+  }
+
+  // If saved search is an json object with the original query and filter
+  // retrieve the parsed query and filter
+  const savedSearchData = getQueryFromSavedSearchObject(savedSearch);
+
   // If no saved search available, use user's query and filters
   if (!savedSearchData && userQuery) {
     if (filterManager && userFilters) filterManager.setFilters(userFilters);
@@ -139,7 +174,8 @@ export function getEsQueryFromSavedSearch({
     };
   }
 
-  // If saved search available, merge saved search with latest user query or filters differ from extracted saved search data
+  // If saved search available, merge saved search with latest user query or filters
+  // which might differ from extracted saved search data
   if (savedSearchData) {
     const currentQuery = userQuery ?? savedSearchData?.query;
     const currentFilters = userFilters ?? savedSearchData?.filter;
@@ -160,17 +196,3 @@ export function getEsQueryFromSavedSearch({
     };
   }
 }
-
-const DEFAULT_QUERY = {
-  bool: {
-    must: [
-      {
-        match_all: {},
-      },
-    ],
-  },
-};
-
-export function getDefaultQuery() {
-  return cloneDeep(DEFAULT_QUERY);
-}

x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/use_saved_search.ts

@@ -15,7 +15,7 @@ import {
 import { estypes } from '@elastic/elasticsearch';
 import { useMlContext } from '../../../../../contexts/ml';
 import { SEARCH_QUERY_LANGUAGE } from '../../../../../../../common/constants/search';
-import { getQueryFromSavedSearch } from '../../../../../util/index_utils';
+import { getQueryFromSavedSearchObject } from '../../../../../util/index_utils';
 
 // `undefined` is used for a non-initialized state
 // `null` is set if no saved search is used
@@ -40,7 +40,7 @@ export function useSavedSearch() {
     let qryString;
 
     if (currentSavedSearch !== null) {
-      const { query } = getQueryFromSavedSearch(currentSavedSearch);
+      const { query } = getQueryFromSavedSearchObject(currentSavedSearch);
       const queryLanguage = query.language;
       qryString = query.query;
 

x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.ts

@@ -18,7 +18,7 @@ import { IUiSettingsClient } from 'kibana/public';
 import { getEsQueryConfig } from '../../../../../../../../src/plugins/data/public';
 import { SEARCH_QUERY_LANGUAGE } from '../../../../../common/constants/search';
 import { SavedSearchSavedObject } from '../../../../../common/types/kibana';
-import { getQueryFromSavedSearch } from '../../../util/index_utils';
+import { getQueryFromSavedSearchObject } from '../../../util/index_utils';
 
 // Provider for creating the items used for searching and job creation.
 
@@ -52,7 +52,7 @@ export function createSearchItems(
 
   let combinedQuery: any = getDefaultDatafeedQuery();
   if (savedSearch !== null) {
-    const data = getQueryFromSavedSearch(savedSearch);
+    const data = getQueryFromSavedSearchObject(savedSearch);
 
     query = data.query;
     const filter = data.filter;

x-pack/plugins/ml/public/application/util/index_utils.ts

@@ -80,7 +80,7 @@ export async function getIndexPatternAndSavedSearch(savedSearchId: string) {
   return resp;
 }
 
-export function getQueryFromSavedSearch(savedSearch: SavedSearchSavedObject) {
+export function getQueryFromSavedSearchObject(savedSearch: SavedSearchSavedObject) {
   const search = savedSearch.attributes.kibanaSavedObjectMeta as { searchSourceJSON: string };
   return JSON.parse(search.searchSourceJSON) as {
     query: Query;