language switches and sets the query correctly

Signed-off-by: Kawika Avilla <[email protected]>
kavilla · Aug 25, 2024 · 910db55 · 910db55
1 parent 2323d10
commit 910db55
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 29 deletions.
diff --git a/src/plugins/data/public/query/query_string/language_service/lib/dql_language.ts b/src/plugins/data/public/query/query_string/language_service/lib/dql_language.ts
@@ -11,16 +11,14 @@ export const getDQLLanguageConfig = (search: ISearchInterceptor): LanguageConfig
     id: 'kuery',
     title: 'DQL',
     search,
+    getQueryString(_) {
+      return '';
+    },
     searchBar: {
-      showDataSetsSelector: true,
-      showDataSourcesSelector: false,
       showQueryInput: true,
       showFilterBar: true,
       showDatePicker: true,
       showAutoRefreshOnly: false,
-      queryStringInput: {
-        initialValue: '',
-      },
     },
     fields: {
       filterable: true,

diff --git a/src/plugins/data/public/query/query_string/language_service/lib/lucene_language.ts b/src/plugins/data/public/query/query_string/language_service/lib/lucene_language.ts
@@ -11,16 +11,14 @@ export const getLuceneLanguageConfig = (search: ISearchInterceptor): LanguageCon
     id: 'lucene',
     title: 'Lucene',
     search,
+    getQueryString(_) {
+      return '';
+    },
     searchBar: {
-      showDataSetsSelector: true,
-      showDataSourcesSelector: false,
       showQueryInput: true,
       showFilterBar: true,
       showDatePicker: true,
       showAutoRefreshOnly: false,
-      queryStringInput: {
-        initialValue: '',
-      },
     },
     fields: {
       filterable: true,

diff --git a/src/plugins/data/public/query/query_string/language_service/types.ts b/src/plugins/data/public/query/query_string/language_service/types.ts
@@ -4,24 +4,18 @@
  */
 
 import { ISearchInterceptor } from '../../../search';
+import { Query } from '../../../../public';
 
 export interface LanguageConfig {
   id: string;
   title: string;
   search: ISearchInterceptor;
-  // Leave blank to support all data sources
-  // supportedDataSourceTypes?: Record<string, GenericDataSource>;
+  getQueryString: (query: Query) => string;
   searchBar?: {
-    showDataSetsSelector?: boolean;
-    showDataSourcesSelector?: boolean;
     showQueryInput?: boolean;
     showFilterBar?: boolean;
     showDatePicker?: boolean;
     showAutoRefreshOnly?: boolean;
-    queryStringInput?: {
-      // will replace '<data_source>' with the data source name
-      initialValue?: string;
-    };
     dateRange?: {
       initialFrom?: string;
       initialTo?: string;

diff --git a/src/plugins/data/public/query/query_string/query_string_manager.ts b/src/plugins/data/public/query/query_string/query_string_manager.ts
@@ -148,12 +148,12 @@ export class QueryStringManager {
     const curQuery = this.query$.getValue();
     const language = this.languageService.getLanguage(languageId);
     const dataset = curQuery.dataset;
-    const input = language?.searchBar?.queryStringInput?.initialValue || '';
+    const input = language?.getQueryString(curQuery) || '';
 
     return {
-      query: input || input.replace('<data_source>', dataset?.title ?? ''),
+      query: input,
       language: languageId,
-      dataset: curQuery.dataset,
+      dataset,
     };
   };
 

diff --git a/src/plugins/data/public/ui/query_editor/query_editor_top_row.tsx b/src/plugins/data/public/ui/query_editor/query_editor_top_row.tsx
@@ -13,7 +13,6 @@ import {
   prettyDuration,
 } from '@elastic/eui';
 import classNames from 'classnames';
-import { isEqual } from 'lodash';
 import React, { useState } from 'react';
 import { createPortal } from 'react-dom';
 import { IDataPluginServices, IIndexPattern, Query, TimeHistoryContract, TimeRange } from '../..';

diff --git a/src/plugins/query_enhancements/public/plugin.tsx b/src/plugins/query_enhancements/public/plugin.tsx
@@ -16,7 +16,7 @@ import {
   QueryEnhancementsPluginStart,
   QueryEnhancementsPluginStartDependencies,
 } from './types';
-import { LanguageConfig } from '../../data/public';
+import { LanguageConfig, Query } from '../../data/public';
 import { s3TypeConfig } from './datasets';
 
 export class QueryEnhancementsPlugin
@@ -61,15 +61,15 @@ export class QueryEnhancementsPlugin
       id: 'PPL',
       title: 'PPL',
       search: pplSearchInterceptor,
+      getQueryString: (query: Query) => {
+        return `source = ${query.dataset?.title}`;
+      },
       searchBar: {
-        queryStringInput: { initialValue: 'source=<data_source>' },
         dateRange: {
           initialFrom: moment().subtract(2, 'days').toISOString(),
           initialTo: moment().add(2, 'days').toISOString(),
         },
         showFilterBar: false,
-        showDataSetsSelector: true,
-        showDataSourcesSelector: true,
       },
       fields: {
         filterable: false,
@@ -85,12 +85,12 @@ export class QueryEnhancementsPlugin
       id: 'SQL',
       title: 'SQL',
       search: sqlSearchInterceptor,
+      getQueryString: (query: Query) => {
+        return `SELECT * FROM ${queryString.getQuery().dataset?.title} LIMIT 10`;
+      },
       searchBar: {
         showDatePicker: false,
         showFilterBar: false,
-        showDataSetsSelector: true,
-        showDataSourcesSelector: true,
-        queryStringInput: { initialValue: 'SELECT * FROM <data_source> LIMIT 10' },
       },
       fields: {
         filterable: false,