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

Move gantt-chart out from subdirectory #321

Merged
merged 2 commits into from
Jan 26, 2024

Conversation

joshuali925
Copy link
Member

@joshuali925 joshuali925 commented Jan 26, 2024

Description

Currently all frontend plugins are under git root except gantt-chart, this PR makes the directory structure more consistent with other plugins.

This PR is a prerequisite for opensearch-project/opensearch-build#4375, which will do the corresponding change in the build repo

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Joshua Li <joshuali925@gmail.com>
Signed-off-by: Joshua Li <joshuali925@gmail.com>
Copy link

codecov bot commented Jan 26, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (09ef7f9) 94.73% compared to head (03cd364) 94.73%.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #321   +/-   ##
=======================================
  Coverage   94.73%   94.73%           
=======================================
  Files           5        5           
  Lines         152      152           
  Branches       45       45           
=======================================
  Hits          144      144           
  Misses          8        8           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Collaborator

@derek-ho derek-ho left a comment

Choose a reason for hiding this comment

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

LGTM

@derek-ho
Copy link
Collaborator

Do you want to backport this for 2.12 release?

@joshuali925
Copy link
Member Author

joshuali925 commented Jan 26, 2024

Do you want to backport this for 2.12 release?

yes but doesn't need to be in 2.12, since it doesn't make a difference for users. i'll try to make it in because the build repo doesn't version the build scripts, it becomes difficult to manage if main and 2.x are using different build script

Copy link
Collaborator

@mengweieric mengweieric left a comment

Choose a reason for hiding this comment

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

Looks good

@vamsi-amazon
Copy link
Member

Looks good. Thanks.

@joshuali925 joshuali925 merged commit 12ad9b7 into opensearch-project:main Jan 26, 2024
13 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/dashboards-visualizations/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/dashboards-visualizations/backport-2.x
# Create a new branch
git switch --create backport/backport-321-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 12ad9b729ad3290c84a7cb5c681aca94f7102efe
# Push it to GitHub
git push --set-upstream origin backport/backport-321-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/dashboards-visualizations/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-321-to-2.x.

joshuali925 added a commit to joshuali925/dashboards-visualizations that referenced this pull request Jan 26, 2024
Signed-off-by: Joshua Li <joshuali925@gmail.com>
(cherry picked from commit 12ad9b7)
joshuali925 added a commit to joshuali925/dashboards-visualizations that referenced this pull request Jan 26, 2024
Signed-off-by: Joshua Li <joshuali925@gmail.com>
(cherry picked from commit 12ad9b7)
(cherry picked from commit af334ca)
joshuali925 added a commit to joshuali925/dashboards-visualizations that referenced this pull request Jan 26, 2024
Signed-off-by: Joshua Li <joshuali925@gmail.com>
(cherry picked from commit 12ad9b7)
(cherry picked from commit af334ca)
joshuali925 added a commit that referenced this pull request Feb 1, 2024
Signed-off-by: Joshua Li <joshuali925@gmail.com>
(cherry picked from commit 12ad9b7)
(cherry picked from commit af334ca)
joshuali925 added a commit that referenced this pull request Feb 1, 2024
Signed-off-by: Joshua Li <joshuali925@gmail.com>
(cherry picked from commit 12ad9b7)
xnox added a commit to wolfi-dev/os that referenced this pull request Mar 1, 2024
opensearch-project/dashboards-visualizations#321 moved this plugin from a sub-dir, such that special case for it should not be needed anymore.

Signed-off-by: Dimitri John Ledkov <19779+xnox@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.

5 participants