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

7499 - Update react router dom #7591

Merged
merged 53 commits into from
Feb 11, 2025
Merged
Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
ed06afc
update package
Zasa-san Jan 16, 2025
e052ca7
update package to new name
Zasa-san Jan 16, 2025
3702a25
remove @remix-run/router
Zasa-san Jan 16, 2025
3883fb4
bulk update imports, types, mocks
Zasa-san Jan 16, 2025
f4b1ad8
add missing import update
Zasa-san Jan 16, 2025
44d9ebb
update dependabot ignores
Zasa-san Jan 16, 2025
6a4fccb
Merge branch 'development' into 7499-update-react-router-dom
Zasa-san Jan 20, 2025
d848ffb
relative splat path
Zasa-san Jan 20, 2025
6b825b6
keep element defined in parent route
Zasa-san Jan 20, 2025
694c20b
Merge branch 'development' of https://github.com/huridocs/uwazi into …
Zasa-san Jan 20, 2025
11576d3
Merge branch 'development' of https://github.com/huridocs/uwazi into …
Zasa-san Jan 21, 2025
3291d32
wip await useNavigate and useRevalidator
Zasa-san Jan 21, 2025
54eccc4
await navigates and revalidators
Zasa-san Jan 21, 2025
b3e4162
Merge branch 'development' into 7499-update-react-router-dom
Zasa-san Jan 21, 2025
038167d
sets TextEncoder/TextDecoder for jsdom in jest config
mfacar Jan 22, 2025
57bfcae
Merge branch 'development' into 7499-update-react-router-dom
Zasa-san Jan 22, 2025
cca70da
updates snapshots
mfacar Jan 23, 2025
0472d33
Commented lines to diagnose rendering problem
mfacar Jan 23, 2025
a163c78
Merge branch '7499-update-react-router-dom' of https://github.com/hur…
mfacar Jan 23, 2025
aef169d
wait for navigation to finish
Zasa-san Jan 23, 2025
19633d1
add missing future flags
Zasa-san Jan 23, 2025
90aab4c
use same config in server side render
Zasa-san Jan 23, 2025
ae20a6b
upgrade library route layout
Zasa-san Jan 23, 2025
e7ce32d
wip possible solution for index element
Zasa-san Jan 23, 2025
f35f325
only run cleanup when leaving library
Zasa-san Jan 24, 2025
32de251
wip update library tests
Zasa-san Jan 24, 2025
c98e999
library cards as default
mfacar Jan 24, 2025
65c27b1
check library status
mfacar Jan 25, 2025
fab5376
move from useEffect to componentWillUnmount
mfacar Jan 26, 2025
79da954
Merge branch 'development' into 7499-update-react-router-dom
Zasa-san Jan 27, 2025
8dd7a3b
remove outdated asserts
Zasa-san Jan 27, 2025
d0c64b2
use array method
Zasa-san Jan 27, 2025
46fbe94
await fetcher
Zasa-san Jan 27, 2025
3bd1e5d
wait for selectors in puppeteer
Zasa-san Jan 27, 2025
d118aa8
migrate e2e/mobile/sidePanels.test.ts
Zasa-san Jan 27, 2025
f7512d1
migrate private instance e2e
Zasa-san Jan 27, 2025
80f5bcb
Merge branch 'development' into 7499-update-react-router-dom
Zasa-san Jan 28, 2025
7121298
wait for navigations
Zasa-san Jan 28, 2025
af2c8af
wait for notifications and paginator + realclick
Zasa-san Jan 28, 2025
7efa994
wait selectors
Zasa-san Jan 28, 2025
712e144
single viewport set
Zasa-san Jan 28, 2025
10a773b
Merge branch 'development' of https://github.com/huridocs/uwazi into …
Zasa-san Jan 28, 2025
4a8b74a
update import
Zasa-san Jan 28, 2025
d823a44
Merge branch 'development' of https://github.com/huridocs/uwazi into …
mfacar Feb 3, 2025
622d0a6
Library components and DocumentList test fixes
josh-huridocs Feb 3, 2025
b73e1b0
fix unit tests
josh-huridocs Feb 4, 2025
c74ca1a
Merge branch 'development' into 7499-update-react-router-dom
mfacar Feb 5, 2025
3be208d
Merge branch 'development' into 7499-update-react-router-dom
mfacar Feb 10, 2025
6f51408
Merge branch 'development' of https://github.com/huridocs/uwazi into …
mfacar Feb 11, 2025
951305e
Merge branch '7499-update-react-router-dom' of https://github.com/hur…
mfacar Feb 11, 2025
1640b21
Merge branch 'development' into 7499-update-react-router-dom
mfacar Feb 11, 2025
2edcaac
wait for elements
mfacar Feb 11, 2025
de33313
Merge branch '7499-update-react-router-dom' of https://github.com/hur…
mfacar Feb 11, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
relative splat path
Zasa-san committed Jan 20, 2025
commit d848ffba8142dc4bbf44c8c5b784111d500940a7
8 changes: 6 additions & 2 deletions app/react/Routes.tsx
Original file line number Diff line number Diff line change
@@ -83,8 +83,12 @@ const getRoutesLayout = (
<Route path="library" element={privateRoute(<LibraryCards />, settings)} />
<Route path="library/map" element={privateRoute(<LibraryMap />, settings)} />
<Route path="library/table" element={privateRoute(<LibraryTable />, settings)} />
<Route path="document/:sharedId/*" element={privateRoute(<ViewerRoute />, settings)} />
<Route path="entity/:sharedId/*" element={privateRoute(<ViewerRoute />, settings)} />
<Route path="document/:sharedId">
<Route path="*" element={privateRoute(<ViewerRoute />, settings)} />
</Route>
<Route path="entity/:sharedId">
<Route path="*" element={privateRoute(<ViewerRoute />, settings)} />
</Route>
<Route path="entity/:sharedId/:tabView" element={privateRoute(<ViewerRoute />, settings)} />
<Route path="error/:errorCode" element={<GeneralError />} />
<Route path="404" element={<GeneralError />} />
9 changes: 7 additions & 2 deletions app/react/entry-client.tsx
Original file line number Diff line number Diff line change
@@ -48,15 +48,20 @@ if (window.SENTRY_APP_DSN) {
}

const router = createBrowserRouter(
getRoutes(atomStore.get(settingsAtom), atomStore.get(userAtom)?._id)
getRoutes(atomStore.get(settingsAtom), atomStore.get(userAtom)?._id),
{
future: {
v7_relativeSplatPath: true,
},
}
);

const App = () => (
<ReduxProvider store={store as any}>
<CustomProvider>
<Provider store={atomStore}>
<ErrorBoundary>
<RouterProvider router={router} fallbackElement={null} />
<RouterProvider router={router} />
</ErrorBoundary>
</Provider>
</CustomProvider>
Loading