Filter Saved Query by supported language #8325

LDrago27 · 2024-09-24T21:09:14Z

Description

This PR aims at filtering Saved Queries on the basis of language.

Issues Resolved

Screenshot

In Discover that supports additional SQL and PPL languages

In Visualize page where we only support DQL, other language Saved Queries are filtered

Testing the changes

Changelog

skip

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

github-actions · 2024-09-24T21:09:46Z

❌ 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.

Signed-off-by: Suchit Sahoo <suchsah@amazon.com>

codecov · 2024-09-24T21:34:28Z

Codecov Report

Attention: Patch coverage is 55.55556% with 4 lines in your changes missing coverage. Please review.

Project coverage is 64.14%. Comparing base (9a88bf5) to head (728fde5).
Report is 177 commits behind head on main.

Files with missing lines	Patch %	Lines
...ta/public/query/saved_query/saved_query_service.ts	55.55%	4 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #8325      +/-   ##
==========================================
- Coverage   64.14%   64.14%   -0.01%     
==========================================
  Files        3743     3743              
  Lines       88843    88851       +8     
  Branches    13855    13858       +3     
==========================================
+ Hits        56987    56991       +4     
- Misses      31241    31245       +4     
  Partials      615      615

Flag	Coverage Δ
Linux_1	`30.06% <0.00%> (-0.01%)`	⬇️
Linux_2	`58.86% <ø> (ø)`
Linux_3	`40.35% <55.55%> (+<0.01%)`	⬆️
Linux_4	`31.57% <0.00%> (-0.01%)`	⬇️
Windows_1	`30.07% <0.00%> (-0.01%)`	⬇️
Windows_2	`58.81% <ø> (ø)`
Windows_3	`40.35% <55.55%> (+<0.01%)`	⬆️
Windows_4	`31.57% <0.00%> (-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.

sejli

Nice changes! Just some non-blocking comments, otherwise LGTM

sejli · 2024-09-25T23:58:44Z

src/plugins/data/public/query/saved_query/saved_query_service.ts

+        return (
+          languageService?.getLanguage(languageId)?.supportedAppNames?.includes(currentAppId) ??
+          true
+        );


nit: Do we just need the parenthesis here? Or could it just be

return languageService?.getLanguage(languageId)?.supportedAppNames?.includes(currentAppId) ?? true;

sejli · 2024-09-25T23:58:46Z

src/plugins/data/public/query/saved_query/saved_query_service.ts

+      (await application?.currentAppId$?.pipe(first()).toPromise()) ?? Promise.resolve(undefined);
+    const languageService = queryStringManager?.getLanguageService();
+
+    // Filtering saved queries based on language supported by cirrent application


nit:

Suggested change

// Filtering saved queries based on language supported by cirrent application

// Filtering saved queries based on language supported by current application

sejli · 2024-09-26T00:00:29Z

src/plugins/data/public/query/saved_query/saved_query_service.ts

+      queries = queries.filter((query) => {
+        const languageId = query.attributes.query.language;
+        return (
+          languageService?.getLanguage(languageId)?.supportedAppNames?.includes(currentAppId) ??


nit: Will languageService ever not have getLanguage()?

kavilla · 2024-09-26T10:32:22Z

src/plugins/data/public/query/saved_query/saved_query_service.ts

@@ -41,7 +43,9 @@ type SerializedSavedQueryAttributes = SavedObjectAttributes &
  };

 export const createSavedQueryService = (


we should add a back log item to extend this service. i think at one point we were going to have a toggle to save the query with or without the dataset. which id imagine that is something we would want since in the past the saved query wouldn't replace the selected dataset (index pattern) it would just replace the current query

kavilla · 2024-09-26T10:33:47Z

lgtm its for 2.18 correct?

Signed-off-by: Suchit Sahoo <suchsah@amazon.com> (cherry picked from commit 33f4f64) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

(cherry picked from commit 33f4f64) Signed-off-by: Suchit Sahoo <suchsah@amazon.com> 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>

…pensearch-project#8356) (cherry picked from commit 33f4f64) Signed-off-by: Suchit Sahoo <suchsah@amazon.com> 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>

Signed-off-by: Sean Li <lnse@amazon.com>

* Adding recent datasets to dataset selector Signed-off-by: Sean Li <lnse@amazon.com> * addressing comments, adding tests Signed-off-by: Sean Li <lnse@amazon.com> * moving recent datasets to fetched datasets Signed-off-by: Sean Li <lnse@amazon.com> * mocking UI settings for test Signed-off-by: Sean Li <lnse@amazon.com> * fixing connect_to_query_state.test Signed-off-by: Sean Li <lnse@amazon.com> * fixing sync_state_with_url test Signed-off-by: Sean Li <lnse@amazon.com> * adding recent datasets to session storage Signed-off-by: Sean Li <lnse@amazon.com> * fixing cache bug, improving code structure Signed-off-by: Sean Li <lnse@amazon.com> * adding i18n translation for group labels Signed-off-by: Sean Li <lnse@amazon.com> * updating mock Signed-off-by: Sean Li <lnse@amazon.com> * updating state sync tests and fixing typos in #8325 Signed-off-by: Sean Li <lnse@amazon.com> * fixing dataset selector test Signed-off-by: Sean Li <lnse@amazon.com> * fixing index test Signed-off-by: Sean Li <lnse@amazon.com> --------- Signed-off-by: Sean Li <lnse@amazon.com>

* Adding recent datasets to dataset selector Signed-off-by: Sean Li <lnse@amazon.com> * addressing comments, adding tests Signed-off-by: Sean Li <lnse@amazon.com> * moving recent datasets to fetched datasets Signed-off-by: Sean Li <lnse@amazon.com> * mocking UI settings for test Signed-off-by: Sean Li <lnse@amazon.com> * fixing connect_to_query_state.test Signed-off-by: Sean Li <lnse@amazon.com> * fixing sync_state_with_url test Signed-off-by: Sean Li <lnse@amazon.com> * adding recent datasets to session storage Signed-off-by: Sean Li <lnse@amazon.com> * fixing cache bug, improving code structure Signed-off-by: Sean Li <lnse@amazon.com> * adding i18n translation for group labels Signed-off-by: Sean Li <lnse@amazon.com> * updating mock Signed-off-by: Sean Li <lnse@amazon.com> * updating state sync tests and fixing typos in #8325 Signed-off-by: Sean Li <lnse@amazon.com> * fixing dataset selector test Signed-off-by: Sean Li <lnse@amazon.com> * fixing index test Signed-off-by: Sean Li <lnse@amazon.com> --------- Signed-off-by: Sean Li <lnse@amazon.com> (cherry picked from commit 464ef56) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* Adding recent datasets to dataset selector Signed-off-by: Sean Li <lnse@amazon.com> * addressing comments, adding tests Signed-off-by: Sean Li <lnse@amazon.com> * moving recent datasets to fetched datasets Signed-off-by: Sean Li <lnse@amazon.com> * mocking UI settings for test Signed-off-by: Sean Li <lnse@amazon.com> * fixing connect_to_query_state.test Signed-off-by: Sean Li <lnse@amazon.com> * fixing sync_state_with_url test Signed-off-by: Sean Li <lnse@amazon.com> * adding recent datasets to session storage Signed-off-by: Sean Li <lnse@amazon.com> * fixing cache bug, improving code structure Signed-off-by: Sean Li <lnse@amazon.com> * adding i18n translation for group labels Signed-off-by: Sean Li <lnse@amazon.com> * updating mock Signed-off-by: Sean Li <lnse@amazon.com> * updating state sync tests and fixing typos in opensearch-project#8325 Signed-off-by: Sean Li <lnse@amazon.com> * fixing dataset selector test Signed-off-by: Sean Li <lnse@amazon.com> * fixing index test Signed-off-by: Sean Li <lnse@amazon.com> --------- Signed-off-by: Sean Li <lnse@amazon.com>

github-actions bot added the all-star-contributor label Sep 24, 2024

github-actions bot added failed changeset Skip-Changelog PRs that are too trivial to warrant a changelog or release notes entry and removed failed changeset labels Sep 24, 2024

Filter Saved Query by supported language

728fde5

Signed-off-by: Suchit Sahoo <suchsah@amazon.com>

LDrago27 force-pushed the filterSavedQuery branch from 4494b59 to 728fde5 Compare September 24, 2024 21:18

LDrago27 added discover for discover reinvent v2.18.0 backport 2.x labels Sep 24, 2024

LDrago27 marked this pull request as ready for review September 24, 2024 22:08

LDrago27 requested review from ananzh, kavilla, AMoo-Miki, ashwin-pc, joshuarrrr, abbyhu2000, zengyan-amazon, zhongnansu, manasvinibs, ZilongX, Flyingliuhub, curq, bandinib-amzn, SuZhou-Joe, ruanyl, BionIT, xinruiba and zhyuanqi as code owners September 24, 2024 22:08

LDrago27 requested review from mengweieric, virajsanghvi, sejli, joshuali925 and huyaboo as code owners September 24, 2024 22:08

sejli approved these changes Sep 26, 2024

View reviewed changes

kavilla reviewed Sep 26, 2024

View reviewed changes

kavilla approved these changes Sep 26, 2024

View reviewed changes

LDrago27 added discover-next and removed v2.18.0 labels Sep 26, 2024

LDrago27 merged commit 33f4f64 into opensearch-project:main Sep 26, 2024
73 of 75 checks passed

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

[Backport 2.x] Filter Saved Query by supported language #8356

Merged

SuZhou-Joe added the in-next label Oct 3, 2024

sejli added a commit to sejli/OpenSearch-Dashboards that referenced this pull request Oct 4, 2024

updating state sync tests and fixing typos in opensearch-project#8325

39ced0d

Signed-off-by: Sean Li <lnse@amazon.com>

sejli added a commit to sejli/OpenSearch-Dashboards that referenced this pull request Oct 8, 2024

updating state sync tests and fixing typos in opensearch-project#8325

73bcdf2

Signed-off-by: Sean Li <lnse@amazon.com>

ananzh added the v2.18.0 label Oct 30, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Filter Saved Query by supported language #8325

Filter Saved Query by supported language #8325

LDrago27 commented Sep 24, 2024 •

edited

Loading

github-actions bot commented Sep 24, 2024

codecov bot commented Sep 24, 2024 •

edited

Loading

sejli left a comment

sejli Sep 25, 2024

sejli Sep 25, 2024

sejli Sep 26, 2024

kavilla Sep 26, 2024

kavilla commented Sep 26, 2024

	// Filtering saved queries based on language supported by cirrent application
	// Filtering saved queries based on language supported by current application

		@@ -41,7 +43,9 @@ type SerializedSavedQueryAttributes = SavedObjectAttributes &
		};

		export const createSavedQueryService = (

Filter Saved Query by supported language #8325

Filter Saved Query by supported language #8325

Conversation

LDrago27 commented Sep 24, 2024 • edited Loading

Description

Issues Resolved

Screenshot

Testing the changes

Changelog

Check List

github-actions bot commented Sep 24, 2024

❌ Empty Changelog Section

codecov bot commented Sep 24, 2024 • edited Loading

Codecov Report

sejli left a comment

Choose a reason for hiding this comment

sejli Sep 25, 2024

Choose a reason for hiding this comment

sejli Sep 25, 2024

Choose a reason for hiding this comment

sejli Sep 26, 2024

Choose a reason for hiding this comment

kavilla Sep 26, 2024

Choose a reason for hiding this comment

kavilla commented Sep 26, 2024

LDrago27 commented Sep 24, 2024 •

edited

Loading

codecov bot commented Sep 24, 2024 •

edited

Loading