diff --git a/assets/js/dashboard/components/combobox.js b/assets/js/dashboard/components/combobox.js index 509666e5d..ae55c93e1 100644 --- a/assets/js/dashboard/components/combobox.js +++ b/assets/js/dashboard/components/combobox.js @@ -169,8 +169,13 @@ export default function PlausibleCombobox(props) { 'hidden': props.singleOption && props.values.length === 1 }) + const containerClass = classNames('relative w-full', { + [props.className]: !!props.className, + 'opacity-20 cursor-default pointer-events-none': props.isDisabled + }) + return ( -
+
{ props.values.map((value) => { return ( diff --git a/assets/js/dashboard/components/filter-type-selector.js b/assets/js/dashboard/components/filter-type-selector.js index 2b6d491e9..07b4e24f1 100644 --- a/assets/js/dashboard/components/filter-type-selector.js +++ b/assets/js/dashboard/components/filter-type-selector.js @@ -31,39 +31,41 @@ export default function FilterTypeSelector(props) { } return ( - - {({ open }) => ( - <> -
- - {props.selectedType} - -
+
+ + {({ open }) => ( + <> +
+ + {props.selectedType} + +
- - -
- {renderTypeItem(FILTER_TYPES.is, true)} - {renderTypeItem(FILTER_TYPES.isNot, supportsIsNot(filterName))} - {renderTypeItem(FILTER_TYPES.contains, isFreeChoiceFilter(filterName))} -
-
-
- - )} -
+ +
+ {renderTypeItem(FILTER_TYPES.is, true)} + {renderTypeItem(FILTER_TYPES.isNot, supportsIsNot(filterName))} + {renderTypeItem(FILTER_TYPES.contains, isFreeChoiceFilter(filterName))} +
+
+ + + )} +
+
) } \ No newline at end of file diff --git a/assets/js/dashboard/stats/modals/prop-filter-modal.js b/assets/js/dashboard/stats/modals/prop-filter-modal.js index 5256722bb..ace109147 100644 --- a/assets/js/dashboard/stats/modals/prop-filter-modal.js +++ b/assets/js/dashboard/stats/modals/prop-filter-modal.js @@ -23,6 +23,10 @@ function PropFilterModal(props) { return (input) => { if (filter === 'prop_key') { return api.get(apiPath(props.site, `/suggestions/${filter}`), query, { q: input.trim() }) + } else { + const propKey = formState.prop_key?.value + const updatedQuery = { ...query, filters: { ...query.filters, props: {[propKey]: '!(none)'} } } + return api.get(apiPath(props.site, `/suggestions/${filter}`), updatedQuery, { q: input.trim() }) } } } @@ -30,12 +34,19 @@ function PropFilterModal(props) { function onPropKeySelect() { return (selectedOptions) => { const newPropKey = selectedOptions.length === 0 ? null : selectedOptions[0] - setFormState(prevState => ({ ...prevState, prop_key: newPropKey })) + setFormState(prevState => ({ + prop_key: newPropKey, + prop_value: { type: prevState.prop_value.type, clauses: [] } + })) } } function onPropValueSelect() { - return (selection) => { } + return (selection) => { + setFormState(prevState => ({ + ...prevState, prop_value: { ...prevState.prop_value, clauses: selection } + })) + } } function onFilterTypeSelect() { @@ -54,8 +65,8 @@ function PropFilterModal(props) { return (
- - + +
) }