Remove unsupported languages for dataset #8100

abbyhu2000 · 2024-09-10T01:32:00Z

Description

Remove unsupported languages for dataset in language selector

Issues Resolved

Screenshot

Testing the changes

Changelog

fix: Remove unsupported languages for dataset

Check List

All tests pass
- yarn test:jest
- yarn test:jest_integration
New functionality includes testing.
New functionality has been documented.
Update CHANGELOG.md
Commits are signed per the DCO using --signoff

ruanyl · 2024-09-10T05:59:05Z

src/plugins/data/public/ui/query_editor/language_selector.tsx

@@ -36,6 +38,9 @@ export const QueryLanguageSelector = (props: QueryLanguageSelectorProps) => {
  const queryString = getQueryService().queryString;
  const languageService = queryString.getLanguageService();

+  const type = queryString.getDatasetService().getType(props.dataset!.type);


Try to avoid non-null assertion as it's one of the major cause of runtime exception.

Suggested change

const type = queryString.getDatasetService().getType(props.dataset!.type);

const type = props.dataset ? queryString.getDatasetService().getType(props.dataset.type) : undefined

Changed to use conditional operator

ruanyl · 2024-09-10T06:01:40Z

src/plugins/data/public/ui/query_editor/language_selector.tsx

+        languageService.getUserQueryLanguageBlocklist().includes(language?.id)
+      )
+        return;
+      languageOptions.unshift(mapExternalLanguageToOptions(language!));


Seems you don't need non-null assertion here

Suggested change

languageOptions.unshift(mapExternalLanguageToOptions(language!));

languageOptions.unshift(mapExternalLanguageToOptions(language));

codecov · 2024-09-10T09:15:58Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 63.84%. Comparing base (22f1d46) to head (7392a6f).
Report is 34 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #8100      +/-   ##
==========================================
+ Coverage   63.71%   63.84%   +0.13%     
==========================================
  Files        3738     3738              
  Lines       88682    88702      +20     
  Branches    13788    13795       +7     
==========================================
+ Hits        56501    56631     +130     
+ Misses      31593    31474     -119     
- Partials      588      597       +9

Flag	Coverage Δ
Linux_1	`29.96% <ø> (+<0.01%)`	⬆️
Linux_2	`58.79% <ø> (ø)`
Linux_3	`40.27% <100.00%> (+0.21%)`	⬆️
Linux_4	`31.20% <ø> (ø)`
Windows_1	`29.97% <ø> (+<0.01%)`	⬆️
Windows_2	`58.74% <ø> (ø)`
Windows_3	`40.27% <100.00%> (+0.21%)`	⬆️
Windows_4	`31.20% <ø> (ø)`

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: abbyhu2000 <[email protected]>

ashwin-pc · 2024-09-10T22:18:28Z

