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

[navigation] Add workspace icon to left nav / workspace picker menu / home page. #7823

Merged

Conversation

SuZhou-Joe
Copy link
Member

@SuZhou-Joe SuZhou-Joe commented Aug 23, 2024

Description

We have icons for each user case and they should be displayed in home page / workspace picker menu and left nav. This PR is to adopt the icons in related places.

Issues Resolved

Screenshot

Use case icons in home page

image

Use case icons in workspace picker

image

Use case icons in left nav

image

Testing the changes

Changelog

  • feat: Add workspace icon to left nav / workspace picker menu / home page.

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: SuZhou-Joe <suzhou@amazon.com>
Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
…ce is disabled

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
@SuZhou-Joe SuZhou-Joe changed the title [navigation] Add workspace icon to all consumed placed. [navigation] Add workspace icon to left nav / workspace picker menu / home page. Aug 23, 2024
opensearch-changeset-bot bot added a commit to SuZhou-Joe/OpenSearch-Dashboards that referenced this pull request Aug 23, 2024
Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
@SuZhou-Joe SuZhou-Joe force-pushed the feature/add-workspace-icon branch from 66acdd9 to d2cccf3 Compare August 24, 2024 14:33
@SuZhou-Joe SuZhou-Joe force-pushed the feature/add-workspace-icon branch from d2cccf3 to c8a5819 Compare August 24, 2024 14:35
Copy link

codecov bot commented Aug 24, 2024

Codecov Report

Attention: Patch coverage is 65.21739% with 8 lines in your changes missing coverage. Please review.

Project coverage is 61.02%. Comparing base (a7024e6) to head (85a7d3a).
Report is 104 commits behind head on main.

Files with missing lines Patch % Lines
...me/ui/header/collapsible_nav_group_enabled_top.tsx 78.57% 0 Missing and 3 partials ⚠️
...nents/home_get_start_card/setup_get_start_card.tsx 0.00% 2 Missing ⚠️
...ic/components/use_case_overview/setup_overview.tsx 0.00% 2 Missing ⚠️
...ublic/components/workspace_menu/workspace_menu.tsx 0.00% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##             main    #7823   +/-   ##
=======================================
  Coverage   61.01%   61.02%           
=======================================
  Files        3688     3688           
  Lines       87221    87232   +11     
  Branches    13417    13423    +6     
=======================================
+ Hits        53219    53229   +10     
  Misses      30775    30775           
