From 4fbcc7ccfef668a03d671d0a27635a2f8e153116 Mon Sep 17 00:00:00 2001 From: Nicholas Lee Date: Tue, 25 Apr 2023 16:37:52 -0400 Subject: [PATCH] feat: update algorithm step --- .../AlgorithmDialog/AlgorithmDialog.tsx | 63 ++++-- .../DynamicForm/DynamicForm.spec.tsx | 2 +- .../DynamicForm/DynamicForm.tsx | 2 +- .../DynamicForm/DynamicFormBaseTitle.spec.tsx | 0 .../DynamicForm/DynamicFormBaseTitle.tsx | 0 .../DynamicForm/DynamicFormBoolInput.tsx | 2 +- .../DynamicFormKwargInput.spec.tsx | 0 .../DynamicForm/DynamicFormKwargInput.tsx | 2 +- .../DynamicFormNumericInput.spec.tsx | 0 .../DynamicForm/DynamicFormNumericInput.tsx | 2 +- .../DynamicFormSelectInput.spec.tsx | 0 .../DynamicForm/DynamicFormSelectInput.tsx | 2 +- .../DynamicFormStringInput.spec.tsx | 0 .../DynamicForm/DynamicFormStringInput.tsx | 2 +- .../DynamicForm/DynamicFormStyles.ts | 0 .../DynamicForm/DynamicformBoolInput.spec.tsx | 0 .../DynamicForm/__mocks__/DynamicForm.tsx | 0 .../__mocks__/DynamicFormBoolInput.tsx | 0 .../__mocks__/DynamicFormKwargInput.tsx | 0 .../__mocks__/DynamicFormNumericInput.tsx | 0 .../__mocks__/DynamicFormSelectInput.tsx | 0 .../__mocks__/DynamicFormStringInput.tsx | 0 .../DynamicInputDisplay.spec.tsx | 2 +- .../DynamicInputDisplay.styles.ts | 2 +- .../DynamicInputDisplay.tsx | 2 +- .../MetaAnalaysisSummaryRow.spec.tsx | 0 .../MetaAnalysisSummaryRow.styles.ts | 8 +- .../MetaAnalysisSummaryRow.tsx | 8 +- .../AlgorithmStep/AlgorithmStep.tsx | 169 +++++++---------- .../ExtractionStep/ExtractionStep.tsx | 87 +++++---- .../SelectionStep/SelectionStep.tsx | 25 +-- .../requests/useGetSpecificationById.tsx | 18 ++ .../src/hooks/requests/useGetStudyById.tsx | 1 - .../hooks/requests/useUpdateSpecification.tsx | 39 ++++ .../MetaAnalysis/MetaAnalysisAlgorithm.tsx | 2 +- .../MetaAnalysisBuilderPage.tsx | 2 +- .../MetaAnalysisFinalize.styles.ts | 0 .../MetaAnalysisFinalize.tsx | 4 +- .../MetaAnalysisPage/MetaAnalysisPage.tsx | 6 +- .../Projects/ProjectPage/ProjectPage.tsx | 179 +++++++++--------- 40 files changed, 345 insertions(+), 286 deletions(-) rename compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/{MetaAnalysisAlgorithm => }/DynamicForm/DynamicForm.spec.tsx (97%) rename compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/{MetaAnalysisAlgorithm => }/DynamicForm/DynamicForm.tsx (98%) rename compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/{MetaAnalysisAlgorithm => }/DynamicForm/DynamicFormBaseTitle.spec.tsx (100%) rename compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/{MetaAnalysisAlgorithm => }/DynamicForm/DynamicFormBaseTitle.tsx (100%) rename compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/{MetaAnalysisAlgorithm => }/DynamicForm/DynamicFormBoolInput.tsx (93%) rename compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/{MetaAnalysisAlgorithm => }/DynamicForm/DynamicFormKwargInput.spec.tsx (100%) rename compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/{MetaAnalysisAlgorithm => }/DynamicForm/DynamicFormKwargInput.tsx (98%) rename compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/{MetaAnalysisAlgorithm => }/DynamicForm/DynamicFormNumericInput.spec.tsx (100%) rename compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/{MetaAnalysisAlgorithm => }/DynamicForm/DynamicFormNumericInput.tsx (94%) rename compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/{MetaAnalysisAlgorithm => }/DynamicForm/DynamicFormSelectInput.spec.tsx (100%) rename compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/{MetaAnalysisAlgorithm => }/DynamicForm/DynamicFormSelectInput.tsx (94%) rename compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/{MetaAnalysisAlgorithm => }/DynamicForm/DynamicFormStringInput.spec.tsx (100%) rename compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/{MetaAnalysisAlgorithm => }/DynamicForm/DynamicFormStringInput.tsx (92%) rename compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/{MetaAnalysisAlgorithm => }/DynamicForm/DynamicFormStyles.ts (100%) rename compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/{MetaAnalysisAlgorithm => }/DynamicForm/DynamicformBoolInput.spec.tsx (100%) rename compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/{MetaAnalysisAlgorithm => }/DynamicForm/__mocks__/DynamicForm.tsx (100%) rename compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/{MetaAnalysisAlgorithm => }/DynamicForm/__mocks__/DynamicFormBoolInput.tsx (100%) rename compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/{MetaAnalysisAlgorithm => }/DynamicForm/__mocks__/DynamicFormKwargInput.tsx (100%) rename compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/{MetaAnalysisAlgorithm => }/DynamicForm/__mocks__/DynamicFormNumericInput.tsx (100%) rename compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/{MetaAnalysisAlgorithm => }/DynamicForm/__mocks__/DynamicFormSelectInput.tsx (100%) rename compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/{MetaAnalysisAlgorithm => }/DynamicForm/__mocks__/DynamicFormStringInput.tsx (100%) rename compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/{MetaAnalysisFinalize => }/DynamicInputDisplay/DynamicInputDisplay.spec.tsx (97%) rename compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/{MetaAnalysisFinalize => }/DynamicInputDisplay/DynamicInputDisplay.styles.ts (92%) rename compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/{MetaAnalysisFinalize => }/DynamicInputDisplay/DynamicInputDisplay.tsx (97%) rename compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/{MetaAnalysisFinalize => }/MetaAnalysisSummaryRow/MetaAnalaysisSummaryRow.spec.tsx (100%) rename compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/{MetaAnalysisFinalize => }/MetaAnalysisSummaryRow/MetaAnalysisSummaryRow.styles.ts (61%) rename compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/{MetaAnalysisFinalize => }/MetaAnalysisSummaryRow/MetaAnalysisSummaryRow.tsx (78%) create mode 100644 compose/neurosynth-frontend/src/hooks/requests/useGetSpecificationById.tsx create mode 100644 compose/neurosynth-frontend/src/hooks/requests/useUpdateSpecification.tsx rename compose/neurosynth-frontend/src/{components/MetaAnalysisConfigComponents => legacy/MetaAnalysis}/MetaAnalysisFinalize/MetaAnalysisFinalize.styles.ts (100%) rename compose/neurosynth-frontend/src/{components/MetaAnalysisConfigComponents => legacy/MetaAnalysis}/MetaAnalysisFinalize/MetaAnalysisFinalize.tsx (95%) diff --git a/compose/neurosynth-frontend/src/components/Dialogs/AlgorithmDialog/AlgorithmDialog.tsx b/compose/neurosynth-frontend/src/components/Dialogs/AlgorithmDialog/AlgorithmDialog.tsx index c9c8d738a..6f655b7a1 100644 --- a/compose/neurosynth-frontend/src/components/Dialogs/AlgorithmDialog/AlgorithmDialog.tsx +++ b/compose/neurosynth-frontend/src/components/Dialogs/AlgorithmDialog/AlgorithmDialog.tsx @@ -10,7 +10,6 @@ import BaseDialog, { IDialog } from '../BaseDialog'; import metaAnalysisSpec from 'assets/config/meta_analysis_params.json'; import { EAnalysisType } from 'legacy/MetaAnalysis/MetaAnalysisBuilderPage/MetaAnalysisBuilderPage'; import NeurosynthAccordion from 'components/NeurosynthAccordion/NeurosynthAccordion'; -import DynamicForm from 'components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicForm'; import { useState } from 'react'; import EditAnalysesStyles from 'components/EditStudyComponents/EditAnalyses/EditAnalyses.styles'; import { useCreateAlgorithmSpecification } from 'hooks'; @@ -21,9 +20,12 @@ import { useProjectId, useProjectName, useProjectSelectionMetadata, + useAlgorithmSpecificationId, } from 'pages/Projects/ProjectPage/ProjectStore'; import LoadingButton from 'components/Buttons/LoadingButton/LoadingButton'; import StateHandlerComponent from 'components/StateHandlerComponent/StateHandlerComponent'; +import DynamicForm from 'components/MetaAnalysisConfigComponents/DynamicForm/DynamicForm'; +import useUpdateSpecification from 'hooks/requests/useUpdateSpecification'; const metaAnalysisSpecification: IMetaAnalysisParamsSpecification = metaAnalysisSpec; @@ -70,26 +72,49 @@ const AlgorithmDialog: React.FC = (props) => { const studysetId = useProjectExtractionStudysetId(); const annotationId = useProjectExtractionAnnotationId(); const setAlgorithmSpecification = useUpdateSpecificationMetadata(); + const { mutate } = useUpdateSpecification(); + const specificationId = useAlgorithmSpecificationId(); const handleSelectAlgorithm = async () => { - const metaAnalysis = await createMetaAnalysis( - projectId, - EAnalysisType.CBMA, - algorithmSpec.estimator, - algorithmSpec.corrector, - studysetId, - annotationId, - filter?.filter?.selectionKey, - `${projectName} Meta Analysis`, - '', - algorithmSpec.estimatorArgs, - algorithmSpec.correctorArgs - ); + if (specificationId) { + // if we already have a specification + mutate({ + specificationId, + specification: { + estimator: { + type: algorithmSpec.estimator?.label, + args: algorithmSpec.estimatorArgs || {}, + }, + type: EAnalysisType.CBMA, + corrector: algorithmSpec.corrector + ? { + type: algorithmSpec.corrector.label as string, + args: algorithmSpec.correctorArgs || {}, + } + : null, + }, + }); + } else { + const metaAnalysis = await createMetaAnalysis( + projectId, + EAnalysisType.CBMA, + algorithmSpec.estimator, + algorithmSpec.corrector, + studysetId, + annotationId, + filter?.filter?.selectionKey, + `${projectName} Meta Analysis`, + '', + algorithmSpec.estimatorArgs, + algorithmSpec.correctorArgs + ); + if (!metaAnalysis.data.specification || !metaAnalysis.data.id) + throw new Error( + 'no specification Id from create meta-analysis specification found' + ); - if (!metaAnalysis.data.specification || !metaAnalysis.data.id) - throw new Error('no specification Id from create meta-analysis specification found'); - - // setAlgorithmSpecification(metaAnalysis.data.specification as string, metaAnalysis.data.id); + // setAlgorithmSpecification(metaAnalysis.data.specification as string, metaAnalysis.data.id); + } }; const getMetaAnalyticAlgorithms: IAutocompleteObject[] = Object.keys( @@ -259,7 +284,7 @@ const AlgorithmDialog: React.FC = (props) => { variant="contained" color="success" > - save and run meta-analysis + save and go to run meta-analysis diff --git a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicForm.spec.tsx b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicForm.spec.tsx similarity index 97% rename from compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicForm.spec.tsx rename to compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicForm.spec.tsx index 89b14dc32..e9073969f 100644 --- a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicForm.spec.tsx +++ b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicForm.spec.tsx @@ -1,5 +1,5 @@ import { render, screen } from '@testing-library/react'; -import { IParameter } from '../..'; +import { IParameter } from 'components/MetaAnalysisConfigComponents/index'; import DynamicForm from './DynamicForm'; jest.mock('./DynamicFormBoolInput'); diff --git a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicForm.tsx b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicForm.tsx similarity index 98% rename from compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicForm.tsx rename to compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicForm.tsx index a74db760e..1bb3100ad 100644 --- a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicForm.tsx +++ b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicForm.tsx @@ -5,7 +5,7 @@ import { IMetaAnalysisParamsSpecification, IParameter, KWARG_STRING, -} from '../..'; +} from 'components/MetaAnalysisConfigComponents/index'; import DynamicFormBoolInput from './DynamicFormBoolInput'; import DynamicFormKwargInput from './DynamicFormKwargInput'; import DynamicFormNumericInput from './DynamicFormNumericInput'; diff --git a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicFormBaseTitle.spec.tsx b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicFormBaseTitle.spec.tsx similarity index 100% rename from compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicFormBaseTitle.spec.tsx rename to compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicFormBaseTitle.spec.tsx diff --git a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicFormBaseTitle.tsx b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicFormBaseTitle.tsx similarity index 100% rename from compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicFormBaseTitle.tsx rename to compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicFormBaseTitle.tsx diff --git a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicFormBoolInput.tsx b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicFormBoolInput.tsx similarity index 93% rename from compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicFormBoolInput.tsx rename to compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicFormBoolInput.tsx index 42020a49e..28ed5cf96 100644 --- a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicFormBoolInput.tsx +++ b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicFormBoolInput.tsx @@ -1,5 +1,5 @@ import { Box, Typography, ToggleButtonGroup, ToggleButton } from '@mui/material'; -import { IDynamicFormInput } from '../..'; +import { IDynamicFormInput } from 'components/MetaAnalysisConfigComponents/index'; import DynamicFormStyles from './DynamicFormStyles'; const DynamicFormBoolInput: React.FC = (props) => { diff --git a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicFormKwargInput.spec.tsx b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicFormKwargInput.spec.tsx similarity index 100% rename from compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicFormKwargInput.spec.tsx rename to compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicFormKwargInput.spec.tsx diff --git a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicFormKwargInput.tsx b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicFormKwargInput.tsx similarity index 98% rename from compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicFormKwargInput.tsx rename to compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicFormKwargInput.tsx index 0db6fec47..9613e44a1 100644 --- a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicFormKwargInput.tsx +++ b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicFormKwargInput.tsx @@ -2,7 +2,7 @@ import { Box, Button, Divider, TableCell, TableRow, Typography, IconButton } fro import { useState } from 'react'; import { IMetadataRowModel } from 'components/EditMetadata'; import AddMetadataRow from 'components/EditMetadata/EditMetadataRow/AddMetadataRow'; -import { IDynamicFormInput } from '../..'; +import { IDynamicFormInput } from 'components/MetaAnalysisConfigComponents/index'; import DynamicFormBaseTitle from './DynamicFormBaseTitle'; import NeurosynthTable from 'components/Tables/NeurosynthTable/NeurosynthTable'; import RemoveCircle from '@mui/icons-material/RemoveCircle'; diff --git a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicFormNumericInput.spec.tsx b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicFormNumericInput.spec.tsx similarity index 100% rename from compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicFormNumericInput.spec.tsx rename to compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicFormNumericInput.spec.tsx diff --git a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicFormNumericInput.tsx b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicFormNumericInput.tsx similarity index 94% rename from compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicFormNumericInput.tsx rename to compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicFormNumericInput.tsx index ab39c4e5b..0246232f4 100644 --- a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicFormNumericInput.tsx +++ b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicFormNumericInput.tsx @@ -1,5 +1,5 @@ import { Box, TextField } from '@mui/material'; -import { IDynamicFormInput } from '../..'; +import { IDynamicFormInput } from 'components/MetaAnalysisConfigComponents/index'; import DynamicFormBaseTitle from './DynamicFormBaseTitle'; import DynamicFormStyles from './DynamicFormStyles'; diff --git a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicFormSelectInput.spec.tsx b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicFormSelectInput.spec.tsx similarity index 100% rename from compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicFormSelectInput.spec.tsx rename to compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicFormSelectInput.spec.tsx diff --git a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicFormSelectInput.tsx b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicFormSelectInput.tsx similarity index 94% rename from compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicFormSelectInput.tsx rename to compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicFormSelectInput.tsx index d70c1006c..62656207b 100644 --- a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicFormSelectInput.tsx +++ b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicFormSelectInput.tsx @@ -1,5 +1,5 @@ import { Box, MenuItem, Select } from '@mui/material'; -import { IDynamicFormInput } from '../..'; +import { IDynamicFormInput } from 'components/MetaAnalysisConfigComponents/index'; import DynamicFormBaseTitle from './DynamicFormBaseTitle'; import DynamicFormStyles from './DynamicFormStyles'; diff --git a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicFormStringInput.spec.tsx b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicFormStringInput.spec.tsx similarity index 100% rename from compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicFormStringInput.spec.tsx rename to compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicFormStringInput.spec.tsx diff --git a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicFormStringInput.tsx b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicFormStringInput.tsx similarity index 92% rename from compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicFormStringInput.tsx rename to compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicFormStringInput.tsx index 04a1fb425..07913b459 100644 --- a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicFormStringInput.tsx +++ b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicFormStringInput.tsx @@ -1,5 +1,5 @@ import { Box, TextField } from '@mui/material'; -import { IDynamicFormInput } from '../..'; +import { IDynamicFormInput } from 'components/MetaAnalysisConfigComponents/index'; import DynamicFormBaseTitle from './DynamicFormBaseTitle'; import DynamicFormStyles from './DynamicFormStyles'; diff --git a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicFormStyles.ts b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicFormStyles.ts similarity index 100% rename from compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicFormStyles.ts rename to compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicFormStyles.ts diff --git a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicformBoolInput.spec.tsx b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicformBoolInput.spec.tsx similarity index 100% rename from compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicformBoolInput.spec.tsx rename to compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/DynamicformBoolInput.spec.tsx diff --git a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/__mocks__/DynamicForm.tsx b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/__mocks__/DynamicForm.tsx similarity index 100% rename from compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/__mocks__/DynamicForm.tsx rename to compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/__mocks__/DynamicForm.tsx diff --git a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/__mocks__/DynamicFormBoolInput.tsx b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/__mocks__/DynamicFormBoolInput.tsx similarity index 100% rename from compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/__mocks__/DynamicFormBoolInput.tsx rename to compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/__mocks__/DynamicFormBoolInput.tsx diff --git a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/__mocks__/DynamicFormKwargInput.tsx b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/__mocks__/DynamicFormKwargInput.tsx similarity index 100% rename from compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/__mocks__/DynamicFormKwargInput.tsx rename to compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/__mocks__/DynamicFormKwargInput.tsx diff --git a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/__mocks__/DynamicFormNumericInput.tsx b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/__mocks__/DynamicFormNumericInput.tsx similarity index 100% rename from compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/__mocks__/DynamicFormNumericInput.tsx rename to compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/__mocks__/DynamicFormNumericInput.tsx diff --git a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/__mocks__/DynamicFormSelectInput.tsx b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/__mocks__/DynamicFormSelectInput.tsx similarity index 100% rename from compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/__mocks__/DynamicFormSelectInput.tsx rename to compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/__mocks__/DynamicFormSelectInput.tsx diff --git a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/__mocks__/DynamicFormStringInput.tsx b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/__mocks__/DynamicFormStringInput.tsx similarity index 100% rename from compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/__mocks__/DynamicFormStringInput.tsx rename to compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicForm/__mocks__/DynamicFormStringInput.tsx diff --git a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisFinalize/DynamicInputDisplay/DynamicInputDisplay.spec.tsx b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicInputDisplay/DynamicInputDisplay.spec.tsx similarity index 97% rename from compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisFinalize/DynamicInputDisplay/DynamicInputDisplay.spec.tsx rename to compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicInputDisplay/DynamicInputDisplay.spec.tsx index 26247d2e1..629b1e294 100644 --- a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisFinalize/DynamicInputDisplay/DynamicInputDisplay.spec.tsx +++ b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicInputDisplay/DynamicInputDisplay.spec.tsx @@ -1,5 +1,5 @@ import { render, screen } from '@testing-library/react'; -import { KWARG_STRING } from '../..'; +import { KWARG_STRING } from '..'; import DynamicInputDisplay from './DynamicInputDisplay'; describe('DynamicInputDisplay Component', () => { diff --git a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisFinalize/DynamicInputDisplay/DynamicInputDisplay.styles.ts b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicInputDisplay/DynamicInputDisplay.styles.ts similarity index 92% rename from compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisFinalize/DynamicInputDisplay/DynamicInputDisplay.styles.ts rename to compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicInputDisplay/DynamicInputDisplay.styles.ts index c55a76d8c..043512aa6 100644 --- a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisFinalize/DynamicInputDisplay/DynamicInputDisplay.styles.ts +++ b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicInputDisplay/DynamicInputDisplay.styles.ts @@ -1,4 +1,4 @@ -import { Style } from '../../../..'; +import { Style } from '../../..'; const DynamicInputDisplayStyles: Style = { dynamicInputSection: { diff --git a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisFinalize/DynamicInputDisplay/DynamicInputDisplay.tsx b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicInputDisplay/DynamicInputDisplay.tsx similarity index 97% rename from compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisFinalize/DynamicInputDisplay/DynamicInputDisplay.tsx rename to compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicInputDisplay/DynamicInputDisplay.tsx index ba5ff25f8..9573c4197 100644 --- a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisFinalize/DynamicInputDisplay/DynamicInputDisplay.tsx +++ b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/DynamicInputDisplay/DynamicInputDisplay.tsx @@ -1,5 +1,5 @@ import { Box, Typography } from '@mui/material'; -import { IDynamicValueType, KWARG_STRING } from '../..'; +import { IDynamicValueType, KWARG_STRING } from '..'; import DynamicInputDisplayStyles from './DynamicInputDisplay.styles'; const DynamicInputDisplay: React.FC<{ dynamicArg: IDynamicValueType }> = (props) => { diff --git a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisFinalize/MetaAnalysisSummaryRow/MetaAnalaysisSummaryRow.spec.tsx b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisSummaryRow/MetaAnalaysisSummaryRow.spec.tsx similarity index 100% rename from compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisFinalize/MetaAnalysisSummaryRow/MetaAnalaysisSummaryRow.spec.tsx rename to compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisSummaryRow/MetaAnalaysisSummaryRow.spec.tsx diff --git a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisFinalize/MetaAnalysisSummaryRow/MetaAnalysisSummaryRow.styles.ts b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisSummaryRow/MetaAnalysisSummaryRow.styles.ts similarity index 61% rename from compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisFinalize/MetaAnalysisSummaryRow/MetaAnalysisSummaryRow.styles.ts rename to compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisSummaryRow/MetaAnalysisSummaryRow.styles.ts index 1de8b45e8..223b336f7 100644 --- a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisFinalize/MetaAnalysisSummaryRow/MetaAnalysisSummaryRow.styles.ts +++ b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisSummaryRow/MetaAnalysisSummaryRow.styles.ts @@ -1,11 +1,11 @@ -import { Style } from '../../../..'; +import { Style } from '../../..'; const MetaAnalysisSummaryRowStyles: Style = { - titleColWidth: { - width: '350px', + colWidth: { + width: '45%', }, dynamicInput: { - marginLeft: '350px', + marginLeft: '55%', }, divider: { margin: '1rem 0', diff --git a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisFinalize/MetaAnalysisSummaryRow/MetaAnalysisSummaryRow.tsx b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisSummaryRow/MetaAnalysisSummaryRow.tsx similarity index 78% rename from compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisFinalize/MetaAnalysisSummaryRow/MetaAnalysisSummaryRow.tsx rename to compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisSummaryRow/MetaAnalysisSummaryRow.tsx index 683247c46..4ec9007f2 100644 --- a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisFinalize/MetaAnalysisSummaryRow/MetaAnalysisSummaryRow.tsx +++ b/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisSummaryRow/MetaAnalysisSummaryRow.tsx @@ -9,14 +9,14 @@ interface IMetaAnalysisSummaryRow { const MetaAnalysisSummaryRow: React.FC = (props) => { return ( - - - + + + {props.title} - + {props.value} {props.caption || ''} diff --git a/compose/neurosynth-frontend/src/components/ProjectStepComponents/AlgorithmStep/AlgorithmStep.tsx b/compose/neurosynth-frontend/src/components/ProjectStepComponents/AlgorithmStep/AlgorithmStep.tsx index 1f1dfb26a..0e58bc8ae 100644 --- a/compose/neurosynth-frontend/src/components/ProjectStepComponents/AlgorithmStep/AlgorithmStep.tsx +++ b/compose/neurosynth-frontend/src/components/ProjectStepComponents/AlgorithmStep/AlgorithmStep.tsx @@ -19,6 +19,12 @@ import { useHistory, useParams } from 'react-router-dom'; import ProjectStepComponentsStyles from '../ProjectStepComponents.styles'; import { useState } from 'react'; import AlgorithmDialog from 'components/Dialogs/AlgorithmDialog/AlgorithmDialog'; +import { useAlgorithmSpecificationId } from 'pages/Projects/ProjectPage/ProjectStore'; +import useGetSpecification from 'hooks/requests/useGetSpecificationById'; +import StateHandlerComponent from 'components/StateHandlerComponent/StateHandlerComponent'; +import MetaAnalysisSummaryRow from 'components/MetaAnalysisConfigComponents/MetaAnalysisSummaryRow/MetaAnalysisSummaryRow'; +import DynamicInputDisplay from 'components/MetaAnalysisConfigComponents/DynamicInputDisplay/DynamicInputDisplay'; +import { IDynamicValueType } from 'components/MetaAnalysisConfigComponents'; interface IAlgorithmStep { algorithmStepHasBeenInitialized: boolean; @@ -27,9 +33,15 @@ interface IAlgorithmStep { const AlgorithmStep: React.FC = (props) => { const { projectId }: { projectId: string } = useParams(); + const { algorithmStepHasBeenInitialized, disabled, ...stepProps } = props; + const specificationId = useAlgorithmSpecificationId(); + const { + data: specification, + isLoading: getSpecificationIsLoading, + isError: getSpecificationIsError, + } = useGetSpecification(specificationId); const history = useHistory(); const [algorithmDialogIsOpen, setAlgorithmDialogIsOpen] = useState(false); - const { algorithmStepHasBeenInitialized, disabled, ...stepProps } = props; return ( @@ -59,117 +71,68 @@ const AlgorithmStep: React.FC = (props) => { {algorithmStepHasBeenInitialized ? ( - - - - - 433 studies - - - - - Study Curation Summary - - - - - - 30 included - - - - - + + + - - - 31 uncategorized + + Specification + + + + + + + - - - - + + - + continue editing + + + ) : ( diff --git a/compose/neurosynth-frontend/src/components/ProjectStepComponents/ExtractionStep/ExtractionStep.tsx b/compose/neurosynth-frontend/src/components/ProjectStepComponents/ExtractionStep/ExtractionStep.tsx index 8a3691336..566753abe 100644 --- a/compose/neurosynth-frontend/src/components/ProjectStepComponents/ExtractionStep/ExtractionStep.tsx +++ b/compose/neurosynth-frontend/src/components/ProjectStepComponents/ExtractionStep/ExtractionStep.tsx @@ -89,26 +89,33 @@ const ExtractionStep: React.FC = (props) => { isOpen={moveToExtractionDialogIsOpen} onCloseDialog={() => setMoveToExtractionDialogIsOpen(false)} /> - - - - - You have completed your study curation, and now have a potential - list of studies to include in your meta-analysis - - - - In this step, add necessary study data to the studies in your studyset - (like coordinates and metadata) as well as analysis annotations that - will be used to help filter analyses within your studies - - - {extractionStepHasBeenInitialized ? ( - - + + + + You have completed your study curation, and now have a potential list of + studies to include in your meta-analysis + + + + In this step, add necessary study data to the studies in your studyset (like + coordinates and metadata) as well as analysis annotations that will be used + to help filter analyses within your studies + + + {extractionStepHasBeenInitialized ? ( + + + @@ -210,28 +217,28 @@ const ExtractionStep: React.FC = (props) => { Mark all as complete - - - ) : ( - + + + ) : ( + + - - )} - + extraction: get started + + + )} - + ); diff --git a/compose/neurosynth-frontend/src/components/ProjectStepComponents/SelectionStep/SelectionStep.tsx b/compose/neurosynth-frontend/src/components/ProjectStepComponents/SelectionStep/SelectionStep.tsx index c9ed8167f..1baded7e6 100644 --- a/compose/neurosynth-frontend/src/components/ProjectStepComponents/SelectionStep/SelectionStep.tsx +++ b/compose/neurosynth-frontend/src/components/ProjectStepComponents/SelectionStep/SelectionStep.tsx @@ -9,6 +9,7 @@ import { CardContent, CardActions, Button, + Chip, } from '@mui/material'; import { useState } from 'react'; import SelectionDialog, { @@ -72,23 +73,23 @@ const SelectionStep: React.FC = (props) => { Selection Filter: - - {filter.selectionKey || ''} - + { + return useQuery( + ['specifications', specificationId], + () => + API.NeurosynthServices.SpecificationsService.specificationsIdGet(specificationId || ''), + { + select: (res) => { + return res.data; + }, + enabled: !!specificationId, + } + ); +}; + +export default useGetSpecification; diff --git a/compose/neurosynth-frontend/src/hooks/requests/useGetStudyById.tsx b/compose/neurosynth-frontend/src/hooks/requests/useGetStudyById.tsx index 0f5b7b8cf..c406ce482 100644 --- a/compose/neurosynth-frontend/src/hooks/requests/useGetStudyById.tsx +++ b/compose/neurosynth-frontend/src/hooks/requests/useGetStudyById.tsx @@ -21,7 +21,6 @@ const useGetStudyById = (studyId: string) => { res.data.analyses = sortedAnalyses; return res.data; }, - staleTime: Infinity, } ); }; diff --git a/compose/neurosynth-frontend/src/hooks/requests/useUpdateSpecification.tsx b/compose/neurosynth-frontend/src/hooks/requests/useUpdateSpecification.tsx new file mode 100644 index 000000000..0f692f1a4 --- /dev/null +++ b/compose/neurosynth-frontend/src/hooks/requests/useUpdateSpecification.tsx @@ -0,0 +1,39 @@ +import { AxiosError, AxiosResponse } from 'axios'; +import { useSnackbar } from 'notistack'; +import { useMutation, useQueryClient } from 'react-query'; +import { StudyRequest, StudyReturn } from 'neurostore-typescript-sdk'; +import API from 'utils/api'; +import { SpecificationPostBody, SpecificationReturn } from 'neurosynth-compose-typescript-sdk'; + +const useUpdateSpecification = () => { + const { enqueueSnackbar } = useSnackbar(); + const queryClient = useQueryClient(); + return useMutation< + AxiosResponse, + AxiosError, + { + specificationId: string; + specification: SpecificationPostBody; + }, + unknown + >( + (args) => + API.NeurosynthServices.SpecificationsService.specificationsIdPut( + args.specificationId, + args.specification + ), + { + onSuccess: () => { + queryClient.invalidateQueries('specifications'); + enqueueSnackbar('specification updated successfully', { variant: 'success' }); + }, + onError: () => { + enqueueSnackbar('there was an error updating the specification', { + variant: 'error', + }); + }, + } + ); +}; + +export default useUpdateSpecification; diff --git a/compose/neurosynth-frontend/src/legacy/MetaAnalysis/MetaAnalysisAlgorithm.tsx b/compose/neurosynth-frontend/src/legacy/MetaAnalysis/MetaAnalysisAlgorithm.tsx index 60196977e..9ab78048a 100644 --- a/compose/neurosynth-frontend/src/legacy/MetaAnalysis/MetaAnalysisAlgorithm.tsx +++ b/compose/neurosynth-frontend/src/legacy/MetaAnalysis/MetaAnalysisAlgorithm.tsx @@ -1,7 +1,7 @@ import { Box, Divider, Typography } from '@mui/material'; import NavigationButtons from 'components/Buttons/NavigationButtons/NavigationButtons'; import { IMetaAnalysisParamsSpecification } from 'components/MetaAnalysisConfigComponents'; -import DynamicForm from 'components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicForm'; +// import DynamicForm from 'components/MetaAnalysisConfigComponents/MetaAnalysisAlgorithm/DynamicForm/DynamicForm'; import NeurosynthAccordion from 'components/NeurosynthAccordion/NeurosynthAccordion'; import { IAutocompleteObject } from 'components/NeurosynthAutocomplete/NeurosynthAutocomplete'; diff --git a/compose/neurosynth-frontend/src/legacy/MetaAnalysis/MetaAnalysisBuilderPage/MetaAnalysisBuilderPage.tsx b/compose/neurosynth-frontend/src/legacy/MetaAnalysis/MetaAnalysisBuilderPage/MetaAnalysisBuilderPage.tsx index b6c0faf93..aec03edfd 100644 --- a/compose/neurosynth-frontend/src/legacy/MetaAnalysis/MetaAnalysisBuilderPage/MetaAnalysisBuilderPage.tsx +++ b/compose/neurosynth-frontend/src/legacy/MetaAnalysis/MetaAnalysisBuilderPage/MetaAnalysisBuilderPage.tsx @@ -1,7 +1,7 @@ import { Box, IconButton, Step, StepLabel, Stepper } from '@mui/material'; import { useEffect, useState } from 'react'; import { IDynamicValueType } from 'components/MetaAnalysisConfigComponents'; -import MetaAnalysisFinalize from 'components/MetaAnalysisConfigComponents/MetaAnalysisFinalize/MetaAnalysisFinalize'; +import MetaAnalysisFinalize from 'legacy/MetaAnalysis/MetaAnalysisFinalize/MetaAnalysisFinalize'; import { ENavigationButton } from 'components/Buttons/NavigationButtons/NavigationButtons'; import { IAutocompleteObject } from 'components/NeurosynthAutocomplete/NeurosynthAutocomplete'; import BackButton from 'components/Buttons/BackButton/BackButton'; diff --git a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisFinalize/MetaAnalysisFinalize.styles.ts b/compose/neurosynth-frontend/src/legacy/MetaAnalysis/MetaAnalysisFinalize/MetaAnalysisFinalize.styles.ts similarity index 100% rename from compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisFinalize/MetaAnalysisFinalize.styles.ts rename to compose/neurosynth-frontend/src/legacy/MetaAnalysis/MetaAnalysisFinalize/MetaAnalysisFinalize.styles.ts diff --git a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisFinalize/MetaAnalysisFinalize.tsx b/compose/neurosynth-frontend/src/legacy/MetaAnalysis/MetaAnalysisFinalize/MetaAnalysisFinalize.tsx similarity index 95% rename from compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisFinalize/MetaAnalysisFinalize.tsx rename to compose/neurosynth-frontend/src/legacy/MetaAnalysis/MetaAnalysisFinalize/MetaAnalysisFinalize.tsx index 638e6735e..07eaf47e0 100644 --- a/compose/neurosynth-frontend/src/components/MetaAnalysisConfigComponents/MetaAnalysisFinalize/MetaAnalysisFinalize.tsx +++ b/compose/neurosynth-frontend/src/legacy/MetaAnalysis/MetaAnalysisFinalize/MetaAnalysisFinalize.tsx @@ -2,8 +2,8 @@ import { Box, Typography, Paper, Button } from '@mui/material'; import LoadingButton from 'components/Buttons/LoadingButton/LoadingButton'; import { EAnalysisType } from 'legacy/MetaAnalysis/MetaAnalysisBuilderPage/MetaAnalysisBuilderPage'; import { ENavigationButton } from 'components/Buttons/NavigationButtons/NavigationButtons'; -import DynamicInputDisplay from './DynamicInputDisplay/DynamicInputDisplay'; -import MetaAnalysisSummaryRow from './MetaAnalysisSummaryRow/MetaAnalysisSummaryRow'; +import DynamicInputDisplay from '../../../components/MetaAnalysisConfigComponents/DynamicInputDisplay/DynamicInputDisplay'; +import MetaAnalysisSummaryRow from '../../../components/MetaAnalysisConfigComponents/MetaAnalysisSummaryRow/MetaAnalysisSummaryRow'; import MetaAnalysisFinalizeStyles from './MetaAnalysisFinalize.styles'; import React from 'react'; import { useHistory } from 'react-router-dom'; diff --git a/compose/neurosynth-frontend/src/pages/MetaAnalyses/MetaAnalysisPage/MetaAnalysisPage.tsx b/compose/neurosynth-frontend/src/pages/MetaAnalyses/MetaAnalysisPage/MetaAnalysisPage.tsx index 5f556a2cc..2e36bfca6 100644 --- a/compose/neurosynth-frontend/src/pages/MetaAnalyses/MetaAnalysisPage/MetaAnalysisPage.tsx +++ b/compose/neurosynth-frontend/src/pages/MetaAnalyses/MetaAnalysisPage/MetaAnalysisPage.tsx @@ -17,10 +17,10 @@ import MetaAnalysisPageStyles from './MetaAnalysisPage.styles'; import Help from '@mui/icons-material/Help'; import useGetTour from 'hooks/useGetTour'; import { useAuth0 } from '@auth0/auth0-react'; -import MetaAnalysisSummaryRow from 'components/MetaAnalysisConfigComponents/MetaAnalysisFinalize/MetaAnalysisSummaryRow/MetaAnalysisSummaryRow'; -import { getAnalysisTypeDescription } from 'components/MetaAnalysisConfigComponents/MetaAnalysisFinalize/MetaAnalysisFinalize'; +import MetaAnalysisSummaryRow from 'components/MetaAnalysisConfigComponents/MetaAnalysisSummaryRow/MetaAnalysisSummaryRow'; +import { getAnalysisTypeDescription } from 'legacy/MetaAnalysis/MetaAnalysisFinalize/MetaAnalysisFinalize'; import NeurosynthAccordion from 'components/NeurosynthAccordion/NeurosynthAccordion'; -import DynamicInputDisplay from 'components/MetaAnalysisConfigComponents/MetaAnalysisFinalize/DynamicInputDisplay/DynamicInputDisplay'; +import DynamicInputDisplay from 'components/MetaAnalysisConfigComponents/DynamicInputDisplay/DynamicInputDisplay'; import { IDynamicValueType } from 'components/MetaAnalysisConfigComponents'; import { NeurostoreAnnotation } from 'utils/api'; diff --git a/compose/neurosynth-frontend/src/pages/Projects/ProjectPage/ProjectPage.tsx b/compose/neurosynth-frontend/src/pages/Projects/ProjectPage/ProjectPage.tsx index f99ff2df6..927811db9 100644 --- a/compose/neurosynth-frontend/src/pages/Projects/ProjectPage/ProjectPage.tsx +++ b/compose/neurosynth-frontend/src/pages/Projects/ProjectPage/ProjectPage.tsx @@ -96,95 +96,101 @@ const ProjectPage: React.FC = (props) => { return ( - - - - - - - updateProjectName(updatedName)} - sx={{ input: { fontSize: '2rem' }, width: '50%' }} - textToEdit={projectName || ''} - > - + + + + + + + updateProjectName(updatedName)} + sx={{ input: { fontSize: '2rem' }, width: '50%' }} + textToEdit={projectName || ''} > - {projectName || 'No name'} - - - - updateProjectDescription(updatedDescription) - } - sx={{ input: { fontSize: '1.25rem' }, width: '50%' }} - textToEdit={projectDescription || ''} - > - + {projectName || 'No name'} + + + + updateProjectDescription(updatedDescription) + } + sx={{ input: { fontSize: '1.25rem' }, width: '50%' }} + textToEdit={projectDescription || ''} > - {projectDescription || 'No description'} - - - - - - setTab(0)} color="primary" value={0}> - Build Meta-Analysis - - + {projectDescription || 'No description'} + + + + + - View Meta-Analysis - - - - {tab === 0 && ( - - - - - - - )} - {tab === 1 &&
view meta-analysis
} - {/* */} + ); };