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

Downgrade react-router-dom (#803) #837

Merged
merged 3 commits into from
Nov 30, 2021
Merged

Conversation

w0wka91
Copy link
Contributor

@w0wka91 w0wka91 commented Oct 23, 2021

Signed-off-by: Waldemar Penner waldemar.penner91@gmail.com

Which problem is this PR solving?

Short description of the changes

  • Downgraded react-router-dom due to incompatibility issues with react-router-redux

Signed-off-by: Waldemar Penner <waldemar.penner91@gmail.com>
@yurishkuro
Copy link
Member

Thanks for the investigation and PR. We should really have some unit tests to catch a major function breaking silently like this.

Signed-off-by: Waldemar Penner <waldemar.penner91@gmail.com>
@w0wka91
Copy link
Contributor Author

w0wka91 commented Oct 23, 2021

Not sure if unit tests will be sufficient to test this because every unit did work correct but the combination of react-router-dom and react-router-redux was broken.
We could test it quite good with some e2e cypress tests?!

@yurishkuro
Copy link
Member

A discussion of the UI testing techniques is a bit outside of my area of expertise.

cc @jkowall

@codecov
Copy link

codecov bot commented Oct 23, 2021

Codecov Report

Merging #837 (be5e475) into master (42b39c9) will decrease coverage by 0.02%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #837      +/-   ##
==========================================
- Coverage   95.29%   95.26%   -0.03%     
==========================================
  Files         240      240              
  Lines        7460     7460              
  Branches     1812     1812              
==========================================
- Hits         7109     7107       -2     
- Misses        345      347       +2     
  Partials        6        6              
Impacted Files Coverage Δ
...nents/TracePage/TraceTimelineViewer/SpanBarRow.tsx 94.44% <0.00%> (-5.56%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 42b39c9...be5e475. Read the comment docs.

@jpkrohling
Copy link
Contributor

There was indeed a conversation about introducing Cypress, and even a presentation delivered by an Outreachy candidate a few months ago on the topic. IMO, it would be great to have it.

@w0wka91
Copy link
Contributor Author

w0wka91 commented Oct 28, 2021

I think the integration of cypress should be not done in the scope of this PR. So I would suggest we merge this PR, close this Issue and create a new Issue which is about the integration of cypress.

What do you guys think?

@jpkrohling
Copy link
Contributor

jpkrohling commented Oct 28, 2021

Sounds like a plan! @rubenvp8510, could you do a final review before I merge this?

@yurishkuro
Copy link
Member

cc @meenal06 who made the original change

@yurishkuro
Copy link
Member

@w0wka91 the PR #727 that added the upgrade had more changed files than yours, any idea why? Should we just revert that PR in full?

@w0wka91
Copy link
Contributor Author

w0wka91 commented Nov 17, 2021

We could also just revert the PR. The original PR just changed some formatting and made 2 simple changes to tests. So either way should be fine

@yurishkuro
Copy link
Member

@w0wka91 the change to packages/jaeger-ui/src/index.js looks significant, but not present in your PR. I prefer not to roll back #727 completely if it had useful forward-looking changes.

@jpkrohling
Copy link
Contributor

Should this be considered for tomorrow's release?

@yurishkuro
Copy link
Member

Yes. We need someone w/ React knowledge to look at this

@jpkrohling
Copy link
Contributor

@rubenvp8510, could you do a final review?

@rubenvp8510
Copy link
Collaborator

@rubenvp8510, could you do a final review?

Sure! I did a quick review and looks good. I'll do a final review and approve if everything is OK.

Copy link
Collaborator

@rubenvp8510 rubenvp8510 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!

@jpkrohling jpkrohling merged commit f56c427 into jaegertracing:master Nov 30, 2021
yurishkuro pushed a commit that referenced this pull request Sep 27, 2023
## Which problem is this PR solving?
- part of: #1825
- Upgrades react-router-dom to v5.2.0

## Description of the changes
- This PR upgrades the rrd to v5.2.0
- This upgrade was previously attempted with PR
#727 but at that time, an
issue (#803) was
reported because `react-router-redux` v5.x was not compatible with rrd
v5.2.0, so it was reverted with PR:
#837
- Now, since we have `redux-first-history` instead of
`react-router-redux`, we can upgrade to rrd v5.2.0 safely now.

## How was this change tested?
- The reported issue with v5.2.0
(#803) is not being
reproduced now.


![image](https://github.com/jaegertracing/jaeger-ui/assets/94157520/43c11ec6-02e6-4ede-855b-22822f77d4ae)


## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `yarn lint` and `yarn test`

Signed-off-by: Ansh Goyal <anshgoyal1704@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Searching spans in a trace page doesn't work
4 participants