Skip to content
Snippets Groups Projects
Commit 194ddff5 authored by esikkala's avatar esikkala
Browse files

FacetBar: handle dateNoTimespanFilter

parent 50647d92
No related branches found
No related tags found
No related merge requests found
......@@ -4,7 +4,10 @@ import intl from 'react-intl-universal'
import ChipsArray from './ChipsArray'
const ActiveFilters = props => {
const { uriFilters, textFilters, timespanFilters, integerFilters, facetClass, someFacetIsFetching, fetchingResultCount } = props
const {
uriFilters, textFilters, timespanFilters, dateNoTimespanFilters, integerFilters,
facetClass, someFacetIsFetching, fetchingResultCount
} = props
const facetValues = []
Object.keys(uriFilters).forEach(activeFacetID => {
// URI filter may have multiple values
......@@ -33,6 +36,14 @@ const ActiveFilters = props => {
value: timespanFilters[facetID]
})
})
Object.keys(dateNoTimespanFilters).forEach(facetID => {
facetValues.push({
facetID: facetID,
facetLabel: intl.get(`perspectives.${facetClass}.properties.${facetID}.label`),
filterType: 'dateNoTimespanFilter',
value: dateNoTimespanFilters[facetID]
})
})
Object.keys(integerFilters).forEach(facetID => {
facetValues.push({
facetID: facetID,
......
......@@ -173,6 +173,7 @@ class FacetBar extends React.Component {
)
break
case 'dateFilter':
case 'dateNoTimespanFilter':
facetComponent = (
<DateFacet
facetID={facetID}
......
......@@ -70,11 +70,13 @@ class FacetInfo extends React.Component {
const spatialFilters = {}
const textFilters = {}
const timespanFilters = {}
const dateNoTimespanFilters = {}
const integerFilters = {}
let activeUriFilters = false
let activeSpatialFilters = false
let activeTextFilters = false
let activeTimespanFilters = false
let activeDateNoTimespanFilters = false
let activeIntegerFilters = false
Object.entries(facets).forEach(entry => {
const [key, value] = entry
......@@ -94,6 +96,10 @@ class FacetInfo extends React.Component {
activeTimespanFilters = true
timespanFilters[key] = value.timespanFilter
}
if (has(value, 'dateNoTimespanFilter') && value.dateNoTimespanFilter !== null) {
activeDateNoTimespanFilters = true
dateNoTimespanFilters[key] = value.dateNoTimespanFilter
}
if (has(value, 'integerFilter') && value.integerFilter !== null) {
activeIntegerFilters = true
integerFilters[key] = value.integerFilter
......@@ -109,6 +115,7 @@ class FacetInfo extends React.Component {
activeSpatialFilters ||
activeTextFilters ||
activeTimespanFilters ||
activeDateNoTimespanFilters ||
activeIntegerFilters
) &&
<>
......@@ -132,6 +139,7 @@ class FacetInfo extends React.Component {
spatialFilters={spatialFilters}
textFilters={textFilters}
timespanFilters={timespanFilters}
dateNoTimespanFilters={dateNoTimespanFilters}
integerFilters={integerFilters}
updateFacetOption={this.props.updateFacetOption}
someFacetIsFetching={someFacetIsFetching}
......
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