Revert "[Discover-next] data set picker (#7426)" (#7479)

This reverts commit 6a079d3.

package.json

@@ -63,7 +63,7 @@
     "start": "scripts/use_node scripts/opensearch_dashboards --dev",
     "start:docker": "scripts/use_node scripts/opensearch_dashboards --dev --opensearch.hosts=$OPENSEARCH_HOSTS --opensearch.ignoreVersionMismatch=true --server.host=$SERVER_HOST",
     "start:security": "scripts/use_node scripts/opensearch_dashboards --dev --security",
-    "start:enhancements": "scripts/use_node scripts/opensearch_dashboards --dev --uiSettings.overrides['query:enhancements:enabled']=true --uiSettings.overrides['home:useNewHomePage']=true",
+    "start:enhancements": "scripts/use_node scripts/opensearch_dashboards --dev --uiSettings.overrides['query:enhancements:enabled']=true",
     "debug": "scripts/use_node --nolazy --inspect scripts/opensearch_dashboards --dev",
     "debug-break": "scripts/use_node --nolazy --inspect-brk scripts/opensearch_dashboards --dev",
     "lint": "yarn run lint:es && yarn run lint:style",

src/plugins/data/common/data_frames/utils.ts

@@ -45,6 +45,29 @@ export const getRawQueryString = (
   );
 };
 
+/**
+ * Parses a raw query string and extracts the query string and data source.
+ * @param rawQueryString - The raw query string to parse.
+ * @returns An object containing the parsed query string and data source (if found).
+ */
+export const parseRawQueryString = (rawQueryString: string) => {
+  const rawDataSource = rawQueryString.match(/::(.*?)::/);
+  return {
+    qs: rawQueryString.replace(/::.*?::/, ''),
+    formattedQs(key: string = '.'): string {
+      const parts = rawQueryString.split('::');
+      if (parts.length > 1) {
+        return (parts.slice(0, 1).join('') + parts.slice(1).join(key)).replace(
+          new RegExp(key + '$'),
+          ''
+        );
+      }
+      return rawQueryString;
+    },
+    ...(rawDataSource && { dataSource: rawDataSource[1] }),
+  };
+};
+
 /**
  * Returns the raw aggregations from the search request.
  *

src/plugins/data/common/index.ts

@@ -31,7 +31,6 @@
 export * from './constants';
 export * from './opensearch_query';
 export * from './data_frames';
-export * from './data_sets';
 export * from './field_formats';
 export * from './field_mapping';
 export * from './index_patterns';

src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts

@@ -433,13 +433,11 @@ export class IndexPatternsService {
   /**
    * Get an index pattern by id. Cache optimized
    * @param id
-   * @param onlyCheckCache - Only check cache for index pattern if it doesn't exist it will not error out
    */
 
