address comments

Signed-off-by: abbyhu2000 <[email protected]>
opensearch-project · Aug 28, 2024 · 316bea9 · 316bea9
1 parent 9be3b74
commit 316bea9
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
@@ -481,7 +481,6 @@ export {
   QueryStateChange,
   QueryStart,
   PersistedLog,
-  QueryControl,
 } from './query';
 
 export { AggsStart } from './search/aggs';

diff --git a/src/plugins/data/public/query/query_string/index.ts b/src/plugins/data/public/query/query_string/index.ts
@@ -35,5 +35,4 @@ export {
   LanguageService,
   LanguageConfig,
   EditorEnhancements,
-  QueryControl,
 } from './language_service';
diff --git a/src/plugins/data/public/query/query_string/language_service/default_language_reference.tsx b/src/plugins/data/public/query/query_string/language_service/default_language_reference.tsx
@@ -56,8 +56,7 @@ export const DefaultLanguageReference = () => {
           <p>
             <FormattedMessage
               id="data.query.queryBar.syntaxOptionsDescription"
-              defaultMessage="The {docsLink} (DQL) offers a simplified query
-                      syntax and support for scripted fields."
+              defaultMessage="The {docsLink} (DQL) offers a simplified query syntax and support for scripted fields."
               values={{
                 docsLink: (
                   <EuiLink href={osdDQLDocs} target="_blank">

diff --git a/src/plugins/data/public/query/query_string/language_service/get_query_control_links.tsx b/src/plugins/data/public/query/query_string/language_service/get_query_control_links.tsx
@@ -9,8 +9,10 @@ import { EuiFlexItem } from '@elastic/eui';
 export const QueryControls = (props: { queryControls: React.ReactElement[] }) => {
   return (
     <>
-      {props.queryControls.map((queryControl) => (
-        <EuiFlexItem grow={false}>{queryControl}</EuiFlexItem>
+      {props.queryControls.map((queryControl, idx) => (
+        <EuiFlexItem grow={false} key={idx}>
+          {queryControl}
+        </EuiFlexItem>
       ))}
     </>
   );

diff --git a/src/plugins/data/public/query/query_string/language_service/index.ts b/src/plugins/data/public/query/query_string/language_service/index.ts
@@ -5,4 +5,3 @@
 
 export * from './types';
 export { LanguageServiceContract, LanguageService } from './language_service';
-export { QueryControl } from './get_query_control_links';
diff --git a/src/plugins/data/public/query/query_string/language_service/language_service.ts b/src/plugins/data/public/query/query_string/language_service/language_service.ts
@@ -35,14 +35,18 @@ export class LanguageService {
     }
   };
 
+  public createDefaultLanguageReference = () => {
+    return createDefaultLanguageReference();
+  };
+
   /**
    * Registers default handlers for index patterns and indices.
    */
   private registerDefaultLanguages() {
     const defaultEditor = createEditor(
       SingleLineInput,
       SingleLineInput,
-      [createDefaultLanguageReference()],
+      [this.createDefaultLanguageReference()],
       DQLBody
     );
     this.registerLanguage(getDQLLanguageConfig(this.defaultSearchInterceptor, defaultEditor));

diff --git a/src/plugins/query_enhancements/public/query_editor/query_language_reference.tsx b/src/plugins/query_enhancements/public/query_editor/query_language_reference.tsx
@@ -36,7 +36,7 @@ export class QueryLanguageReference {
             toMountPoint(
               <OpenSearchDashboardsContextProvider services={this.coreStart}>
                 <PPLReferenceFlyout
-                  onClose={() => flyoutSession?.close?.().then()}
+                  onClose={() => flyoutSession?.close()}
                   makeUrl={(searchId: any) => `#/view/${encodeURIComponent(searchId)}`}
                 />
               </OpenSearchDashboardsContextProvider>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,4 +5,3 @@

		export * from './types';
		export { LanguageServiceContract, LanguageService } from './language_service';
		export { QueryControl } from './get_query_control_links';