From 0e072c8a5099df044ccad3d426e60e42ab5719e3 Mon Sep 17 00:00:00 2001 From: Nicholas Lee Date: Tue, 1 Oct 2024 13:23:54 -0400 Subject: [PATCH] fix: removed isRefetching --- .../CreateMetaAnalysisSpecificationAlgorithmStep.tsx | 1 + .../CreateMetaAnalysisSpecificationDialogBase.tsx | 4 ++-- .../CreateMetaAnalysisSpecificationSelectionStep.tsx | 3 ++- .../src/pages/Project/ProjectPage.tsx | 2 +- .../pages/Project/components/ProjectViewMetaAnalyses.tsx | 9 ++------- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/compose/neurosynth-frontend/src/pages/MetaAnalysis/components/CreateMetaAnalysisSpecificationAlgorithmStep.tsx b/compose/neurosynth-frontend/src/pages/MetaAnalysis/components/CreateMetaAnalysisSpecificationAlgorithmStep.tsx index e8da005c..b4af1853 100644 --- a/compose/neurosynth-frontend/src/pages/MetaAnalysis/components/CreateMetaAnalysisSpecificationAlgorithmStep.tsx +++ b/compose/neurosynth-frontend/src/pages/MetaAnalysis/components/CreateMetaAnalysisSpecificationAlgorithmStep.tsx @@ -41,6 +41,7 @@ const CreateMetaAnalysisSpecificationAlgorithmStep: React.FC<{ nextButtonDisabled={!algorithmSpec.estimator} nextButtonStyle="contained" onButtonClick={handleNavigate} + prevButtonDisabled /> diff --git a/compose/neurosynth-frontend/src/pages/MetaAnalysis/components/CreateMetaAnalysisSpecificationDialogBase.tsx b/compose/neurosynth-frontend/src/pages/MetaAnalysis/components/CreateMetaAnalysisSpecificationDialogBase.tsx index 78c7ae86..a86beed2 100644 --- a/compose/neurosynth-frontend/src/pages/MetaAnalysis/components/CreateMetaAnalysisSpecificationDialogBase.tsx +++ b/compose/neurosynth-frontend/src/pages/MetaAnalysis/components/CreateMetaAnalysisSpecificationDialogBase.tsx @@ -71,10 +71,10 @@ const CreateMetaAnalysisSpecificationDialogBase: React.FC = (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; } }); diff --git a/compose/neurosynth-frontend/src/pages/MetaAnalysis/components/CreateMetaAnalysisSpecificationSelectionStep.tsx b/compose/neurosynth-frontend/src/pages/MetaAnalysis/components/CreateMetaAnalysisSpecificationSelectionStep.tsx index 3c7c1b4c..cb911682 100644 --- a/compose/neurosynth-frontend/src/pages/MetaAnalysis/components/CreateMetaAnalysisSpecificationSelectionStep.tsx +++ b/compose/neurosynth-frontend/src/pages/MetaAnalysis/components/CreateMetaAnalysisSpecificationSelectionStep.tsx @@ -28,10 +28,11 @@ const CreateMetaAnalysisSpecificationSelectionStep: React.FC<{ const [selectedValue, setSelectedValue] = useState(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); }; diff --git a/compose/neurosynth-frontend/src/pages/Project/ProjectPage.tsx b/compose/neurosynth-frontend/src/pages/Project/ProjectPage.tsx index 114b4495..fdb7dda3 100644 --- a/compose/neurosynth-frontend/src/pages/Project/ProjectPage.tsx +++ b/compose/neurosynth-frontend/src/pages/Project/ProjectPage.tsx @@ -168,7 +168,7 @@ const ProjectPage: React.FC = (props) => { borderTopRightRadius: '6px', borderColor: 'lightgray', borderBottom: '0px', - marginBottom: '-1px', + marginBottom: '-2px', }, '.MuibuttonBase-root': {}, transition: 'none', diff --git a/compose/neurosynth-frontend/src/pages/Project/components/ProjectViewMetaAnalyses.tsx b/compose/neurosynth-frontend/src/pages/Project/components/ProjectViewMetaAnalyses.tsx index a591d5a3..fafcaf81 100644 --- a/compose/neurosynth-frontend/src/pages/Project/components/ProjectViewMetaAnalyses.tsx +++ b/compose/neurosynth-frontend/src/pages/Project/components/ProjectViewMetaAnalyses.tsx @@ -30,12 +30,7 @@ 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); @@ -49,7 +44,7 @@ const ProjectViewMetaAnalyses: React.FC = () => { ); return ( - + setCreateMetaAnalysisDialogIsOpen(false)}