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.

Sign up for GitHub

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

Jump to bottom

Feat: Migrate react router from v3 to v6 #2828

Merged
merged 87 commits into from
Jul 3, 2023
Merged

Feat: Migrate react router from v3 to v6 #2828

merged 87 commits into from
Jul 3, 2023

Conversation

cballevre
Copy link
Member

@cballevre cballevre commented Jan 13, 2023 •
edited
Loading 

### ✨ Features

* Migrate react router from v3 to v6

Related PRs:

@cballevre cballevre mentioned this pull request Jan 13, 2023
Closed
@cballevre cballevre force-pushed the feat/migrate-react-router-from-v3-to-v6 branch from bc8d182 to 6a5604a Compare February 17, 2023 14:07
@bundlemon
Copy link

bundlemon bot commented Feb 17, 2023 •
edited
Loading

BundleMon

Files updated (5)
Status Path Size Limits
✅ drive/intents/drive.(hash).js
 151.29KB (-117B -0.08%) 171KB
✅ drive/vendors/drive.(hash).js
 1.35MB (-613B -0.04%) 1.6MB
✅ drive/app/drive.(hash).js
 244.42KB (-1.04KB -0.42%) 255KB
✅ drive/public/drive.(hash).min.css
 89.46KB (-4.81KB -5.1%) 100KB
✅ drive/public/drive.(hash).js
 1.57MB (-68.04KB -4.06%) 1.65MB
Unchanged files (14)
Status Path Size Limits
✅ drive/public/pdf.worker.entry.(hash).worker.j
s
 343.37KB 345KB
✅ drive/services/dacc/drive.js
 252.18KB 500KB
✅ drive/services/qualificationMigration/drive.j
s
 246.9KB 500KB
✅ drive/public/cozy-client-js.js
 158.97KB 160KB
✅ drive/app-drive.(hash).min.css
 55.96KB 56KB
✅ drive/intents-drive.(hash).min.css
 37.03KB 40KB
✅ drive/onlyOffice/slide.pptx
 24.82KB 25KB
✅ drive/onlyOffice/text.docx
 5.84KB 6KB
✅ drive/onlyOffice/spreadsheet.xlsx
 5.01KB 6KB
✅ drive/manifest.webapp
 1.77KB 2KB
✅ drive/index.html
 531B 1KB
✅ drive/intents/index.html
 516B 1KB
✅ drive/img/app-icon.(hash).svg
 419B 1KB
✅ drive/manifest.json
 184B 1KB

Total files change -74.6KB -1.59%

