[2.x Manual Backport] Backport cypress related work to 2.x and 2 missing backports #9261

ananzh · 2025-01-23T15:53:42Z

Description

Backport all cypress work in order
Found two missing PRs [Discover] Makes caching dataset options optional #8799 and fix: 0 rendered in discover when there are no results #9153
This PR is a refactor of Backport/backport lots of prs for discover 2.0 #9218 where @angle943 found missing backports and fixed CI issues

Backport PRs and Order

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

…#8799) * [Discover] Makes caching dataset options optional. * Adds unit test * Changeset file for PR opensearch-project#8799 created/updated * Update test Signed-off-by: Kawika Avilla <kavilla414@gmail.com> --------- Signed-off-by: Kawika Avilla <kavilla414@gmail.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> Co-authored-by: Kawika Avilla <kavilla414@gmail.com>

* Update Cypress to v12 (opensearch-project#8926) * Update cypress to v12 Signed-off-by: Daniel Rowe <rowdane@amazon.com> * Add required e2e.js Signed-off-by: Daniel Rowe <rowdane@amazon.com> * Changeset file for PR opensearch-project#8926 created/updated * Update license header Signed-off-by: Daniel Rowe <51932404+d-rowe@users.noreply.github.com> * Update license in e2e.js Signed-off-by: Daniel Rowe <51932404+d-rowe@users.noreply.github.com> --------- Signed-off-by: Daniel Rowe <rowdane@amazon.com> Signed-off-by: Daniel Rowe <51932404+d-rowe@users.noreply.github.com> Co-authored-by: Daniel Rowe <rowdane@amazon.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> * fix: support imports without extensions in cypress webpack build (opensearch-project#8993) * fix: support imports without extensions in cypress webpack build Signed-off-by: Daniel Rowe <rowdane@amazon.com> * Changeset file for PR opensearch-project#8993 created/updated * use typescript config Signed-off-by: Daniel Rowe <51932404+d-rowe@users.noreply.github.com> * fix lint Signed-off-by: Daniel Rowe <51932404+d-rowe@users.noreply.github.com> * disable new test isolation feature This isolation was causing regressions Signed-off-by: Daniel Rowe <51932404+d-rowe@users.noreply.github.com> --------- Signed-off-by: Daniel Rowe <rowdane@amazon.com> Signed-off-by: Daniel Rowe <51932404+d-rowe@users.noreply.github.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> --------- Signed-off-by: Daniel Rowe <rowdane@amazon.com> Signed-off-by: Daniel Rowe <51932404+d-rowe@users.noreply.github.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>

…earch-project#9027) * Update Cypress to v12 (opensearch-project#8926) * Update cypress to v12 Signed-off-by: Daniel Rowe <rowdane@amazon.com> * Add required e2e.js Signed-off-by: Daniel Rowe <rowdane@amazon.com> * Changeset file for PR opensearch-project#8926 created/updated * Update license header Signed-off-by: Daniel Rowe <51932404+d-rowe@users.noreply.github.com> * Update license in e2e.js Signed-off-by: Daniel Rowe <51932404+d-rowe@users.noreply.github.com> --------- Signed-off-by: Daniel Rowe <rowdane@amazon.com> Signed-off-by: Daniel Rowe <51932404+d-rowe@users.noreply.github.com> Co-authored-by: Daniel Rowe <rowdane@amazon.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> * fix: support imports without extensions in cypress webpack build (opensearch-project#8993) * fix: support imports without extensions in cypress webpack build Signed-off-by: Daniel Rowe <rowdane@amazon.com> * Changeset file for PR opensearch-project#8993 created/updated * use typescript config Signed-off-by: Daniel Rowe <51932404+d-rowe@users.noreply.github.com> * fix lint Signed-off-by: Daniel Rowe <51932404+d-rowe@users.noreply.github.com> * disable new test isolation feature This isolation was causing regressions Signed-off-by: Daniel Rowe <51932404+d-rowe@users.noreply.github.com> --------- Signed-off-by: Daniel Rowe <rowdane@amazon.com> Signed-off-by: Daniel Rowe <51932404+d-rowe@users.noreply.github.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> * Add data-test-subj tags. Signed-off-by: Argus Li <contactme@chunkeili.com> --------- Signed-off-by: Daniel Rowe <rowdane@amazon.com> Signed-off-by: Daniel Rowe <51932404+d-rowe@users.noreply.github.com> Signed-off-by: Argus Li <contactme@chunkeili.com> Co-authored-by: Daniel Rowe <51932404+d-rowe@users.noreply.github.com> Co-authored-by: Daniel Rowe <rowdane@amazon.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>

…rch-project#9048) * migrate query enhacenement tests Signed-off-by: abbyhu2000 <abigailhu2000@gmail.com> * ignore lint in data files Signed-off-by: abbyhu2000 <abigailhu2000@gmail.com> * remove yarn lock changes Signed-off-by: abbyhu2000 <abigailhu2000@gmail.com> * add changelog Signed-off-by: abbyhu2000 <abigailhu2000@gmail.com> --------- Signed-off-by: abbyhu2000 <abigailhu2000@gmail.com>

…ct#9049) * Add data-test-subj for discover Signed-off-by: Anan Zhuang <ananzh@amazon.com> * fix comment Signed-off-by: Anan Zhuang <ananzh@amazon.com> --------- Signed-off-by: Anan Zhuang <ananzh@amazon.com>

) * Add missing data-test-subj tags for data plugin * Update Snapshots * Fix as per the comments --------- Signed-off-by: Suchit Sahoo <suchsah@amazon.com> Co-authored-by: Anan Zhuang <ananzh@amazon.com>

…pensearch-project#9060) * Follow up on opensearch-project#9048 by updating data and utilities Feature branch PRs: opensearch-project#9038 opensearch-project#9006 Signed-off-by: Anan <ananzh@amazon.com> * fix comment Signed-off-by: Anan <ananzh@amazon.com> * update path and add utility from suchit commit Signed-off-by: Anan <ananzh@amazon.com> * update the path to run sample test Signed-off-by: Anan <ananzh@amazon.com> * fix PR comments Signed-off-by: Anan <ananzh@amazon.com> * skip tests before enable workspace Signed-off-by: Anan <ananzh@amazon.com> --------- Signed-off-by: Anan <ananzh@amazon.com>

…ypings (opensearch-project#9074) * refactor some query-enhancement utility functions, add some missing typings Signed-off-by: Justin Kim <jungkm@amazon.com> * Changeset file for PR opensearch-project#9074 created/updated --------- Signed-off-by: Justin Kim <jungkm@amazon.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>

opensearch-project#9029) Signed-off-by: Federico Silva <federico.silva.-nd@disney.com> Co-authored-by: Federico Silva <federico.silva.-nd@disney.com>

opensearch-project#9082) * Re-enable dataset_selector.spec.js and queries.spec.js under workspace Signed-off-by: Anan <ananzh@amazon.com> * fix comment Signed-off-by: Anan <ananzh@amazon.com> * add verifyHitCount for PPL Signed-off-by: Anan <ananzh@amazon.com> * Changeset file for PR opensearch-project#9082 created/updated --------- Signed-off-by: Anan <ananzh@amazon.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>

…ean up (opensearch-project#9129) * Make createWorkspaceIndexPatterns to handle no default cluster and clean up Signed-off-by: Anan <ananzh@amazon.com> * Changeset file for PR opensearch-project#9129 created/updated --------- Signed-off-by: Anan <ananzh@amazon.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>

Signed-off-by: Federico Silva <federico.silva.dev@gmail.com>

)

…pensearch-project#9119) * Add test for filtering functionality for discover, which enables query enhancement * Make test more robust: Add logic to use date picker start and end buttons if set to absolute times. Check the table length directly instead of number of hits to avoid bug where not all results load. --------- Signed-off-by: Argus Li <contactme@chunkeili.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>

…opensearch-project#9112) * Add tests for saved search creation and loading for query enhancement * click on a random element before typing on query editor to bypass the popover that appears * address pr comments - refactor to create saved search as an api call * address pr comments - specifically navigate to discover page before setting datasource Signed-off-by: Justin Kim <jungkm@amazon.com> --------- Signed-off-by: Justin Kim <jungkm@amazon.com> Signed-off-by: Anan Zhuang <ananzh@amazon.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> Co-authored-by: Anan Zhuang <ananzh@amazon.com>

…ject#9153) * fix: 0 rendered in discover when there are no results Signed-off-by: Daniel Rowe <rowdane@amazon.com> * Changeset file for PR opensearch-project#9153 created/updated --------- Signed-off-by: Daniel Rowe <rowdane@amazon.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>

* update saved search * minor refactor4 on setDatePickerDatesAndSearchIfRelevant Signed-off-by: Justin Kim <jungkm@amazon.com> --------- Signed-off-by: Justin Kim <jungkm@amazon.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>

* chore: use relative paths in cypress when we move to running tests in parallel we won't be able to use a single hardcoded basepath as these can differ by tasks Signed-off-by: Daniel Rowe <rowdane@amazon.com> * Changeset file for PR opensearch-project#9079 created/updated --------- Signed-off-by: Daniel Rowe <rowdane@amazon.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>

…d 124: View list of Saved query) (opensearch-project#9166) * add spec for old ui Signed-off-by: Argus Li <contactme@chunkeili.com> * Add comment about cleaning up saved queries Signed-off-by: Argus Li <contactme@chunkeili.com> * Add data-test-subj for save query new ui Signed-off-by: Argus Li <contactme@chunkeili.com> * Add data-test-subj for save query button for new ui Signed-off-by: Argus Li <contactme@chunkeili.com> * Add data-test-subj for open query button in query management popover Signed-off-by: Argus Li <contactme@chunkeili.com> * Add new ui spec to test list saved queries Signed-off-by: Argus Li <contactme@chunkeili.com> * Fix DataSource url Signed-off-by: Argus Li <contactme@chunkeili.com> * Changeset file for PR opensearch-project#9166 created/updated * Address Justin's comments. Signed-off-by: Argus Li <contactme@chunkeili.com> * Remove final force. Signed-off-by: Argus Li <contactme@chunkeili.com> * Fix final force. Signed-off-by: Argus Li <contactme@chunkeili.com> * Move utils to Suchit's suggested location, fix comments Signed-off-by: Argus Li <contactme@chunkeili.com> * Rename specs, change cypress workflow to use new save query ui, merge old ui and new ui commands Signed-off-by: Argus Li <contactme@chunkeili.com> * fix import Signed-off-by: Argus Li <contactme@chunkeili.com> --------- Signed-off-by: Argus Li <contactme@chunkeili.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>

…ensearch-project#9197) Signed-off-by: Justin Kim <jungkm@amazon.com>

…h test spec (opensearch-project#9200) * wait for the page to be loaded before loading a saved search * when loading a saved search and saving it as a new saved search, use a different name Signed-off-by: Justin Kim <jungkm@amazon.com> --------- Signed-off-by: Justin Kim <jungkm@amazon.com>

Signed-off-by: Justin Kim <jungkm@amazon.com>

…ules (opensearch-project#9220) Signed-off-by: Justin Kim <jungkm@amazon.com>

… utils (opensearch-project#9219) Signed-off-by: Justin Kim <jungkm@amazon.com>

codecov · 2025-01-23T16:08:35Z

Codecov Report

Attention: Patch coverage is 59.09091% with 9 lines in your changes missing coverage. Please review.

Project coverage is 61.14%. Comparing base (e2abd3a) to head (ec8750b).
Report is 1 commits behind head on 2.x.

Files with missing lines	Patch %	Lines
...over/public/application/components/chart/chart.tsx	0.00%	3 Missing ⚠️
...ry/query_string/dataset_service/dataset_service.ts	85.71%	0 Missing and 1 partial ⚠️
...ta/public/ui/dataset_selector/dataset_explorer.tsx	0.00%	1 Missing ⚠️
...lugins/data/public/ui/saved_query_form/helpers.tsx	0.00%	1 Missing ⚠️
...i/saved_query_management/saved_query_list_item.tsx	0.00%	1 Missing ⚠️
...failure_modal/shard_failure_description_header.tsx	0.00%	1 Missing ⚠️
...c/application/components/no_results/no_results.tsx	0.00%	1 Missing ⚠️

Additional details and impacted files

@@           Coverage Diff           @@
##              2.x    #9261   +/-   ##
=======================================
  Coverage   61.13%   61.14%           
=======================================
  Files        3815     3815           
  Lines       91522    91528    +6     
  Branches    14454    14459    +5     
=======================================
+ Hits        55951    55963   +12     
+ Misses      32010    32003    -7     
- Partials     3561     3562    +1

Flag	Coverage Δ
Linux_1	`29.13% <0.00%> (-0.01%)`	⬇️
Linux_2	`56.60% <ø> (ø)`
Linux_3	`38.06% <43.75%> (+0.01%)`	⬆️
Linux_4	`29.18% <33.33%> (+<0.01%)`	⬆️
Windows_1	`29.14% <0.00%> (-0.01%)`	⬇️
Windows_2	`56.55% <ø> (ø)`
Windows_3	`38.06% <43.75%> (+0.02%)`	⬆️
Windows_4	`29.18% <33.33%> (+<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.

…lWorkspaceWithDataSource (opensearch-project#9262) Signed-off-by: Justin Kim <jungkm@amazon.com>

ananzh · 2025-01-23T20:04:52Z

@sejli ciGroup11 still fails. could you help?

ashwin-pc and others added 25 commits January 23, 2025 15:01

Add missing data-test-subj tags for discover plugin (opensearch-proje…

608a9bc

…ct#9049) * Add data-test-subj for discover Signed-off-by: Anan Zhuang <ananzh@amazon.com> * fix comment Signed-off-by: Anan Zhuang <ananzh@amazon.com> --------- Signed-off-by: Anan Zhuang <ananzh@amazon.com>

Add missing data-test-subj tags for data plugin (opensearch-project#9051

97dfa0c

) * Add missing data-test-subj tags for data plugin * Update Snapshots * Fix as per the comments --------- Signed-off-by: Suchit Sahoo <suchsah@amazon.com> Co-authored-by: Anan Zhuang <ananzh@amazon.com>

add queryEditorLanguageOptions data-test-subj on language_selector.tsx (

564cb23

opensearch-project#9029) Signed-off-by: Federico Silva <federico.silva.-nd@disney.com> Co-authored-by: Federico Silva <federico.silva.-nd@disney.com>

add data-test-subj (opensearch-project#9135)

aaf46cd

Signed-off-by: Federico Silva <federico.silva.dev@gmail.com>

[Discover] Adding Cypress Tests for S3 Datasets (opensearch-project#9113

396ad2c

)

change casing to folder structures to be compliant with our rules (op…

a2ae0ba

…ensearch-project#9197) Signed-off-by: Justin Kim <jungkm@amazon.com>

refactor query enhancement tests (opensearch-project#9208)

ccfb52d

Signed-off-by: Justin Kim <jungkm@amazon.com>

chore: change casing of data-logs to be compliant with our git hook r…

fe867bf

…ules (opensearch-project#9220) Signed-off-by: Justin Kim <jungkm@amazon.com>

chore: remove unused/redundant functions from field_display_filtering…

6e57cab

… utils (opensearch-project#9219) Signed-off-by: Justin Kim <jungkm@amazon.com>

Create cypress command namespacing util (opensearch-project#9150)

3fde8f4

ananzh requested review from kavilla, AMoo-Miki, ashwin-pc, joshuarrrr and abbyhu2000 as code owners January 23, 2025 15:53

ananzh requested review from zengyan-amazon, zhongnansu, manasvinibs, ZilongX, Flyingliuhub, curq, bandinib-amzn, SuZhou-Joe, ruanyl, BionIT, xinruiba, zhyuanqi, mengweieric, LDrago27, virajsanghvi, sejli, joshuali925 and huyaboo as code owners January 23, 2025 15:53

github-actions bot added the Skip-Changelog PRs that are too trivial to warrant a changelog or release notes entry label Jan 23, 2025

ananzh mentioned this pull request Jan 23, 2025

Backport/backport lots of prs for discover 2.0 #9218

Closed

7 tasks

update cy.createInitialWorkspaceWithDataSource -> cy.osd.createInitia…

ec8750b

…lWorkspaceWithDataSource (opensearch-project#9262) Signed-off-by: Justin Kim <jungkm@amazon.com>

LDrago27 approved these changes Jan 23, 2025

View reviewed changes

abbyhu2000 approved these changes Jan 23, 2025

View reviewed changes

ananzh merged commit 0916f05 into opensearch-project:2.x Jan 23, 2025
65 of 68 checks passed

ananzh added discover_2.0-test Issues that are specific to the Discover 2.0 testing initiative v2.19.0 labels Jan 23, 2025

This was referenced Feb 3, 2025

[Backport 2.x] [Discover Test] TestID-69: Filtering. Add data-test-subj tags. #9028

Closed

[Backport 2.x] TESTID-140: add queryEditorLanguageOptions data-test-subj on language_selector.tsx #9030

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[2.x Manual Backport] Backport cypress related work to 2.x and 2 missing backports #9261

[2.x Manual Backport] Backport cypress related work to 2.x and 2 missing backports #9261

ananzh commented Jan 23, 2025 •

edited

Loading

codecov bot commented Jan 23, 2025 •

edited

Loading

ananzh commented Jan 23, 2025 •

edited

Loading

[2.x Manual Backport] Backport cypress related work to 2.x and 2 missing backports #9261

[2.x Manual Backport] Backport cypress related work to 2.x and 2 missing backports #9261

Conversation

ananzh commented Jan 23, 2025 • edited Loading

Description

Backport PRs and Order

Changelog

Check List

codecov bot commented Jan 23, 2025 • edited Loading

Codecov Report

ananzh commented Jan 23, 2025 • edited Loading

ananzh commented Jan 23, 2025 •

edited

Loading

codecov bot commented Jan 23, 2025 •

edited

Loading

ananzh commented Jan 23, 2025 •

edited

Loading