feat: addressed meta-analysis bugs and improvements (#648)

* feat: addressed meta-analysis bugs and improvements

* feat: delete studysets page and fix tests

Author: nicoalee

compose/neurosynth-frontend/cypress/e2e/pages/PublicStudysetsPage.cy.tsx renamed to compose/neurosynth-frontend/cypress/e2e/pages/PublicStudysetPage.cy.tsx

@@ -2,7 +2,7 @@
 
 export {};
 
-const PATH = '/studysets';
+const PATH = '/studysets/abc123';
 const PAGE_NAME = 'StudysetsPage';
 
 describe(PAGE_NAME, () => {
@@ -12,9 +12,11 @@ describe(PAGE_NAME, () => {
     });
 
     it('should load successfully', () => {
-        cy.intercept('GET', `**/api/projects*`).as('realProjectsRequest');
-        cy.intercept('GET', `**/api/studysets/**`).as('realStudysetRequest');
-        cy.visit(PATH).wait('@realStudysetRequest');
+        cy.intercept('GET', `**/api/studysets/**`, { fixture: 'studyset' }).as('studysetRequest');
+        cy.intercept('GET', `**/api/annotations/**`, { fixture: 'annotation' }).as(
+            'annotationRequest'
+        );
+        cy.visit(PATH).wait('@studysetRequest').wait('@annotationRequest');
     });
 
     // describe('Search', () => {

compose/neurosynth-frontend/src/components/Dialogs/CreateMetaAnalysisSpecificationDialog/CreateMetaAnalysisSpecificationAlgorithmStep/SelectSpecificationComponent/SelectSpecificationComponent.tsx

@@ -11,6 +11,7 @@ import NeurosynthAutocomplete, {
 import { EAnalysisType } from 'hooks/metaAnalyses/useCreateAlgorithmSpecification';
 import DynamicForm from 'components/MetaAnalysisConfigComponents/DynamicForm/DynamicForm';
 import CreateMetaAnalysisSpecificationDialogBaseStyles from '../../CreateMetaAnalysisSpecificationDialogBase.styles';
+import { useEffect, useMemo, useRef } from 'react';
 
 const metaAnalysisSpecification: IMetaAnalysisParamsSpecification = metaAnalysisSpec;
 
@@ -50,19 +51,41 @@ const SelectSpecificationComponent: React.FC<{
         correctorArgs: IDynamicValueType;
     };
 }> = (props) => {
-    const metaAnalyticAlgorithms: IAutocompleteObject[] = Object.keys(
-        metaAnalysisSpecification[EAnalysisType.CBMA]
-    ).map((algoName) => ({
-        label: algoName,
-        description: metaAnalysisSpecification[EAnalysisType.CBMA][algoName]?.summary || '',
-    }));
-
-    const correctorOptions: IAutocompleteObject[] = Object.keys(
-        metaAnalysisSpecification.CORRECTOR
-    ).map((corrector) => ({
-        label: corrector,
-        description: metaAnalysisSpecification.CORRECTOR[corrector]?.summary,
-    }));
+    const initialized = useRef<boolean>(false);
+
+    const metaAnalyticAlgorithms: IAutocompleteObject[] = useMemo(
+        () =>
+            Object.keys(metaAnalysisSpecification[EAnalysisType.CBMA]).map((algoName) => ({
+                label: algoName,
+                description: metaAnalysisSpecification[EAnalysisType.CBMA][algoName]?.summary || '',
+            })),
+        []
+    );
+
+    useEffect(() => {
+        if (props.algorithm?.estimator || initialized.current) return;
+
+        const algorithmOpt = metaAnalyticAlgorithms.find((algo) => algo.label === 'MKDADensity');
+        if (!algorithmOpt) return;
+        props.onSelectSpecification({
+            ...props.algorithm,
+            estimator: algorithmOpt,
+            estimatorArgs: getDefaultValuesForTypeAndParameter(
+                EAnalysisType.CBMA,
+                algorithmOpt?.label
+            ),
+        });
+        initialized.current = true;
+    }, [props.algorithm?.estimator, metaAnalyticAlgorithms, props]);
+
+    const correctorOptions: IAutocompleteObject[] = useMemo(
+        () =>
+            Object.keys(metaAnalysisSpecification.CORRECTOR).map((corrector) => ({
+                label: corrector,
+                description: metaAnalysisSpecification.CORRECTOR[corrector]?.summary,
+            })),
+        []
+    );
 
     return (
         <Box>

compose/neurosynth-frontend/src/components/Dialogs/CreateMetaAnalysisSpecificationDialog/CreateMetaAnalysisSpecificationSelectionStep/CreateMetaAnalysisSpecificationSelectionStep.tsx

@@ -1,4 +1,4 @@
-import { Box, Button, Typography } from '@mui/material';
+import { Box, Button, Link, Typography } from '@mui/material';
 import { ENavigationButton } from 'components/Buttons/NavigationButtons/NavigationButtons';
 import { EPropertyType } from 'components/EditMetadata';
 import {
@@ -44,9 +44,27 @@ const CreateMetaAnalysisSpecificationSelectionStep: React.FC<{
                 </Typography>
             </Box>
             <Box>
+                <Typography gutterBottom>
+                    Select the{' '}
+                    <Link
+                        target="_blank"
+                        href="https://neurostuff.github.io/compose-docs/guide/glossary#annotation"
+                    >
+                        annotation
+                    </Link>{' '}
+                    column for inclusion. This will determine which{' '}
+                    <Link
+                        target="_blank"
+                        href="https://neurostuff.github.io/compose-docs/guide/glossary#analysis"
+                    >
+                        analyses
+                    </Link>{' '}
+                    are used for this meta-analysis.
+                </Typography>
+
                 <Typography gutterBottom sx={{ marginBottom: '1rem' }}>
-                    Select the <b>annotation inclusion column</b> that you would like to use to
-                    select the analyses for your meta-analysis.
+                    By default, the "included" column includes all studies & analyses. At the
+                    moment, only boolean and string annotations are supported.
                 </Typography>
 
                 <SelectAnalysesComponent

compose/neurosynth-frontend/src/components/EditStudyComponents/EditStudySwapVersionButton/EditStudySwapVersionButton.tsx

@@ -89,7 +89,7 @@ const EditStudySwapVersionButton: React.FC = (props) => {
             });
 
             updateStudysetWithNewStudyId(studyId, versionToSwapTo);
-            await setAnalysesInAnnotationAsIncluded(annotationId, versionToSwapTo);
+            await setAnalysesInAnnotationAsIncluded(annotationId);
 
             history.push(`/projects/${projectId}/extraction/studies/${versionToSwapTo}`);
 

compose/neurosynth-frontend/src/components/HotTables/EditAnnotationsHotTable/EditAnnotationsHotTable.helpers.tsx

@@ -147,7 +147,7 @@ export const createColumnHeader = (
     );
 };
 
-export const createColumns = (noteKeys: NoteKeyType[]) =>
+export const createColumns = (noteKeys: NoteKeyType[], disable?: boolean) =>
     [
         {
             className: `${styles['study-col']} ${styles['read-only-col']} truncate`,
@@ -159,7 +159,7 @@ export const createColumns = (noteKeys: NoteKeyType[]) =>
         },
         ...noteKeys.map((x) => {
             return {
-                readOnly: false,
+                readOnly: disable !== undefined ? disable : false,
                 className: styles[x.type],
                 allowInvalid: false,
                 type: x.type === EPropertyType.BOOLEAN ? 'checkbox' : 'text',