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

add empty state and test except the aggregated view #6499

Merged
merged 7 commits into from
Apr 17, 2024

Conversation

yujin-emma
Copy link
Contributor

@yujin-emma yujin-emma commented Apr 16, 2024

Description

Issues Resolved

#6420

Screenshot

when there is no remote data source but do not hide local cluster

empty-state-lc-new

when there is no remote data source but do hide local cluster

empty-state-hide-lc-new

when there is data source but filter out, still show empty-state
Screenshot 2024-04-16 at 22 55 33

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

Copy link
Contributor

ℹ️ Manual Changeset Creation Reminder

Please ensure manual commit for changeset file 6499.yml under folder changelogs/fragments to complete this PR.

If you want to use the available OpenSearch Changeset Bot App to avoid manual creation of changeset file you can install it in your forked repository following this link.

For more information about formatting of changeset files, please visit OpenSearch Auto Changeset and Release Notes Tool.

Signed-off-by: yujin-emma <[email protected]>
Copy link
Contributor

❌ Changeset File Not Added Yet

Please ensure manual commit for changeset file 6499.yml under folder changelogs/fragments to complete this PR. File still missing.

Copy link

codecov bot commented Apr 16, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 32.74%. Comparing base (b619ccb) to head (b1d65d4).
Report is 2 commits behind head on main.

❗ Current head b1d65d4 differs from pull request most recent head 16da8fd. Consider uploading reports for the commit 16da8fd to get more accurate results

Additional details and impacted files
@@             Coverage Diff             @@
##             main    #6499       +/-   ##
===========================================
- Coverage   45.18%   32.74%   -12.44%     
===========================================
  Files        1656     2257      +601     
  Lines       33591    45617    +12026     
  Branches     6385     7159      +774     
===========================================
- Hits        15177    14937      -240     
- Misses      17244    29981    +12737     
+ Partials     1170      699      -471     
Flag Coverage Δ
Linux_1 32.74% <ø> (?)
Windows_3 ?

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.

@@ -180,6 +183,9 @@ export class DataSourceSelectable extends React.Component<
'title',
'auth.type',
]);
if (fetchedDataSources?.length === 0 && this.props.hideLocalCluster) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

instead of evaluate fetechedDataSources, we should evaluate the options after filter, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, updated

Copy link
Contributor

❌ Changeset File Not Added Yet

Please ensure manual commit for changeset file 6499.yml under folder changelogs/fragments to complete this PR. File still missing.

@github-actions github-actions bot added Skip-Changelog PRs that are too trivial to warrant a changelog or release notes entry and removed failed changeset labels Apr 17, 2024
@BionIT BionIT merged commit c4af2ab into opensearch-project:main Apr 17, 2024
66 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-6499-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 c4af2ab583158c634ec73ad5aa1aa795b572ffa8
# Push it to GitHub
git push --set-upstream origin backport/backport-6499-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-6499-to-2.x.

opensearch-trigger-bot bot pushed a commit that referenced this pull request Apr 18, 2024
* add empty state and test except the aggregated view

Signed-off-by: yujin-emma <[email protected]>

* update change log

Signed-off-by: yujin-emma <[email protected]>

* adjust the order for filter options and empty state check

Signed-off-by: yujin-emma <[email protected]>

* fix lint

Signed-off-by: yujin-emma <[email protected]>

---------

Signed-off-by: yujin-emma <[email protected]>
Signed-off-by: Yu Jin <[email protected]>
(cherry picked from commit c4af2ab)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

# Conflicts:
#	CHANGELOG.md
ZilongX pushed a commit that referenced this pull request Apr 18, 2024
* add empty state and test except the aggregated view

Signed-off-by: yujin-emma <[email protected]>

* update change log

Signed-off-by: yujin-emma <[email protected]>

* adjust the order for filter options and empty state check

Signed-off-by: yujin-emma <[email protected]>

* fix lint

Signed-off-by: yujin-emma <[email protected]>

---------

Signed-off-by: yujin-emma <[email protected]>
Signed-off-by: Yu Jin <[email protected]>
(cherry picked from commit c4af2ab)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

# Conflicts:
#	CHANGELOG.md

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@BionIT BionIT added the v2.14.0 label Jun 3, 2024
@yujin-emma yujin-emma deleted the new-empty-state branch June 12, 2024 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Skip-Changelog PRs that are too trivial to warrant a changelog or release notes entry v2.14.0 valued-contributor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants