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
[v1.73] Graph context menu fixed + downgrade openshift-sdk to support OCP 4.12+ #263
Conversation
Do not merge until OSSM 2.5.0 is released. |
OSSM 2.5 is released, so we can merge backports to v1.73 branch |
f0b13e7
to
df06515
Compare
) * Copy of Kiali frontend source code Kiali frontend source originated from: * git ref: v1.73 * git commit: 1ac06a5ad1b2e4a04e2da057b00b4d1c96a85f93 * GitHub URL: https://github.com/kiali/kiali/tree/1ac06a5ad1b2e4a04e2da057b00b4d1c96a85f93/frontend/src Signed-off-by: Fernando Hoyos <fhoyosle@redhat.com> * Update frontend libraries * Downgrade openshift-console libraries to support OCP 4.12+ --------- Signed-off-by: Fernando Hoyos <fhoyosle@redhat.com>
Kiali frontend source originated from: * git ref: v1.73 * git commit: e0589b3dfac102a5299451b7d3c29ae16ac7ce85 * GitHub URL: https://github.com/kiali/kiali/tree/e0589b3dfac102a5299451b7d3c29ae16ac7ce85/frontend/src Signed-off-by: Fernando Hoyos <fhoyosle@redhat.com>
df06515
to
a035a31
Compare
"bootstrap-slider-without-jquery": "10.0.0", | ||
"cy-node-html-label": "2.0.0", | ||
"cytoscape": "3.15.5", | ||
"cytoscape-canvas": "3.0.1", | ||
"cytoscape-popper": "1.0.7", | ||
"dagre": "0.8.5", | ||
"dagre": "0.8.2", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
dagre
library is downgraded to match with @patternfly/react-topology
dagre dependency and avoid library duplications
@@ -126,13 +125,6 @@ | |||
"webpack-cli": "^4.9.1", | |||
"webpack-dev-server": "^4.5.0" | |||
}, | |||
"resolutions": { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have reviewed all dependency resolutions and found them to be outdated. The previous versions of these libraries no longer exist to be overridden in the yarn.lock
file. I haven't yet checked the Kiali repository, but it's likely that this change can also be applied there.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks good to me!
Describe the change
Backport of #261 to branch v1.73
Fixes #284 in branch v1.73
To avoid
yarn.lock
conflicts I have merged both changes in one PR (backport of #261 is quite simple, no test needed).For the review, you can ignore changes in
src/kiali
, they have been copied from the Kiali repository.How to test the PR
-- Node graph: Opens a new detailed graph. Check that back button works too.
-- Any other option to go to details page