Language with dataset service

package.json

@@ -65,7 +65,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 --uiSettings.overrides['state:storeInSessionStorage']=true",
+    "start:enhancements": "scripts/use_node scripts/opensearch_dashboards --dev --uiSettings.overrides['query:enhancements:enabled']=true --uiSettings.overrides['home:useNewHomePage']=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/constants.ts

@@ -42,105 +42,6 @@ export const DEFAULT_DATA = {
         tooltip: 'Root Data Structure',
       },
     } as DataStructure,
-
-    NULL: {
-      id: 'NULL',
-      title: 'Empty',
-      type: 'NULL',
-      meta: {
-        type: DATA_STRUCTURE_META_TYPES.FEATURE,
-        icon: 'empty',
-        tooltip: 'Empty Data Structure',
-      },
-    } as DataStructure,
-
-    CATEGORY: {
-      id: 'CATEGORY',
-      title: 'Categories',
-      type: 'CATEGORY',
-      meta: {
-        type: DATA_STRUCTURE_META_TYPES.FEATURE,
-        icon: 'listAdd',
-        tooltip: 'Data Categories',
-      },
-    } as DataStructure,
-
-    DATA_SOURCE: {
-      id: 'DATA_SOURCE',
-      title: 'Clusters',
-      type: 'DATA_SOURCE',
-      meta: {
-        type: DATA_STRUCTURE_META_TYPES.FEATURE,
-        icon: 'cluster',
-        tooltip: 'Data Clusters',
-      },
-    } as DataStructure,
-
-    CONNECTION: {
-      id: 'CONNECTION',
-      title: 'Connections',
-      type: 'CONNECTION',
-      meta: {
-        type: DATA_STRUCTURE_META_TYPES.FEATURE,
-        icon: 'link',
-        tooltip: 'Data Connections',
-      },
-    } as DataStructure,
-
-    INDEX: {
-      id: 'INDEX',
-      title: 'Indexes',
-      type: 'INDEX',
-      meta: {
-        type: DATA_STRUCTURE_META_TYPES.FEATURE,
-        icon: 'indexOpen',
-        tooltip: 'Data Indexes',
-      },
-    } as DataStructure,
-
-    FIELD: {
-      id: 'FIELD',
-      title: 'Fields',
-      type: 'FIELD',
-      meta: {
-        type: DATA_STRUCTURE_META_TYPES.FEATURE,
-        icon: 'field',
-        tooltip: 'Data Fields',
-      },
-    } as DataStructure,
-
-    TIME_FIELD: {
-      id: 'TIME_FIELD',
-      title: 'Time fields',
-      type: 'TIME_FIELD',
-      meta: {
-        type: DATA_STRUCTURE_META_TYPES.FEATURE,
-        icon: 'clock',
-        tooltip: 'Time Fields',
-      },
-    } as DataStructure,
-
-    DATASET: {
-      id: 'DATASET',
-      title: 'Datasets',
-      type: 'DATASET',
-      meta: {
-        type: DATA_STRUCTURE_META_TYPES.FEATURE,
-        icon: 'document',
-        tooltip: 'Datasets',
-      },
-    } as DataStructure,
-
-    DATASET_CATEGORY: {
-      id: 'DATASET_CATEGORY',
-      title: 'Datasets',
-      type: 'DATASET_CATEGORY',
-      meta: {
-        type: DATA_STRUCTURE_META_TYPES.FEATURE,
-        icon: 'documents',
-        tooltip: 'Dataset Categories',
-      },
-    } as DataStructure,
   },
 
   SET_TYPES: {

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

@@ -18,7 +18,7 @@ import {
 import { IFieldType } from './fields';
 import { IndexPatternFieldMap, IndexPatternSpec } from '../index_patterns';
 import { IOpenSearchDashboardsSearchRequest } from '../search';
-import { GetAggTypeFn, GetDataFrameAggQsFn, TimeRange } from '../types';
+import { GetAggTypeFn, GetDataFrameAggQsFn, Query, TimeRange } from '../types';
 
 /**
  * Returns the raw data frame from the search request.
@@ -380,14 +380,14 @@ export const createDataFrame = (partial: PartialDataFrame): IDataFrame | IDataFr
  */
 export const updateDataFrameMeta = ({
   dataFrame,
-  qs,
+  query,
   aggConfig,
   timeField,
   timeFilter,
   getAggQsFn,
 }: {
   dataFrame: IDataFrame;
-  qs: string;
+  query: Query;
   aggConfig: DataFrameAggConfig;
   timeField: any;
   timeFilter: string;
@@ -398,7 +398,7 @@ export const updateDataFrameMeta = ({
     aggs: aggConfig,
     aggsQs: {
       [aggConfig.id]: getAggQsFn({
-        qs,
+        query,
         aggConfig,
         timeField,
         timeFilter,
@@ -411,7 +411,7 @@ export const updateDataFrameMeta = ({
     for (const [key, subAgg] of Object.entries(subAggs)) {
       const subAggConfig: Record<string, any> = { [key]: subAgg };
       dataFrame.meta.aggsQs[subAgg.id] = getAggQsFn({
-        qs,
+        query,
         aggConfig: subAggConfig as DataFrameAggConfig,
         timeField,
         timeFilter,

src/plugins/data/common/datasets/types.ts

@@ -121,7 +121,7 @@ export interface DataStructure {
   children?: DataStructure[];
   /** Optional array of data structures of ancestors */
   path?: DataStructure[];
-  isLeaf?: boolean;
+  hasNext?: boolean;
   columnHeader?: string;
   /** Optional metadata for the data structure */
   meta?: DataStructureMeta;
@@ -152,7 +152,6 @@ export interface DataStructureDataTypeMeta {
   type: DATA_STRUCTURE_META_TYPES.TYPE;
   icon: EuiIconProps;
   tooltip: string;
-  isLeaf?: boolean;
 }
 
 /**

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

@@ -320,16 +320,9 @@ export class SearchSource {
    * @return {undefined|IDataFrame}
    */
   async createDataFrame(searchRequest: SearchRequest) {
-    const rawQueryString = this.getRawQueryStringFromRequest(searchRequest);
     const dataFrame = createDataFrame({
       name: searchRequest.index.title || searchRequest.index,
       fields: [],
-      ...(rawQueryString && {
-        meta: {
-          queryConfig: { qs: rawQueryString },
-          ...(searchRequest.dataSourceId && { dataSource: searchRequest.dataSourceId }),
-        },
-      }),
     });
     await this.setDataFrame(dataFrame);
     return this.getDataFrame();

src/plugins/data/common/types.ts

@@ -29,6 +29,7 @@
  */
 
 import { DataFrameAggConfig, IDataFrame } from './data_frames';
+import { Query } from './query';
 import { BucketAggType, MetricAggType } from './search';
 
 export * from './query/types';
@@ -50,12 +51,12 @@ export * from './datasets/types';
 export type GetConfigFn = <T = any>(key: string, defaultOverride?: T) => T;
 export type GetDataFrameFn = () => IDataFrame | undefined;
 export type GetDataFrameAggQsFn = ({
-  qs,
+  query,
   aggConfig,
   timeField,
   timeFilter,
 }: {
-  qs: string;
+  query: Query;
   aggConfig: DataFrameAggConfig;
   timeField: any;
   timeFilter: any;

src/plugins/data/public/antlr/opensearch_sql/code_completion.ts

@@ -47,7 +47,7 @@ export const getSuggestions = async ({
   services,
 }: QuerySuggestionGetFnArgs): Promise<QuerySuggestion[]> => {
   const { api } = services.uiSettings;
-  const datasetManager = services.data.query.queryString.getDatasetManager();
+  const queryString = services.data.query.queryString;
   const { lineNumber, column } = position || {};
   const suggestions = getOpenSearchSqlAutoCompleteSuggestions(query, {
     line: lineNumber || selectionStart,
@@ -60,7 +60,7 @@ export const getSuggestions = async ({
     // Fetch columns and values
     if (suggestions.suggestColumns?.tables?.length) {
       const tableNames = suggestions.suggestColumns.tables.map((table) => table.name);
-      const schemas = await fetchTableSchemas(tableNames, api, datasetManager);
+      const schemas = await fetchTableSchemas(tableNames, api, queryString);
 
       (schemas as IDataFrameResponse[]).forEach((schema: IDataFrameResponse) => {
         if ('body' in schema && schema.body && 'fields' in schema.body) {

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

@@ -5,7 +5,7 @@
 
 import { from } from 'rxjs';
 import { distinctUntilChanged, startWith, switchMap } from 'rxjs/operators';
-import { DatasetContract } from '../../query';
+import { QueryStringContract } from '../../query';
 
 export interface IDataSourceRequestHandlerParams {
   dataSourceId: string;
@@ -14,22 +14,22 @@ export interface IDataSourceRequestHandlerParams {
 
 // Function to get raw suggestion data
 export const getRawSuggestionData$ = (
-  datasetManager: DatasetContract,
+  queryString: QueryStringContract,
   dataSourceRequestHandler: ({
     dataSourceId,
     title,
   }: IDataSourceRequestHandlerParams) => Promise<any>,
   defaultRequestHandler: () => Promise<any>
 ) =>
-  datasetManager.getUpdates$().pipe(
-    startWith(datasetManager.getDataset()),
+  queryString.getUpdates$().pipe(
+    startWith(queryString.getQuery()),
     distinctUntilChanged(),
-    switchMap((dataset) => {
-      if (!dataset) {
+    switchMap((query) => {
+      if (!query) {
         return from(defaultRequestHandler());
       }
-      const dataSourceId = dataset?.dataSource?.id;
-      const title = dataset?.dataSource?.title;
+      const dataSourceId = query.dataset?.dataSource?.id;
+      const title = query.dataset?.dataSource?.title;
       return from(dataSourceRequestHandler({ dataSourceId, title }));
     })
   );
@@ -52,11 +52,11 @@ export const fetchData = (
   tables: string[],
   queryFormatter: (table: string, dataSourceId?: string, title?: string) => any,
   api: any,
-  datasetManager: DatasetContract
+  queryString: QueryStringContract
 ) => {
   return new Promise((resolve, reject) => {
     getRawSuggestionData$(
-      datasetManager,
+      queryString,
       ({ dataSourceId, title }) => {
         const requests = tables.map(async (table) => {
           const body = JSON.stringify(queryFormatter(table, dataSourceId, title));
@@ -82,11 +82,11 @@ export const fetchData = (
 };
 
 // Specific fetch function for table schemas
-export const fetchTableSchemas = (tables: string[], api: any, datasetManager: DatasetContract) => {
+export const fetchTableSchemas = (tables: string[], api: any, queryString: QueryStringContract) => {
   return fetchData(
     tables,
     (table, dataSourceId, title) => ({
-      query: { qs: `DESCRIBE TABLES LIKE ${table}`, format: 'jdbc' },
+      query: { query: `DESCRIBE TABLES LIKE ${table}`, format: 'jdbc' },
       df: {
         meta: {
           queryConfig: {
@@ -97,6 +97,6 @@ export const fetchTableSchemas = (tables: string[], api: any, datasetManager: Da
       },
     }),
     api,
-    datasetManager
+    queryString
   );
 };

src/plugins/data/public/index.ts

@@ -445,7 +445,6 @@ export {
   QueryEditorTopRow,
   // for BWC, keeping the old name
   IUiStart as DataPublicPluginStartUi,
-  DataSetNavigator,
 } from './ui';
 
 /**
@@ -462,9 +461,14 @@ export {
   QueryState,
   getDefaultQuery,
   FilterManager,
-  DatasetContract,
-  DatasetManager,
-  DatasetHandlerConfig,
+  QueryStringContract,
+  QueryStringManager,
+  DatasetTypeConfig,
+  DatasetService,
+  DatasetServiceContract,
+  LanguageConfig,
+  LanguageService,
+  LanguageServiceContract,
   SavedQuery,
   SavedQueryService,
   SavedQueryTimeFilter,

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

@@ -29,11 +29,10 @@
  */
 
 export * from './lib';
-
+export * from './types';
 export * from './query_service';
 export * from './filter_manager';
 export * from './query_string';
-export * from './query_string/dataset_manager';
 export * from './timefilter';
 export * from './saved_query';
 export * from './persisted_log';