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] [navigation-next] Fix issues. (#7377) #7380

Merged
merged 1 commit into from
Jul 23, 2024

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

@opensearch-trigger-bot opensearch-trigger-bot bot commented Jul 23, 2024

Backport 6551af7 from #7377.

Changelog

  • skip

* [navigation-next] fix: redirect to standard index pattern applications while nav group is enabled (#7305)

* feat: fix the incorrect jumping logic for Index pattern management

* Changeset file for PR #7305 created/updated

* feat: update

* feat: update with comment

* feat: update order and remove reset logic

* feat: update

* feat: update

* feat: update snapshot

* feat: some category change

* feat: update category

---------

* fix: bugs found in integration test

* Changeset file for PR #7356 created/updated

* feat: show workspace detail in all use case

* fix: unit test error

* feat: revert back detect category

---------

(cherry picked from commit 8b46c44)

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>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
(cherry picked from commit 6551af7)

Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
(cherry picked from commit 7adc980)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot opensearch-trigger-bot bot added autocut Skip the changelog verification check on backports Skip-Changelog PRs that are too trivial to warrant a changelog or release notes entry v2.16.0 navigation labels Jul 23, 2024
@github-actions github-actions bot added failed changeset and removed Skip-Changelog PRs that are too trivial to warrant a changelog or release notes entry labels Jul 23, 2024
@SuZhou-Joe SuZhou-Joe changed the title [Backport 2.x] [navigation-next] Fix issues. (#7356) (#7377) [Backport 2.x] [navigation-next] Fix issues. (#7377) Jul 23, 2024
@github-actions github-actions bot added the Skip-Changelog PRs that are too trivial to warrant a changelog or release notes entry label Jul 23, 2024
Copy link

codecov bot commented Jul 23, 2024

Codecov Report

Attention: Patch coverage is 77.77778% with 2 lines in your changes missing coverage. Please review.

Project coverage is 67.83%. Comparing base (5944bd7) to head (62bdc11).
Report is 1 commits behind head on 2.x.

Files Patch % Lines
src/plugins/workspace/public/plugin.ts 60.00% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##              2.x    #7380   +/-   ##
=======================================
  Coverage   67.83%   67.83%           
=======================================
  Files        3520     3520           
  Lines       69758    69765    +7     
  Branches    11368    11371    +3     
=======================================
+ Hits        47320    47325    +5     
- Misses      19652    19653    +1     
- Partials     2786     2787    +1     
Flag Coverage Δ
Linux_1 33.16% <33.33%> (+<0.01%) ⬆️
Linux_2 55.61% <100.00%> (+<0.01%) ⬆️
Linux_3 43.28% <0.00%> (-0.01%) ⬇️
Linux_4 34.96% <0.00%> (-0.01%) ⬇️
Windows_1 33.18% <33.33%> (+<0.01%) ⬆️
Windows_2 55.56% <100.00%> (+<0.01%) ⬆️
Windows_3 43.29% <0.00%> (-0.01%) ⬇️
Windows_4 34.96% <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.

@SuZhou-Joe SuZhou-Joe merged commit 0429e8a into 2.x Jul 23, 2024
70 of 72 checks passed
@opensearch-trigger-bot
Copy link
Contributor Author

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

opensearch-trigger-bot bot added a commit that referenced this pull request Jul 23, 2024
* [navigation-next] fix: redirect to standard index pattern applications while nav group is enabled (#7305)

* feat: fix the incorrect jumping logic for Index pattern management

* Changeset file for PR #7305 created/updated

* feat: update

* feat: update with comment

* feat: update order and remove reset logic

* feat: update

* feat: update

* feat: update snapshot

* feat: some category change

* feat: update category

---------

* fix: bugs found in integration test

* Changeset file for PR #7356 created/updated

* feat: show workspace detail in all use case

* fix: unit test error

* feat: revert back detect category

---------

(cherry picked from commit 8b46c44)

(cherry picked from commit 6551af7)

(cherry picked from commit 7adc980)

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-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
(cherry picked from commit 0429e8a)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
SuZhou-Joe pushed a commit that referenced this pull request Jul 23, 2024
* [navigation-next] fix: redirect to standard index pattern applications while nav group is enabled (#7305)

* feat: fix the incorrect jumping logic for Index pattern management

* Changeset file for PR #7305 created/updated

* feat: update

* feat: update with comment

* feat: update order and remove reset logic

* feat: update

* feat: update

* feat: update snapshot

* feat: some category change

* feat: update category

---------

* fix: bugs found in integration test

* Changeset file for PR #7356 created/updated

* feat: show workspace detail in all use case

* fix: unit test error

* feat: revert back detect category

---------

(cherry picked from commit 8b46c44)

(cherry picked from commit 6551af7)

(cherry picked from commit 7adc980)




(cherry picked from commit 0429e8a)

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-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
autocut Skip the changelog verification check on backports backport 2.16 navigation Skip-Changelog PRs that are too trivial to warrant a changelog or release notes entry v2.16.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants