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.

Sign up for GitHub

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

[DT-1081] Typescriptify the filters file #2746

Merged
merged 2 commits into from
Dec 9, 2024
Merged

[DT-1081] Typescriptify the filters file #2746

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a5ecbf
Typescriptify the filters file
s-rubenstein Dec 6, 2024
8f07303
PR feedback
s-rubenstein Dec 9, 2024
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
46 changes: 33 additions & 13 deletions ...ponents/data_search/DatasetFilterList.jsx → ...ponents/data_search/DatasetFilterList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,15 @@ import ListItemButton from '@mui/material/ListItemButton';
import ListItemIcon from '@mui/material/ListItemIcon';
import ListItemText from '@mui/material/ListItemText';
import Divider from '@mui/material/Divider';
import { Button, TextField, Typography } from '@mui/material';
import { Checkbox } from '@mui/material';
import { Button, Checkbox, TextField, Typography } from '@mui/material';
import { flatten, uniq, compact, orderBy } from 'lodash';
import { getAccessManagementSummary } from '../../types/model';
import {DatasetTerm, getAccessManagementSummary} from '../../types/model';

export const FilterItemHeader = (props) => {
interface FilterItemHeaderProps {
title: React.ReactNode;
headerStyle?: React.CSSProperties;
}
export const FilterItemHeader = (props: FilterItemHeaderProps) => {
const { title, headerStyle = { fontFamily: 'Montserrat', fontWeight: '600', marginTop: '1em' } } = props;
return (
<Typography variant='h6' gutterBottom component='div' sx={headerStyle}>
Expand All @@ -20,7 +23,15 @@ export const FilterItemHeader = (props) => {
);
};

export const FilterItemList = (props) => {
interface FilterItemListProps {
category: string;
filter: string[];
filterHandler: (category: string, filter: string) => void;
isFiltered: (filter: string, category: string) => boolean;
filterNameFn: (filter: string) => string;
filterDisplayFn?: (filter: string) => React.ReactNode;
}
export const FilterItemList = (props: FilterItemListProps) => {
const { category, filter, filterHandler, isFiltered, filterNameFn, filterDisplayFn } = props;
return (
<List sx={{ margin: '-0.5em -0.5em' }}>
Expand All @@ -45,9 +56,17 @@ export const FilterItemList = (props) => {
);
};

export const FilterItemRange = (props) => {
interface FilterItemRangeProps {
min: number;
max: number;
minCategory: string;
maxCategory: string;
filterHandler: (category: string, filter: string) => void;
}

export const FilterItemRange = (props: FilterItemRangeProps) => {
const { min, max, minCategory, maxCategory, filterHandler } = props;
const getValue = (val, defaultVal) => isNaN(Number(val)) ? defaultVal : Number(val);
const getValue = (val: any, defaultVal: any) => isNaN(Number(val)) ? defaultVal : Number(val);
return (
<Box key={minCategory + '-' + maxCategory} sx={{ display: 'flex', flexDirection: 'row', alignItems: 'center' }}>
<TextField id={minCategory + '-range-input'} size='small' margin='dense' variant='outlined' defaultValue={min}
Expand All @@ -64,7 +83,13 @@ export const FilterItemRange = (props) => {
);
};

export const DatasetFilterList = (props) => {
interface DatasetFilterListProps {
datasets: DatasetTerm[];
filterHandler: (category: string, filter: string) => void;
isFiltered: (filter: string, category: string) => boolean;
onClear: () => void;
}
export const DatasetFilterList = (props: DatasetFilterListProps) => {
const { datasets, filterHandler, isFiltered, onClear } = props;

const accessManagementFilters = uniq(compact(datasets.map((dataset) => dataset.accessManagement)));
Expand All @@ -90,7 +115,6 @@ export const DatasetFilterList = (props) => {
<FilterItemHeader title='Access Type' />
<FilterItemList
category='accessManagement'
datasets={datasets}
filter={accessManagementFilters}
filterHandler={filterHandler}
isFiltered={isFiltered}
Expand All @@ -106,7 +130,6 @@ export const DatasetFilterList = (props) => {
<FilterItemHeader title='Data Use'/>
<FilterItemList
category='dataUse'
datasets={datasets}
filter={dataUseFilters}
filterHandler={filterHandler}
isFiltered={isFiltered}
Expand All @@ -118,7 +141,6 @@ export const DatasetFilterList = (props) => {
/>
<FilterItemList
category='dac'
datasets={datasets}
filter={dacFilters}
filterHandler={filterHandler}
isFiltered={isFiltered}
Expand All @@ -127,7 +149,6 @@ export const DatasetFilterList = (props) => {
<FilterItemHeader title='Data Type' />
<FilterItemList
category='dataType'
datasets={datasets}
filter={dataTypeFilters}
filterHandler={filterHandler}
isFiltered={isFiltered}
Expand All @@ -139,7 +160,6 @@ export const DatasetFilterList = (props) => {
max={defaultValues.max}
minCategory='participantCountMin'
maxCategory='participantCountMax'
datasets={datasets}
filterHandler={filterHandler}
/>
</Box>
Expand Down
Loading