mirror of
https://github.com/plausible/analytics.git
synced 2024-12-29 20:42:01 +03:00
b6eeb40472
* 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 * Second pass - mostly everything user-facing is done Still needs: - Tests - Potentially negating other filters - Potentially some code cleanup * Bugfix in realtime view, formatting * Fixes editing UX on list view * Adds tests for exclusions and wildcards * Various UI Improvements - Makes edit buttons full-length & properly sized - Adds remove filter button in edit menu * Changelog * Makes requested changes, adds different version of filter button * Makes colorings on top bar elements consistent
442 lines
13 KiB
JavaScript
442 lines
13 KiB
JavaScript
import React from "react";
|
|
import { withRouter } from "react-router-dom";
|
|
import Flatpickr from "react-flatpickr";
|
|
import {
|
|
shiftDays,
|
|
shiftMonths,
|
|
formatDay,
|
|
formatDayShort,
|
|
formatMonthYYYY,
|
|
formatISO,
|
|
isToday,
|
|
lastMonth,
|
|
nowForSite,
|
|
isSameMonth,
|
|
isThisMonth,
|
|
parseUTCDate,
|
|
isBefore,
|
|
isAfter,
|
|
} from "./date";
|
|
import Transition from "../transition";
|
|
import { navigateToQuery, QueryLink, QueryButton } from "./query";
|
|
|
|
class DatePicker extends React.Component {
|
|
constructor(props) {
|
|
super(props);
|
|
this.handleKeydown = this.handleKeydown.bind(this);
|
|
this.handleClick = this.handleClick.bind(this);
|
|
this.openCalendar = this.openCalendar.bind(this);
|
|
this.open = this.open.bind(this);
|
|
this.state = { mode: "menu", open: false };
|
|
}
|
|
|
|
componentDidMount() {
|
|
document.addEventListener("keydown", this.handleKeydown);
|
|
document.addEventListener("mousedown", this.handleClick, false);
|
|
}
|
|
|
|
componentWillUnmount() {
|
|
document.removeEventListener("keydown", this.handleKeydown);
|
|
document.removeEventListener("mousedown", this.handleClick, false);
|
|
}
|
|
|
|
handleKeydown(e) {
|
|
const { query, history } = this.props;
|
|
|
|
if (e.target.tagName === 'INPUT') return true;
|
|
if (e.ctrlKey || e.metaKey || e.altKey || e.isComposing || e.keyCode === 229) return;
|
|
|
|
const newSearch = {
|
|
period: false,
|
|
from: false,
|
|
to: false,
|
|
date: false,
|
|
};
|
|
|
|
const insertionDate = parseUTCDate(this.props.site.insertedAt);
|
|
|
|
if (e.key === "ArrowLeft") {
|
|
const prevDate = formatISO(shiftDays(query.date, -1));
|
|
const prevMonth = formatISO(shiftMonths(query.date, -1));
|
|
|
|
if (
|
|
query.period === "day" &&
|
|
!isBefore(parseUTCDate(prevDate), insertionDate, query.period)
|
|
) {
|
|
newSearch.period = "day";
|
|
newSearch.date = prevDate;
|
|
} else if (
|
|
query.period === "month" &&
|
|
!isBefore(parseUTCDate(prevMonth), insertionDate, query.period)
|
|
) {
|
|
newSearch.period = "month";
|
|
newSearch.date = prevMonth;
|
|
}
|
|
} else if (e.key === "ArrowRight") {
|
|
const nextDate = formatISO(shiftDays(query.date, 1));
|
|
const nextMonth = formatISO(shiftMonths(query.date, 1));
|
|
|
|
if (
|
|
query.period === "day" &&
|
|
!isAfter(
|
|
parseUTCDate(nextDate),
|
|
nowForSite(this.props.site),
|
|
query.period
|
|
)
|
|
) {
|
|
newSearch.period = "day";
|
|
newSearch.date = nextDate;
|
|
} else if (
|
|
query.period === "month" &&
|
|
!isAfter(
|
|
parseUTCDate(nextMonth),
|
|
nowForSite(this.props.site),
|
|
query.period
|
|
)
|
|
) {
|
|
newSearch.period = "month";
|
|
newSearch.date = nextMonth;
|
|
}
|
|
}
|
|
|
|
this.setState({open: false});
|
|
|
|
const keys = ['d', 'r', 'w', 'm', 'y', 't', 's'];
|
|
const redirects = [{date: false, period: 'day'}, {period: 'realtime'}, {date: false, period: '7d'}, {date: false, period: 'month'}, {date: false, period: '12mo'}, {date: false, period: '30d'}, {date: false, period: '6mo'}];
|
|
|
|
if (keys.includes(e.key.toLowerCase())) {
|
|
navigateToQuery(history, query, {...newSearch, ...(redirects[keys.indexOf(e.key.toLowerCase())])});
|
|
} else if (e.key.toLowerCase() === 'c') {
|
|
this.setState({mode: 'calendar', open: true}, this.openCalendar);
|
|
} else if (newSearch.date) {
|
|
navigateToQuery(history, query, newSearch);
|
|
}
|
|
}
|
|
|
|
handleClick(e) {
|
|
if (this.dropDownNode && this.dropDownNode.contains(e.target)) return;
|
|
|
|
this.setState({ open: false });
|
|
}
|
|
|
|
timeFrameText() {
|
|
const { query, site } = this.props;
|
|
|
|
if (query.period === "day") {
|
|
if (isToday(site, query.date)) {
|
|
return "Today";
|
|
}
|
|
return formatDay(query.date);
|
|
} if (query.period === '7d') {
|
|
return 'Last 7 days'
|
|
} if (query.period === '30d') {
|
|
return 'Last 30 days'
|
|
} if (query.period === 'month') {
|
|
if (isThisMonth(site, query.date)) {
|
|
return 'Month to Date'
|
|
}
|
|
return formatMonthYYYY(query.date)
|
|
} if (query.period === '6mo') {
|
|
return 'Last 6 months'
|
|
} if (query.period === '12mo') {
|
|
return 'Last 12 months'
|
|
} if (query.period === 'custom') {
|
|
return `${formatDayShort(query.from)} - ${formatDayShort(query.to)}`
|
|
}
|
|
return 'Realtime'
|
|
}
|
|
|
|
renderArrow(period, prevDate, nextDate) {
|
|
const insertionDate = parseUTCDate(this.props.site.insertedAt);
|
|
const disabledLeft = isBefore(
|
|
parseUTCDate(prevDate),
|
|
insertionDate,
|
|
period
|
|
);
|
|
const disabledRight = isAfter(
|
|
parseUTCDate(nextDate),
|
|
nowForSite(this.props.site),
|
|
period
|
|
);
|
|
|
|
const leftClasses = `flex items-center px-2 border-r border-gray-300 rounded-l
|
|
dark:border-gray-500 dark:text-gray-100 ${
|
|
disabledLeft ? "bg-gray-300 dark:bg-gray-950" : "hover:bg-gray-200 dark:hover:bg-gray-900"
|
|
}`;
|
|
const rightClasses = `flex items-center px-2 rounded-r dark:text-gray-100 ${
|
|
disabledRight ? "bg-gray-300 dark:bg-gray-950" : "hover:bg-gray-200 dark:hover:bg-gray-900"
|
|
}`;
|
|
return (
|
|
<div className="flex rounded shadow bg-white mr-4 cursor-pointer dark:bg-gray-800">
|
|
<QueryButton
|
|
to={{ date: prevDate }}
|
|
query={this.props.query}
|
|
className={leftClasses}
|
|
disabled={disabledLeft}
|
|
>
|
|
<svg
|
|
className="feather h-4 w-4"
|
|
xmlns="http://www.w3.org/2000/svg"
|
|
viewBox="0 0 24 24"
|
|
fill="none"
|
|
stroke="currentColor"
|
|
strokeWidth="2"
|
|
strokeLinecap="round"
|
|
strokeLinejoin="round"
|
|
>
|
|
<polyline points="15 18 9 12 15 6"></polyline>
|
|
</svg>
|
|
</QueryButton>
|
|
<QueryButton
|
|
to={{ date: nextDate }}
|
|
query={this.props.query}
|
|
className={rightClasses}
|
|
disabled={disabledRight}
|
|
>
|
|
<svg
|
|
className="feather h-4 w-4"
|
|
xmlns="http://www.w3.org/2000/svg"
|
|
viewBox="0 0 24 24"
|
|
fill="none"
|
|
stroke="currentColor"
|
|
strokeWidth="2"
|
|
strokeLinecap="round"
|
|
strokeLinejoin="round"
|
|
>
|
|
<polyline points="9 18 15 12 9 6"></polyline>
|
|
</svg>
|
|
</QueryButton>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
renderArrows() {
|
|
const { query } = this.props;
|
|
|
|
if (query.period === "month") {
|
|
const prevDate = formatISO(shiftMonths(query.date, -1));
|
|
const nextDate = formatISO(shiftMonths(query.date, 1));
|
|
|
|
return this.renderArrow("month", prevDate, nextDate);
|
|
} if (query.period === "day") {
|
|
const prevDate = formatISO(shiftDays(query.date, -1));
|
|
const nextDate = formatISO(shiftDays(query.date, 1));
|
|
|
|
return this.renderArrow("day", prevDate, nextDate);
|
|
}
|
|
}
|
|
|
|
open() {
|
|
this.setState({ mode: "menu", open: true });
|
|
}
|
|
|
|
renderDropDown() {
|
|
return (
|
|
<div
|
|
className="relative"
|
|
style={{ height: "35.5px", width: "190px" }}
|
|
ref={(node) => (this.dropDownNode = node)}
|
|
>
|
|
<div
|
|
onClick={this.open}
|
|
onKeyPress={this.open}
|
|
className="flex items-center justify-between rounded bg-white dark:bg-gray-800 shadow px-4
|
|
pr-3 py-2 leading-tight cursor-pointer text-sm font-medium text-gray-800
|
|
dark:text-gray-200 h-full hover:bg-gray-200 dark:hover:bg-gray-900"
|
|
tabIndex="0"
|
|
role="button"
|
|
aria-haspopup="true"
|
|
aria-expanded="false"
|
|
aria-controls="datemenu"
|
|
>
|
|
<span className="mr-2">{this.timeFrameText()}</span>
|
|
<svg
|
|
className="text-indigo-500 h-4 w-4"
|
|
xmlns="http://www.w3.org/2000/svg"
|
|
viewBox="0 0 24 24"
|
|
fill="none"
|
|
stroke="currentColor"
|
|
strokeWidth="2"
|
|
strokeLinecap="round"
|
|
strokeLinejoin="round"
|
|
>
|
|
<polyline points="6 9 12 15 18 9"></polyline>
|
|
</svg>
|
|
</div>
|
|
|
|
<Transition
|
|
show={this.state.open}
|
|
enter="transition ease-out duration-100 transform"
|
|
enterFrom="opacity-0 scale-95"
|
|
enterTo="opacity-100 scale-100"
|
|
leave="transition ease-in duration-75 transform"
|
|
leaveFrom="opacity-100 scale-100"
|
|
leaveTo="opacity-0 scale-95"
|
|
>
|
|
{this.renderDropDownContent()}
|
|
</Transition>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
close() {
|
|
this.setState({ open: false });
|
|
}
|
|
|
|
renderLink(period, text, opts = {}) {
|
|
const { query, site } = this.props;
|
|
let boldClass;
|
|
if (query.period === "day" && period === "day") {
|
|
boldClass = isToday(site, query.date) ? "font-bold" : "";
|
|
} else if (query.period === "month" && period === "month") {
|
|
const linkDate = opts.date || nowForSite(site);
|
|
boldClass = isSameMonth(linkDate, query.date) ? "font-bold" : "";
|
|
} else {
|
|
boldClass = query.period === period ? "font-bold" : "";
|
|
}
|
|
|
|
opts.date = opts.date ? formatISO(opts.date) : false;
|
|
|
|
const keybinds = {
|
|
'Today': 'D',
|
|
'Realtime': 'R',
|
|
'Last 7 days': 'W',
|
|
'Month to Date': 'M',
|
|
'Last 12 months': 'Y',
|
|
'Last 6 months': 'S',
|
|
'Last 30 days': 'T',
|
|
};
|
|
|
|
return (
|
|
<QueryLink
|
|
to={{from: false, to: false, period, ...opts}}
|
|
onClick={this.close.bind(this)}
|
|
query={this.props.query}
|
|
className={`${boldClass } px-4 py-2 md:text-sm leading-tight hover:bg-gray-200
|
|
dark:hover:bg-gray-900 hover:text-gray-900 dark:hover:text-gray-100 flex items-center justify-between`}
|
|
>
|
|
{text}
|
|
<span className='font-normal'>{keybinds[text]}</span>
|
|
</QueryLink>
|
|
);
|
|
}
|
|
|
|
renderDropDownContent() {
|
|
if (this.state.mode === "menu") {
|
|
return (
|
|
<div
|
|
id="datemenu"
|
|
className="absolute mt-2 rounded shadow-md z-10"
|
|
style={{width: '235px', right: '-5px'}}
|
|
>
|
|
<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"
|
|
>
|
|
<div className="py-1">
|
|
{this.renderLink("day", "Today")}
|
|
{this.renderLink("realtime", "Realtime")}
|
|
</div>
|
|
<div className="border-t border-gray-200 dark:border-gray-500"></div>
|
|
<div className="py-1">
|
|
{this.renderLink("7d", "Last 7 days")}
|
|
{this.renderLink("30d", "Last 30 days")}
|
|
</div>
|
|
<div className="border-t border-gray-200 dark:border-gray-500"></div>
|
|
<div className="py-1">
|
|
{ this.renderLink('month', 'Month to Date') }
|
|
{ this.renderLink('month', 'Last month', {date: lastMonth(this.props.site)}) }
|
|
</div>
|
|
<div className="border-t border-gray-200 dark:border-gray-500"></div>
|
|
<div className="py-1">
|
|
{this.renderLink("6mo", "Last 6 months")}
|
|
{this.renderLink("12mo", "Last 12 months")}
|
|
</div>
|
|
<div className="border-t border-gray-200 dark:border-gray-500"></div>
|
|
<div className="py-1">
|
|
<span
|
|
onClick={() => this.setState({mode: 'calendar'}, this.openCalendar)}
|
|
onKeyPress={() => this.setState({mode: 'calendar'}, this.openCalendar)}
|
|
className="px-4 py-2 md:text-sm leading-tight hover:bg-gray-100
|
|
dark:hover:bg-gray-900 hover:text-gray-900 dark:hover:text-gray-100
|
|
cursor-pointer flex items-center justify-between"
|
|
tabIndex="0"
|
|
role="button"
|
|
aria-haspopup="true"
|
|
aria-expanded="false"
|
|
aria-controls="calendar"
|
|
>
|
|
Custom range
|
|
<span className='font-normal'>C</span>
|
|
</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
);
|
|
} if (this.state.mode === "calendar") {
|
|
const insertionDate = new Date(this.props.site.insertedAt);
|
|
const dayBeforeCreation = insertionDate - 86400000;
|
|
return (
|
|
<Flatpickr
|
|
id="calendar"
|
|
options={{
|
|
mode: 'range',
|
|
maxDate: 'today',
|
|
minDate: dayBeforeCreation,
|
|
showMonths: 1,
|
|
static: true,
|
|
animate: true}}
|
|
ref={calendar => this.calendar = calendar}
|
|
className="invisible"
|
|
onChange={this.setCustomDate.bind(this)}
|
|
/>
|
|
)
|
|
}
|
|
}
|
|
|
|
setCustomDate(dates) {
|
|
if (dates.length === 2) {
|
|
const [from, to] = dates
|
|
if (formatISO(from) === formatISO(to)) {
|
|
navigateToQuery(
|
|
this.props.history,
|
|
this.props.query,
|
|
{
|
|
period: 'day',
|
|
date: formatISO(from),
|
|
from: false,
|
|
to: false,
|
|
}
|
|
)
|
|
} else {
|
|
navigateToQuery(
|
|
this.props.history,
|
|
this.props.query,
|
|
{
|
|
period: 'custom',
|
|
date: false,
|
|
from: formatISO(from),
|
|
to: formatISO(to),
|
|
}
|
|
)
|
|
}
|
|
this.close()
|
|
}
|
|
}
|
|
|
|
openCalendar() {
|
|
this.calendar && this.calendar.flatpickr.open();
|
|
}
|
|
|
|
render() {
|
|
return (
|
|
<div className="flex justify-end ml-auto pl-2">
|
|
{ this.renderArrows() }
|
|
{ this.renderDropDown() }
|
|
</div>
|
|
);
|
|
}
|
|
}
|
|
|
|
export default withRouter(DatePicker);
|