backend: reduce number of concurrent db connections
This commit is contained in:
+11
-11
@@ -323,8 +323,8 @@ const AppLayout = () => {
|
||||
const location = useLocation();
|
||||
const appState = useAppState();
|
||||
const appDispatch = useAppDispatch();
|
||||
const folderMatch = matchPath('/folders/:folderId', location.pathname);
|
||||
const nestedDocMatch = matchPath('/folders/:folderId/documents/:documentId', location.pathname);
|
||||
const folderMatch = matchPath('/documents/folder/:folderId', location.pathname);
|
||||
const nestedDocMatch = matchPath('/documents/folder/:folderId/documents/:documentId', location.pathname);
|
||||
const docMatch = nestedDocMatch || matchPath('/documents/:documentId', location.pathname);
|
||||
const routeFolderId =
|
||||
folderMatch?.params?.folderId || nestedDocMatch?.params?.folderId || null;
|
||||
@@ -1741,7 +1741,7 @@ const AppLayout = () => {
|
||||
return;
|
||||
}
|
||||
|
||||
const path = targetId === 'root' ? '/folders' : `/folders/${targetId}`;
|
||||
const path = targetId === 'root' ? '/documents' : `/documents/folder/${targetId}`;
|
||||
navigate(path, { replace });
|
||||
},
|
||||
[loadFolder, navigate],
|
||||
@@ -3155,7 +3155,7 @@ const AppLayout = () => {
|
||||
return;
|
||||
}
|
||||
|
||||
const path = targetId === 'root' ? '/folders' : `/folders/${targetId}`;
|
||||
const path = targetId === 'root' ? '/documents' : `/documents/folder/${targetId}`;
|
||||
navigate(path, { replace: false });
|
||||
},
|
||||
[navigate, selectedFolder, loadFolder],
|
||||
@@ -4669,7 +4669,7 @@ const LoginRoute = () => {
|
||||
if (typeof target === 'string' && target.startsWith('/')) {
|
||||
return target;
|
||||
}
|
||||
return '/folders';
|
||||
return '/documents';
|
||||
}, [location.state]);
|
||||
|
||||
if (appStatus !== 'logged-out' && appStatus !== 'authenticating') {
|
||||
@@ -4734,17 +4734,17 @@ const AppRouter = () => (
|
||||
<Routes>
|
||||
<Route path="/account/login" element={<LoginRoute />} />
|
||||
<Route element={<AppLayout />}>
|
||||
<Route path="/" element={<Navigate to="/folders" replace />} />
|
||||
<Route path="/folders" element={<DocumentsRoute />} />
|
||||
<Route path="/folders/:folderId" element={<DocumentsRoute />} />
|
||||
<Route path="/documents/:documentId" element={<DocumentsRoute />} />
|
||||
<Route path="/" element={<Navigate to="/documents" replace />} />
|
||||
<Route path="/documents" element={<DocumentsRoute />} />
|
||||
<Route path="/documents/folder/:folderId" element={<DocumentsRoute />} />
|
||||
<Route
|
||||
path="/folders/:folderId/documents/:documentId"
|
||||
path="/documents/folder/:folderId/documents/:documentId"
|
||||
element={<DocumentsRoute />}
|
||||
/>
|
||||
<Route path="/documents/:documentId" element={<DocumentsRoute />} />
|
||||
<Route path="/tags" element={<TagsRoute />} />
|
||||
<Route path="/correspondents" element={<CorrespondentsRoute />} />
|
||||
<Route path="*" element={<Navigate to="/folders" replace />} />
|
||||
<Route path="*" element={<Navigate to="/documents" replace />} />
|
||||
</Route>
|
||||
</Routes>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user