refactor: StudyListFilter refactor (#1580)

* Creating InputGroup

* Updating Views with new InputGroup

* Creating Docz for InputGroup

* Fixing eslint issues

* Renaming inputGroup props naming to be more generic.
This commit is contained in:
Gustavo André Lelis authored and James A. Petts committed 2020-05-15 13:44:33 +02:00
1 parent 5766d4e91a
commit 056f56f5b4
13 files changed
+418 -97

No files matched your search

@@ -1,17 +1,9 @@
import React, { useState } from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import {
Button,
Icon,
Typography,
InputText,
InputDateRange,
InputMultiSelect,
InputLabelWrapper,
} from '@ohif/ui';
import { Button, Icon, Typography, InputGroup } from '@ohif/ui';
<<<<<<< HEAD
const isFiltering = (currentFiltersValues, filtersValues) => {
return Object.keys(currentFiltersValues).some((name) => {
const filterValue = currentFiltersValues[name];
@@ -129,10 +121,28 @@ const StudyListFilter = ({ filtersMeta, filtersValues, numOfStudies }) => {
default:
break;
}
=======
const StudyListFilter = ({
filtersMeta,
filterValues,
setFilterValues,
clearFilters,
isFiltering,
numOfStudies,
}) => {
const { sortBy, sortDirection } = filterValues;
const filterSorting = { sortBy, sortDirection };
const setFilterSorting = sortingValues => {
setFilterValues({
...filterValues,
...sortingValues,
});
>>>>>>> 26d8c8ae5... refactor: StudyListFilter refactor (#1580)
};
const isSortingEnable = numOfStudies > 0 && numOfStudies <= 100;
return (
<>
<React.Fragment>
<div>
<div className="bg-primary-dark">
<div className="container m-auto relative flex flex-col pt-5">
@@ -157,7 +167,7 @@ const StudyListFilter = ({ filtersMeta, filtersValues, numOfStudies }) => {
</div>
</div>
<div className="flex flex-row">
{isFiltering(currentFiltersValues, filtersValues) && (
{isFiltering && (
<Button
rounded="full"
variant="outlined"
@@ -184,6 +194,7 @@ const StudyListFilter = ({ filtersMeta, filtersValues, numOfStudies }) => {
</div>
</div>
<div className="sticky z-10 border-b-4 border-black" style={{ top: 58 }}>
<<<<<<< HEAD
<div className="bg-primary-dark pt-3 pb-3 ">
<div className="container m-auto relative flex flex-col">
<div className="flex flex-row w-full">
@@ -202,6 +213,17 @@ const StudyListFilter = ({ filtersMeta, filtersValues, numOfStudies }) => {
})}
</div>
</div>
=======
<div className="bg-custom-navyDark pt-3 pb-3 ">
<InputGroup
inputMeta={filtersMeta}
values={filterValues}
onValuesChange={setFilterValues}
sorting={filterSorting}
onSortingChange={setFilterSorting}
isSortingEnable={isSortingEnable}
/>
>>>>>>> 26d8c8ae5... refactor: StudyListFilter refactor (#1580)
</div>
{numOfStudies > 100 && (
<div className="container m-auto">
@@ -213,28 +235,33 @@ const StudyListFilter = ({ filtersMeta, filtersValues, numOfStudies }) => {
</div>
)}
</div>
</>
</React.Fragment>
);
};
StudyListFilter.defaultProps = {
filtersMeta: [],
filtersValues: {},
numOfStudies: 0,
};
StudyListFilter.propTypes = {
filtersMeta: PropTypes.arrayOf(
PropTypes.shape({
name: PropTypes.string,
dsplayName: PropTypes.string,
inputType: PropTypes.oneOf(['Text', 'MultiSelect', 'DateRange', 'None']),
isSortable: PropTypes.bool,
gridCol: PropTypes.oneOf([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]),
name: PropTypes.string.isRequired,
displayName: PropTypes.string.isRequired,
inputType: PropTypes.oneOf(['Text', 'MultiSelect', 'DateRange', 'None'])
.isRequired,
isSortable: PropTypes.bool.isRequired,
gridCol: PropTypes.oneOf([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12])
.isRequired,
option: PropTypes.arrayOf(
PropTypes.shape({
value: PropTypes.string,
label: PropTypes.string,
})
),
})
),
filtersValues: PropTypes.object,
numOfStudies: PropTypes.number,
).isRequired,
filterValues: PropTypes.object.isRequired,
numOfStudies: PropTypes.number.isRequired,
setFilterValues: PropTypes.func.isRequired,
clearFilters: PropTypes.func.isRequired,
isFiltering: PropTypes.bool.isRequired,
};
export default StudyListFilter;