feat: update algorithm step

neurostuff · Apr 25, 2023 · 4fbcc7c · 4fbcc7c
1 parent 8288107
commit 4fbcc7c
Show file tree

Hide file tree

Showing 40 changed files with 345 additions and 286 deletions.
diff --git 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<IDialog> = (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<IDialog> = (props) => {
                         variant="contained"
                         color="success"
                     >
-                        save and run meta-analysis
+                        save and go to run meta-analysis
                     </Button>
                 </Box>
             </StateHandlerComponent>

diff --git a/...lgorithm/DynamicForm/DynamicForm.spec.tsx → ...mponents/DynamicForm/DynamicForm.spec.tsx b/...lgorithm/DynamicForm/DynamicForm.spec.tsx → ...mponents/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/...ysisAlgorithm/DynamicForm/DynamicForm.tsx → ...figComponents/DynamicForm/DynamicForm.tsx b/...ysisAlgorithm/DynamicForm/DynamicForm.tsx → ...figComponents/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/...DynamicForm/DynamicFormBaseTitle.spec.tsx → ...DynamicForm/DynamicFormBaseTitle.spec.tsx b/...DynamicForm/DynamicFormBaseTitle.spec.tsx → ...DynamicForm/DynamicFormBaseTitle.spec.tsx
diff --git a/...ithm/DynamicForm/DynamicFormBaseTitle.tsx → ...ents/DynamicForm/DynamicFormBaseTitle.tsx b/...ithm/DynamicForm/DynamicFormBaseTitle.tsx → ...ents/DynamicForm/DynamicFormBaseTitle.tsx
diff --git a/...ithm/DynamicForm/DynamicFormBoolInput.tsx → ...ents/DynamicForm/DynamicFormBoolInput.tsx b/...ithm/DynamicForm/DynamicFormBoolInput.tsx → ...ents/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<IDynamicFormInput> = (props) => {

diff --git a/...ynamicForm/DynamicFormKwargInput.spec.tsx → ...ynamicForm/DynamicFormKwargInput.spec.tsx b/...ynamicForm/DynamicFormKwargInput.spec.tsx → ...ynamicForm/DynamicFormKwargInput.spec.tsx
diff --git a/...thm/DynamicForm/DynamicFormKwargInput.tsx → ...nts/DynamicForm/DynamicFormKwargInput.tsx b/...thm/DynamicForm/DynamicFormKwargInput.tsx → ...nts/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/...amicForm/DynamicFormNumericInput.spec.tsx → ...amicForm/DynamicFormNumericInput.spec.tsx b/...amicForm/DynamicFormNumericInput.spec.tsx → ...amicForm/DynamicFormNumericInput.spec.tsx
diff --git a/...m/DynamicForm/DynamicFormNumericInput.tsx → ...s/DynamicForm/DynamicFormNumericInput.tsx b/...m/DynamicForm/DynamicFormNumericInput.tsx → ...s/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/...namicForm/DynamicFormSelectInput.spec.tsx → ...namicForm/DynamicFormSelectInput.spec.tsx b/...namicForm/DynamicFormSelectInput.spec.tsx → ...namicForm/DynamicFormSelectInput.spec.tsx
diff --git a/...hm/DynamicForm/DynamicFormSelectInput.tsx → ...ts/DynamicForm/DynamicFormSelectInput.tsx b/...hm/DynamicForm/DynamicFormSelectInput.tsx → ...ts/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/...namicForm/DynamicFormStringInput.spec.tsx → ...namicForm/DynamicFormStringInput.spec.tsx b/...namicForm/DynamicFormStringInput.spec.tsx → ...namicForm/DynamicFormStringInput.spec.tsx
diff --git a/...hm/DynamicForm/DynamicFormStringInput.tsx → ...ts/DynamicForm/DynamicFormStringInput.tsx b/...hm/DynamicForm/DynamicFormStringInput.tsx → ...ts/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/...lgorithm/DynamicForm/DynamicFormStyles.ts → ...mponents/DynamicForm/DynamicFormStyles.ts b/...lgorithm/DynamicForm/DynamicFormStyles.ts → ...mponents/DynamicForm/DynamicFormStyles.ts
diff --git a/...DynamicForm/DynamicformBoolInput.spec.tsx → ...DynamicForm/DynamicformBoolInput.spec.tsx b/...DynamicForm/DynamicformBoolInput.spec.tsx → ...DynamicForm/DynamicformBoolInput.spec.tsx
diff --git a/...thm/DynamicForm/__mocks__/DynamicForm.tsx → ...nts/DynamicForm/__mocks__/DynamicForm.tsx b/...thm/DynamicForm/__mocks__/DynamicForm.tsx → ...nts/DynamicForm/__mocks__/DynamicForm.tsx
diff --git a/...icForm/__mocks__/DynamicFormBoolInput.tsx → ...icForm/__mocks__/DynamicFormBoolInput.tsx b/...icForm/__mocks__/DynamicFormBoolInput.tsx → ...icForm/__mocks__/DynamicFormBoolInput.tsx
diff --git a/...cForm/__mocks__/DynamicFormKwargInput.tsx → ...cForm/__mocks__/DynamicFormKwargInput.tsx b/...cForm/__mocks__/DynamicFormKwargInput.tsx → ...cForm/__mocks__/DynamicFormKwargInput.tsx
diff --git a/...orm/__mocks__/DynamicFormNumericInput.tsx → ...orm/__mocks__/DynamicFormNumericInput.tsx b/...orm/__mocks__/DynamicFormNumericInput.tsx → ...orm/__mocks__/DynamicFormNumericInput.tsx
diff --git a/...Form/__mocks__/DynamicFormSelectInput.tsx → ...Form/__mocks__/DynamicFormSelectInput.tsx b/...Form/__mocks__/DynamicFormSelectInput.tsx → ...Form/__mocks__/DynamicFormSelectInput.tsx
diff --git a/...Form/__mocks__/DynamicFormStringInput.tsx → ...Form/__mocks__/DynamicFormStringInput.tsx b/...Form/__mocks__/DynamicFormStringInput.tsx → ...Form/__mocks__/DynamicFormStringInput.tsx
diff --git a/...InputDisplay/DynamicInputDisplay.spec.tsx → ...InputDisplay/DynamicInputDisplay.spec.tsx b/...InputDisplay/DynamicInputDisplay.spec.tsx → ...InputDisplay/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/...nputDisplay/DynamicInputDisplay.styles.ts → ...nputDisplay/DynamicInputDisplay.styles.ts b/...nputDisplay/DynamicInputDisplay.styles.ts → ...nputDisplay/DynamicInputDisplay.styles.ts
@@ -1,4 +1,4 @@
-import { Style } from '../../../..';
+import { Style } from '../../..';
 
 const DynamicInputDisplayStyles: Style = {
     dynamicInputSection: {

diff --git a/...namicInputDisplay/DynamicInputDisplay.tsx → ...namicInputDisplay/DynamicInputDisplay.tsx b/...namicInputDisplay/DynamicInputDisplay.tsx → ...namicInputDisplay/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/...mmaryRow/MetaAnalaysisSummaryRow.spec.tsx → ...mmaryRow/MetaAnalaysisSummaryRow.spec.tsx b/...mmaryRow/MetaAnalaysisSummaryRow.spec.tsx → ...mmaryRow/MetaAnalaysisSummaryRow.spec.tsx
diff --git a/...mmaryRow/MetaAnalysisSummaryRow.styles.ts → ...mmaryRow/MetaAnalysisSummaryRow.styles.ts b/...mmaryRow/MetaAnalysisSummaryRow.styles.ts → ...mmaryRow/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/...ysisSummaryRow/MetaAnalysisSummaryRow.tsx → ...ysisSummaryRow/MetaAnalysisSummaryRow.tsx b/...ysisSummaryRow/MetaAnalysisSummaryRow.tsx → ...ysisSummaryRow/MetaAnalysisSummaryRow.tsx
@@ -9,14 +9,14 @@ interface IMetaAnalysisSummaryRow {
 
 const MetaAnalysisSummaryRow: React.FC<IMetaAnalysisSummaryRow> = (props) => {
     return (
-        <Box sx={{ marginBottom: '1.5rem' }}>
-            <Box sx={{ display: 'flex' }}>
-                <Box sx={MetaAnalysisSummaryRowStyles.titleColWidth}>
+        <Box sx={{ marginBottom: '1.5rem', width: '100%' }}>
+            <Box sx={{ display: 'flex', justifyContent: 'space-between' }}>
+                <Box sx={MetaAnalysisSummaryRowStyles.colWidth}>
                     <Typography sx={{ color: 'primary.main' }} variant="h6">
                         {props.title}
                     </Typography>
                 </Box>
-                <Box>
+                <Box sx={MetaAnalysisSummaryRowStyles.colWidth}>
                     <Typography variant="h6">{props.value}</Typography>
                     <Typography variant="body1" sx={{ color: 'gray' }}>
                         {props.caption || ''}