[data] updates query and lang if language is not supported by query data #8749

kavilla · 2024-10-29T22:47:16Z

Description

If the query currently has a language set that is not valid for that dataset type then update the language and get the initial query for that language and dataset and then send the query.

The scenario we can see this is when we are on an index pattern, and DQL selected. Then from recent datasets select an S3 connection. The dataset updates but the language does not update so therefore the query is invalid.

Issues Resolved

n/a

Screenshot

Testing the changes

Changelog

fix: updates query and language if language is not supported by query data

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

If the query currently has a language set that is not valid for that dataset type then update the language and get the initial query for that language and dataset and then send the query. The scenario we can see this is when we are on an index pattern, and DQL selected. Then from recent datasets select an S3 connection. The dataset updates but the language does not update so therefore the query is invalid. Issue: n/a Signed-off-by: Kawika Avilla <[email protected]>

github-actions · 2024-10-29T22:47:48Z

❌ Empty Changelog Section

The Changelog section in your PR description is empty. Please add a valid changelog entry or entries. If you did add a changelog entry, check to make sure that it was not accidentally included inside the comment block in the Changelog section.

codecov · 2024-10-29T23:02:02Z

Codecov Report

Attention: Patch coverage is 85.71429% with 1 line in your changes missing coverage. Please review.

Project coverage is 60.76%. Comparing base (48bfe2c) to head (096d189).
Report is 7 commits behind head on main.

Files with missing lines	Patch %	Lines
.../public/query/query_string/query_string_manager.ts	85.71%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #8749      +/-   ##
==========================================
+ Coverage   60.75%   60.76%   +0.01%     
==========================================
  Files        3798     3798              
  Lines       90684    90690       +6     
  Branches    14272    14274       +2     
==========================================
+ Hits        55091    55111      +20     
+ Misses      32094    32080      -14     
  Partials     3499     3499

Flag	Coverage Δ
Linux_1	`29.05% <14.28%> (-0.01%)`	⬇️
Linux_2	`56.39% <ø> (ø)`
Linux_3	`37.61% <85.71%> (+0.01%)`	⬆️
Linux_4	`29.82% <14.28%> (-0.01%)`	⬇️
Windows_1	`29.09% <14.28%> (+0.01%)`	⬆️
Windows_2	`56.34% <ø> (ø)`
Windows_3	`37.61% <85.71%> (+<0.01%)`	⬆️
Windows_4	`29.82% <14.28%> (-0.01%)`	⬇️

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.

github-actions · 2024-10-29T23:07:30Z

❌ Empty Changelog Section

The Changelog section in your PR description is empty. Please add a valid changelog entry or entries. If you did add a changelog entry, check to make sure that it was not accidentally included inside the comment block in the Changelog section.

src/plugins/data/public/query/query_string/query_string_manager.ts

virajsanghvi · 2024-10-30T16:29:56Z

src/plugins/data/public/query/query_string/query_string_manager.ts

