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

[Backport 2.x] [Workspace] Content menu picker in side bar and enable searching #8017

Merged
merged 1 commit into from
Sep 5, 2024

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport a05c4a2 from #7881.

* 01-feat/refractor-content-menu-picker-in-side-bar

Signed-off-by: Qxisylolo <qianxisy@amazon.com>

* 02-enable-associated-icon

Signed-off-by: Qxisylolo <qianxisy@amazon.com>

* 03-update-side-bar

Signed-off-by: Qxisylolo <qianxisy@amazon.com>

* 04-fix-bugs

Signed-off-by: Qxisylolo <qianxisy@amazon.com>

* 04-fix-bugs, add test

Signed-off-by: Qxisylolo <qianxisy@amazon.com>

* 05-delete search

Signed-off-by: Qxisylolo <qianxisy@amazon.com>

* 06-delete search

Signed-off-by: Qxisylolo <qianxisy@amazon.com>

* 06-fix-bug

Signed-off-by: Qxisylolo <qianxisy@amazon.com>

* 07-fix-conflication-1

Signed-off-by: Qxisylolo <qianxisy@amazon.com>

* 07-fix-conflication-adjust-icon-size

Signed-off-by: Qxisylolo <qianxisy@amazon.com>

* Changeset file for PR #7881 created/updated

---------

Signed-off-by: Qxisylolo <qianxisy@amazon.com>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
(cherry picked from commit a05c4a2)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Copy link
Contributor

github-actions bot commented Sep 5, 2024

❌ Invalid Changelog Heading

The '## Changelog' heading in your PR description is either missing or malformed. Please make sure that your PR description includes a '## Changelog' heading with proper spelling, capitalization, spacing, and Markdown syntax.

Copy link

codecov bot commented Sep 5, 2024

Codecov Report

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

Project coverage is 60.61%. Comparing base (d88e3b0) to head (71ebe1d).
Report is 10 commits behind head on 2.x.

Files with missing lines Patch % Lines
...ublic/components/workspace_menu/workspace_menu.tsx 75.00% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##              2.x    #8017   +/-   ##
=======================================
  Coverage   60.60%   60.61%           
=======================================
  Files        3727     3727           
  Lines       88292    88304   +12     
  Branches    13652    13656    +4     
=======================================
+ Hits        53512    53524   +12     
  Misses      31529    31529           
  Partials     3251     3251           
Flag Coverage Δ
Linux_1 28.74% <96.55%> (?)
Linux_2 56.36% <ø> (ø)
Linux_3 37.44% <ø> (ø)
Linux_4 29.72% <ø> (ø)
Windows_1 28.76% <96.55%> (+0.01%) ⬆️
Windows_2 56.31% <ø> (ø)
Windows_3 37.40% <ø> (-0.05%) ⬇️
Windows_4 29.72% <ø> (ø)

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 f29bc57 into 2.x Sep 5, 2024
67 of 70 checks passed
@opensearch-trigger-bot
Copy link
Contributor Author

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

Then, create a pull request where the base branch is 2.17 and the compare/head branch is backport/backport-8017-to-2.17.

@opensearch-trigger-bot
Copy link
Contributor Author

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

Then, create a pull request where the base branch is 2.17 and the compare/head branch is backport/backport-8017-to-2.17.

opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 6, 2024
…) (#8017)

* 01-feat/refractor-content-menu-picker-in-side-bar

* 02-enable-associated-icon

* 03-update-side-bar

* 04-fix-bugs

* 04-fix-bugs, add test

* 05-delete search

* 06-delete search

* 06-fix-bug

* 07-fix-conflication-1

* 07-fix-conflication-adjust-icon-size

* Changeset file for PR #7881 created/updated

---------

(cherry picked from commit a05c4a2)

Signed-off-by: Qxisylolo <qianxisy@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>
(cherry picked from commit f29bc57)
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
…) (#8017) (#8049)

* 01-feat/refractor-content-menu-picker-in-side-bar

* 02-enable-associated-icon

* 03-update-side-bar

* 04-fix-bugs

* 04-fix-bugs, add test

* 05-delete search

* 06-delete search

* 06-fix-bug

* 07-fix-conflication-1

* 07-fix-conflication-adjust-icon-size

* Changeset file for PR #7881 created/updated

---------

(cherry picked from commit a05c4a2)





(cherry picked from commit f29bc57)

Signed-off-by: Qxisylolo <qianxisy@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>
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.

2 participants