Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat 839 update visualizer with niivue #861

Merged
merged 23 commits into from
Feb 27, 2025
Merged
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
fc2376e
feat: updated meta analysis page view
nicoalee Nov 6, 2024
8f234c1
chore: merged in master branch
nicoalee Nov 11, 2024
f7f598f
feat: added niivue visualizer and updated meta analysis page
nicoalee Nov 11, 2024
42da8e4
feat: visualizer changes
nicoalee Dec 2, 2024
3fbc352
fix: albany vite config
nicoalee Dec 2, 2024
b7ec727
Merge branch 'master' into FEAT-839-update-visualizer-with-niivue
nicoalee Dec 2, 2024
ad1b7ef
feat: added results and dynamic image display
nicoalee Dec 5, 2024
fca6e56
maint: remove banner
nicoalee Dec 5, 2024
7e11b5e
Merge branch 'MAINT-remove-dec-townhall-banner' into FEAT-839-update-…
nicoalee Dec 5, 2024
5e3d363
feat: added nimare file parsing
nicoalee Dec 5, 2024
ff1e90e
feat: added ordering of maps
nicoalee Dec 12, 2024
675262a
feat: added download and snapshot
nicoalee Jan 3, 2025
7a84982
chore: added tests for ordering
nicoalee Jan 6, 2025
7786781
Merge branch 'master' into FEAT-839-update-visualizer-with-niivue
nicoalee Jan 6, 2025
8d3940b
Merge branch 'master' of github.com:neurostuff/neurostore into FEAT-8…
jdkent Jan 6, 2025
e554149
Merge branch 'master' of github.com:neurostuff/neurostore into FEAT-8…
jdkent Jan 9, 2025
1d9575a
feat: added threshold textfields
nicoalee Jan 14, 2025
abca406
fix: remove unused code
nicoalee Jan 14, 2025
49af43d
fix: order
nicoalee Jan 22, 2025
5392d03
fix: prevented mutation of array
nicoalee Jan 23, 2025
29147ba
fix: order
nicoalee Jan 23, 2025
905550d
Merge branch 'master' into FEAT-839-update-visualizer-with-niivue
nicoalee Jan 23, 2025
e056bd9
feat: added tooltip
nicoalee Feb 27, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compose/neurosynth-frontend/index.html
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@

<link rel="preload" as="image" href="/static/brain-analysis.png" type="image/png">

<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/handsontable/dist/handsontable.full.min.css" />
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/handsontable/dist/handsontable.full.min.css" crossorigin="anonymous" />

<link
rel="stylesheet"
231 changes: 229 additions & 2 deletions compose/neurosynth-frontend/package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions compose/neurosynth-frontend/package.json
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@
"@mui/styles": "^5.5.1",
"@mui/system": "^5.5.1",
"@mui/x-data-grid": "^5.10.0",
"@niivue/niivue": "^0.46.0",
"@reactour/tour": "^2.10.3",
"@sentry/react": "^7.119.2",
"@tanstack/react-table": "^8.20.5",
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
import ErrorIcon from '@mui/icons-material/Error';
import {
Autocomplete,
AutocompleteRenderOptionState,
Box,
FilterOptionsState,
TextField,
} from '@mui/material';
import { Autocomplete, AutocompleteRenderOptionState, Box, FilterOptionsState, TextField } from '@mui/material';
import { SystemStyleObject } from '@mui/system';
import ProgressLoader from 'components/ProgressLoader';
import { useInputValidation } from '../../hooks';
@@ -38,6 +32,7 @@ interface INeurosynthAutocomplete<T> {
inputPropsSx?: SystemStyleObject;
filterOptions?: (options: T[], state: FilterOptionsState<T>) => T[];
groupBy?: (option: T) => string;
errorText?: string;
}

const NeurosynthAutocomplete = <T,>(props: INeurosynthAutocomplete<T>) => {
@@ -63,6 +58,7 @@ const NeurosynthAutocomplete = <T,>(props: INeurosynthAutocomplete<T>) => {
size = 'small',
inputPropsSx = {},
groupBy = undefined,
errorText = 'There was an error',
} = props;

const handleOnChange = (_event: any, newVal: T | null, _reason: any) => {
@@ -96,7 +92,7 @@ const NeurosynthAutocomplete = <T,>(props: INeurosynthAutocomplete<T>) => {
<>
{isError && (
<Box sx={{ color: 'error.main', display: 'flex' }}>
There was an error
{errorText}
<ErrorIcon sx={{ marginLeft: '5px' }} />
</Box>
)}
Original file line number Diff line number Diff line change
@@ -13,11 +13,7 @@ export interface IStateHandlerComponent {

const StateHandlerComponent: React.FC<IStateHandlerComponent> = (props) => {
if (props.isError) {
return (
<Typography sx={{ color: 'error.main' }}>
{props.errorMessage || 'There was an error'}
</Typography>
);
return <Typography sx={{ color: 'error.main' }}>{props.errorMessage || 'There was an error'}</Typography>;
}

if (props.isLoading) {
Loading