diff --git a/assets/js/dashboard/components/search-select.js b/assets/js/dashboard/components/search-select.js index b9c262288..24ec5e2b3 100644 --- a/assets/js/dashboard/components/search-select.js +++ b/assets/js/dashboard/components/search-select.js @@ -81,7 +81,7 @@ export default function SearchSelect(props) { return (
- +
{ !loading && } { loading && } diff --git a/assets/js/dashboard/filters.js b/assets/js/dashboard/filters.js index 85bcacbb5..6189f7dd2 100644 --- a/assets/js/dashboard/filters.js +++ b/assets/js/dashboard/filters.js @@ -126,7 +126,7 @@ class Filters extends React.Component { return UTM campaign is {value} } if (key === "referrer") { - return Referrer is {value} + return Referrer URL is {value} } if (key === "screen") { return Screen size is {value} diff --git a/assets/js/dashboard/stats/modals/filter.js b/assets/js/dashboard/stats/modals/filter.js index d49cd8b1b..e082598c3 100644 --- a/assets/js/dashboard/stats/modals/filter.js +++ b/assets/js/dashboard/stats/modals/filter.js @@ -21,14 +21,42 @@ function getFilterValue(selectedFilter, query) { return {filterValue, negated} } +function withIndefiniteArticle(word) { + if (word.startsWith('UTM')) { + return 'a ' + word + } else if (['a', 'e', 'i', 'o', 'u'].some((vowel) => word.toLowerCase().startsWith(vowel))) { + return 'an ' + word + } else { + return 'a ' + word + } +} + +const SECONDARY_FILTERS = { + 'browser': 'browser_version', + 'os': 'os_version', + 'source': 'referrer', +} + +const SECONDARY_TO_PRIMARY = Object.keys(SECONDARY_FILTERS) + .reduce((res, key) => Object.assign(res, {[SECONDARY_FILTERS[key]]: key}), {}); + +function getVersionFilter(forFilter) { + return SECONDARY_FILTERS[forFilter] +} class FilterModal extends React.Component { constructor(props) { super(props) const query = parseQuery(props.location.search, props.site) - const selectedFilter = this.props.match.params.field || 'page' + let selectedFilter = this.props.match.params.field || 'page' + let secondaryFilter; - this.state = Object.assign({selectedFilter, query}, getFilterValue(selectedFilter, query)) + if (Object.values(SECONDARY_FILTERS).includes(selectedFilter)) { + selectedFilter = SECONDARY_TO_PRIMARY[selectedFilter] + } + secondaryFilter = SECONDARY_FILTERS[selectedFilter] + + this.state = Object.assign({selectedFilter, query}, getFilterValue(selectedFilter, query), {secondaryFilterValue: query.filters[secondaryFilter] || ''}) this.handleKeydown = this.handleKeydown.bind(this) this.handleSubmit = this.handleSubmit.bind(this) @@ -75,31 +103,68 @@ class FilterModal extends React.Component { this.setState({filterValue: val}) } - renderSearchSelector(filter) { + renderSearchSelector() { + const {selectedFilter, filterValue} = this.state + return ( ) } - selectFilterAndCloseModal(filterKey, filterValue) { + fetchSecondaryOptions(filterName) { + const {query, selectedFilter} = this.state + + return (input) => { + const {filterValue} = this.state + const updatedQuery = { ...query, filters: { ...query.filters, [selectedFilter]: filterValue, [filterName]: null } } + + return api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/suggestions/${filterName}`, updatedQuery, { q: input.trim() }) + } + } + + onSecondaryInput(val) { + this.setState({secondaryFilterValue: val}) + } + + renderVersionSelector() { + const {selectedFilter, filterValue, secondaryFilterValue} = this.state + const secondaryFilter = SECONDARY_FILTERS[selectedFilter] + + if (secondaryFilter) { + return ( + + ) + } + } + + selectFiltersAndCloseModal(filters) { const queryString = new URLSearchParams(window.location.search) - if (filterValue) { - queryString.set(filterKey, filterValue) - } else { - queryString.delete(filterKey) + for (const entry of filters) { + if (entry.value) { + queryString.set(entry.filter, entry.value) + } else { + queryString.delete(entry.filter) + } } this.props.history.replace({pathname: `/${encodeURIComponent(this.props.site.domain)}`, search: queryString.toString()}) } handleSubmit() { - const { selectedFilter, negated, filterValue } = this.state; + const { selectedFilter, negated, filterValue, secondaryFilterValue } = this.state; let finalFilterValue = (this.negationSupported(selectedFilter) && negated ? '!' : '') + filterValue.trim() if (selectedFilter == 'country') { @@ -108,7 +173,15 @@ class FilterModal extends React.Component { finalFilterValue = selectedCountry.id } - this.selectFilterAndCloseModal(selectedFilter, finalFilterValue) + const filters = [{filter: selectedFilter, value: finalFilterValue}] + + const secondaryFilter = SECONDARY_FILTERS[selectedFilter] + + if (secondaryFilter) { + filters.push({filter: secondaryFilter, value: secondaryFilterValue.trim()}) + } + + this.selectFiltersAndCloseModal(filters) } updateSelectedFilter(e) { @@ -116,12 +189,12 @@ class FilterModal extends React.Component { } renderBody() { - const { selectedFilter, negated, filterValue, query } = this.state; - const editableFilters = Object.keys(this.state.query.filters).filter(filter => !['props'].includes(filter)) + const { selectedFilter, negated, filterValue, secondaryFilterValue, query } = this.state; + const editableFilters = Object.keys(this.state.query.filters).filter(filter => !['props'].concat(Object.values(SECONDARY_FILTERS)).includes(filter)) return ( <> -

{query.filters[selectedFilter] ? 'Edit' : 'Add'} Filter

+

{query.filters[selectedFilter] || query.filters[SECONDARY_FILTERS[selectedFilter]] ? 'Edit' : 'Add'} Filter

@@ -152,21 +225,22 @@ class FilterModal extends React.Component { )} {this.renderSearchSelector()} + {this.renderVersionSelector()}
{query.filters[selectedFilter] && (