From 579010bafc8fcf00772c17e6a24925058bb8a458 Mon Sep 17 00:00:00 2001
From: Nicholas Lee <niconal902@gmail.com>
Date: Sun, 29 Oct 2023 18:16:20 -0400
Subject: [PATCH] feat: added swap study button feature

---
 .../ConfirmationDialog/ConfirmationDialog.tsx |  19 +-
 .../MoveToExtractionIngest/helpers/utils.ts   |  55 +++---
 .../EditStudyDetails/EditStudyDetails.tsx     |   7 +-
 .../EditStudySaveButton.tsx                   |  10 +-
 .../EditStudySwapVersionButton.tsx            | 186 +++++++++++++++---
 .../src/hooks/studies/useGetBaseStudyById.tsx |   1 +
 .../hooks/studysets/useGetStudysetById.tsx    |   3 +-
 .../src/hooks/studysets/useGetStudysets.tsx   |   4 +-
 .../src/neurostore-typescript-sdk             |   2 +-
 .../CurationPage/ProjectIsLoadingText.tsx     |   6 +-
 .../pages/ExtractionPage/ExtractionPage.tsx   |   3 +-
 .../src/pages/Studies/StudyStore.ts           |   3 +
 .../src/pages/helpers/utils.ts                |   9 +-
 compose/neurosynth_compose/openapi            |   2 +-
 store/neurostore/openapi                      |   2 +-
 15 files changed, 233 insertions(+), 79 deletions(-)

diff --git a/compose/neurosynth-frontend/src/components/Dialogs/ConfirmationDialog/ConfirmationDialog.tsx b/compose/neurosynth-frontend/src/components/Dialogs/ConfirmationDialog/ConfirmationDialog.tsx
index 1d4534e9f..e72ac7c93 100644
--- a/compose/neurosynth-frontend/src/components/Dialogs/ConfirmationDialog/ConfirmationDialog.tsx
+++ b/compose/neurosynth-frontend/src/components/Dialogs/ConfirmationDialog/ConfirmationDialog.tsx
@@ -9,18 +9,29 @@ import {
     IconButton,
 } from '@mui/material';
 import CloseIcon from '@mui/icons-material/Close';
