fix: added order and added test (#714)

* fix: added order and added test

* fix: fix failing test case

* feat: added order on put requests

Author: nicoalee

compose/neurosynth-frontend/src/components/Dialogs/ConfirmationDialog/ConfirmationDialog.tsx

@@ -50,7 +50,7 @@ const ConfirmationDialog: React.FC<IConfirmationDialog> = (props) => {
                     <Button
                         sx={{ width: '250px', marginRight: '15px' }}
                         onClick={() => props.onCloseDialog(false, props.data)}
-                        variant="contained"
+                        variant="text"
                         color="error"
                     >
                         {props.rejectText ? props.rejectText : 'Reject'}

compose/neurosynth-frontend/src/components/DisplayStudy/DisplayStudyChipLinks/FullTextChip.spec.tsx

@@ -0,0 +1,29 @@
+import { render, screen } from '@testing-library/react';
+import FullTextChip from './FullTextChip';
+import { useStudyName } from 'pages/Studies/StudyStore';
+import { useGetFullText } from 'hooks';
+
+jest.mock('pages/Studies/StudyStore');
+jest.mock('hooks');
+describe('FullTextChip Component', () => {
+    it('should render', () => {
+        render(<FullTextChip />);
+    });
+
+    it('should show the chip with the link', async () => {
+        (useStudyName as jest.Mock).mockReturnValue(undefined);
+        useGetFullText().data = 'study-name';
+        render(<FullTextChip name="study-name" />);
+        const element = await screen.findByRole('link');
+        expect(element).toBeInTheDocument();
+        expect(element.getAttribute('href')).toEqual('study-name');
+    });
+
+    it('should not show the chip with the link', () => {
+        (useStudyName as jest.Mock).mockReturnValue(undefined);
+        useGetFullText().data = '';
+        render(<FullTextChip name="study-name" />);
+        const element = screen.queryByRole('link');
+        expect(element).not.toBeInTheDocument();
+    });
+});

compose/neurosynth-frontend/src/components/DisplayStudy/DisplayStudyChipLinks/FullTextChip.tsx

@@ -1,6 +1,6 @@
 import OpenInNewIcon from '@mui/icons-material/OpenInNew';
 import { Chip } from '@mui/material';
-import useGetFullText from 'hooks/external/useGetFullText';
+import { useGetFullText } from 'hooks';
 import { useStudyName } from 'pages/Studies/StudyStore';
 import { useEffect, useState } from 'react';
 import DisplayStudyChipLinksStyles from './DisplayStudyChipLinks.styles';

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

@@ -1,4 +1,3 @@
-import { Box } from '@mui/material';
 import LoadingButton from 'components/Buttons/LoadingButton/LoadingButton';
 import { AnalysisReturn, StudyRequest } from 'neurostore-typescript-sdk';
 import { useSnackbar } from 'notistack';
@@ -16,7 +15,7 @@ import {
     useUpdateAnnotationById,
     useUpdateStudyset,
 } from 'hooks';
-import EditStudyPageStyles from 'pages/Studies/EditStudyPage/EditStudyPage.styles';
+import { STUDYSET_QUERY_STRING } from 'hooks/studysets/useGetStudysets';
 import {
     useStudy,
     useStudyAnalyses,
@@ -38,9 +37,7 @@ import {
 import { storeNotesToDBNotes } from 'stores/AnnotationStore.helpers';
 import API from 'utils/api';
 import { arrayToMetadata } from '../EditStudyMetadata/EditStudyMetadata';
-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();
@@ -273,19 +270,16 @@ const EditStudySaveButton: React.FC = React.memo((props) => {
     };
 
     return (
-        <Box sx={EditStudyPageStyles.loadingButtonContainer}>
-            <EditStudySwapVersionButton />
-            <LoadingButton
-                text="save"
-                isLoading={updateStudyIsLoading || updateAnnotationIsLoading || isCloning}
-                variant="contained"
-                loaderColor="secondary"
-                disabled={!studyHasBeenEdited && !annotationHasBeenEdited}
-                disableElevation
-                sx={{ width: '280px', height: '36px' }}
-                onClick={handleSave}
-            />
-        </Box>
+        <LoadingButton
+            text="save"
+            isLoading={updateStudyIsLoading || updateAnnotationIsLoading || isCloning}
+            variant="contained"
+            loaderColor="secondary"
+            disabled={!studyHasBeenEdited && !annotationHasBeenEdited}
+            disableElevation
+            sx={{ width: '280px', height: '36px' }}
+            onClick={handleSave}
+        />
     );
 });
 

compose/neurosynth-frontend/src/components/FullTextLinkComponent/FullTextLinkComponent.tsx

@@ -1,6 +1,6 @@
 import { Box, Link, Typography } from '@mui/material';
 import ProgressLoader from 'components/ProgressLoader/ProgressLoader';
-import useGetFullText from 'hooks/external/useGetFullText';
+import { useGetFullText } from 'hooks';
 
 const FullTextLinkComponent: React.FC<{ paperTitle: string; text?: string }> = (props) => {
     const { paperTitle, text = 'article full text' } = props;

compose/neurosynth-frontend/src/hooks/__mocks__/index.ts

@@ -125,6 +125,12 @@ const useGetStudysetById = jest.fn().mockReturnValue({
     data: mockStudysetNested(),
 });
 
+const useGetFullText = jest.fn().mockReturnValue({
+    isLoading: false,
+    isError: false,
+    data: '',
+});
+
 const useIsMounted = () => {
     return {
         __esModule: true,
@@ -157,4 +163,5 @@ export {
     useDeleteProject,
     useGetExtractionSummary,
     useGetStudysetById,
+    useGetFullText,
 };

compose/neurosynth-frontend/src/hooks/index.ts

@@ -34,6 +34,7 @@ import useGetStudyById from './studies/useGetStudyById';
 import useUpdateAnnotationById from './analyses/useUpdateAnnotationById';
 import useGetExtractionSummary from './useGetExtractionSummary';
 import useGetCurationSummary from './useGetCurationSummary';
+import useGetFullText from './external/useGetFullText';
 
 export {
     useGetCurationSummary,
@@ -44,6 +45,7 @@ export {
     useGuard,
     useGetTour,
     useGetWindowHeight,
+    useGetFullText,
     // STUDIES
     useGetBaseStudies,
     useGetStudyById,

compose/neurosynth-frontend/src/neurostore-typescript-sdk

@@ -20,6 +20,8 @@ import {
     useInitStudyStore,
     useStudyId,
 } from '../StudyStore';
+import EditStudyPageStyles from './EditStudyPage.styles';
+import EditStudySwapVersionButton from 'components/EditStudyComponents/EditStudySwapVersionButton/EditStudySwapVersionButton';
 
 const EditStudyPage: React.FC = (props) => {
     const { studyId } = useParams<{ studyId: string }>();
@@ -68,7 +70,10 @@ const EditStudyPage: React.FC = (props) => {
             <Box sx={{ marginBottom: '5rem' }}>
                 <EditAnalyses />
             </Box>
-            <EditStudySaveButton />
+            <Box sx={EditStudyPageStyles.loadingButtonContainer}>
+                <EditStudySwapVersionButton />
+                <EditStudySaveButton />
+            </Box>
         </StateHandlerComponent>
     );
 };

compose/neurosynth-frontend/src/pages/Studies/EditStudyPage/EditStudyPage.tsx

@@ -199,7 +199,7 @@ export const studyAnalysesToStoreAnalyses = (analyses?: AnalysisReturn[]): IStor
     });
 
     return (studyAnalyses || []).sort((a, b) => {
-        return (a.name || '').localeCompare(b.name || '');
+        return (a.order as number) - (b.order as number);
 
         // previously sorted by date: may want this again in the future
         // const dateA = Date.parse(a.created_at || '');
@@ -214,7 +214,7 @@ export const storeAnalysesToStudyAnalyses = (analyses?: IStoreAnalysis[]): Analy
     // we therefore need to scrub the id from the analysis if it was newly created by us.
     // we also need to remove the readonly attributes and any attributes we added
     const updatedAnalyses: AnalysisRequest[] = (analyses || []).map(
-        ({ isNew, conditions, points, pointSpace, pointStatistic, ...analysisArgs }) => {
+        ({ isNew, conditions, points, pointSpace, pointStatistic, ...analysisArgs }, index) => {
             const scrubbedConditions: ConditionRequest[] = conditions.map(({ isNew, ...args }) => ({
                 name: args.name,
                 description: args.description,
@@ -250,6 +250,7 @@ export const storeAnalysesToStudyAnalyses = (analyses?: IStoreAnalysis[]): Analy
                 conditions: scrubbedConditions,
                 points: scrubbedPoints,
                 id: isNew ? undefined : analysisArgs.id,
+                order: index + 1, // order is not 0 indexed in the BE
             };
         }
     );