feat: merged in master

Author: nicoalee

compose/neurosynth-frontend/cypress/e2e/workflows/MetaAnalyses/CreateSpecificationDialog.cy.tsx

@@ -14,6 +14,9 @@ describe('CreateSpecificationDialog', () => {
             fixture: 'projects/projectCanCreateSpecification',
         }).as('projectFixture');
         cy.intercept('GET', `**/api/studysets/*`, { fixture: 'studyset' }).as('studysetFixture');
+        cy.intercept('GET', '**/api/annotations/*', { fixture: 'annotation' }).as(
+            'annotationFixture'
+        );
     });
 
     it('should show the dialog', () => {
@@ -23,5 +26,51 @@ describe('CreateSpecificationDialog', () => {
         cy.contains('button', 'Meta-Analyses').click();
         cy.contains('button', 'Meta-Analysis Specification').click();
         cy.get('.MuiDialog-container').should('be.visible');
+        cy.contains('button', 'Back').should('be.disabled');
+    });
+
+    it('should set the default specification values', () => {
+        cy.login('mocked', { sub: 'github|26612023' })
+            .visit('/projects/abc123')
+            .wait('@projectFixture');
+        cy.contains('button', 'Meta-Analyses').click();
+        cy.contains('button', 'Meta-Analysis Specification').click();
+        cy.get('.MuiDialog-container').should('be.visible');
+        cy.contains('MKDADensity').should('exist');
+        cy.contains('FDRCorrector').should('exist');
+    });
+
+    it.only('should step through the wizard', () => {
+        cy.intercept('POST', '**/api/specifications', {
+            id: 'mockedSpecificationId',
+        }).as('createSpecificationFixture');
+        cy.intercept('POST', '**/api/studysets', {
+            id: 'mockedStudySetId',
+        });
+        cy.intercept('POST', '**/api/annotations', {
+            id: 'mockedAnnotationId',
+        });
+        cy.intercept('POST', '**/api/meta-analyses', {
+            id: 'mockedMetaAnalysisId',
+            specification: {},
+        });
+        cy.intercept('GET', '**/api/specifications/*', {
+            fixture: 'specification',
+        });
+
+        cy.intercept('GET', '**/api/meta-analyses/mockedMetaAnalysisId*', {
+            fixture: 'metaAnalysis',
+        }).as('metaAnalysesFixture');
+
+        cy.login('mocked', { sub: 'github|26612023' })
+            .visit('/projects/abc123')
+            .wait('@projectFixture');
+        cy.contains('button', 'Meta-Analyses').click();
+        cy.contains('button', 'Meta-Analysis Specification').click();
+        cy.contains('Next').click();
+        cy.contains('included').should('exist');
+        cy.contains('button', 'Next').click();
+        cy.contains('button', 'Next').click();
+        cy.contains('button', 'Create Meta-Analysis Specification').click();
     });
 });

compose/neurosynth-frontend/package-lock.json

