Skip to content
Snippets Groups Projects
Commit 6dbdc355 authored by esikkala's avatar esikkala
Browse files

Chips array: handle open intervals

parent 0b96b227
No related branches found
No related tags found
No related merge requests found
......@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
import { withStyles } from '@material-ui/core/styles';
import Chip from '@material-ui/core/Chip';
import Tooltip from '@material-ui/core/Tooltip';
import { ISOStringToYear } from './FacetHelpers';
const styles = theme => ({
root: {
......@@ -53,21 +54,13 @@ class ChipsArray extends React.Component {
};
generateLabel = (facetLabel, valueLabel, filterType) => {
return filterType !== 'timespanFilter' && valueLabel.length > 18
return filterType !== 'timespanFilter'
&& filterType !== 'integerFilter'
&& valueLabel.length > 18
? `${facetLabel}: ${valueLabel.substring(0, 18)}...`
: `${facetLabel}: ${valueLabel}`;
}
ISOStringToYear = str => {
let year = null;
if (str.charAt(0) == '-') {
year = parseInt(str.substring(0,5));
} else {
year = parseInt(str.substring(0,4));
}
return year;
}
render() {
const { classes, data } = this.props;
return (
......@@ -86,12 +79,16 @@ class ChipsArray extends React.Component {
}
if (item.filterType === 'timespanFilter') {
key = item.facetID;
valueLabel = `${this.ISOStringToYear(item.value.start)} to
${this.ISOStringToYear(item.value.end)}`;
valueLabel = `${ISOStringToYear(item.value.start)} to
${ISOStringToYear(item.value.end)}`;
}
if (item.filterType === 'integerFilter') {
let { start, end } = item.value;
key = item.facetID;
valueLabel = `${item.value.start} to ${item.value.end}`;
//valueLabel = `${item.value.start} to ${item.value.end}`;
valueLabel = `
${start !== '' ? start : '-'}
to ${end !== '' ? end : '-'}`;
}
return (
<Tooltip key={key} title={`${item.facetLabel}: ${valueLabel}`}>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment