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

Sync dependencies to the latest versions #241

Merged
merged 4 commits into from
Jan 8, 2024

Conversation

RyanL1997
Copy link
Contributor

Description

Due to the failure of version conflict for security dashboards plugin's distribution build: https://github.com/opensearch-project/security-dashboards-plugin/blob/7cad47c38478646cd96f0eb1623b77acd853b803/package.json#L30

Issues Resolved

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.

Copy link

codecov bot commented Jan 8, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (c4163bb) 53.08% compared to head (7a7d046) 53.76%.
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #241      +/-   ##
==========================================
+ Coverage   53.08%   53.76%   +0.67%     
==========================================
  Files          33       33              
  Lines        1622     1622              
  Branches      288      288              
==========================================
+ Hits          861      872      +11     
+ Misses        673      662      -11     
  Partials       88       88              
Flag Coverage Δ
dashboards-query-workbench 53.76% <ø> (+0.67%) ⬆️

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.

@RyanL1997 RyanL1997 changed the title Sync Cypress version to ^13.6.0 Sync dependencies to the latest versions Jan 8, 2024
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.

Thanks!

@derek-ho
Copy link
Collaborator

derek-ho commented Jan 8, 2024

Why is snapshot failing?

Signed-off-by: Ryan Liang <[email protected]>
Signed-off-by: Ryan Liang <[email protected]>
@RyanL1997
Copy link
Contributor Author

@derek-ho I have updated the snapshot by running yarn run test:jest -u but im not sure if we should do that.. cc @ps48

@RyanL1997
Copy link
Contributor Author

For reference, the snapshots test would fail like this: https://github.com/opensearch-project/dashboards-query-workbench/actions/runs/7452711838/job/20276572778?pr=241#step:5:328 without the update

Copy link
Collaborator

@Swiddis Swiddis left a comment

Choose a reason for hiding this comment

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

Snapshot updates look like they're checking loaded components now instead of loading ones. I checked the tests and it doesn't look like any of these should be on a loading component, so I'm wondering why the snapshot was made with a loading state at all. This seems like maybe a silent rendering bugfix with the react update? Poked around the changelog and didn't see any obvious candidates.

I'm inclined to merge this if there's not a clear reason we need the components to remain loading in the snapshot.

Copy link
Member

@ps48 ps48 left a comment

Choose a reason for hiding this comment

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

@RyanL1997 Can you please add the backport label to 2.x?

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

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

@RyanL1997
Copy link
Contributor Author

I will manually backport this

RyanL1997 added a commit to RyanL1997/dashboards-query-workbench that referenced this pull request Jan 8, 2024
* Sync Cypress version to 13.6.0

Signed-off-by: Ryan Liang <[email protected]>

* Sync all the dependencies with latest versions

Signed-off-by: Ryan Liang <[email protected]>

* Add yarn lock changes

Signed-off-by: Ryan Liang <[email protected]>

* Update snapshots

Signed-off-by: Ryan Liang <[email protected]>

---------

Signed-off-by: Ryan Liang <[email protected]>
ps48 pushed a commit that referenced this pull request Jan 9, 2024
* Sync Cypress version to 13.6.0



* Sync all the dependencies with latest versions



* Add yarn lock changes



* Update snapshots



---------

Signed-off-by: Ryan Liang <[email protected]>
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.

4 participants