Remove unsupported languages for dataset (opensearch-project#8100)

* remove unsupported languages Signed-off-by: abbyhu2000 <[email protected]> * Changeset file for PR opensearch-project#8100 created/updated * address comments Signed-off-by: abbyhu2000 <[email protected]> * address comments Signed-off-by: abbyhu2000 <[email protected]> --------- Signed-off-by: abbyhu2000 <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
bandinib-amzn · Sep 11, 2024 · 42317f1 · 42317f1
1 parent b438c2e
commit 42317f1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/changelogs/fragments/8100.yml b/changelogs/fragments/8100.yml
@@ -0,0 +1,2 @@
+fix:
+- Remove unsupported languages for dataset ([#8100](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8100))
diff --git a/src/plugins/data/public/ui/query_editor/language_selector.tsx b/src/plugins/data/public/ui/query_editor/language_selector.tsx
@@ -36,6 +36,13 @@ export const QueryLanguageSelector = (props: QueryLanguageSelectorProps) => {
   const queryString = getQueryService().queryString;
   const languageService = queryString.getLanguageService();
 
+  const datasetSupportedLanguages = props.query.dataset
+    ? queryString
+        .getDatasetService()
+        .getType(props.query.dataset.type)
+        ?.supportedLanguages(props.query.dataset)
+    : undefined;
+
   useEffect(() => {
     const subscription = queryString.getUpdates$().subscribe((query: Query) => {
       if (query.language !== currentLanguage) {
@@ -57,10 +64,11 @@ export const QueryLanguageSelector = (props: QueryLanguageSelectorProps) => {
   languageService.getLanguages().forEach((language) => {
     if (
       (language && props.appName && !language.editorSupportedAppNames?.includes(props.appName)) ||
-      languageService.getUserQueryLanguageBlocklist().includes(language?.id)
+      languageService.getUserQueryLanguageBlocklist().includes(language?.id) ||
+      (datasetSupportedLanguages && !datasetSupportedLanguages.includes(language.id))
     )
       return;
-    languageOptions.unshift(mapExternalLanguageToOptions(language!));
+    languageOptions.unshift(mapExternalLanguageToOptions(language));
   });
 
   const selectedLanguage = {

diff --git a/src/plugins/data/public/ui/types.ts b/src/plugins/data/public/ui/types.ts
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { QueryStatus } from '../query';
 import { IndexPatternSelectProps } from './index_pattern_select';
 import { StatefulSearchBarProps } from './search_bar';
 import { SuggestionsComponentProps } from './typeahead/suggestions_component';
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		fix:
		- Remove unsupported languages for dataset ([#8100](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8100))