Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Fix open state in combobox (#2797)
Uku Taht70f1c6538df4
diff --git a/assets/.eslintrc.json b/assets/.eslintrc.jsonindex 272394c936..0d9b76aa00 100644--- a/assets/.eslintrc.json+++ b/assets/.eslintrc.json@@ -1,6 +1,7 @@{"env": {- "browser": true+ "browser": true,+ "es6": true},"extends": ["eslint:recommended","plugin:react/recommended",diff --git a/assets/js/dashboard/components/combobox.js b/assets/js/dashboard/components/combobox.jsindex 16a01ae814..98eeb2512b 100644--- a/assets/js/dashboard/components/combobox.js+++ b/assets/js/dashboard/components/combobox.js@@ -99,6 +99,7 @@ export default function PlausibleCombobox(props) {function fetchOptions(query) {setLoading(true)+ setOpen(true)return props.fetchOptions(query).then((loadedOptions) => {setLoading(false)@@ -119,7 +120,6 @@ export default function PlausibleCombobox(props) {if (!isOpen) {fetchOptions(input)searchRef.current.focus()- setOpen(true)} else {setInput('')setOpen(false)@@ -186,11 +186,16 @@ export default function PlausibleCombobox(props) {Loading options...</div>)}- { noMatchesFound && (+ { noMatchesFound && !props.freeChoice && (<div className="relative cursor-default select-none py-2 px-4 text-gray-700 dark:text-gray-300">No matches found in the current dashboard. Try selecting a different time range or searching for something different</div>)}+ { noMatchesFound && props.freeChoice && (+ <div className="relative cursor-default select-none py-2 px-4 text-gray-700 dark:text-gray-300">+ Start typing to apply filter+ </div>+ )}{ matchesFound && (visibleOptions.map((option, i) => {const text = option.freeChoice ? `Filter by '${option.label}'` : option.labeldiff --git a/assets/js/dashboard/stats/modals/filter.js b/assets/js/dashboard/stats/modals/filter.jsindex c516b7b81e..a9ea5013f1 100644--- a/assets/js/dashboard/stats/modals/filter.js+++ b/assets/js/dashboard/stats/modals/filter.js@@ -35,10 +35,6 @@ function getFormState(filterGroup, query) {}, {})}-function supportsContains(filterName) {- return ['page', 'entry_page', 'exit_page'].includes(filterName)-}-function supportsIsNot(filterName) {return !['goal', 'prop_key'].includes(filterName)}@@ -122,6 +118,8 @@ class FilterModal extends React.Component {fetchOptions(filter) {return (input) => {const { query, formState } = this.state+ if (formState[filter].type === FILTER_TYPES.contains) {return Promise.resolve([])}+const formFilters = Object.fromEntries(Object.entries(formState).map(([filter, {type, clauses}]) => [filter, toFilterQuery(type, clauses)]))@@ -147,6 +145,8 @@ class FilterModal extends React.Component {return filterVal} else if (filterVal.startsWith('!')) {return filterVal+ } else if (filterVal.startsWith('~')) {+ return null} else {return '!' + filterVal}@@ -178,9 +178,12 @@ class FilterModal extends React.Component {this.props.history.replace({ pathname: siteBasePath(this.props.site), search: queryString.toString() })}+ isFreeChoice() {+ return ['page', 'utm'].includes(this.state.selectedFilterGroup)+ }+renderSearchBox(filter) {- const freeChoice = this.state.selectedFilterGroup === 'page'- return <Combobox fetchOptions={this.fetchOptions(filter)} freeChoice={freeChoice} values={this.state.formState[filter].clauses} onChange={this.onChange(filter)} placeholder={`Select ${withIndefiniteArticle(formattedFilters[filter])}`} />+ return <Combobox fetchOptions={this.fetchOptions(filter)} freeChoice={this.isFreeChoice()} values={this.state.formState[filter].clauses} onChange={this.onChange(filter)} placeholder={`Select ${withIndefiniteArticle(formattedFilters[filter])}`} />}renderFilterInputs() {@@ -228,7 +231,7 @@ class FilterModal extends React.Component {<div className="py-1">{this.renderTypeItem(filterName, FILTER_TYPES.is, true)}{this.renderTypeItem(filterName, FILTER_TYPES.isNot, supportsIsNot(filterName))}- {this.renderTypeItem(filterName, FILTER_TYPES.contains, supportsContains(filterName))}+ {this.renderTypeItem(filterName, FILTER_TYPES.contains, this.isFreeChoice())}</div></Menu.Items></Transition>diff --git a/assets/js/dashboard/util/filters.js b/assets/js/dashboard/util/filters.jsindex 654dbe7312..300d14493c 100644--- a/assets/js/dashboard/util/filters.js+++ b/assets/js/dashboard/util/filters.js@@ -31,8 +31,6 @@ try {NON_ESCAPED_PIPE_REGEX = '|'}-console.log(NON_ESCAPED_PIPE_REGEX)-const ESCAPED_PIPE = '\\|'function escapeFilterValue(value) {