Support multple filter clauses in combobox

pull/2773/head
Uku Taht 4 years ago
parent 181de8225e
commit df95b61eca

@ -3,15 +3,6 @@ import { Transition } from '@headlessui/react'
import { ChevronDownIcon } from '@heroicons/react/20/solid'
import debounce from 'debounce-promise'
function Spinner() {
return (
<svg className="animate-spin h-4 w-4 text-indigo-500" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
<circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4"></circle>
<path className="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
</svg>
)
}
export default function PlausibleCombobox(props) {
const [options, setOptions] = useState([])
const [loading, setLoading] = useState(false)
@ -37,20 +28,24 @@ export default function PlausibleCombobox(props) {
function toggleOpen() {
if (!isOpen) {
debouncedFetchOptions(searchRef.current.value)
setLoading(true)
fetchOptions(searchRef.current.value)
searchRef.current.focus()
}
setOpen(!isOpen)
}
function selectOption(option) {
props.onChange(option)
searchRef.current.value = ''
props.onChange([...props.values, option])
if (searchRef.current.value !== '') {
searchRef.current.value = ''
fetchOptions('')
}
searchRef.current.focus()
}
function removeOption() {
props.onChange({value: '', label: ''})
function removeOption(option) {
const newValues = props.values.filter((val) => val.value !== option.value)
props.onChange(newValues)
searchRef.current.focus()
}
@ -67,16 +62,18 @@ export default function PlausibleCombobox(props) {
const noMatchesFound = !loading && options.length === 0
const matchesFound = !loading && options.length > 0
const placeholder = props.value.label ? '' : props.placeholder
return (
<div ref={containerRef} className="relative ml-2 w-full">
<div className="flex items-center flex-wrap w-full dark:bg-gray-900 dark:text-gray-300 rounded-md shadow-sm border border-gray-300 dark:border-gray-700 hover:border-gray-400 dark:hover:border-gray-200 focus-within:border-indigo-500">
{ props.value.label && (
<span className="bg-indigo-100 rounded-sm px-2 py-0.5 ml-2 text-sm">{props.value.label} <button onClick={() => removeOption(props.value)} className="font-bold ml-1">&times;</button></span>
)}
<input className="border-none w-44 pr-4 flex-auto inline-block rounded-md focus:outline-none focus:ring-0 text-sm" ref={searchRef} style={{backgroundColor: "inherit"}} onFocus={(e) => fetchOptions(e.target.value)} placeholder={placeholder} type="text" onChange={onInput}></input>
<div onClick={toggleOpen} className="cursor-pointer absolute inset-y-0 right-0 flex items-center pr-2">
<div onClick={toggleOpen} className="pl-2 pr-4 py-1 flex flex-1 items-center flex-wrap w-full dark:bg-gray-900 dark:text-gray-300 rounded-md shadow-sm border border-gray-300 dark:border-gray-700 hover:border-gray-400 dark:hover:border-gray-200 focus-within:border-indigo-500">
{ props.values.map((value) => {
return (
<span key={value.value} className="bg-indigo-100 rounded-sm px-2 py-0.5 mx-1 my-0.5 text-sm">{value.label} <button onClick={() => removeOption(value)} className="font-bold ml-1">&times;</button></span>
)
})
}
<input className="border-none py-1 px-1 p-0 w-24 flex-auto inline-block rounded-md focus:outline-none focus:ring-0 text-sm" ref={searchRef} style={{backgroundColor: "inherit"}} placeholder={props.placeholder} type="text" onChange={onInput}></input>
<div className="cursor-pointer absolute inset-y-0 right-0 flex items-center pr-2">
{!loading && <ChevronDownIcon className="h-4 w-4 text-gray-500" />}
{loading && <Spinner />}
</div>
@ -117,3 +114,12 @@ export default function PlausibleCombobox(props) {
</div>
);
}
function Spinner() {
return (
<svg className="animate-spin h-4 w-4 text-indigo-500" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
<circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4"></circle>
<path className="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
</svg>
)
}

@ -37,51 +37,21 @@ function clearAllFilters(history, query) {
);
}
function filterText(key, rawValue, query) {
const {type, value} = parseQueryFilter(rawValue)
function filterText(key, _rawValue, query) {
const {type, clauses} = parseQueryFilter(query, key)
if (key === "goal") {
return <>Completed goal <b>{value}</b></>
}
if (key === "props") {
const [metaKey, metaValue] = Object.entries(value)[0]
const eventName = query.filters.goal ? query.filters.goal : 'event'
const metaFilter = parseQueryFilter(metaValue)
return <>{eventName}.{metaKey} {metaFilter.type} <b>{metaFilter.value}</b></>
}
if (key === "browser_version") {
const isNotSet = query.filters.browser === '(not set)' || (!query.filters.browser)
const browserName = isNotSet ? 'Browser' : query.filters.browser
return <>{browserName}.Version {type} <b>{value}</b></>
}
if (key === "os_version") {
const isNotSet = query.filters.os === '(not set)' || (!query.filters.os)
const osName = isNotSet ? 'Operating System' : query.filters.os
console.info('osname', osName)
return <>{osName}.Version {type} <b>{value}</b></>
}
if (key === "country") {
const q = new URLSearchParams(window.location.search)
const countryName = q.get('country_name')
return <>Country {type} <b>{countryName}</b></>
}
if (key === "region") {
const q = new URLSearchParams(window.location.search)
const regionName = q.get('region_name')
return <>Region {type} <b>{regionName}</b></>
}
if (key === "city") {
const q = new URLSearchParams(window.location.search)
const cityName = q.get('city_name')
return <>City {type} <b>{cityName}</b></>
}
// TODO
// if (key === "goal") {
// return <>Completed goal <b>{value}</b></>
// }
const formattedFilter = formattedFilters[key]
if (formattedFilter) {
return <>{formattedFilter} {type} <b>{value}</b></>
if (key === "props") {
const [[propKey, _propValue]] = Object.entries(query.filters['props'])
return <>props.{propKey} {type} {clauses.map(({label}) => <b key={label}>{label}</b>).reduce((prev, curr) => [prev, ' or ', curr])} </>
} else if (formattedFilter) {
return <>{formattedFilter} {type} {clauses.map(({label}) => <b key={label}>{label}</b>).reduce((prev, curr) => [prev, ' or ', curr])} </>
}
throw new Error(`Unknown filter: ${key}`)

@ -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() {

@ -22,15 +22,52 @@ export const FILTER_PREFIXES = {
[FILTER_TYPES.is]: ''
};
export function parseQueryFilter(queryFilter) {
function parsePrefix(rawValue) {
const type = Object.keys(FILTER_PREFIXES)
.find(type => FILTER_PREFIXES[type] === queryFilter[0]) || FILTER_TYPES.is;
.find(type => FILTER_PREFIXES[type] === rawValue[0]) || FILTER_TYPES.is;
const value = [FILTER_TYPES.isNot, FILTER_TYPES.contains].includes(type)
? queryFilter.substring(1)
: queryFilter;
? rawValue.substring(1)
: rawValue;
return {type, value}
const values = value
.split('|')
.filter((clause) => !!clause)
return {type, values}
}
export function parseQueryFilter(query, filter) {
if (filter === 'props') {
const rawValue = query.filters['props']
const [[_propKey, propVal]] = Object.entries(rawValue)
const {type, values} = parsePrefix(propVal)
const clauses = values.map(val => { return {value: val, label: val}})
return {type, clauses}
} else {
const {type, values} = parsePrefix(query.filters[filter] || '')
let labels = values
if (filter === 'country' && values.length > 0) {
const rawLabel = (new URLSearchParams(window.location.search)).get('country_labels') || ''
labels = rawLabel.split('|').filter(label => !!label)
}
if (filter === 'region' && values.length > 0) {
const rawLabel = (new URLSearchParams(window.location.search)).get('region_labels') || ''
labels = rawLabel.split('|').filter(label => !!label)
}
if (filter === 'city' && values.length > 0) {
const rawLabel = (new URLSearchParams(window.location.search)).get('city_labels') || ''
labels = rawLabel.split('|').filter(label => !!label)
}
const clauses = values.map((value, index) => { return {value, label: labels[index]}})
return {type, clauses}
}
}
export function formatFilterGroup(filterGroup) {

Loading…
Cancel
Save