@@ -36,11 +36,12 @@ const CreateMetaAnalysisSpecificationAlgorithmStep: React.FC<{
                 algorithm={algorithmSpec}
                 onSelectSpecification={(update) => setAlgorithmSpec(update)}
             />
-            <Box sx={{ width: '100$%', marginTop: '1rem' }}>
+            <Box sx={{ marginTop: '1rem' }}>
                 <NavigationButtons
                     nextButtonDisabled={!algorithmSpec.estimator}
                     nextButtonStyle="contained"
                     onButtonClick={handleNavigate}
+                    prevButtonDisabled
                 />
             </Box>
         </Box>

compose/neurosynth-frontend/src/pages/MetaAnalysis/components/CreateMetaAnalysisSpecificationAlgorithmStep.tsx

@@ -16,8 +16,8 @@ import CreateMetaAnalysisSpecificationReview from 'pages/MetaAnalysis/components
 import CreateMetaAnalysisSpecificationSelectionStep from 'pages/MetaAnalysis/components/CreateMetaAnalysisSpecificationSelectionStep';
 import {
     getDefaultValuesForTypeAndParameter,
-    correctorOpt,
-    algorithmOpt,
+    correctorDefaultOption,
+    algorithmDefaultOption,
 } from './CreateMetaAnalysisSpecificationDialogConstants';
 
 const CreateMetaAnalysisSpecificationDialogBase: React.FC<IDialog> = (props) => {
@@ -35,10 +35,16 @@ const CreateMetaAnalysisSpecificationDialogBase: React.FC<IDialog> = (props) =>
         referenceDataset: undefined,
     });
     const [algorithm, setAlgorithm] = useState<IAlgorithmSelection>({
-        estimator: algorithmOpt,
-        estimatorArgs: getDefaultValuesForTypeAndParameter(EAnalysisType.CBMA, algorithmOpt?.label),
-        corrector: correctorOpt,
-        correctorArgs: getDefaultValuesForTypeAndParameter('CORRECTOR', correctorOpt?.label),
+        estimator: algorithmDefaultOption,
+        estimatorArgs: getDefaultValuesForTypeAndParameter(
+            EAnalysisType.CBMA,
+            algorithmDefaultOption?.label
+        ),
+        corrector: correctorDefaultOption,
+        correctorArgs: getDefaultValuesForTypeAndParameter(
+            'CORRECTOR',
+            correctorDefaultOption?.label
+        ),
     });
 
     useEffect(() => {
@@ -52,13 +58,16 @@ const CreateMetaAnalysisSpecificationDialogBase: React.FC<IDialog> = (props) =>
         props.onCloseDialog();
         setActiveStep(0);
         setAlgorithm({
-            estimator: algorithmOpt,
+            estimator: algorithmDefaultOption,
             estimatorArgs: getDefaultValuesForTypeAndParameter(
                 EAnalysisType.CBMA,
-                algorithmOpt?.label
+                algorithmDefaultOption?.label
+            ),
+            corrector: correctorDefaultOption,
+            correctorArgs: getDefaultValuesForTypeAndParameter(
+                'CORRECTOR',
+                correctorDefaultOption?.label
             ),
-            corrector: correctorOpt,
-            correctorArgs: getDefaultValuesForTypeAndParameter('CORRECTOR', correctorOpt?.label),
         });
         setSelection({
             selectionKey: undefined,
@@ -71,10 +80,10 @@ const CreateMetaAnalysisSpecificationDialogBase: React.FC<IDialog> = (props) =>
     const handleNavigate = (button: ENavigationButton) => {
         setActiveStep((prev) => {
             if (button === ENavigationButton.NEXT) {
-                if (activeStep < 3) return prev + 1;
+                if (prev < 3) return prev + 1;
                 return prev;
             } else {
-                if (activeStep > 0) return prev - 1;
+                if (prev > 0) return prev - 1;
                 return prev;
             }
         });

compose/neurosynth-frontend/src/pages/MetaAnalysis/components/CreateMetaAnalysisSpecificationDialogBase.tsx

@@ -63,15 +63,16 @@ const correctorOptions: IAutocompleteObject[] = Object.keys(
     description: metaAnalysisSpecification.CORRECTOR[corrector]?.summary,
 }));
 
-const correctorOpt =
+const correctorDefaultOption =
     correctorOptions.find((corrector) => corrector.label === 'FDRCorrector') || null;
-const algorithmOpt = metaAnalyticAlgorithms.find((algo) => algo.label === 'MKDADensity') || null;
+const algorithmDefaultOption =
+    metaAnalyticAlgorithms.find((algo) => algo.label === 'MKDADensity') || null;
 
 export {
     getDefaultValuesForTypeAndParameter,
     metaAnalysisSpecification,
     metaAnalyticAlgorithms,
     correctorOptions,
-    correctorOpt,
-    algorithmOpt,
+    correctorDefaultOption,
+    algorithmDefaultOption,
 };

compose/neurosynth-frontend/src/pages/MetaAnalysis/components/CreateMetaAnalysisSpecificationDialogConstants.ts

@@ -118,7 +118,7 @@ describe('CreateMetaAnalysisSpecificationSelectionStep', () => {
                 />
             );
 
-            const backButton = screen.getByRole('button', { name: 'back' });
+            const backButton = screen.getByRole('button', { name: 'Back' });
             userEvent.click(backButton);
 
             expect(mockOnNavigate).toHaveBeenCalledWith(ENavigationButton.PREV);
@@ -134,7 +134,7 @@ describe('CreateMetaAnalysisSpecificationSelectionStep', () => {
                 />
             );
 
-            const nextButton = screen.getByRole('button', { name: 'next' });
+            const nextButton = screen.getByRole('button', { name: 'Next' });
             userEvent.click(nextButton);
 
             expect(mockOnNavigate).toHaveBeenCalledWith(ENavigationButton.NEXT);
@@ -156,7 +156,7 @@ describe('CreateMetaAnalysisSpecificationSelectionStep', () => {
                 />
             );
 
-            const nextButton = screen.getByRole('button', { name: 'next' });
+            const nextButton = screen.getByRole('button', { name: 'Next' });
             expect(nextButton).toBeDisabled();
         });
 
@@ -176,7 +176,7 @@ describe('CreateMetaAnalysisSpecificationSelectionStep', () => {
                 />
             );
 
-            const nextButton = screen.getByRole('button', { name: 'next' });
+            const nextButton = screen.getByRole('button', { name: 'Next' });
             expect(nextButton).toBeDisabled();
         });
 
@@ -207,7 +207,7 @@ describe('CreateMetaAnalysisSpecificationSelectionStep', () => {
                 />
             );
 
-            const nextButton = screen.getByRole('button', { name: 'next' });
+            const nextButton = screen.getByRole('button', { name: 'Next' });
             expect(nextButton).toBeDisabled();
         });
     });

