ppl working better

Signed-off-by: Kawika Avilla <[email protected]>
kavilla · Aug 25, 2024 · 19a00be · 19a00be
1 parent 733a723
commit 19a00be
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
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
@@ -157,6 +157,19 @@ export class QueryStringManager {
     };
   };
 
+  public getInitialQueryByDataset = (newDataset: Dataset) => {
+    const curQuery = this.query$.getValue();
+    const languageId = curQuery.language;
+    const language = this.languageService.getLanguage(languageId);
+    const newQuery = { ...curQuery, dataset: newDataset };
+    const input = language?.getQueryString(newQuery) || '';
+
+    return {
+      ...newQuery,
+      query: input,
+    };
+  };
+
   private getDefaultLanguage() {
     return (
       this.storage.get('userQueryLanguage') ||

diff --git a/src/plugins/data/public/ui/dataset_selector/index.tsx b/src/plugins/data/public/ui/dataset_selector/index.tsx
@@ -5,12 +5,16 @@
 
 import { useEffect, useState } from 'react';
 import React from 'react';
-import { Dataset } from '../../../common/datasets';
+import { Dataset, Query, TimeRange } from '../../../common';
 import { DatasetSelector } from './dataset_selector';
 import { useOpenSearchDashboards } from '../../../../opensearch_dashboards_react/public';
 import { IDataPluginServices } from '../../types';
 
-const ConnectedDatasetSelector = () => {
+interface ConnectedDatasetSelectorProps {
+  onSubmit: ((query: Query, dateRange?: TimeRange | undefined) => void) | undefined;
+}
+
+const ConnectedDatasetSelector = ({ onSubmit }: ConnectedDatasetSelectorProps) => {
   const [selectedDataset, setSelectedDataset] = useState<Dataset | undefined>();
   const { services } = useOpenSearchDashboards<IDataPluginServices>();
   const queryString = services.data.query.queryString;
@@ -29,8 +33,9 @@ const ConnectedDatasetSelector = () => {
   const handleDatasetChange = (dataset?: Dataset) => {
     setSelectedDataset(dataset);
     if (dataset) {
-      const query = queryString.getQuery();
-      queryString.setQuery({ ...query, dataset });
+      const query = queryString.getInitialQueryByDataset(dataset);
+      queryString.setQuery(query);
+      onSubmit!(queryString.getQuery());
     }
   };
 

diff --git a/src/plugins/data/public/ui/query_editor/query_editor.tsx b/src/plugins/data/public/ui/query_editor/query_editor.tsx
@@ -395,7 +395,7 @@ export default class QueryEditorUI extends Component<Props, State> {
             onClick={() => this.setState({ isCollapsed: !this.state.isCollapsed })}
             isCollapsed={!this.state.isCollapsed}
           />
-          <DatasetSelector />
+          <DatasetSelector onSubmit={this.props.onSubmit} />
           <div className="osdQueryEditor__input">
             {this.state.isCollapsed
               ? languageEditor.TopBar.Collapsed()

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
@@ -73,12 +73,6 @@ export default function QueryEditorTopRow(props: QueryEditorTopRowProps) {
   } = opensearchDashboards.services;
 
   const queryLanguage = props.query && props.query.language;
-  // const parsedQuery =
-  //   !language || isValidQuery(props.query) ? props.query! : queryString.getInitialQuery();
-  // if (!isEqual(parsedQuery?.query, props.query?.query)) {
-  //   onQueryChange(parsedQuery);
-  //   onSubmit({ query: parsedQuery, dateRange: getDateRange() });
-  // }
   const persistedLog: PersistedLog | undefined = React.useMemo(
     () =>
       queryLanguage && uiSettings && storage && appName