-  get = async (id: string, onlyCheckCache: boolean = false): Promise<IndexPattern> => {
+  get = async (id: string): Promise<IndexPattern> => {
     const cache = indexPatternCache.get(id);
-
-    if (cache || onlyCheckCache) {
+    if (cache) {
       return cache;
     }
 

src/plugins/data/common/search/opensearch_search/types.ts

@@ -48,10 +48,6 @@ export interface ISearchOptions {
    * Use this option to enable support for long numerals.
    */
   withLongNumeralsSupport?: boolean;
-  /**
-   * Use this option to enable support for async.
-   */
-  isAsync?: boolean;
 }
 
 export type ISearchRequestParams<T = Record<string, any>> = {

src/plugins/data/common/search/search_source/search_source.ts

@@ -94,6 +94,7 @@ import {
   convertResult,
   createDataFrame,
   getRawQueryString,
+  parseRawQueryString,
 } from '../../data_frames';
 import { IOpenSearchSearchRequest, IOpenSearchSearchResponse, ISearchOptions } from '../..';
 import { IOpenSearchDashboardsSearchRequest, IOpenSearchDashboardsSearchResponse } from '../types';
@@ -323,12 +324,7 @@ export class SearchSource {
     const dataFrame = createDataFrame({
       name: searchRequest.index.title || searchRequest.index,
       fields: [],
-      ...(rawQueryString && {
-        meta: {
-          queryConfig: { qs: rawQueryString },
-          ...(searchRequest.dataSourceId && { dataSource: searchRequest.dataSourceId }),
-        },
-      }),
+      ...(rawQueryString && { meta: { queryConfig: parseRawQueryString(rawQueryString) } }),
     });
     await this.setDataFrame(dataFrame);
     return this.getDataFrame();
@@ -430,8 +426,7 @@ export class SearchSource {
   private async fetchExternalSearch(searchRequest: SearchRequest, options: ISearchOptions) {
     const { search, getConfig, onResponse } = this.dependencies;
 
-    const currentDataframe = this.getDataFrame();
-    if (!currentDataframe || currentDataframe.name !== searchRequest.index?.id) {
+    if (!this.getDataFrame()) {
       await this.createDataFrame(searchRequest);
     }
 

src/plugins/data/common/types.ts

@@ -35,7 +35,6 @@ export * from './query/types';
 export * from './osd_field_types/types';
 export * from './index_patterns/types';
 export * from './data_frames/types';
-export * from './data_sets/types';
 
 /**
  * If a service is being shared on both the client and the server, and

src/plugins/data/public/antlr/shared/utils.ts

@@ -12,7 +12,7 @@ export interface IDataSourceRequestHandlerParams {
 }
 
 export const getRawSuggestionData$ = (
-  connectionsService: any,
+  connectionsService,
   dataSourceReuqstHandler: ({
     dataSourceId,
     title,
@@ -21,11 +21,11 @@ export const getRawSuggestionData$ = (
 ) =>
   connectionsService.getSelectedConnection$().pipe(
     distinctUntilChanged(),
-    switchMap((connection: any) => {
+    switchMap((connection) => {
       if (connection === undefined) {
         return from(defaultReuqstHandler());
       }
-      const dataSourceId = connection?.dataSource?.id;
+      const dataSourceId = connection?.id;
       const title = connection?.attributes?.title;
       return from(dataSourceReuqstHandler({ dataSourceId, title }));
     })
@@ -34,8 +34,8 @@ export const getRawSuggestionData$ = (
 export const fetchData = (
   tables: string[],
   queryFormatter: (table: string, dataSourceId?: string, title?: string) => any,
-  api: any,
-  connectionService: any
+  api,
+  connectionService
 ): Promise<any[]> => {
   return new Promise((resolve, reject) => {
     getRawSuggestionData$(
@@ -65,20 +65,16 @@ export const fetchData = (
         );
       }
     ).subscribe({
-      next: (dataFrames: any) => resolve(dataFrames),
-      error: (err: any) => {
+      next: (dataFrames) => resolve(dataFrames),
+      error: (err) => {
         // TODO: pipe error to UI
         reject(err);
       },
     });
   });
 };
 
-export const fetchTableSchemas = (
-  tables: string[],
-  api: any,
-  connectionService: any
-): Promise<any[]> => {
+export const fetchTableSchemas = (tables: string[], api, connectionService): Promise<any[]> => {
   return fetchData(
     tables,
     (table, dataSourceId, title) => ({
@@ -100,8 +96,8 @@ export const fetchTableSchemas = (
 export const fetchColumnValues = (
   tables: string[],
   column: string,
-  api: any,
-  connectionService: any
+  api,
+  connectionService
 ): Promise<any[]> => {
   return fetchData(
     tables,

src/plugins/data/public/index.ts

@@ -445,7 +445,6 @@ export {
   QueryEditorTopRow,
   // for BWC, keeping the old name
   IUiStart as DataPublicPluginStartUi,
-  DataSetNavigator,
 } from './ui';
 
 /**

src/plugins/data/public/query/index.tsx

@@ -32,7 +32,6 @@ export * from './lib';
 
 export * from './query_service';
 export * from './filter_manager';
-export * from './dataset_manager';
 export * from './timefilter';
 export * from './saved_query';
 export * from './persisted_log';