src/plugins/data/public/ui/query_editor/language_selector.tsx


 export interface QueryLanguageSelectorProps {
  query: Query;
  onSelectLanguage: (newLanguage: string) => void;
  anchorPosition?: PopoverAnchorPosition;
  appName?: string;
+  dataset?: Dataset;


Doesnt the query object already contain the dataset?

yes, removed extra prop

sejli · 2024-09-10T22:34:10Z

src/plugins/data/public/ui/query_editor/language_selector.tsx

+    .forEach((language) => {
+      if (
+        (language && props.appName && !language.editorSupportedAppNames?.includes(props.appName)) ||
+        languageService.getUserQueryLanguageBlocklist().includes(language?.id)
+      )
+        return;


Could this be in filter(), since it's basically just filtering it again but in the forEach() loop? Then, we can pass the mapExternalLanguageOptions() function into a .map() instead of a for loop. Not a blocking comment, just something that might make it a bit easier more readable.

combined forEach and filter

Signed-off-by: abbyhu2000 <[email protected]>

* remove unsupported languages Signed-off-by: abbyhu2000 <[email protected]> * Changeset file for PR #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> (cherry picked from commit 42317f1) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* remove unsupported languages * Changeset file for PR #8100 created/updated * address comments * address comments --------- (cherry picked from commit 42317f1) Signed-off-by: abbyhu2000 <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> Co-authored-by: Qingyang(Abby) Hu <[email protected]>

* remove unsupported languages Signed-off-by: abbyhu2000 <[email protected]> * Changeset file for PR #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> (cherry picked from commit 42317f1) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* remove unsupported languages * Changeset file for PR #8100 created/updated * address comments * address comments --------- (cherry picked from commit 42317f1) Signed-off-by: abbyhu2000 <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>

…8100) (opensearch-project#8262)" This reverts commit cb3b4f6.

github-actions bot added the distinguished-contributor label Sep 10, 2024

opensearch-changeset-bot bot added a commit to abbyhu2000/OpenSearch-Dashboards that referenced this pull request Sep 10, 2024

Changeset file for PR opensearch-project#8100 created/updated

31b9f79

ruanyl reviewed Sep 10, 2024

View reviewed changes

abbyhu2000 and others added 3 commits September 10, 2024 18:14

remove unsupported languages

0cac158

Signed-off-by: abbyhu2000 <[email protected]>

Changeset file for PR opensearch-project#8100 created/updated

e1dfc6f

address comments

1dafc7e

Signed-off-by: abbyhu2000 <[email protected]>

abbyhu2000 force-pushed the remove_unsupported_dataset_type branch from b2eeb68 to 1dafc7e Compare September 10, 2024 18:14

abbyhu2000 added v2.17.0 backport 2.x backport 2.17 discover for discover reinvent labels Sep 10, 2024

ashwin-pc reviewed Sep 10, 2024

View reviewed changes

sejli previously approved these changes Sep 10, 2024

View reviewed changes

address comments

7392a6f

Signed-off-by: abbyhu2000 <[email protected]>

abbyhu2000 dismissed sejli’s stale review via 7392a6f September 10, 2024 22:50

ashwin-pc approved these changes Sep 10, 2024

View reviewed changes

sejli approved these changes Sep 10, 2024

View reviewed changes

ashwin-pc removed the backport 2.17 label Sep 11, 2024

ashwin-pc merged commit 42317f1 into opensearch-project:main Sep 11, 2024
67 checks passed

opensearch-trigger-bot bot mentioned this pull request Sep 11, 2024

[Backport 2.x] Remove unsupported languages for dataset #8132

Merged

ashwin-pc added v2.18.0 2.17.1 and removed v2.17.0 v2.18.0 labels Sep 13, 2024

sejli added the backport 2.17 label Sep 20, 2024

opensearch-trigger-bot bot mentioned this pull request Sep 20, 2024

[Backport 2.17] Remove unsupported languages for dataset #8262

Merged

abbyhu2000 added a commit to abbyhu2000/OpenSearch-Dashboards that referenced this pull request Sep 24, 2024

Revert "Remove unsupported languages for dataset (opensearch-project#…

16da35b

…8100) (opensearch-project#8262)" This reverts commit cb3b4f6.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove unsupported languages for dataset #8100

Remove unsupported languages for dataset #8100

abbyhu2000 commented Sep 10, 2024

ruanyl Sep 10, 2024

abbyhu2000 Sep 10, 2024

ruanyl Sep 10, 2024

abbyhu2000 Sep 10, 2024

codecov bot commented Sep 10, 2024 •

edited

Loading

ashwin-pc Sep 10, 2024

sejli Sep 10, 2024

abbyhu2000 Sep 10, 2024

sejli Sep 10, 2024

abbyhu2000 Sep 10, 2024

	const type = queryString.getDatasetService().getType(props.dataset!.type);
	const type = props.dataset ? queryString.getDatasetService().getType(props.dataset.type) : undefined

	languageOptions.unshift(mapExternalLanguageToOptions(language!));
	languageOptions.unshift(mapExternalLanguageToOptions(language));

Remove unsupported languages for dataset #8100

Remove unsupported languages for dataset #8100

Conversation

abbyhu2000 commented Sep 10, 2024

Description

Issues Resolved

Screenshot

Testing the changes

Changelog

Check List

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Sep 10, 2024 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Sep 10, 2024 •

edited

Loading