|
|
|
|
@ -17,38 +17,27 @@ function getFormState(filterGroup, query) {
|
|
|
|
|
const entries = propsObject && Object.entries(propsObject)
|
|
|
|
|
|
|
|
|
|
if (entries && entries.length == 1) {
|
|
|
|
|
const propKey = entries[0][0]
|
|
|
|
|
const {type, value} = parseQueryFilter(entries[0][1])
|
|
|
|
|
const [[propKey, _propVal]] = entries
|
|
|
|
|
const {type, clauses} = parseQueryFilter(query, 'props')
|
|
|
|
|
|
|
|
|
|
return {
|
|
|
|
|
'prop_key': { label: propKey, value: propKey, type: FILTER_TYPES.is },
|
|
|
|
|
'prop_value': { label: value, value: value, type: type }
|
|
|
|
|
'prop_key': { type: FILTER_TYPES.is, clauses: [{label: propKey, value: propKey}] },
|
|
|
|
|
'prop_value': { type, clauses }
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return FILTER_GROUPS[filterGroup].reduce((result, filter) => {
|
|
|
|
|
const rawFilterValue = query.filters[filter] || ''
|
|
|
|
|
const {type, value} = parseQueryFilter(rawFilterValue)
|
|
|
|
|
const {type, clauses} = parseQueryFilter(query, filter)
|
|
|
|
|
|
|
|
|
|
let filterLabel = value
|
|
|
|
|
|
|
|
|
|
if (filter === 'country' && value !== '') {
|
|
|
|
|
filterLabel = (new URLSearchParams(window.location.search)).get('country_name')
|
|
|
|
|
}
|
|
|
|
|
if (filter === 'region' && value !== '') {
|
|
|
|
|
filterLabel = (new URLSearchParams(window.location.search)).get('region_name')
|
|
|
|
|
}
|
|
|
|
|
if (filter === 'city' && value !== '') {
|
|
|
|
|
filterLabel = (new URLSearchParams(window.location.search)).get('city_name')
|
|
|
|
|
}
|
|
|
|
|
return Object.assign(result, { [filter]: { label: filterLabel, value: value, type } })
|
|
|
|
|
return Object.assign(result, { [filter]: { type, clauses } })
|
|
|
|
|
}, {})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function toFilterQuery(value, type) {
|
|
|
|
|
function toFilterQuery(type, clauses) {
|
|
|
|
|
const prefix = FILTER_PREFIXES[type];
|
|
|
|
|
return prefix + value.trim();
|
|
|
|
|
const result = clauses.map(clause => clause.value.trim()).join('|')
|
|
|
|
|
return prefix + result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function supportsContains(filterName) {
|
|
|
|
|
@ -100,19 +89,18 @@ class FilterModal extends React.Component {
|
|
|
|
|
handleSubmit() {
|
|
|
|
|
const { formState } = this.state;
|
|
|
|
|
|
|
|
|
|
const filters = Object.entries(formState).reduce((res, [filterKey, { type, value, label }]) => {
|
|
|
|
|
if (filterKey === 'country') { res.push({ filter: 'country_name', value: label }) }
|
|
|
|
|
if (filterKey === 'region') { res.push({ filter: 'region_name', value: label }) }
|
|
|
|
|
if (filterKey === 'city') { res.push({ filter: 'city_name', value: label }) }
|
|
|
|
|
const filters = Object.entries(formState).reduce((res, [filterKey, { type, clauses }]) => {
|
|
|
|
|
if (filterKey === 'country') { res.push({ filter: 'country_labels', value: clauses.map(clause => clause.label).join('|') }) }
|
|
|
|
|
if (filterKey === 'region') { res.push({ filter: 'region_labels', value: clauses.map(clause => clause.label).join('|') }) }
|
|
|
|
|
if (filterKey === 'city') { res.push({ filter: 'city_labels', value: clauses.map(clause => clause.label).join('|') }) }
|
|
|
|
|
if (filterKey === 'prop_value') { return res }
|
|
|
|
|
if (filterKey === 'prop_key') {
|
|
|
|
|
let propValue = formState['prop_value']
|
|
|
|
|
let filterValue = JSON.stringify({ [value]: toFilterQuery(propValue.value, propValue.type) })
|
|
|
|
|
res.push({ filter: 'props', value: filterValue })
|
|
|
|
|
const [{value: propKey}] = clauses
|
|
|
|
|
res.push({ filter: 'props', value: JSON.stringify({ [propKey]: toFilterQuery(formState.prop_value.type, formState.prop_value.clauses) }) })
|
|
|
|
|
return res
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
res.push({ filter: filterKey, value: toFilterQuery(value, type) })
|
|
|
|
|
res.push({ filter: filterKey, value: toFilterQuery(type, clauses) })
|
|
|
|
|
return res
|
|
|
|
|
}, [])
|
|
|
|
|
|
|
|
|
|
@ -123,7 +111,7 @@ class FilterModal extends React.Component {
|
|
|
|
|
return (selection) => {
|
|
|
|
|
this.setState(prevState => ({
|
|
|
|
|
formState: Object.assign(prevState.formState, {
|
|
|
|
|
[filterName]: Object.assign(prevState.formState[filterName], selection)
|
|
|
|
|
[filterName]: Object.assign(prevState.formState[filterName], { clauses: selection })
|
|
|
|
|
})
|
|
|
|
|
}))
|
|
|
|
|
}
|
|
|
|
|
@ -141,7 +129,7 @@ class FilterModal extends React.Component {
|
|
|
|
|
return (input) => {
|
|
|
|
|
const { query, formState } = this.state
|
|
|
|
|
const formFilters = Object.fromEntries(
|
|
|
|
|
Object.entries(formState).map(([k, v]) => [k, v.code || v.value])
|
|
|
|
|
Object.entries(formState).map(([filter, {type, clauses}]) => [filter, toFilterQuery(type, clauses)])
|
|
|
|
|
)
|
|
|
|
|
const updatedQuery = this.queryForSuggestions(query, formFilters, filter)
|
|
|
|
|
return api.get(apiPath(this.props.site, `/suggestions/${filter}`), updatedQuery, { q: input.trim() })
|
|
|
|
|
@ -165,7 +153,11 @@ class FilterModal extends React.Component {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
isDisabled() {
|
|
|
|
|
return Object.entries(this.state.formState).every(([_key, { value: val }]) => !val)
|
|
|
|
|
if (this.state.selectedFilterGroup === 'props') {
|
|
|
|
|
return Object.entries(this.state.formState).some(([_key, { clauses }]) => clauses.length === 0)
|
|
|
|
|
} else {
|
|
|
|
|
return Object.entries(this.state.formState).every(([_key, { clauses }]) => clauses.length === 0)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
selectFiltersAndCloseModal(filters) {
|
|
|
|
|
@ -184,7 +176,7 @@ class FilterModal extends React.Component {
|
|
|
|
|
|
|
|
|
|
renderSearchBox(filter) {
|
|
|
|
|
const isStrict = this.state.selectedFilterGroup === 'location'
|
|
|
|
|
return <Combobox fetchOptions={this.fetchOptions(filter)} strict={isStrict} value={this.state.formState[filter]} onChange={this.onChange(filter)} placeholder={`Select ${withIndefiniteArticle(formattedFilters[filter])}`} />
|
|
|
|
|
return <Combobox fetchOptions={this.fetchOptions(filter)} strict={isStrict} values={this.state.formState[filter].clauses} onChange={this.onChange(filter)} placeholder={`Select ${withIndefiniteArticle(formattedFilters[filter])}`} />
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
renderFilterInputs() {
|
|
|
|
|
|