Groups updated (4)
Status Path Size Limits
✅ drive/intents/**
 151.79KB (-117B -0.08%) +2%
✅ drive/vendors/**
 1.35MB (-613B -0.04%) +6%
✅ drive/app/**
 244.42KB (-1.04KB -0.42%) +1%
✅ drive/public/**
 2.16MB (-72.85KB -3.19%) +7%
Unchanged groups (4)
Status Path Size Limits
✅ drive/screenshots/**
 2.13MB +0.4%
✅ drive/services/**
 499.08KB +1%
✅ drive/onlyOffice/**
 35.68KB +0.4%
✅ drive/img/**
 419B +0.4%

Final result: ✅

View report in BundleMon website ➡️

Current branch size history | Target branch size history

@cballevre cballevre force-pushed the feat/migrate-react-router-from-v3-to-v6 branch 7 times, most recently from cddded3 to 7babba1 Compare February 17, 2023 17:25
@cballevre cballevre force-pushed the feat/migrate-react-router-from-v3-to-v6 branch from 720e40a to 22c4a62 Compare March 10, 2023 16:36
@cballevre cballevre force-pushed the feat/migrate-react-router-from-v3-to-v6 branch 3 times, most recently from abcd0e3 to cd9397f Compare April 3, 2023 11:23
@cballevre cballevre force-pushed the feat/migrate-react-router-from-v3-to-v6 branch 2 times, most recently from 42f28f3 to ec57baa Compare May 23, 2023 08:46
@cballevre cballevre marked this pull request as ready for review May 23, 2023 08:49
@cballevre cballevre requested a review from zatteo as a code owner May 23, 2023 08:49
zatteo and others added 12 commits July 3, 2023 16:37
@zatteo @cballevre
feat: Upgrade react-router from 3.2.6 to 6.6.0
89eda65
@zatteo @cballevre
feat: Update Router and AppRouter
6bde074
@zatteo @cballevre
feat: Remove withRouter() from components
f85da01
@zatteo @cballevre
feat: Remove unused getCurrentViewFetchStatus function
5d52087
@cballevre
feat: Remove router history from redux store
7f16890 
Router history as is does not exist anymore in react-router-v6

- Remove router history from redux store
- Use custom hooks instead of selectors using history from redux store
- Remove toolbarContainer which has no purpose anymore

fix: Remove unused PropTypes in DeleteItem
fix(Selectors): Add useClient to search in client state
@cballevre
refactor(Toolbar): Remove useRouter
d039213
@cballevre
refactor(LightFileViewer): Remove useRouter
12152c7
@cballevre
refactor(FilesViewer): Remove useRouter
5b30aa7
@cballevre
refactor(FilesViewerDrive): Remove useRouter
029d815
@cballevre
refactor(useTrashRedirect): Remove useRouter
5196207
@cballevre
refactor(FolderViewBody): Remove useRouter
46a7d46
@cballevre
refactor(OnlyOffice): Remove useRouter
28db3e8
zatteo and others added 24 commits July 3, 2023 16:37
@zatteo @cballevre
test: Fix AddMenu and AddMenuProvider test with react-router update
5bae8c6
@cballevre
test: Update snapshot
ec13adf
@zatteo @cballevre
test: Fix FilesViewer test with react-router update
ec6c403
@zatteo @cballevre
test: Fix views/Drive/index test with react-router update
95cc658 
test: Remove deprecated todo. PR has been merged.
@cballevre
photos - test: Fix Topbar with react-router-update
6695320
@cballevre
test: Fix TrashFolderView with react-router-dom
0a5ed35
@cballevre
test: Fix PublicFolderView with react-router-dom
4b94c21
@zatteo @cballevre
test: Fix RecentViewWithProvider with react-router-dom
ba690b0 
test: Fix skipped views/Recent test
@zatteo @cballevre
test: Fix InsideRegularFolder test with hooks mock
efe8d83 
I also homogenized test cases.
@zatteo @cballevre
refactor(Unlink): Use navigate hook instead router
660d17a
@zatteo @cballevre
feat(Embeder): Migrate Router to react-router v6
390f0cd
@zatteo @cballevre
feat(photos/targets): Migrate public photo target to react-router v6
df495bd 
Co-authored-by: Célestin Ballèvre <[email protected]>
@zatteo @cballevre
fix: useParams imported from react-router instead of react-router-dom
670d62a
@zatteo @cballevre
feat(drive/targets): Migrate public target to react-router v6
47389da
@cballevre
fix: Add files redirection
07e2050 
The notes back button access files route and this was creating an blank page
@cballevre
fix(ExternalRedirect): use react-router v6 hooks
c54814a
@cballevre
refactor(Trash/Toolbar): use popperOptions to set placement
01c8a8f
@zatteo @cballevre
test: Update snapshots
6e1aa67
@cballevre
fix: Album toolbar in mobile
4523f53 
Album toolbar is render into cozy-bar which don't have access to react-router-dom. So we can't use hooks inside, we have to share it with props
@cballevre
fix: Display Oops or redirect on not found errors
35bb36e
@cballevre
fix: Convert Office to react-router v6
7cc21c6
@cballevre
fix: Navigation to revision modal
9b534a1 
Relative path doesn't work in this case instead I used the pathname from useLocation
@cballevre
fix: Load photo in timeline viewer
55bebb9
@cballevre
feat: Pass router params through props instead of hooks for cozy-bar
64ac6bd 
react-router-dom is not available anymore in cozy-bar because we removed the context from Cozy Drive. However MoreMenu has been moved inside cozy-bar in the meantime and make extensives use of these hooks.

We did not find any better solution that  props drilling.
@cballevre cballevre force-pushed the feat/migrate-react-router-from-v3-to-v6 branch from ec57baa to 64ac6bd Compare July 3, 2023 14:48
@cballevre cballevre enabled auto-merge (rebase) July 3, 2023 15:19
@cballevre cballevre merged commit e517866 into master Jul 3, 2023
3 checks passed
@cballevre cballevre deleted the feat/migrate-react-router-from-v3-to-v6 branch July 3, 2023 15:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zatteo zatteo zatteo approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@cballevre @zatteo