-
Notifications
You must be signed in to change notification settings - Fork 916
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
[navigation] display workspace picker content when outside workspace and nav group #7716
[navigation] display workspace picker content when outside workspace and nav group #7716
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #7716 +/- ##
==========================================
+ Coverage 63.86% 64.18% +0.31%
==========================================
Files 3665 3661 -4
Lines 81441 80842 -599
Branches 12994 12882 -112
==========================================
- Hits 52010 51885 -125
+ Misses 26243 25770 -473
+ Partials 3188 3187 -1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
1dcc264
to
5a10dc1
Compare
3b0db4f
to
ffc57c3
Compare
src/core/public/chrome/ui/header/collapsible_nav_group_enabled.tsx
Outdated
Show resolved
Hide resolved
src/core/public/chrome/ui/header/collapsible_nav_group_enabled.tsx
Outdated
Show resolved
Hide resolved
src/core/public/chrome/ui/header/collapsible_nav_group_enabled.tsx
Outdated
Show resolved
Hide resolved
src/plugins/workspace/public/components/workspace_picker_content/workspace_picker_content.tsx
Outdated
Show resolved
Hide resolved
Signed-off-by: SuZhou-Joe <[email protected]>
Signed-off-by: SuZhou-Joe <[email protected]>
Signed-off-by: SuZhou-Joe <[email protected]>
Signed-off-by: SuZhou-Joe <[email protected]>
src/core/public/chrome/ui/header/collapsible_nav_group_enabled.tsx
Outdated
Show resolved
Hide resolved
src/core/public/chrome/ui/header/collapsible_nav_group_enabled.tsx
Outdated
Show resolved
Hide resolved
Signed-off-by: SuZhou-Joe <[email protected]>
Signed-off-by: SuZhou-Joe <[email protected]>
Signed-off-by: SuZhou-Joe <[email protected]>
Signed-off-by: SuZhou-Joe <[email protected]>
Signed-off-by: SuZhou-Joe <[email protected]>
The backport to
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-7716-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 56fc8f4057c1d6b3e58f4b77394f9bf8c4a9447c
# Push it to GitHub
git push --set-upstream origin backport/backport-7716-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 |
The backport to
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-7716-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 56fc8f4057c1d6b3e58f4b77394f9bf8c4a9447c
# Push it to GitHub
git push --set-upstream origin backport/backport-7716-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 |
…and nav group (opensearch-project#7716) * feat: show workspace picker content in left nav Signed-off-by: SuZhou-Joe <[email protected]> * fix: bootstrap error Signed-off-by: SuZhou-Joe <[email protected]> * fix: unit test error Signed-off-by: SuZhou-Joe <[email protected]> * feat: finish picker content Signed-off-by: SuZhou-Joe <[email protected]> * feat: finish picker content Signed-off-by: SuZhou-Joe <[email protected]> * feat: only register index patterns to settings and setup when workspace is disabled Signed-off-by: SuZhou-Joe <[email protected]> * fix: unit test Signed-off-by: SuZhou-Joe <[email protected]> * feat: put discover 2.0 behind discover Signed-off-by: SuZhou-Joe <[email protected]> * feat: add coverage Signed-off-by: SuZhou-Joe <[email protected]> * feat: improve test coverage Signed-off-by: SuZhou-Joe <[email protected]> * feat: merge conflict Signed-off-by: SuZhou-Joe <[email protected]> * feat: optimize code based on comment Signed-off-by: SuZhou-Joe <[email protected]> * feat: optimize code based on comment Signed-off-by: SuZhou-Joe <[email protected]> * feat: optimize filter code Signed-off-by: SuZhou-Joe <[email protected]> * feat: update Signed-off-by: SuZhou-Joe <[email protected]> --------- Signed-off-by: SuZhou-Joe <[email protected]> (cherry picked from commit 56fc8f4)
…and nav group (#7716) (#7880) * feat: show workspace picker content in left nav Signed-off-by: SuZhou-Joe <[email protected]> * fix: bootstrap error Signed-off-by: SuZhou-Joe <[email protected]> * fix: unit test error Signed-off-by: SuZhou-Joe <[email protected]> * feat: finish picker content Signed-off-by: SuZhou-Joe <[email protected]> * feat: finish picker content Signed-off-by: SuZhou-Joe <[email protected]> * feat: only register index patterns to settings and setup when workspace is disabled Signed-off-by: SuZhou-Joe <[email protected]> * fix: unit test Signed-off-by: SuZhou-Joe <[email protected]> * feat: put discover 2.0 behind discover Signed-off-by: SuZhou-Joe <[email protected]> * feat: add coverage Signed-off-by: SuZhou-Joe <[email protected]> * feat: improve test coverage Signed-off-by: SuZhou-Joe <[email protected]> * feat: merge conflict Signed-off-by: SuZhou-Joe <[email protected]> * feat: optimize code based on comment Signed-off-by: SuZhou-Joe <[email protected]> * feat: optimize code based on comment Signed-off-by: SuZhou-Joe <[email protected]> * feat: optimize filter code Signed-off-by: SuZhou-Joe <[email protected]> * feat: update Signed-off-by: SuZhou-Joe <[email protected]> --------- Signed-off-by: SuZhou-Joe <[email protected]> (cherry picked from commit 56fc8f4)
…and nav group (#7716) (#7880) * feat: show workspace picker content in left nav Signed-off-by: SuZhou-Joe <[email protected]> * fix: bootstrap error Signed-off-by: SuZhou-Joe <[email protected]> * fix: unit test error Signed-off-by: SuZhou-Joe <[email protected]> * feat: finish picker content Signed-off-by: SuZhou-Joe <[email protected]> * feat: finish picker content Signed-off-by: SuZhou-Joe <[email protected]> * feat: only register index patterns to settings and setup when workspace is disabled Signed-off-by: SuZhou-Joe <[email protected]> * fix: unit test Signed-off-by: SuZhou-Joe <[email protected]> * feat: put discover 2.0 behind discover Signed-off-by: SuZhou-Joe <[email protected]> * feat: add coverage Signed-off-by: SuZhou-Joe <[email protected]> * feat: improve test coverage Signed-off-by: SuZhou-Joe <[email protected]> * feat: merge conflict Signed-off-by: SuZhou-Joe <[email protected]> * feat: optimize code based on comment Signed-off-by: SuZhou-Joe <[email protected]> * feat: optimize code based on comment Signed-off-by: SuZhou-Joe <[email protected]> * feat: optimize filter code Signed-off-by: SuZhou-Joe <[email protected]> * feat: update Signed-off-by: SuZhou-Joe <[email protected]> --------- Signed-off-by: SuZhou-Joe <[email protected]> (cherry picked from commit 56fc8f4) (cherry picked from commit b02dd2b) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…and nav group (#7716) (#7880) (#7882) * feat: show workspace picker content in left nav * fix: bootstrap error * fix: unit test error * feat: finish picker content * feat: finish picker content * feat: only register index patterns to settings and setup when workspace is disabled * fix: unit test * feat: put discover 2.0 behind discover * feat: add coverage * feat: improve test coverage * feat: merge conflict * feat: optimize code based on comment * feat: optimize code based on comment * feat: optimize filter code * feat: update --------- (cherry picked from commit 56fc8f4) (cherry picked from commit b02dd2b) Signed-off-by: SuZhou-Joe <[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>
Manually backported with #7882 |
Description
Left navigation will always be expandable in 2.17, and in order to prevent user creating objects in global when workspace is enabled, we will show workspace picker when outside workspace and nav group.
Issues Resolved
Screenshot
Workspace enabled and outside any workspace or nav group
Workspace disabled
Testing the changes
Changelog
Check List
yarn test:jest
yarn test:jest_integration