Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 0 rendered in discover when there are no results #9153

Merged
merged 2 commits into from
Jan 8, 2025

Conversation

d-buckner
Copy link
Member

@d-buckner d-buckner commented Jan 7, 2025

Description

This is to resolve a bug where a 0 is rendered in discover when there are no results. This is due to the following logic
{tabs.length && (... which leads the 0 to be rendered as React will only skip rendering false, null, or undefined values in the render template.

Screenshot

Before

Screenshot 2025-01-07 at 12 35 33 PM

After

Screenshot 2025-01-07 at 12 36 16 PM

Changelog

  • fix: 0 rendered in discover when there are no results

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

Signed-off-by: Daniel Rowe <rowdane@amazon.com>
Copy link
Contributor

github-actions bot commented Jan 7, 2025

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

@d-buckner d-buckner requested a review from huyaboo as a code owner January 7, 2025 20:45
Copy link

codecov bot commented Jan 7, 2025

Codecov Report

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

Project coverage is 60.94%. Comparing base (47a2351) to head (1e42ca6).
Report is 28 commits behind head on main.

Files with missing lines Patch % Lines
...c/application/components/no_results/no_results.tsx 0.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #9153      +/-   ##
==========================================
- Coverage   60.95%   60.94%   -0.02%     
==========================================
  Files        3809     3809              
  Lines       91270    91270              
  Branches    14414    14414              
==========================================
- Hits        55634    55620      -14     
- Misses      32082    32096      +14     
  Partials     3554     3554              
Flag Coverage Δ
Linux_1 28.97% <0.00%> (ø)
Linux_2 56.45% <ø> (ø)
Linux_3 37.97% <0.00%> (ø)
Linux_4 29.03% <0.00%> (ø)
Windows_1 28.98% <0.00%> (-0.02%) ⬇️
Windows_2 56.40% <ø> (ø)
Windows_3 37.97% <0.00%> (+<0.01%) ⬆️
Windows_4 29.03% <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.

@ruanyl ruanyl merged commit 2aac3ee into opensearch-project:main Jan 8, 2025
70 of 71 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x 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.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch-Dashboards/backport-2.x
# Create a new branch
git switch --create backport/backport-9153-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 2aac3ee0dec6ba9690da41b4a894fbf360ba7e8e
# Push it to GitHub
git push --set-upstream origin backport/backport-9153-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch-Dashboards/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-9153-to-2.x.

@d-buckner d-buckner deleted the no-results-zero branch January 8, 2025 03:51
AMoo-Miki pushed a commit to AMoo-Miki/OpenSearch-Dashboards that referenced this pull request Jan 10, 2025
…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>
d-buckner added a commit to d-buckner/OpenSearch-Dashboards that referenced this pull request Jan 17, 2025
…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>
@ananzh ananzh added discover_2.0-test Issues that are specific to the Discover 2.0 testing initiative and removed discover_2.0-test Issues that are specific to the Discover 2.0 testing initiative labels Jan 18, 2025
ananzh pushed a commit to ananzh/OpenSearch-Dashboards that referenced this pull request Jan 23, 2025
…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>
ananzh added a commit that referenced this pull request Jan 23, 2025
…ing backports (#9261)

* [Discover] Makes caching dataset options optional (#8799)

* [Discover] Makes caching dataset options optional.

* Adds unit test

* Changeset file for PR #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>

* Upgrade Cypress to v12 (#8995)

* Update Cypress to v12 (#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 #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 (#8993)

* fix: support imports without extensions in cypress webpack build

Signed-off-by: Daniel Rowe <rowdane@amazon.com>

* Changeset file for PR #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>

* [Discover Test] TestID-69: Filtering. Add data-test-subj tags. (#9027)

* Update Cypress to v12 (#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 #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 (#8993)

* fix: support imports without extensions in cypress webpack build

Signed-off-by: Daniel Rowe <rowdane@amazon.com>

* Changeset file for PR #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>

* Migrate query enhancement tests from functional repo to main (#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>

* Add missing data-test-subj tags for discover plugin (#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 (#9051)

* 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>

* Follow up on #9048 by updating data and utilities (#9060)

* Follow up on #9048 by updating data and utilities

Feature branch PRs:
#9038
#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>

* refactor some query-enhancement utility functions, add some missing typings (#9074)

* refactor some query-enhancement utility functions, add some missing typings

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

* Changeset file for PR #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>

* add queryEditorLanguageOptions data-test-subj on language_selector.tsx (#9029)

Signed-off-by: Federico Silva <federico.silva.-nd@disney.com>
Co-authored-by: Federico Silva <federico.silva.-nd@disney.com>

* Re-enable dataset_selector.spec.js and queries.spec.js under workspace (#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 #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>

* Make createWorkspaceIndexPatterns to handle no default cluster and clean up (#9129)

* Make createWorkspaceIndexPatterns to handle no default cluster and clean up

Signed-off-by: Anan <ananzh@amazon.com>

* Changeset file for PR #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>

* add data-test-subj (#9135)

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

* [Discover] Adding Cypress Tests for S3 Datasets (#9113)

* [Discover 2.0 Testing] Create Filtering Test (TestId-69: Filtering) (#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>

* Add tests for saved search creation and loading for query enhancement (#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>

* fix: 0 rendered in discover when there are no results (#9153)

* fix: 0 rendered in discover when there are no results

Signed-off-by: Daniel Rowe <rowdane@amazon.com>

* Changeset file for PR #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>

* [Cypress][Fix] Update saved search utilities (#9151)

* 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 (#9079)

* 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 #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>

* [Discover 2.0 Testing] Create View List of Saved Queries Test (Test-Id 124: View list of Saved query)  (#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 #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>

* change casing to folder structures to be compliant with our rules (#9197)

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

* [Fix] Saved Search Integ Test Update: update saving a new saved search test spec (#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>

* refactor query enhancement tests (#9208)

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

* chore: change casing of data-logs to be compliant with our git hook rules (#9220)

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

* chore: remove unused/redundant functions from field_display_filtering utils (#9219)

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

* Create cypress command namespacing util (#9150)

* update cy.createInitialWorkspaceWithDataSource -> cy.osd.createInitialWorkspaceWithDataSource (#9262)

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

---------

Signed-off-by: Kawika Avilla <kavilla414@gmail.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>
Signed-off-by: abbyhu2000 <abigailhu2000@gmail.com>
Signed-off-by: Anan Zhuang <ananzh@amazon.com>
Signed-off-by: Suchit Sahoo <suchsah@amazon.com>
Signed-off-by: Anan <ananzh@amazon.com>
Signed-off-by: Justin Kim <jungkm@amazon.com>
Signed-off-by: Federico Silva <federico.silva.-nd@disney.com>
Signed-off-by: Federico Silva <federico.silva.dev@gmail.com>
Co-authored-by: Ashwin P Chandran <ashwinpc@amazon.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>
Co-authored-by: Daniel Rowe <51932404+d-rowe@users.noreply.github.com>
Co-authored-by: Argus Li <43020525+ArgusLi@users.noreply.github.com>
Co-authored-by: Daniel Rowe <rowdane@amazon.com>
Co-authored-by: Qingyang(Abby) Hu <abigailhu2000@gmail.com>
Co-authored-by: Suchit Sahoo <38322563+LDrago27@users.noreply.github.com>
Co-authored-by: Justin Kim <jungkm@amazon.com>
Co-authored-by: Federico Silva <federico.silva@improving.com>
Co-authored-by: Federico Silva <federico.silva.-nd@disney.com>
Co-authored-by: Federico Silva <federico.silva.dev@gmail.com>
Co-authored-by: Sean Li <lnse@amazon.com>
Co-authored-by: d rowe <51932404+d-buckner@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants