fix: fixed redirection state

Author: nicoalee

compose/neurosynth-frontend/src/pages/BaseNavigation/BaseNavigation.tsx

@@ -80,26 +80,13 @@ const BaseNavigation: React.FC = (_props) => {
                         </ProtectedProjectRoute>
                     }
                     children={[
-                        <Route
-                            key="project-id-project"
-                            path="project"
-                            element={<ProjectEditMetaAnalyses />}
-                        />,
+                        <Route key="project-id-project" path="project" element={<ProjectEditMetaAnalyses />} />,
                         <Route
                             key="project-id-meta-analyses"
                             path="meta-analyses"
                             element={<ProjectViewMetaAnalyses />}
                         />,
-                        <Route
-                            key="project-id-index"
-                            index
-                            element={<Navigate replace to="project" />}
-                        />,
-                        <Route
-                            key="project-id-*"
-                            path="*"
-                            element={<Navigate replace to="project" />}
-                        />,
+                        <Route key="project-id-index" index element={<Navigate replace to="project" />} />,
                     ]}
                 />
                 <Route
@@ -138,10 +125,7 @@ const BaseNavigation: React.FC = (_props) => {
                 <Route
                     path="/projects/:projectId/extraction/studies/:studyId/edit"
                     element={
-                        <ProtectedProjectRoute
-                            onlyOwnerCanAccess
-                            errorMessage="You do not have access to this project"
-                        >
+                        <ProtectedProjectRoute onlyOwnerCanAccess errorMessage="You do not have access to this project">
                             <Box sx={BaseNavigationStyles.pagesContainer}>
                                 <EditStudyPage />
                             </Box>
@@ -196,19 +180,17 @@ const BaseNavigation: React.FC = (_props) => {
                         </Box>
                     }
                 />
-                {['/base-studies/:baseStudyId', '/base-studies/:baseStudyId/:studyVersionId'].map(
-                    (path) => (
-                        <Route
-                            key={path}
-                            path={path}
-                            element={
-                                <Box sx={BaseNavigationStyles.pagesContainer}>
-                                    <BaseStudyPage />
-                                </Box>
-                            }
-                        />
-                    )
-                )}
+                {['/base-studies/:baseStudyId', '/base-studies/:baseStudyId/:studyVersionId'].map((path) => (
+                    <Route
+                        key={path}
+                        path={path}
+                        element={
+                            <Box sx={BaseNavigationStyles.pagesContainer}>
+                                <BaseStudyPage />
+                            </Box>
+                        }
+                    />
+                ))}
                 <Route
                     path="/meta-analyses"
                     element={

compose/neurosynth-frontend/src/pages/Curation/CurationPage.tsx

@@ -21,7 +21,7 @@ import { useState } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import CurationDownloadIncludedStudiesButton from './components/CurationDownloadIncludedStudiesButton';
 
-const CurationPage: React.FC = (props) => {
+const CurationPage: React.FC = () => {
     const [prismaIsOpen, setPrismaIsOpen] = useState(false);
     const { projectId } = useParams<{ projectId: string | undefined }>();
     const projectUser = useProjectUser();
@@ -38,14 +38,13 @@ const CurationPage: React.FC = (props) => {
     const { included, uncategorized } = useGetCurationSummary();
     const { data: studyset } = useGetStudysetById(studysetId || '', false);
 
-    const extractionStepInitialized =
-        studysetId && annotationId && (studyset?.studies?.length || 0) > 0;
+    const extractionStepInitialized = studysetId && annotationId && (studyset?.studies?.length || 0) > 0;
 
     const handleMoveToExtractionPhase = () => {
         if (extractionStepInitialized) {
             navigate(`/projects/${projectId}/extraction`);
         } else {
-            navigate(`/projects/${projectId}`, {
+            navigate(`/projects/${projectId}/project`, {
                 state: {
                     projectPage: {
                         openCurationDialog: true,
@@ -93,10 +92,7 @@ const CurationPage: React.FC = (props) => {
                         <CurationDownloadIncludedStudiesButton />
                         {isPrisma && (
                             <>
-                                <PrismaDialog
-                                    onCloseDialog={() => setPrismaIsOpen(false)}
-                                    isOpen={prismaIsOpen}
-                                />
+                                <PrismaDialog onCloseDialog={() => setPrismaIsOpen(false)} isOpen={prismaIsOpen} />
                                 <Button
                                     onClick={() => setPrismaIsOpen(true)}
                                     variant="outlined"

compose/neurosynth-frontend/src/pages/Project/components/MoveToExtractionDialog.tsx

@@ -73,8 +73,7 @@ const MoveToExtractionDialog: React.FC<IDialog> = (props) => {
                 });
 
                 const newStudysetId = newStudyset.data.id;
-                if (!newStudysetId)
-                    throw new Error('expected a studyset id but did not receive one');
+                if (!newStudysetId) throw new Error('expected a studyset id but did not receive one');
 
                 tempStudysetId = newStudysetId;
 
@@ -114,8 +113,7 @@ const MoveToExtractionDialog: React.FC<IDialog> = (props) => {
                 });
 
                 const newAnnotationId = newAnnotation.data.id;
-                if (!newAnnotationId)
-                    throw new Error('expected a studyset id but did not receive one');
+                if (!newAnnotationId) throw new Error('expected a studyset id but did not receive one');
 
                 tempAnnotationId = newAnnotationId;
                 updateExtractionMetadata({
@@ -140,15 +138,7 @@ const MoveToExtractionDialog: React.FC<IDialog> = (props) => {
         const stubsToBaseStudies: Array<
             Pick<
                 BaseStudy,
-                | 'name'
-                | 'doi'
-                | 'pmid'
-                | 'pmcid'
-                | 'year'
-                | 'description'
-                | 'publication'
-                | 'authors'
-                | 'level'
+                'name' | 'doi' | 'pmid' | 'pmcid' | 'year' | 'description' | 'publication' | 'authors' | 'level'
             >
         > = includedStubs.map((stub) => ({
             name: stub.title,
@@ -252,14 +242,10 @@ const MoveToExtractionDialog: React.FC<IDialog> = (props) => {
                                 value={progress}
                             />
                         </Box>
-                        <Box
-                            sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }}
-                        >
+                        <Box sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }}>
                             <CircularProgress />
                             <Typography>{progressText}</Typography>
-                            <Typography sx={{ marginTop: '1rem' }}>
-                                (This may take a minute)
-                            </Typography>
+                            <Typography sx={{ marginTop: '1rem' }}>(This may take a minute)</Typography>
                         </Box>
                         {/* need this empty div to space out elements properly */}
                         <div></div>