address comments

Signed-off-by: abbyhu2000 <[email protected]>
opensearch-project · Sep 10, 2024 · 7392a6f · 7392a6f
1 parent 1dafc7e
commit 7392a6f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 22 deletions.
diff --git a/src/plugins/data/public/ui/query_editor/language_selector.tsx b/src/plugins/data/public/ui/query_editor/language_selector.tsx
@@ -14,15 +14,12 @@ import {
 import { getQueryService } from '../../services';
 import { LanguageConfig } from '../../query';
 import { Query } from '../..';
-import { Dataset } from '../../../common';
-import { darkCssDistFilename } from '../../../../../../packages/osd-ui-shared-deps/index';
 
 export interface QueryLanguageSelectorProps {
   query: Query;
   onSelectLanguage: (newLanguage: string) => void;
   anchorPosition?: PopoverAnchorPosition;
   appName?: string;
-  dataset?: Dataset;
 }
 
 const mapExternalLanguageToOptions = (language: LanguageConfig) => {
@@ -39,8 +36,11 @@ export const QueryLanguageSelector = (props: QueryLanguageSelectorProps) => {
   const queryString = getQueryService().queryString;
   const languageService = queryString.getLanguageService();
 
-  const datasetSupportedLanguages = props.dataset
-    ? queryString.getDatasetService().getType(props.dataset.type)?.supportedLanguages(props.dataset)
+  const datasetSupportedLanguages = props.query.dataset
+    ? queryString
+        .getDatasetService()
+        .getType(props.query.dataset.type)
+        ?.supportedLanguages(props.query.dataset)
     : undefined;
 
   useEffect(() => {
@@ -61,22 +61,15 @@ export const QueryLanguageSelector = (props: QueryLanguageSelectorProps) => {
 
   const languageOptions: Array<{ label: string; value: string }> = [];
 
-  languageService
-    .getLanguages()
-    .filter((language) => {
-      if (datasetSupportedLanguages) {
-        return datasetSupportedLanguages.includes(language.id);
-      }
-      return true;
-    })
-    .forEach((language) => {
-      if (
-        (language && props.appName && !language.editorSupportedAppNames?.includes(props.appName)) ||
-        languageService.getUserQueryLanguageBlocklist().includes(language?.id)
-      )
-        return;
-      languageOptions.unshift(mapExternalLanguageToOptions(language));
-    });
+  languageService.getLanguages().forEach((language) => {
+    if (
+      (language && props.appName && !language.editorSupportedAppNames?.includes(props.appName)) ||
+      languageService.getUserQueryLanguageBlocklist().includes(language?.id) ||
+      (datasetSupportedLanguages && !datasetSupportedLanguages.includes(language.id))
+    )
+      return;
+    languageOptions.unshift(mapExternalLanguageToOptions(language));
+  });
 
   const selectedLanguage = {
     label:

diff --git a/src/plugins/data/public/ui/query_editor/query_editor.tsx b/src/plugins/data/public/ui/query_editor/query_editor.tsx
@@ -347,7 +347,6 @@ export default class QueryEditorUI extends Component<Props, State> {
         anchorPosition={this.props.languageSwitcherPopoverAnchorPosition}
         onSelectLanguage={this.onSelectLanguage}
         appName={this.services.appName}
-        dataset={this.props.query.dataset}
       />
     );