Add Filter
{this.appliedFilters.map((filter) => this.renderDropdownFilter(history, filter, query))}
@@ -247,10 +263,10 @@ class Filters extends React.Component {
const {viewport} = this.state;
return (
-
+
{(this.appliedFilters.map((filter) => this.renderListFilter(history, filter, query)))}
-
+
{viewport <= 768 ? "Filter" : "Add Filter"}
diff --git a/assets/js/dashboard/stats/modals/filter.js b/assets/js/dashboard/stats/modals/filter.js
index 427e5f66e..91382ac74 100644
--- a/assets/js/dashboard/stats/modals/filter.js
+++ b/assets/js/dashboard/stats/modals/filter.js
@@ -1,91 +1,117 @@
import React from "react";
-import { withRouter, Link } from 'react-router-dom'
+import { withRouter, Redirect } from 'react-router-dom'
import Modal from './modal'
-import { parseQuery, formattedFilters } from '../../query'
+import { parseQuery, formattedFilters, navigateToQuery } from '../../query'
class FilterModal extends React.Component {
constructor(props) {
super(props)
this.state = {
query: parseQuery(props.location.search, props.site),
- selectedFilter: this.props.match.params.field || "",
+ selectedFilter: "",
+ negated: false,
updatedValue: "",
- negated: false
+ filterSaved: false
}
this.editableGoals = Object.keys(this.state.query.filters).filter(filter => !['goal', 'props'].includes(filter))
}
componentDidMount() {
+ this.setState({ selectedFilter: this.props.match.params.field })
+ }
+
+ componentDidUpdate(prevProps, prevState) {
+ const { query, selectedFilter } = this.state
+
+ if (prevState.selectedFilter !== selectedFilter) {
+ const negated = query.filters[selectedFilter] && query.filters[selectedFilter][0] == '!' && this.negationSupported(selectedFilter)
+ const updatedValue = negated ? query.filters[selectedFilter].slice(1) : (query.filters[selectedFilter] || "")
+
+ this.setState({ updatedValue, negated })
+ }
+ }
+ negationSupported(filter) {
+ return ['page', 'entry_page', 'exit_page'].includes(filter)
}
renderBody() {
const { selectedFilter, negated, updatedValue, query } = this.state;
- const updatedQuery = new URLSearchParams(window.location.search)
- const finalFilterValue = (['page', 'entry_page', 'exit_page'].includes(selectedFilter) && negated ? '!' : '') + updatedValue
- const validQuery = this.editableGoals.includes(selectedFilter) && updatedValue
- updatedQuery.set(selectedFilter, finalFilterValue)
+ const finalFilterValue = (this.negationSupported(selectedFilter) && negated ? '!' : '') + updatedValue
+ const finalizedQuery = new URLSearchParams(window.location.search)
+ const validFilter = this.editableGoals.includes(selectedFilter) && updatedValue
+ finalizedQuery.set(selectedFilter, finalFilterValue)
return (
- {query.filters[selectedFilter] ? 'Edit' : 'Add'} a Filter
+ {query.filters[selectedFilter] ? 'Edit' : 'Add'} Filter
-
-
-
- {['page', 'entry_page', 'exit_page'].includes(selectedFilter) &&
-
+ }
+
+ {selectedFilter &&
+ { this.setState({ updatedValue: e.target.value }) }}
+ />
+ }
+
+
+
)
}
render() {
+ const { finalizedQuery } = this.state
+
+ if (finalizedQuery) {
+ return
+ }
+
return (
{ this.renderBody()}