First pass on manual filter & path regex/negated filters

Still needs:
- Form structure on filter modal
- Edit filter button
- Filter dropdown UI improvement
- Filter modal mount data collection
- Tests
- Potentially negating other filters
pull/1067/head
Vignesh Joglekar 6 years ago
parent e80fc7bb8e
commit cb7b5b9fbd

@ -38,7 +38,6 @@
.modal__container {
background-color: #fff;
padding: 1rem 2rem;
max-width: 860px;
border-radius: 4px;
margin: 50px auto;
box-sizing: border-box;

@ -1,5 +1,5 @@
import React from 'react';
import { withRouter } from 'react-router-dom'
import { withRouter, Link } from 'react-router-dom'
import { countFilters, navigateToQuery, removeQueryParam } from './query'
import Datamap from 'datamaps'
import Transition from "../transition.js";
@ -181,7 +181,7 @@ class Filters extends React.Component {
renderListFilter(history, [key, value], query) {
return (
<span key={key} title={value} className="inline-flex bg-white dark:bg-gray-800 text-gray-700 dark:text-gray-300 shadow text-sm rounded py-2 px-3 mr-2">
<span key={key} title={value} className="flex bg-white dark:bg-gray-800 text-gray-700 dark:text-gray-300 shadow text-sm rounded py-2 px-3 mr-2">
{this.filterText(key, value, query)} <b className="ml-1 cursor-pointer hover:text-indigo-500" onClick={() => this.removeFilter(key, history, query)}>✕</b>
</span>
)
@ -198,11 +198,15 @@ class Filters extends React.Component {
renderDropDownContent() {
const { viewport } = this.state;
const { history, query } = this.props;
const { history, query, site } = this.props;
return (
<div className="absolute mt-2 rounded shadow-md z-10" style={{ width: viewport <= 768 ? '320px' : '350px', right: '-5px' }} ref={node => this.dropDownNode = node}>
<div className="rounded bg-white dark:bg-gray-800 ring-1 ring-black ring-opacity-5 font-medium text-gray-800 dark:text-gray-200 flex flex-col">
<Link to={`/${encodeURIComponent(site.domain)}/filter${window.location.search}`} className="border-b flex border-gray-200 dark:border-gray-500 px-4 sm:py-2 py-3 md:text-sm leading-tight hover:text-indigo-700 dark:hover:text-indigo-500 hover:cursor-pointer">
<svg className="mr-2 h-4 w-4 text-gray-500 dark:text-gray-200" fill="none" stroke="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6"></path></svg>
Add Filter
</Link>
{this.appliedFilters.map((filter) => this.renderDropdownFilter(history, filter, query))}
<div className="border-t border-gray-200 dark:border-gray-500 px-4 sm:py-2 py-3 md:text-sm leading-tight hover:text-indigo-700 dark:hover:text-indigo-500 hover:cursor-pointer" onClick={() => this.clearAllFilters(history, query)}>
Clear All Filters
@ -239,11 +243,16 @@ class Filters extends React.Component {
}
renderFilterList() {
const { history, query } = this.props;
const { history, query, site } = this.props;
const {viewport} = this.state;
return (
<div id="filters">
<div id="filters" className="flex flex-grow pl-3 flex-wrap">
{(this.appliedFilters.map((filter) => this.renderListFilter(history, filter, query)))}
<Link to={`/${encodeURIComponent(site.domain)}/filter${window.location.search}`} className={`button ${viewport <= 768 ? "px-2 mr-1" : "px-3 mr-2"} py-2 cursor-pointer ml-auto`}>
<svg className={`${viewport <= 768 ? "mr-1" : "mr-2"} h-4 w-4 text-gray-500 dark:text-gray-200 group-hover:text-gray-600 dark:group-hover:text-gray-400 group-focus:text-gray-500 dark:group-focus:text-gray-200`} fill="none" stroke="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6"></path></svg>
{viewport <= 768 ? "Filter" : "Add Filter"}
</Link>
</div>
);
}
@ -251,15 +260,11 @@ class Filters extends React.Component {
render() {
const { wrapped, viewport } = this.state;
if (this.appliedFilters.length > 0) {
if (wrapped === 2 || viewport <= 768) {
return this.renderDropDown();
}
return this.renderFilterList();
if (this.appliedFilters.length > 0 && (wrapped === 2 || viewport <= 768)) {
return this.renderDropDown();
}
return null;
return this.renderFilterList();
}
}

@ -34,7 +34,7 @@ class Historical extends React.Component {
<div className="flex items-center w-full mb-2 sm:mb-0">
<SiteSwitcher site={this.props.site} loggedIn={this.props.loggedIn} />
<CurrentVisitors timer={this.props.timer} site={this.props.site} query={this.props.query} />
<Filters query={this.props.query} history={this.props.history} />
<Filters site={this.props.site} query={this.props.query} history={this.props.history} />
</div>
<Datepicker site={this.props.site} query={this.props.query} />
</div>

@ -159,3 +159,22 @@ export function eventName(query) {
}
return 'pageviews'
}
export const formattedFilters = {
'goal': 'Goal',
'props': 'Props',
'source': 'Source',
'utm_medium': 'UTM Medium',
'utm_source': 'UTM Source',
'utm_campaign': 'UTM Campaign',
'referrer': 'Referrer',
'screen': 'Screen size',
'browser': 'Browser',
'browser_version': 'Browser Version',
'os': 'Operating System',
'os_version': 'Operating System Version',
'country': 'Country',
'page': 'Page',
'entry_page': 'Entry Page',
'exit_page': 'Exit Page'
}

@ -7,6 +7,7 @@ import PagesModal from './stats/modals/pages'
import EntryPagesModal from './stats/modals/entry-pages'
import ExitPagesModal from './stats/modals/exit-pages'
import CountriesModal from './stats/modals/countries'
import FilterModal from './stats/modals/filter'
import {BrowserRouter, Switch, Route, useLocation} from "react-router-dom";
@ -50,6 +51,9 @@ export default function Router({site, loggedIn}) {
<Route path="/:domain/countries">
<CountriesModal site={site} />
</Route>
<Route path={["/:domain/filter/:field", "/:domain/filter"]}>
<FilterModal site={site} />
</Route>
</Switch>
</Route>
</BrowserRouter>

@ -0,0 +1,97 @@
import React from "react";
import { withRouter, Link } from 'react-router-dom'
import Modal from './modal'
import { parseQuery, formattedFilters } 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 || "",
updatedValue: "",
negated: false
}
this.editableGoals = Object.keys(this.state.query.filters).filter(filter => !['goal', 'props'].includes(filter))
}
componentDidMount() {
}
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)
return (
<React.Fragment>
<h1 className="text-xl font-bold dark:text-gray-100">{query.filters[selectedFilter] ? 'Edit' : 'Add'} a Filter</h1>
<div className="my-4 border-b border-gray-300"></div>
<main className="modal__content flex flex-col">
<select
value={selectedFilter}
className="block w-full py-2 pl-3 pr-10 mt-1 text-base border-gray-300 dark:border-gray-700 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md dark:bg-gray-900 dark:text-gray-300"
placeholder="Select a Filter"
onChange={(e) => {
const negated = query.filters[e.target.value][0] == '!' && ['page', 'entry_page', 'exit_page'].includes(e.target.value)
const updatedValue = negated ? query.filters[e.target.value].slice(1) : (query.filters[e.target.value] || "")
this.setState({ selectedFilter: e.target.value, updatedValue, negated })
}}
>
<option disabled value="" className="hidden">Select a Filter</option>
{this.editableGoals.map(filter => <option key={filter} value={filter}>{formattedFilters[filter]}</option>)}
</select>
{['page', 'entry_page', 'exit_page'].includes(selectedFilter) &&
<div className="my-4 flex items-center">
<label className="text-gray-700 dark:text-gray-300 text-sm cursor-pointer">
<input
type="checkbox"
className={`${negated ? 'bg-indigo-600' : 'bg-gray-200 dark:bg-gray-700'} mr-2 relative inline-flex flex-shrink-0 h-6 w-8 border-2 border-transparent rounded-full cursor-pointer transition-colors ease-in-out duration-200 focus:outline-none focus:ring`}
checked={negated}
name="exclude"
onClick={(e) => this.setState({ negated: e.target.checked })}
/>
Exclude pages matching this filter
</label>
</div>
}
{selectedFilter &&
<input
type="text"
className="bg-gray-100 dark:bg-gray-900 outline-none appearance-none border border-transparent rounded w-full p-2 text-gray-700 dark:text-gray-300 leading-normal focus:outline-none focus:bg-white dark:focus:bg-gray-800 focus:border-gray-300 dark:focus:border-gray-500"
value={updatedValue}
placeholder="Filter value"
onChange={(e) => { this.setState({ updatedValue: e.target.value }) }}
/>
}
<Link to={{ pathname: `/${encodeURIComponent(this.props.site.domain)}`, search: updatedQuery.toString() }}
className={"relative button my-4 w-2/3"}
>
{query.filters[selectedFilter] ? 'Update' : 'Add'} Filter
</Link>
</main>
</React.Fragment>
)
}
render() {
return (
<Modal site={this.props.site} maxWidth="460px">
{ this.renderBody()}
</Modal>
)
}
}
export default withRouter(FilterModal)

@ -47,7 +47,7 @@ class Modal extends React.Component {
<div className="modal is-open" onClick={this.props.onClick}>
<div className="modal__overlay">
<button className="modal__close"></button>
<div ref={this.node} className="modal__container dark:bg-gray-800">
<div ref={this.node} className="modal__container dark:bg-gray-800" style={{maxWidth: this.props.maxWidth || '860px'}}>
{this.props.children}
</div>

@ -257,13 +257,7 @@ defmodule Plausible.Stats.Clickhouse do
from(s in referrers, where: s.referrer_source != "")
end
referrers =
if query.filters["page"] do
page = query.filters["page"]
from(s in referrers, where: s.entry_page == ^page)
else
referrers
end
referrers = apply_page_as_entry_page(referrers, site, query)
referrers =
if include_details do
@ -326,13 +320,7 @@ defmodule Plausible.Stats.Clickhouse do
end
defp apply_page_as_entry_page(db_query, _site, query) do
page = query.filters["page"]
if is_binary(page) do
from(s in db_query, where: s.entry_page == ^page)
else
db_query
end
include_path_filter_entry(db_query, query.filters["page"])
end
def utm_mediums(site, query, limit \\ 9, page \\ 1, show_noref \\ false) do
@ -1153,21 +1141,9 @@ defmodule Plausible.Stats.Clickhouse do
sessions_q
end
sessions_q =
if query.filters["entry_page"] do
entry_page = query.filters["entry_page"]
from(s in sessions_q, where: s.entry_page == ^entry_page)
else
sessions_q
end
sessions_q = include_path_filter_entry(sessions_q, query.filters["entry_page"])
sessions_q =
if query.filters["exit_page"] do
exit_page = query.filters["exit_page"]
from(s in sessions_q, where: s.exit_page == ^exit_page)
else
sessions_q
end
sessions_q = include_path_filter_exit(sessions_q, query.filters["exit_page"])
q =
from(e in "events",
@ -1191,13 +1167,7 @@ defmodule Plausible.Stats.Clickhouse do
q
end
q =
if query.filters["page"] do
page = query.filters["page"]
from(e in q, where: e.pathname == ^page)
else
q
end
q = include_path_filter(q, query.filters["page"])
if query.filters["props"] do
[{key, val}] = query.filters["props"] |> Enum.into([])
@ -1347,21 +1317,9 @@ defmodule Plausible.Stats.Clickhouse do
q
end
q =
if query.filters["entry_page"] do
entry_page = query.filters["entry_page"]
from(s in q, where: s.entry_page == ^entry_page)
else
q
end
q = include_path_filter_entry(q, query.filters["entry_page"])
q =
if query.filters["exit_page"] do
exit_page = query.filters["exit_page"]
from(s in q, where: s.exit_page == ^exit_page)
else
q
end
q = include_path_filter_exit(q, query.filters["exit_page"])
if query.filters["referrer"] do
ref = query.filters["referrer"]
@ -1461,13 +1419,7 @@ defmodule Plausible.Stats.Clickhouse do
q
end
q =
if query.filters["page"] do
page = query.filters["page"]
from(e in q, where: e.pathname == ^page)
else
q
end
q = include_path_filter(q, query.filters["page"])
if query.filters["props"] do
[{key, val}] = query.filters["props"] |> Enum.into([])
@ -1547,12 +1499,9 @@ defmodule Plausible.Stats.Clickhouse do
end
if path do
if String.match?(path, ~r/\*/) do
path_regex =
"^#{path}\/?$"
|> String.replace(~r/\*\*/, ".*")
|> String.replace(~r/(?<!\.)\*/, "[^/]*")
{contains_regex, path_regex} = convert_path_regex(path)
if contains_regex do
from(e in q, where: fragment("match(?, ?)", e.pathname, ^path_regex))
else
from(e in q, where: e.pathname == ^path)
@ -1561,4 +1510,89 @@ defmodule Plausible.Stats.Clickhouse do
q
end
end
defp check_negated_filter(filter) do
negated = String.at(filter, 0) == "!"
updated_filter = if negated, do: String.slice(filter, 1..-1), else: filter
{negated, updated_filter}
end
defp convert_path_regex(path) do
contains_regex = String.match?(path, ~r/\*/)
regex = "^#{path}\/?$"
|> String.replace(~r/\*\*/, ".*")
|> String.replace(~r/(?<!\.)\*/, "[^/]*")
{contains_regex, regex}
end
defp include_path_filter(db_query, path) do
if path do
{negated, path} = check_negated_filter(path)
{contains_regex, path_regex} = convert_path_regex(path)
if contains_regex do
if negated do
from(e in db_query, where: fragment("not(match(?, ?))", e.pathname, ^path_regex))
else
from(e in db_query, where: fragment("match(?, ?)", e.pathname, ^path_regex))
end
else
if negated do
from(e in db_query, where: e.pathname != ^path)
else
from(e in db_query, where: e.pathname == ^path)
end
end
else
db_query
end
end
defp include_path_filter_entry(db_query, path) do
if path do
{negated, path} = check_negated_filter(path)
{contains_regex, path_regex} = convert_path_regex(path)
if contains_regex do
if negated do
from(e in db_query, where: fragment("not(match(?, ?))", e.entry_page, ^path_regex))
else
from(e in db_query, where: fragment("match(?, ?)", e.entry_page, ^path_regex))
end
else
if negated do
from(e in db_query, where: e.entry_page != ^path)
else
from(e in db_query, where: e.entry_page == ^path)
end
end
else
db_query
end
end
defp include_path_filter_exit(db_query, path) do
if path do
{negated, path} = check_negated_filter(path)
{contains_regex, path_regex} = convert_path_regex(path)
if contains_regex do
if negated do
from(e in db_query, where: fragment("not(match(?, ?))", e.exit_page, ^path_regex))
else
from(e in db_query, where: fragment("match(?, ?)", e.exit_page, ^path_regex))
end
else
if negated do
from(e in db_query, where: e.exit_page != ^path)
else
from(e in db_query, where: e.exit_page == ^path)
end
end
else
db_query
end
end
end

Loading…
Cancel
Save