diff --git a/assets/js/dashboard/components/combobox.js b/assets/js/dashboard/components/combobox.js index 7a727d422..ac3b73924 100644 --- a/assets/js/dashboard/components/combobox.js +++ b/assets/js/dashboard/components/combobox.js @@ -159,7 +159,7 @@ export default function PlausibleCombobox(props) { const noMatchesFound = !loading && visibleOptions.length === 0 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 5fbaa2da8..2b6d491e9 100644 --- a/assets/js/dashboard/components/filter-type-selector.js +++ b/assets/js/dashboard/components/filter-type-selector.js @@ -31,7 +31,7 @@ export default function FilterTypeSelector(props) { } return ( - + {({ open }) => ( <>
diff --git a/assets/js/dashboard/stats/modals/filter-modal.js b/assets/js/dashboard/stats/modals/filter-modal.js index f8accc2ec..c6fbb3966 100644 --- a/assets/js/dashboard/stats/modals/filter-modal.js +++ b/assets/js/dashboard/stats/modals/filter-modal.js @@ -2,12 +2,16 @@ import React from "react" import { withRouter } from 'react-router-dom' import Modal from './modal' import RegularFilterModal from './regular-filter-modal' +import PropFilterModal from "./prop-filter-modal" function FilterModal(props) { function renderBody() { const filterGroup = props.match.params.field || 'page' - - return + if (filterGroup === 'props') { + return + } else { + return + } } return ( diff --git a/assets/js/dashboard/stats/modals/prop-filter-modal.js b/assets/js/dashboard/stats/modals/prop-filter-modal.js new file mode 100644 index 000000000..e8ac662af --- /dev/null +++ b/assets/js/dashboard/stats/modals/prop-filter-modal.js @@ -0,0 +1,79 @@ +import React from 'react' +import { withRouter } from "react-router-dom"; +import Combobox from '../../components/combobox' +import FilterTypeSelector from "../../components/filter-type-selector"; +import { FILTER_TYPES } from "../../util/filters"; + +function PropFilterModal(props) { + function fetchOptions(filter) { + return () => { + [] + } + } + + function onComboboxSelect(filter) { + return () => { } + } + + function onFilterTypeSelect(filter) { + return () => { } + } + + function selectedFilterType() { + return FILTER_TYPES.is + } + + function renderFilterInputs() { + return ( +
+ + + +
+ ) + } + + function isDisabled() { + return false + } + + function shouldShowClear() { + return true + } + + return ( + <> +

Filter by Property

+ +
+
+
{ }}> + {renderFilterInputs()} + +
+ + + {shouldShowClear() && ( + + )} +
+
+
+ + ) +} + +export default withRouter(PropFilterModal) \ No newline at end of file