compose/neurosynth-frontend/src/pages/MetaAnalysis/components/CreateMetaAnalysisSpecificationSelectionStep.spec.tsx

@@ -28,10 +28,11 @@ const CreateMetaAnalysisSpecificationSelectionStep: React.FC<{
     const [selectedValue, setSelectedValue] = useState<IAnalysesSelection>(props.selection);
 
     const handleNavigate = (button: ENavigationButton) => {
-        if (selectedValue?.selectionKey && selectedValue?.type !== EPropertyType.NONE)
+        if (selectedValue?.selectionKey && selectedValue?.type !== EPropertyType.NONE) {
             props.onChooseSelection({
                 ...selectedValue,
             });
+        }
         props.onNavigate(button);
     };
 
@@ -97,7 +98,7 @@ const CreateMetaAnalysisSpecificationSelectionStep: React.FC<{
                         onClick={() => handleNavigate(ENavigationButton.PREV)}
                         variant="outlined"
                     >
-                        back
+                        Back
                     </Button>
                     <SelectAnalysesSummaryComponent
                         annotationdId={annotationId || ''}
@@ -113,7 +114,7 @@ const CreateMetaAnalysisSpecificationSelectionStep: React.FC<{
                         }
                         onClick={() => handleNavigate(ENavigationButton.NEXT)}
                     >
-                        next
+                        Next
                     </Button>
                 </Box>
             </Box>

compose/neurosynth-frontend/src/pages/MetaAnalysis/components/CreateMetaAnalysisSpecificationSelectionStep.tsx

@@ -167,7 +167,8 @@ const ProjectPage: React.FC = (props) => {
                                 borderTopLeftRadius: '6px',
                                 borderTopRightRadius: '6px',
                                 borderColor: 'lightgray',
-                                borderBottomColor: 'white',
+                                // borderBottomColor: 'white',
+                                borderBottom: '0px',
                                 marginBottom: '-2px',
                             },
                             '.MuibuttonBase-root': {},

compose/neurosynth-frontend/src/pages/Project/ProjectPage.tsx

@@ -29,26 +29,18 @@ const ProjectViewMetaAnalyses: React.FC = () => {
                 .filter((id): id is string => id !== undefined);
         }
     }
-    const {
-        data = [],
-        isLoading,
-        isError,
-        isRefetching,
-    } = useGetMetaAnalysesByIds(metaAnalysisIds);
+    const { data = [], isLoading, isError } = useGetMetaAnalysesByIds(metaAnalysisIds);
     const canEditMetaAnalyses = useProjectMetaAnalysisCanEdit();
-    const projectIdFromProject = useProjectId();
     const [createMetaAnalysisDialogIsOpen, setCreateMetaAnalysisDialogIsOpen] = useState(false);
 
     useGuard(
         `/projects/${projectId}/edit`,
         'you must finish the meta-analysis creation process to view this page',
-        projectIdFromProject === undefined || projectId !== projectIdFromProject
-            ? false
-            : !canEditMetaAnalyses
+        projectId !== undefined ? false : !canEditMetaAnalyses
     );
 
     return (
-        <StateHandlerComponent isLoading={isLoading || isRefetching} isError={isError}>
+        <StateHandlerComponent isLoading={isLoading} isError={isError}>
             <CreateMetaAnalysisSpecificationDialogBase
                 isOpen={createMetaAnalysisDialogIsOpen}
                 onCloseDialog={() => setCreateMetaAnalysisDialogIsOpen(false)}