+import React, { useMemo } from 'react';
 
 export interface IConfirmationDialog {
     isOpen: boolean;
     onCloseDialog: (confirm: boolean | undefined, data?: any) => void;
     dialogTitle: string;
-    dialogMessage?: string;
+    dialogMessage?: JSX.Element | string;
     confirmText?: string;
     rejectText?: string;
     data?: any;
 }
 
 const ConfirmationDialog: React.FC<IConfirmationDialog> = (props) => {
+    const dialogContent = useMemo(() => {
+        if (!props.dialogMessage) return undefined;
+
+        if (typeof props.dialogMessage === 'string') {
+            return <DialogContentText>{props.dialogMessage}</DialogContentText>;
+        } else {
+            return props.dialogMessage;
+        }
+    }, [props.dialogMessage]);
+
     return (
         <Dialog open={props.isOpen} onClose={() => props.onCloseDialog(undefined, props.data)}>
             <DialogTitle sx={{ display: 'flex' }}>
@@ -34,11 +45,7 @@ const ConfirmationDialog: React.FC<IConfirmationDialog> = (props) => {
                 </Box>
             </DialogTitle>
             <DialogContent>
-                {props.dialogMessage && (
-                    <DialogContentText sx={{ marginBottom: '1rem' }}>
-                        {props.dialogMessage}
-                    </DialogContentText>
-                )}
+                {props.dialogMessage && dialogContent}
                 <Box sx={{ display: 'flex', justifyContent: 'space-between' }}>
                     <Button
                         sx={{ width: '250px', marginRight: '15px' }}
diff --git a/compose/neurosynth-frontend/src/components/Dialogs/MoveToExtractionDialog/MoveToExtractionIngest/helpers/utils.ts b/compose/neurosynth-frontend/src/components/Dialogs/MoveToExtractionDialog/MoveToExtractionIngest/helpers/utils.ts
index 118241669..c1a313f8c 100644
--- a/compose/neurosynth-frontend/src/components/Dialogs/MoveToExtractionDialog/MoveToExtractionIngest/helpers/utils.ts
+++ b/compose/neurosynth-frontend/src/components/Dialogs/MoveToExtractionDialog/MoveToExtractionIngest/helpers/utils.ts
@@ -1,9 +1,34 @@
 import { BaseStudy, StudyReturn } from 'neurostore-typescript-sdk';
 
+export const lastUpdatedAtSortFn = (
+    a: { updated_at?: string | null; created_at?: string | null },
+    b: { updated_at?: string | null; created_at?: string | null }
+): number => {
+    const dateAUpdatedAt = Date.parse(a.updated_at || '');
+    const dateBUpdatedAt = Date.parse(b.updated_at || '');
+
+    if (isNaN(dateAUpdatedAt) && dateBUpdatedAt) {
+        // if update_at A does not exist, automatically treat A as smaller
+        return -1;
+    } else if (isNaN(dateBUpdatedAt) && dateAUpdatedAt) {
+        // if update_at B does not exist, automatically treat B as smaller
+        return 1;
+    } else if (dateAUpdatedAt && dateBUpdatedAt) {
+        // if they both exist and are NOT the same, do comparison
+        return dateAUpdatedAt - dateBUpdatedAt;
+    } else {
+        // if they do not exist, compare created_at instead
+        const dateA = Date.parse(a.created_at || ''); // Date.parse('') will yield NaN
+        const dateB = Date.parse(b.created_at || ''); // Date.parse('') will yield NaN
+        if (isNaN(dateA) || isNaN(dateB)) return 0;
+        return dateA - dateB;
+    }
+};
+
 export const selectBestVersionsForStudyset = (baseStudies: Array<BaseStudy>): string[] => {
     const selectedVersions = baseStudies.map((baseStudy) => {
-        const sortedVersions = (
-            baseStudy.versions as Array<
+        const sortedVersions = [
+            ...((baseStudy.versions || []) as Array<
                 Pick<
                     StudyReturn,
                     | 'id'
@@ -15,30 +40,10 @@ export const selectBestVersionsForStudyset = (baseStudies: Array<BaseStudy>): st
                     | 'studysets'
                     | 'user'
                 >
-            >
-        ).sort((a, b) => {
-            const dateAUpdatedAt = Date.parse(a.updated_at || '');
-            const dateBUpdatedAt = Date.parse(b.updated_at || '');
-
-            if (isNaN(dateAUpdatedAt) && dateBUpdatedAt) {
-                // if update_at A does not exist, automatically treat A as smaller
-                return -1;
-            } else if (isNaN(dateBUpdatedAt) && dateAUpdatedAt) {
-                // if update_at B does not exist, automatically treat B as smaller
-                return 1;
-            } else if (dateAUpdatedAt && dateBUpdatedAt && dateAUpdatedAt !== dateBUpdatedAt) {
-                // if they both exist and are NOT the same, do comparison
-                return dateAUpdatedAt - dateBUpdatedAt;
-            } else {
-                // if they do not exist, compare created_at instead
-                const dateA = Date.parse(a.created_at || ''); // Date.parse('') will yield NaN
-                const dateB = Date.parse(b.created_at || ''); // Date.parse('') will yield NaN
-                if (isNaN(dateA) || isNaN(dateB)) return 0;
-                return dateA - dateB;
-            }
-        });
+            >),
+        ].sort(lastUpdatedAtSortFn);
 
-        return sortedVersions[0].id as string;
+        return sortedVersions[sortedVersions.length - 1].id as string;
     });
 
     return selectedVersions;
diff --git a/compose/neurosynth-frontend/src/components/EditStudyComponents/EditStudyDetails/EditStudyDetails.tsx b/compose/neurosynth-frontend/src/components/EditStudyComponents/EditStudyDetails/EditStudyDetails.tsx
index 4b44366e5..9bf6ee4a4 100644
--- a/compose/neurosynth-frontend/src/components/EditStudyComponents/EditStudyDetails/EditStudyDetails.tsx
+++ b/compose/neurosynth-frontend/src/components/EditStudyComponents/EditStudyDetails/EditStudyDetails.tsx
@@ -42,7 +42,12 @@ const EditStudyDetails: React.FC = React.memo((props) => {
             expandIconColor="secondary.main"
             sx={[
                 EditStudyComponentsStyles.accordion,
-                { borderTop: '2px solid', borderColor: 'secondary.main' },
+                {
+                    borderTop: '2px solid',
+                    borderColor: 'secondary.main',
+                    borderTopLeftRadius: '4px !important',
+                    borderTopRightRadius: '4px !important',
+                },
             ]}
             accordionSummarySx={EditStudyComponentsStyles.accordionSummary}
             TitleElement={
diff --git a/compose/neurosynth-frontend/src/components/EditStudyComponents/EditStudySaveButton/EditStudySaveButton.tsx b/compose/neurosynth-frontend/src/components/EditStudyComponents/EditStudySaveButton/EditStudySaveButton.tsx
index a630085af..57db83ea7 100644
--- a/compose/neurosynth-frontend/src/components/EditStudyComponents/EditStudySaveButton/EditStudySaveButton.tsx
+++ b/compose/neurosynth-frontend/src/components/EditStudyComponents/EditStudySaveButton/EditStudySaveButton.tsx
@@ -1,4 +1,4 @@
-import { Box, Button } from '@mui/material';
+import { Box } from '@mui/material';
 import LoadingButton from 'components/Buttons/LoadingButton/LoadingButton';
 import {
     AnalysisReturn,
@@ -15,7 +15,6 @@ import {
 } from 'pages/Projects/ProjectPage/ProjectStore';
 
 import { useAuth0 } from '@auth0/auth0-react';
-import SwapHorizIcon from '@mui/icons-material/SwapHoriz';
 import {
     useCreateStudy,
     useGetStudysetById,
@@ -29,7 +28,6 @@ import {
     useStudyAnalyses,
     useStudyHasBeenEdited,
     useStudyUser,
-    useStudyUsername,
     useUpdateStudyInDB,
     useUpdateStudyIsLoading,
 } from 'pages/Studies/StudyStore';
@@ -46,8 +44,9 @@ import {
 import { storeNotesToDBNotes } from 'stores/AnnotationStore.helpers';
 import API from 'utils/api';
 import { arrayToMetadata } from '../EditStudyMetadata/EditStudyMetadata';
-import { hasDuplicateStudyAnalysisNames, hasEmptyStudyPoints } from './EditStudySaveButton.helpers';
 import EditStudySwapVersionButton from '../EditStudySwapVersionButton/EditStudySwapVersionButton';
+import { hasDuplicateStudyAnalysisNames, hasEmptyStudyPoints } from './EditStudySaveButton.helpers';
+import { STUDYSET_QUERY_STRING } from 'hooks/studysets/useGetStudysets';
 
 const EditStudySaveButton: React.FC = React.memo((props) => {
     const { user } = useAuth0();
@@ -193,7 +192,7 @@ const EditStudySaveButton: React.FC = React.memo((props) => {
             if (!clonedStudyId) throw new Error('study not cloned correctly');
 
             // 2. update the clone with our latest updates
-            const x = await updateStudy({
+            await updateStudy({
                 studyId: clonedStudyId,
                 study: {
                     ...getNewScrubbedStudyFromStore(),
@@ -214,6 +213,7 @@ const EditStudySaveButton: React.FC = React.memo((props) => {
                     studies: updatedStudies,
                 },
             });
+            queryClient.invalidateQueries(STUDYSET_QUERY_STRING);
 
             // 4. update the project as this keeps track of completion status of studies
             replaceStudyWithNewClonedStudy(storeStudy.id, clonedStudyId);
diff --git a/compose/neurosynth-frontend/src/components/EditStudyComponents/EditStudySwapVersionButton/EditStudySwapVersionButton.tsx b/compose/neurosynth-frontend/src/components/EditStudyComponents/EditStudySwapVersionButton/EditStudySwapVersionButton.tsx
index 873d42046..d4412cf8c 100644
--- a/compose/neurosynth-frontend/src/components/EditStudyComponents/EditStudySwapVersionButton/EditStudySwapVersionButton.tsx
+++ b/compose/neurosynth-frontend/src/components/EditStudyComponents/EditStudySwapVersionButton/EditStudySwapVersionButton.tsx
@@ -1,11 +1,48 @@
-import { Button, ButtonGroup, ListItem, ListItemButton, Menu } from '@mui/material';
-import SwapHorizIcon from '@mui/icons-material/SwapHoriz';
-import { useState } from 'react';
 import OpenInNewIcon from '@mui/icons-material/OpenInNew';
+import SwapHorizIcon from '@mui/icons-material/SwapHoriz';
+import { Button, ButtonGroup, ListItem, Menu, Typography } from '@mui/material';
+import LoadingButton from 'components/Buttons/LoadingButton/LoadingButton';
+import ConfirmationDialog from 'components/Dialogs/ConfirmationDialog/ConfirmationDialog';
+import { lastUpdatedAtSortFn } from 'components/Dialogs/MoveToExtractionDialog/MoveToExtractionIngest/helpers/utils';
+import { useGetStudysetById, useUpdateStudyset } from 'hooks';
+import useGetBaseStudyById from 'hooks/studies/useGetBaseStudyById';
+import { StudyReturn } from 'neurostore-typescript-sdk';
+import { useSnackbar } from 'notistack';
+import {
+    useProjectExtractionReplaceStudyListStatusId,
+    useProjectExtractionStudysetId,
+    useProjectId,
+} from 'pages/Projects/ProjectPage/ProjectStore';
+import { useStudyBaseStudyId, useStudyId } from 'pages/Studies/StudyStore';
+import { setAnalysesInAnnotationAsIncluded } from 'pages/helpers/utils';
+import { useMemo, useState } from 'react';
+import { useHistory } from 'react-router-dom';
+import { useAnnotationId } from 'stores/AnnotationStore.getters';
 
 const EditStudySwapVersionButton: React.FC = (props) => {
     const [anchorEl, setAnchorEl] = useState<null | HTMLButtonElement>(null);
     const open = Boolean(anchorEl);
+    const baseStudyId = useStudyBaseStudyId();
+    const projectId = useProjectId();
+    const studyId = useStudyId();
+    const { data: baseStudy } = useGetBaseStudyById(baseStudyId || '');
+    const { mutateAsync: updateStudyset } = useUpdateStudyset();
+    const updateStudysetWithNewStudyId = useProjectExtractionReplaceStudyListStatusId();
+    const studysetId = useProjectExtractionStudysetId();
+    const { data: studyset } = useGetStudysetById(studysetId, false);
+    const history = useHistory();
+    const { enqueueSnackbar } = useSnackbar();
+
+    const annotationId = useAnnotationId();
+
+    const [isSwapping, setIsSwapping] = useState(false);
+    const [confirmationDialogState, setConfirmationDialogState] = useState<{
+        isOpen: boolean;
+        selectedVersion?: string;
+    }>({
+        isOpen: false,
+        selectedVersion: undefined,
+    });
 
     const handleButtonPress = (event: React.MouseEvent<HTMLButtonElement>) => {
         setAnchorEl(event.currentTarget);
@@ -15,20 +52,105 @@ const EditStudySwapVersionButton: React.FC = (props) => {
         setAnchorEl(null);
     };
 
-    const handleSwapStudy = () => {};
+    const handleCloseConfirmationDialog = (confirm?: boolean) => {
+        if (confirm) {
+            handleSwapStudy(confirmationDialogState.selectedVersion);
+        }
+        setConfirmationDialogState((prev) => ({
+            ...prev,
+            isOpen: false,
+            selectedVersion: undefined,
+        }));
+    };
+
+    const handleSwapStudy = async (versionToSwapTo?: string) => {
+        if (!annotationId || !studyId || !studysetId || !versionToSwapTo || !studyset?.studies)
+            return;
+        if (versionToSwapTo === studyId) {
+            handleCloseNavMenu();
+            return;
+        }
+        setIsSwapping(true);
+        try {
+            handleCloseNavMenu();
+            const updatedStudyset = [...(studyset.studies as string[])];
+
+            const currentStudyBeingEditedIndex = updatedStudyset.findIndex(
+                (study) => study === studyId
+            );
+            if (currentStudyBeingEditedIndex < 0) throw new Error('study not found in studyset');
+
+            updatedStudyset[currentStudyBeingEditedIndex] = versionToSwapTo;
+            await updateStudyset({
+                studysetId: studysetId,
+                studyset: {
+                    studies: updatedStudyset,
+                },
+            });
+
+            updateStudysetWithNewStudyId(studyId, versionToSwapTo);
+            await setAnalysesInAnnotationAsIncluded(annotationId, versionToSwapTo);
+
+            history.push(`/projects/${projectId}/extraction/studies/${versionToSwapTo}`);
+
+            enqueueSnackbar('Updated version', { variant: 'success' });
+        } catch (e) {
+            console.error(e);
+            enqueueSnackbar('There was an error selecting another study version', {
+                variant: 'error',
+            });
+        } finally {
+            setIsSwapping(false);
+        }
+    };
+
+    const handleSelectVersion = (versionId: string | undefined) => {
+        if (!versionId) return;
+        if (versionId === studyId) {
+            handleCloseNavMenu();
+            return;
+        }
+        setConfirmationDialogState({
+            isOpen: true,
+            selectedVersion: versionId,
+        });
+    };
+
+    const baseStudyVersions = useMemo(() => {
+        const baseVersions = (baseStudy?.versions || []) as StudyReturn[];
+        return baseVersions.sort(lastUpdatedAtSortFn).reverse();
+    }, [baseStudy?.versions]);
 
     return (
         <>
-            <Button
+            <LoadingButton
+                isLoading={isSwapping}
                 sx={{ width: '280px', height: '36px' }}
                 variant="contained"
                 disableElevation
                 color="secondary"
                 onClick={handleButtonPress}
                 startIcon={<SwapHorizIcon />}
-            >
-                Switch study version
-            </Button>
+                text="Switch study version"
+            ></LoadingButton>
+            <ConfirmationDialog
+                dialogTitle="Are you sure you want to switch the study version?"
+                dialogMessage={
+                    <>
+                        <Typography>
+                            You are switching from version {studyId} to version
+                            {confirmationDialogState.selectedVersion || ''}
+                        </Typography>
+                        <Typography gutterBottom sx={{ color: 'error.main', marginBottom: '1rem' }}>
+                            Warning: switching versions will remove any annotations you have created
+                            for this study.
+                        </Typography>
+                    </>
+                }
+                onCloseDialog={handleCloseConfirmationDialog}
+                isOpen={confirmationDialogState.isOpen}
+                rejectText="Cancel"
+            />
             <Menu
                 open={open}
                 onClose={handleCloseNavMenu}
@@ -36,30 +158,30 @@ const EditStudySwapVersionButton: React.FC = (props) => {
                 anchorOrigin={{ vertical: 'top', horizontal: 'left' }}
                 transformOrigin={{ vertical: 'bottom', horizontal: 'left' }}
             >
-                <ListItem sx={{ padding: '0 1rem' }}>
-                    <ButtonGroup variant="text">
-                        <Button>
-                            Version 238iERGtug | Owner: Neurosynth | Last Updated: Oct 28 2023
-                        </Button>
-                        <Button endIcon={<OpenInNewIcon />}>View </Button>
-                    </ButtonGroup>
-                </ListItem>
-                <ListItem sx={{ padding: '0 1rem' }}>
-                    <ButtonGroup variant="text">
-                        <Button>
-                            Version 238iERGtug | Owner: Neurosynth | Last Updated: Oct 28 2023
-                        </Button>
-                        <Button endIcon={<OpenInNewIcon />}>View </Button>
-                    </ButtonGroup>
-                </ListItem>
-                <ListItem sx={{ padding: '0 1rem' }}>
-                    <ButtonGroup variant="text">
-                        <Button>
-                            Version 238iERGtug | Owner: Neurosynth | Last Updated: Oct 28 2023
-                        </Button>
-                        <Button endIcon={<OpenInNewIcon />}>View </Button>
-                    </ButtonGroup>
-                </ListItem>
+                {baseStudyVersions.map((baseStudyVersion) => (
+                    <ListItem key={baseStudyVersion.id} sx={{ padding: '0.2rem 1rem' }}>
+                        <ButtonGroup variant="text">
+                            <Button
+                                onClick={() => handleSelectVersion(baseStudyVersion.id)}
+                                color={baseStudyVersion.id === studyId ? 'secondary' : 'primary'}
+                                sx={{ width: '440px' }}
+                            >
+                                Switch to version {baseStudyVersion.id} | Owner:{' '}
+                                {!baseStudyVersion.username
+                                    ? 'neurosynth'
+                                    : baseStudyVersion.username}
+                            </Button>
+                            <Button
+                                color={baseStudyVersion.id === studyId ? 'secondary' : 'primary'}
+                                href={`/base-studies/${baseStudyId}/${studyId}`}
+                                target="_blank"
+                                endIcon={<OpenInNewIcon />}
+                            >
+                                View version
+                            </Button>
+                        </ButtonGroup>
+                    </ListItem>
+                ))}
             </Menu>
         </>
     );
diff --git a/compose/neurosynth-frontend/src/hooks/studies/useGetBaseStudyById.tsx b/compose/neurosynth-frontend/src/hooks/studies/useGetBaseStudyById.tsx
index f32b5ee6a..9cea8d9fd 100644
--- a/compose/neurosynth-frontend/src/hooks/studies/useGetBaseStudyById.tsx
+++ b/compose/neurosynth-frontend/src/hooks/studies/useGetBaseStudyById.tsx
@@ -9,6 +9,7 @@ const useGetBaseStudyById = (baseStudyId: string) => {
             select: (res) => {
                 return res.data;
             },
+            enabled: !!baseStudyId,
         }
     );
 };
diff --git a/compose/neurosynth-frontend/src/hooks/studysets/useGetStudysetById.tsx b/compose/neurosynth-frontend/src/hooks/studysets/useGetStudysetById.tsx
index 820dc9c4f..c28a9fc83 100644
--- a/compose/neurosynth-frontend/src/hooks/studysets/useGetStudysetById.tsx
+++ b/compose/neurosynth-frontend/src/hooks/studysets/useGetStudysetById.tsx
@@ -3,6 +3,7 @@ import { StudysetReturn } from 'neurostore-typescript-sdk';
 import { useSnackbar } from 'notistack';
 import { useQuery } from 'react-query';
 import API from 'utils/api';
+import { STUDYSET_QUERY_STRING } from './useGetStudysets';
 
 const useGetStudysetById = (studysetId?: string, nested?: boolean) => {
     const { enqueueSnackbar } = useSnackbar();
@@ -12,7 +13,7 @@ const useGetStudysetById = (studysetId?: string, nested?: boolean) => {
         StudysetReturn,
         [string, string | undefined, boolean | undefined]
     >(
-        ['studysets', studysetId, nested],
+        [STUDYSET_QUERY_STRING, studysetId, nested],
         () => API.NeurostoreServices.StudySetsService.studysetsIdGet(studysetId || '', nested),
         {
             enabled: !!studysetId,
diff --git a/compose/neurosynth-frontend/src/hooks/studysets/useGetStudysets.tsx b/compose/neurosynth-frontend/src/hooks/studysets/useGetStudysets.tsx
index a4f5ba75c..fa3b00cfa 100644
--- a/compose/neurosynth-frontend/src/hooks/studysets/useGetStudysets.tsx
+++ b/compose/neurosynth-frontend/src/hooks/studysets/useGetStudysets.tsx
@@ -2,12 +2,14 @@ import { Source, SearchCriteria } from 'pages/Studies/StudiesPage/models';
 import { useQuery } from 'react-query';
 import API from 'utils/api';
 
+export const STUDYSET_QUERY_STRING = 'studysets';
+
 const useGetStudysets = (
     searchCriteria: Partial<Omit<SearchCriteria, 'dataType'>>,
     enabled?: boolean
 ) => {
     return useQuery(
-        ['studysets', { ...searchCriteria }],
+        [STUDYSET_QUERY_STRING, { ...searchCriteria }],
         () => {
             return API.NeurostoreServices.StudySetsService.studysetsGet(
                 undefined,
diff --git a/compose/neurosynth-frontend/src/neurostore-typescript-sdk b/compose/neurosynth-frontend/src/neurostore-typescript-sdk
index 6d0811b64..56f3b4e64 160000
--- a/compose/neurosynth-frontend/src/neurostore-typescript-sdk
+++ b/compose/neurosynth-frontend/src/neurostore-typescript-sdk
@@ -1 +1 @@
-Subproject commit 6d0811b647bfcb9f4f1a932b37e17adca8c4e99c
+Subproject commit 56f3b4e641f4e7f6acea04aa649ac472f1b3f395
diff --git a/compose/neurosynth-frontend/src/pages/CurationPage/ProjectIsLoadingText.tsx b/compose/neurosynth-frontend/src/pages/CurationPage/ProjectIsLoadingText.tsx
index e1db0f84a..37438b814 100644
--- a/compose/neurosynth-frontend/src/pages/CurationPage/ProjectIsLoadingText.tsx
+++ b/compose/neurosynth-frontend/src/pages/CurationPage/ProjectIsLoadingText.tsx
@@ -1,16 +1,18 @@
 import { Box, Typography } from '@mui/material';
 import { useUpdateProjectIsLoading } from 'pages/Projects/ProjectPage/ProjectStore';
 
-const ProjectIsLoadingText: React.FC = (props) => {
+const ProjectIsLoadingText: React.FC<{ isLoading?: boolean }> = (props) => {
     const updateProjectIsLoading = useUpdateProjectIsLoading();
 
+    const isLoading = updateProjectIsLoading || props.isLoading;
+
     return (
         <Box sx={{ marginLeft: '2rem' }}>
             <Typography
                 sx={{
                     color: 'muted.main',
                     fontSize: '1.5rem',
-                    display: updateProjectIsLoading ? 'inline' : 'none',
+                    display: isLoading ? 'inline' : 'none',
                 }}
             >
                 updating...
diff --git a/compose/neurosynth-frontend/src/pages/ExtractionPage/ExtractionPage.tsx b/compose/neurosynth-frontend/src/pages/ExtractionPage/ExtractionPage.tsx
index 89dcc051c..13d87922f 100644
--- a/compose/neurosynth-frontend/src/pages/ExtractionPage/ExtractionPage.tsx
+++ b/compose/neurosynth-frontend/src/pages/ExtractionPage/ExtractionPage.tsx
@@ -63,6 +63,7 @@ const ExtractionPage: React.FC = (props) => {
     const {
         data: studyset,
         isLoading: getStudysetIsLoading,
+        isRefetching: getStudysetIsRefetching,
         isError: getStudysetIsError,
     } = useGetStudysetById(studysetId, true);
     const { mutate } = useUpdateStudyset();
@@ -200,7 +201,7 @@ const ExtractionPage: React.FC = (props) => {
                                 },
                             ]}
                         />
-                        <ProjectIsLoadingText />
+                        <ProjectIsLoadingText isLoading={getStudysetIsRefetching} />
                     </Box>
                     <Box>
                         <Button
diff --git a/compose/neurosynth-frontend/src/pages/Studies/StudyStore.ts b/compose/neurosynth-frontend/src/pages/Studies/StudyStore.ts
index 130273d30..ed7ffa082 100644
--- a/compose/neurosynth-frontend/src/pages/Studies/StudyStore.ts
+++ b/compose/neurosynth-frontend/src/pages/Studies/StudyStore.ts
@@ -62,6 +62,7 @@ const useStudyStore = create<
             return {
                 study: {
                     id: undefined,
+                    base_study: undefined,
                     name: undefined,
                     description: undefined,
                     doi: undefined,
@@ -144,6 +145,7 @@ const useStudyStore = create<
                     set((state) => ({
                         study: {
                             id: undefined,
+                            base_study: undefined,
                             name: undefined,
                             description: undefined,
                             doi: undefined,
@@ -612,6 +614,7 @@ export const useUpdateStudyIsLoading = () =>
 export const useStudyHasBeenEdited = () =>
     useStudyStore((state) => state.storeMetadata.studyIsEdited);
 
+export const useStudyBaseStudyId = () => useStudyStore((state) => state.study.base_study);
 export const useStudyName = () => useStudyStore((state) => state.study.name);
 export const useStudyDescription = () => useStudyStore((state) => state.study.description);
 export const useStudyAuthors = () => useStudyStore((state) => state.study.authors);
diff --git a/compose/neurosynth-frontend/src/pages/helpers/utils.ts b/compose/neurosynth-frontend/src/pages/helpers/utils.ts
index 4dab2d943..73aef31a1 100644
--- a/compose/neurosynth-frontend/src/pages/helpers/utils.ts
+++ b/compose/neurosynth-frontend/src/pages/helpers/utils.ts
@@ -105,13 +105,18 @@ const resolveStudysetAndCurationDifferences = (
     return false;
 };
 
-const setAnalysesInAnnotationAsIncluded = async (annotationId: string) => {
+const setAnalysesInAnnotationAsIncluded = async (annotationId: string, studyId?: string) => {
     try {
         const annotation = (await API.NeurostoreServices.AnnotationsService.annotationsIdGet(
             annotationId
         )) as AxiosResponse<NeurostoreAnnotation>;
 
-        const notes = (annotation.data.notes || []) as NoteCollectionReturn[];
+        let notes = (annotation.data.notes || []) as NoteCollectionReturn[];
+
+        if (studyId) {
+            notes = notes.filter((note) => note.study === studyId);
+        }
+
         await API.NeurostoreServices.AnnotationsService.annotationsIdPut(annotationId, {
             notes: notes.map((x) => ({
                 analysis: x.analysis,
diff --git a/compose/neurosynth_compose/openapi b/compose/neurosynth_compose/openapi
index c0c2a1745..f31b6c5f5 160000
--- a/compose/neurosynth_compose/openapi
+++ b/compose/neurosynth_compose/openapi
@@ -1 +1 @@
-Subproject commit c0c2a174540d48b6a6daec89977c7e4a103b4eb4
+Subproject commit f31b6c5f580519d7c21e7d545d63299cbef6b900
diff --git a/store/neurostore/openapi b/store/neurostore/openapi
index c0c2a1745..f31b6c5f5 160000
--- a/store/neurostore/openapi
+++ b/store/neurostore/openapi
@@ -1 +1 @@
-Subproject commit c0c2a174540d48b6a6daec89977c7e4a103b4eb4
+Subproject commit f31b6c5f580519d7c21e7d545d63299cbef6b900