+          });
+
+          // Show warning about language change
+          showWarning(this.notifications, {


Shouldn't this just be an info?

it could be show warning is the helper function for this manager that passes an id that prevents duplicate notifications from popping up. so if the user constantly switches between recent data and somehow the current language is always invalid it won't keep adding a notification on the right side and keep pushing the duplicate ones upwards. it will just have a single notification available.

virajsanghvi · 2024-10-30T16:54:42Z

Btw, looks like there's a cypress test failure related to discover

Signed-off-by: Kawika Avilla <[email protected]>

…penSearch-Dashboards-1 into kavilla/defaultlangaugefordata

sejli · 2024-10-30T20:15:17Z

Does this need a backport 2.18 label?

AMoo-Miki · 2024-10-30T21:55:03Z

src/plugins/data/public/query/query_string/query_string_manager.ts

+        if (supportedLanguages && !supportedLanguages.includes(newQuery.language)) {
+          // Get initial query with first supported language and new dataset
+          newQuery = this.getInitialQuery({
+            language: supportedLanguages[0],


Is it okay if language is undefined?

it shouldn't but with new features i'd imagine there prolly is some way a plugin developer can attempt. will add an issue

AMoo-Miki · 2024-10-30T21:56:07Z

src/plugins/data/public/query/query_string/query_string_manager.ts

+          // Show warning about language change
+          showWarning(this.notifications, {
+            title: i18n.translate('data.languageChangeTitle', {
+              defaultMessage: 'Language Changed',


Suggested change

defaultMessage: 'Language Changed',

defaultMessage: 'Language changed',

i'm not sure if this will retrigger requiring approvals so will do this in fast follow! thanks

…ata (#8749) * [data] updates query and lang if language is not supported by query data If the query currently has a language set that is not valid for that dataset type then update the language and get the initial query for that language and dataset and then send the query. The scenario we can see this is when we are on an index pattern, and DQL selected. Then from recent datasets select an S3 connection. The dataset updates but the language does not update so therefore the query is invalid. Issue: n/a Signed-off-by: Kawika Avilla <[email protected]> * Changeset file for PR #8749 created/updated * update string in notification Signed-off-by: Kawika Avilla <[email protected]> --------- Signed-off-by: Kawika Avilla <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> (cherry picked from commit a70a7b8) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

opensearch-trigger-bot · 2024-10-30T23:02:48Z

The backport to 2.18 failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch-Dashboards/backport-2.18 2.18
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch-Dashboards/backport-2.18
# Create a new branch
git switch --create backport/backport-8749-to-2.18
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 a70a7b83b0165c66391433ba98d4c09ad5127902
# Push it to GitHub
git push --set-upstream origin backport/backport-8749-to-2.18
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch-Dashboards/backport-2.18

Then, create a pull request where the base branch is 2.18 and the compare/head branch is backport/backport-8749-to-2.18.

…ata (#8749) (#8768) * [data] updates query and lang if language is not supported by query data If the query currently has a language set that is not valid for that dataset type then update the language and get the initial query for that language and dataset and then send the query. The scenario we can see this is when we are on an index pattern, and DQL selected. Then from recent datasets select an S3 connection. The dataset updates but the language does not update so therefore the query is invalid. Issue: n/a * Changeset file for PR #8749 created/updated * update string in notification --------- (cherry picked from commit a70a7b8) Signed-off-by: Kawika Avilla <[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>

…ata (opensearch-project#8749) * [data] updates query and lang if language is not supported by query data If the query currently has a language set that is not valid for that dataset type then update the language and get the initial query for that language and dataset and then send the query. The scenario we can see this is when we are on an index pattern, and DQL selected. Then from recent datasets select an S3 connection. The dataset updates but the language does not update so therefore the query is invalid. Issue: n/a Signed-off-by: Kawika Avilla <[email protected]> * Changeset file for PR opensearch-project#8749 created/updated * update string in notification Signed-off-by: Kawika Avilla <[email protected]> --------- Signed-off-by: Kawika Avilla <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>

github-actions bot added the distinguished-contributor label Oct 29, 2024

github-actions bot added the failed changeset label Oct 29, 2024

kavilla added backport 2.x discover for discover reinvent labels Oct 29, 2024

kavilla added the discover-next label Oct 29, 2024

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

0ed7a53

github-actions bot removed the failed changeset label Oct 29, 2024

ruanyl previously approved these changes Oct 30, 2024

View reviewed changes

virajsanghvi reviewed Oct 30, 2024

View reviewed changes

kavilla added 2 commits October 30, 2024 20:00

update string in notification

6cebc22

Signed-off-by: Kawika Avilla <[email protected]>

Merge branch 'kavilla/defaultlangaugefordata' of github.com:kavilla/O…

096d189

…penSearch-Dashboards-1 into kavilla/defaultlangaugefordata

kavilla dismissed ruanyl’s stale review via 096d189 October 30, 2024 20:01

sejli approved these changes Oct 30, 2024

View reviewed changes

joshuali925 approved these changes Oct 30, 2024

View reviewed changes

ananzh added the v2.18.0 label Oct 30, 2024

virajsanghvi approved these changes Oct 30, 2024

View reviewed changes

AMoo-Miki reviewed Oct 30, 2024

View reviewed changes

kavilla added the backport 2.18 label Oct 30, 2024

kavilla merged commit a70a7b8 into opensearch-project:main Oct 30, 2024
72 checks passed

opensearch-trigger-bot bot mentioned this pull request Oct 30, 2024

[Backport 2.x] [data] updates query and lang if language is not supported by query data #8768

Merged

opensearch-trigger-bot bot added the failed backport label Oct 30, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[data] updates query and lang if language is not supported by query data #8749

[data] updates query and lang if language is not supported by query data #8749

kavilla commented Oct 29, 2024 •

edited

Loading

github-actions bot commented Oct 29, 2024

codecov bot commented Oct 29, 2024 •

edited

Loading

github-actions bot commented Oct 29, 2024

virajsanghvi Oct 30, 2024

joshuali925 Oct 30, 2024

kavilla Oct 30, 2024

kavilla Oct 30, 2024

virajsanghvi commented Oct 30, 2024

sejli commented Oct 30, 2024

AMoo-Miki Oct 30, 2024

kavilla Oct 30, 2024

AMoo-Miki Oct 30, 2024

kavilla Oct 30, 2024

opensearch-trigger-bot bot commented Oct 30, 2024

	defaultMessage: 'Language Changed',
	defaultMessage: 'Language changed',

[data] updates query and lang if language is not supported by query data #8749

[data] updates query and lang if language is not supported by query data #8749

Conversation

kavilla commented Oct 29, 2024 • edited Loading

Description

Issues Resolved

Screenshot

Testing the changes

Changelog

Check List

github-actions bot commented Oct 29, 2024

❌ Empty Changelog Section

codecov bot commented Oct 29, 2024 • edited Loading

Codecov Report

github-actions bot commented Oct 29, 2024

❌ Empty Changelog Section

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

virajsanghvi commented Oct 30, 2024

sejli commented Oct 30, 2024

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

opensearch-trigger-bot bot commented Oct 30, 2024

kavilla commented Oct 29, 2024 •

edited

Loading

codecov bot commented Oct 29, 2024 •

edited

Loading