- Partials     3227     3228    +1     
Flag Coverage Δ
Linux_1 29.34% <17.39%> (-0.01%) ⬇️
Linux_2 56.25% <78.57%> (+<0.01%) ⬆️
Linux_3 37.79% <12.50%> (-0.01%) ⬇️
Linux_4 29.60% <12.50%> (-0.01%) ⬇️
Windows_1 29.36% <17.39%> (-0.01%) ⬇️
Windows_2 56.20% <78.57%> (+<0.01%) ⬆️
Windows_3 37.79% <12.50%> (?)
Windows_4 29.60% <12.50%> (-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.

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
@opensearch-project opensearch-project deleted a comment from github-actions bot Aug 29, 2024
@opensearch-project opensearch-project deleted a comment from github-actions bot Aug 29, 2024
Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
ruanyl
ruanyl previously approved these changes Sep 2, 2024
Signed-off-by: Lin Wang <wonglam@amazon.com>
Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
@SuZhou-Joe SuZhou-Joe merged commit 1974ca1 into opensearch-project:main Sep 4, 2024
67 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-7823-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 1974ca1b1f0ac01f5ac94bb52b8c68215b94e320
# Push it to GitHub
git push --set-upstream origin backport/backport-7823-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-7823-to-2.x.

@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-7823-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 1974ca1b1f0ac01f5ac94bb52b8c68215b94e320
# Push it to GitHub
git push --set-upstream origin backport/backport-7823-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-7823-to-2.x.

SuZhou-Joe added a commit to SuZhou-Joe/OpenSearch-Dashboards that referenced this pull request Sep 4, 2024
… home page. (opensearch-project#7823)

* feat: show workspace picker content in left nav

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* fix: bootstrap error

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* fix: unit test error

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: finish picker content

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: finish picker content

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: only register index patterns to settings and setup when workspace is disabled

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* fix: unit test

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: put discover 2.0 behind discover

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: add coverage

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: improve test coverage

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: merge conflict

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: optimize code based on comment

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: optimize code based on comment

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: optimize filter code

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: update

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: add new icon to left navigation and workspace picker menu

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: change use case card in home

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: optimize alignment

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* Changeset file for PR opensearch-project#7823 created/updated

* feat: alignment optimize

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: use new icons in workspace picker

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: optimize color

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* fix: unit test error

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* fix: unit test

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* fix: unit test

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: increase test coverage

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: remove useless code

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* Add workspace icon in workspace creator (#19)

Signed-off-by: Lin Wang <wonglam@amazon.com>

* fix: fatal error when visibleUseCases is empty

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

---------

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
Signed-off-by: Lin Wang <wonglam@amazon.com>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
Co-authored-by: Lin Wang <wonglam@amazon.com>
(cherry picked from commit 1974ca1)
SuZhou-Joe added a commit that referenced this pull request Sep 4, 2024
… home page. (#7823) (#7994)

* feat: show workspace picker content in left nav

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* fix: bootstrap error

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* fix: unit test error

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: finish picker content

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: finish picker content

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: only register index patterns to settings and setup when workspace is disabled

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* fix: unit test

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: put discover 2.0 behind discover

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: add coverage

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: improve test coverage

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: merge conflict

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: optimize code based on comment

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: optimize code based on comment

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: optimize filter code

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: update

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: add new icon to left navigation and workspace picker menu

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: change use case card in home

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: optimize alignment

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* Changeset file for PR #7823 created/updated

* feat: alignment optimize

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: use new icons in workspace picker

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: optimize color

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* fix: unit test error

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* fix: unit test

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* fix: unit test

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: increase test coverage

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: remove useless code

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* Add workspace icon in workspace creator (#19)

Signed-off-by: Lin Wang <wonglam@amazon.com>

* fix: fatal error when visibleUseCases is empty

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

---------

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
Signed-off-by: Lin Wang <wonglam@amazon.com>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
Co-authored-by: Lin Wang <wonglam@amazon.com>
(cherry picked from commit 1974ca1)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 4, 2024
… home page. (#7823) (#7994)

* feat: show workspace picker content in left nav

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* fix: bootstrap error

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* fix: unit test error

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: finish picker content

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: finish picker content

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: only register index patterns to settings and setup when workspace is disabled

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* fix: unit test

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: put discover 2.0 behind discover

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: add coverage

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: improve test coverage

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: merge conflict

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: optimize code based on comment

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: optimize code based on comment

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: optimize filter code

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: update

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: add new icon to left navigation and workspace picker menu

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: change use case card in home

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: optimize alignment

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* Changeset file for PR #7823 created/updated

* feat: alignment optimize

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: use new icons in workspace picker

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: optimize color

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* fix: unit test error

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* fix: unit test

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* fix: unit test

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: increase test coverage

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: remove useless code

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* Add workspace icon in workspace creator (#19)

Signed-off-by: Lin Wang <wonglam@amazon.com>

* fix: fatal error when visibleUseCases is empty

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

---------

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
Signed-off-by: Lin Wang <wonglam@amazon.com>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
Co-authored-by: Lin Wang <wonglam@amazon.com>
(cherry picked from commit 1974ca1)
(cherry picked from commit cbdb0fd)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
ruanyl pushed a commit that referenced this pull request Sep 5, 2024
… home page. (#7823) (#7994) (#7995)

* 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



* feat: add new icon to left navigation and workspace picker menu



* feat: change use case card in home



* feat: optimize alignment



* Changeset file for PR #7823 created/updated

* feat: alignment optimize



* feat: use new icons in workspace picker



* feat: optimize color



* fix: unit test error



* fix: unit test



* fix: unit test



* feat: increase test coverage



* feat: remove useless code



* Add workspace icon in workspace creator (#19)



* fix: fatal error when visibleUseCases is empty



---------





(cherry picked from commit 1974ca1)
(cherry picked from commit cbdb0fd)

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
Signed-off-by: Lin Wang <wonglam@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>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
Co-authored-by: Lin Wang <wonglam@amazon.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 6, 2024
… home page. (#7823) (#7994) (#7995)

* 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

* feat: add new icon to left navigation and workspace picker menu

* feat: change use case card in home

* feat: optimize alignment

* Changeset file for PR #7823 created/updated

* feat: alignment optimize

* feat: use new icons in workspace picker

* feat: optimize color

* fix: unit test error

* fix: unit test

* fix: unit test

* feat: increase test coverage

* feat: remove useless code

* Add workspace icon in workspace creator (#19)

* fix: fatal error when visibleUseCases is empty

---------

(cherry picked from commit 1974ca1)
(cherry picked from commit cbdb0fd)

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
Signed-off-by: Lin Wang <wonglam@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>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
Co-authored-by: Lin Wang <wonglam@amazon.com>
(cherry picked from commit 4c64d81)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
SuZhou-Joe pushed a commit that referenced this pull request Sep 6, 2024
… home page. (#7823) (#7994) (#7995) (#8038)

* 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

* feat: add new icon to left navigation and workspace picker menu

* feat: change use case card in home

* feat: optimize alignment

* Changeset file for PR #7823 created/updated

* feat: alignment optimize

* feat: use new icons in workspace picker

* feat: optimize color

* fix: unit test error

* fix: unit test

* fix: unit test

* feat: increase test coverage

* feat: remove useless code

* Add workspace icon in workspace creator (#19)

* fix: fatal error when visibleUseCases is empty

---------

(cherry picked from commit 1974ca1)
(cherry picked from commit cbdb0fd)







(cherry picked from commit 4c64d81)

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
Signed-off-by: Lin Wang <wonglam@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>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
Co-authored-by: Lin Wang <wonglam@amazon.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