Compare commits

..

2 Commits

Author SHA1 Message Date
Karl-Aksel Puulmann ea11c6c8d8 re-add plug 3 years ago
Karl-Aksel Puulmann 3559a4ce1d Update request logging
Ultimate goal is to be able to compare results with and without a flag against each other.
To do this we need logging which displays the full request url with parameters.

Example logs:
```
14:46:09.042 request_id=F8MRLSsaKB7BeIkAAAHk [info] (200) GET /api/sites took 17ms
14:46:09.175 request_id=F8MRLTKYV3G-GqEAAAZB [info] (200) GET /api/stats/dummy.site/current-visitors took 24ms
14:46:09.396 request_id=F8MRLUDfav28LIkAAAIE [info] (202) POST /api/event took 5ms
14:46:09.501 request_id=F8MRLUDS_YhftUkAAAAD [info] (200) GET /api/stats/dummy.site/sources?period=30d&date=2024-04-04&filters=%7B%7D&with_imported=true&limit=9 took 111ms
14:46:09.508 request_id=F8MRLUDhHbK8WKUAAAah [info] (200) GET /api/stats/dummy.site/main-graph?period=30d&date=2024-04-04&filters=%7B%7D&with_imported=true&metric=visitors took 117ms
14:46:09.511 request_id=F8MRLUDS1CYntK4AAAaB [info] (200) GET /api/stats/dummy.site/entry-pages?period=30d&date=2024-04-04&filters=%7B%7D&with_imported=true&limit=9 took 121ms
14:46:09.541 request_id=F8MRLTk5sIPYSn4AABoC [info] (200) GET /api/stats/dummy.site/top-stats?period=30d&date=2024-04-04&filters=%7B%7D&with_imported=true&comparison=previous_period&compare_from=undefined&compare_to=undefined&match_day_of_week=true took 278ms
```
3 years ago

@ -22,7 +22,6 @@ if (container) {
conversionsOptedOut: container.dataset.conversionsOptedOut === 'true', conversionsOptedOut: container.dataset.conversionsOptedOut === 'true',
funnelsOptedOut: container.dataset.funnelsOptedOut === 'true', funnelsOptedOut: container.dataset.funnelsOptedOut === 'true',
propsOptedOut: container.dataset.propsOptedOut === 'true', propsOptedOut: container.dataset.propsOptedOut === 'true',
revenueGoals: JSON.parse(container.dataset.revenueGoals),
funnels: JSON.parse(container.dataset.funnels), funnels: JSON.parse(container.dataset.funnels),
statsBegin: container.dataset.statsBegin, statsBegin: container.dataset.statsBegin,
nativeStatsBegin: container.dataset.nativeStatsBegin, nativeStatsBegin: container.dataset.nativeStatsBegin,

@ -44,6 +44,7 @@ export function serializeQuery(query, extraQuery = []) {
if (query.to) { queryObj.to = formatISO(query.to) } if (query.to) { queryObj.to = formatISO(query.to) }
if (query.filters) { queryObj.filters = serializeFilters(query.filters) } if (query.filters) { queryObj.filters = serializeFilters(query.filters) }
if (query.experimental_session_count) { queryObj.experimental_session_count = query.experimental_session_count } if (query.experimental_session_count) { queryObj.experimental_session_count = query.experimental_session_count }
if (query.experimental_hostname_filter) { queryObj.experimental_hostname_filter = query.experimental_hostname_filter }
if (query.with_imported) { queryObj.with_imported = query.with_imported } if (query.with_imported) { queryObj.with_imported = query.with_imported }
if (SHARED_LINK_AUTH) { queryObj.auth = SHARED_LINK_AUTH } if (SHARED_LINK_AUTH) { queryObj.auth = SHARED_LINK_AUTH }

@ -40,6 +40,7 @@ export function parseQuery(querystring, site) {
match_day_of_week: matchDayOfWeek == 'true', match_day_of_week: matchDayOfWeek == 'true',
with_imported: q.get('with_imported') ? q.get('with_imported') === 'true' : true, with_imported: q.get('with_imported') ? q.get('with_imported') === 'true' : true,
experimental_session_count: q.get('experimental_session_count'), experimental_session_count: q.get('experimental_session_count'),
experimental_hostname_filter: q.get('experimental_hostname_filter'),
filters: { filters: {
'goal': q.get('goal'), 'goal': q.get('goal'),
'props': JSON.parse(q.get('props')), 'props': JSON.parse(q.get('props')),

@ -1,41 +1,19 @@
import numberFormatter, {durationFormatter} from '../../util/number-formatter' import numberFormatter, {durationFormatter} from '../../util/number-formatter'
import { parsePrefix } from '../../util/filters'
export function getGraphableMetrics(query, site) { export const METRIC_MAPPING = {
const isRealtime = query.period === 'realtime' 'Unique visitors (last 30 min)': 'visitors',
const goalFilter = query.filters.goal 'Pageviews (last 30 min)': 'pageviews',
const pageFilter = query.filters.page 'Unique visitors': 'visitors',
'Visit duration': 'visit_duration',
if (isRealtime && goalFilter) { 'Total pageviews': 'pageviews',
return ["visitors"] 'Views per visit': 'views_per_visit',
} else if (isRealtime) { 'Total visits': 'visits',
return ["visitors", "pageviews"] 'Bounce rate': 'bounce_rate',
} else if (goalFilter && canGraphRevenueMetrics(goalFilter, site)) { 'Unique conversions': 'conversions',
return ["visitors", "events", "average_revenue", "total_revenue", "conversion_rate"] 'Total conversions': 'events',
} else if (goalFilter) { 'Conversion rate': 'conversion_rate',
return ["visitors", "events", "conversion_rate"] 'Average revenue': 'average_revenue',
} else if (pageFilter) { 'Total revenue': 'total_revenue',
return ["visitors", "visits", "pageviews", "bounce_rate", "time_on_page"]
} else {
return ["visitors", "visits", "pageviews", "views_per_visit", "bounce_rate", "visit_duration"]
}
}
// Revenue metrics can only be graphed if:
// * The query is filtered by at least one revenue goal
// * All revenue goals in filter have the same currency
function canGraphRevenueMetrics(goalFilter, site) {
const goalsInFilter = parsePrefix(goalFilter).values
const revenueGoalsInFilter = site.revenueGoals.filter((rg) => {
return goalsInFilter.includes(rg.event_name)
})
const singleCurrency = revenueGoalsInFilter.every((rg) => {
return rg.currency === revenueGoalsInFilter[0].currency
})
return revenueGoalsInFilter.length > 0 && singleCurrency
} }
export const METRIC_LABELS = { export const METRIC_LABELS = {
@ -66,6 +44,14 @@ export const METRIC_FORMATTER = {
'average_revenue': numberFormatter, 'average_revenue': numberFormatter,
} }
export const LoadingState = {
loading: 'loading',
refreshing: 'refreshing',
loaded: 'loaded',
isLoadingOrRefreshing: function (state) { return [this.loading, this.refreshing].includes(state) },
isLoadedOrRefreshing: function (state) { return [this.loaded, this.refreshing].includes(state) }
}
const buildComparisonDataset = function(comparisonPlot) { const buildComparisonDataset = function(comparisonPlot) {
if (!comparisonPlot) return [] if (!comparisonPlot) return []

@ -6,7 +6,7 @@ import * as storage from '../../util/storage'
import { isKeyPressed } from '../../keybinding.js' import { isKeyPressed } from '../../keybinding.js'
import { monthsBetweenDates } from '../../util/date.js' import { monthsBetweenDates } from '../../util/date.js'
const INTERVAL_LABELS = { export const INTERVAL_LABELS = {
'minute': 'Minutes', 'minute': 'Minutes',
'hour': 'Hours', 'hour': 'Hours',
'date': 'Days', 'date': 'Days',
@ -14,19 +14,11 @@ const INTERVAL_LABELS = {
'month': 'Months' 'month': 'Months'
} }
function validIntervals(site, query) { export const getStoredInterval = function(period, domain) {
if (query.period === "custom" && monthsBetweenDates(query.from, query.to) > 12) {
return ["week", "month"]
} else {
return site.validIntervalsByPeriod[query.period]
}
}
function getStoredInterval(period, domain) {
return storage.getItem(`interval__${period}__${domain}`) return storage.getItem(`interval__${period}__${domain}`)
} }
function storeInterval(period, domain, interval) { export const storeInterval = function(period, domain, interval) {
storage.setItem(`interval__${period}__${domain}`, interval) storage.setItem(`interval__${period}__${domain}`, interval)
} }
@ -41,34 +33,7 @@ function subscribeKeybinding(element) {
}, [handleKeyPress]) }, [handleKeyPress])
} }
export const getCurrentInterval = function(site, query) { function DropdownItem({ option, currentInterval, updateInterval }) {
const options = validIntervals(site, query)
const storedInterval = getStoredInterval(query.period, site.domain)
const defaultInterval = [...options].pop()
if (storedInterval && options.includes(storedInterval)) {
return storedInterval
} else {
return defaultInterval
}
}
export function IntervalPicker({ query, site, onIntervalUpdate }) {
if (query.period == 'realtime') return null
const menuElement = React.useRef(null)
const options = validIntervals(site, query)
const currentInterval = getCurrentInterval(site, query)
subscribeKeybinding(menuElement)
function updateInterval(interval) {
storeInterval(query.period, site.domain, interval)
onIntervalUpdate(interval)
}
function renderDropdownItem(option) {
return ( return (
<Menu.Item onClick={() => updateInterval(option)} key={option} disabled={option == currentInterval}> <Menu.Item onClick={() => updateInterval(option)} key={option} disabled={option == currentInterval}>
{({ active }) => ( {({ active }) => (
@ -84,6 +49,23 @@ export function IntervalPicker({ query, site, onIntervalUpdate }) {
) )
} }
export function IntervalPicker({ graphData, query, site, updateInterval }) {
if (query.period == 'realtime') return null
const menuElement = React.useRef(null)
subscribeKeybinding(menuElement)
let currentInterval = graphData?.interval
let options = site.validIntervalsByPeriod[query.period]
if (query.period === "custom" && monthsBetweenDates(query.from, query.to) > 12) {
options = ["week", "month"]
}
if (!options.includes(currentInterval)) {
currentInterval = [...options].pop()
}
return ( return (
<Menu as="div" className="relative inline-block pl-2"> <Menu as="div" className="relative inline-block pl-2">
{({ open }) => ( {({ open }) => (
@ -103,7 +85,7 @@ export function IntervalPicker({ query, site, onIntervalUpdate }) {
leaveFrom="opacity-100 scale-100" leaveFrom="opacity-100 scale-100"
leaveTo="opacity-0 scale-95"> leaveTo="opacity-0 scale-95">
<Menu.Items className="py-1 text-left origin-top-right absolute right-0 mt-2 w-56 rounded-md shadow-lg bg-white dark:bg-gray-800 ring-1 ring-black ring-opacity-5 focus:outline-none z-10" static> <Menu.Items className="py-1 text-left origin-top-right absolute right-0 mt-2 w-56 rounded-md shadow-lg bg-white dark:bg-gray-800 ring-1 ring-black ring-opacity-5 focus:outline-none z-10" static>
{options.map(renderDropdownItem)} {options.map((option) => DropdownItem({ option, currentInterval, updateInterval }))}
</Menu.Items> </Menu.Items>
</Transition> </Transition>
</> </>

@ -1,247 +0,0 @@
import React from 'react';
import { withRouter } from 'react-router-dom'
import Chart from 'chart.js/auto';
import { navigateToQuery } from '../../query'
import GraphTooltip from './graph-tooltip'
import { buildDataSet, METRIC_LABELS, METRIC_FORMATTER } from './graph-util'
import dateFormatter from './date-formatter';
import FadeIn from '../../fade-in';
import classNames from 'classnames';
const calculateMaximumY = function(dataset) {
const yAxisValues = dataset
.flatMap((item) => item.data)
.map((item) => item || 0)
if (yAxisValues) {
return Math.max(...yAxisValues)
} else {
return 1
}
}
class LineGraph extends React.Component {
constructor(props) {
super(props);
this.regenerateChart = this.regenerateChart.bind(this);
this.updateWindowDimensions = this.updateWindowDimensions.bind(this);
}
getGraphMetric() {
let metric = this.props.graphData.metric
if (metric == 'visitors' && this.props.query.filters.goal) {
return 'conversions'
} else {
return metric
}
}
regenerateChart() {
const { graphData, query } = this.props
const metric = this.getGraphMetric()
const graphEl = document.getElementById("main-graph-canvas")
this.ctx = graphEl.getContext('2d');
const dataSet = buildDataSet(graphData.plot, graphData.comparison_plot, graphData.present_index, this.ctx, METRIC_LABELS[metric])
return new Chart(this.ctx, {
type: 'line',
data: {
labels: graphData.labels,
datasets: dataSet
},
options: {
animation: false,
plugins: {
legend: { display: false },
tooltip: {
enabled: false,
mode: 'index',
intersect: false,
position: 'average',
external: GraphTooltip(graphData, metric, query)
},
},
responsive: true,
maintainAspectRatio: false,
onResize: this.updateWindowDimensions,
elements: { line: { tension: 0 }, point: { radius: 0 } },
onClick: this.maybeHopToHoveredPeriod.bind(this),
scale: {
ticks: { precision: 0, maxTicksLimit: 8 }
},
scales: {
y: {
min: 0,
suggestedMax: calculateMaximumY(dataSet),
ticks: {
callback: METRIC_FORMATTER[metric],
color: this.props.darkTheme ? 'rgb(243, 244, 246)' : undefined
},
grid: {
zeroLineColor: 'transparent',
drawBorder: false,
}
},
yComparison: {
min: 0,
suggestedMax: calculateMaximumY(dataSet),
display: false,
grid: { display: false },
},
x: {
grid: { display: false },
ticks: {
callback: function(val, _index, _ticks) {
if (this.getLabelForValue(val) == "__blank__") return ""
const hasMultipleYears =
graphData.labels
.filter((date) => typeof date === 'string')
.map(date => date.split('-')[0])
.filter((value, index, list) => list.indexOf(value) === index)
.length > 1
if (graphData.interval === 'hour' && query.period !== 'day') {
const date = dateFormatter({
interval: "date",
longForm: false,
period: query.period,
shouldShowYear: hasMultipleYears,
})(this.getLabelForValue(val))
const hour = dateFormatter({
interval: graphData.interval,
longForm: false,
period: query.period,
shouldShowYear: hasMultipleYears,
})(this.getLabelForValue(val))
// Returns a combination of date and hour. This is because
// small intervals like hour may return multiple days
// depending on the query period.
return `${date}, ${hour}`
}
if (graphData.interval === 'minute' && query.period !== 'realtime') {
return dateFormatter({
interval: "hour", longForm: false, period: query.period,
})(this.getLabelForValue(val))
}
return dateFormatter({
interval: graphData.interval, longForm: false, period: query.period, shouldShowYear: hasMultipleYears,
})(this.getLabelForValue(val))
},
color: this.props.darkTheme ? 'rgb(243, 244, 246)' : undefined
}
}
},
interaction: {
mode: 'index',
intersect: false,
}
}
});
}
repositionTooltip(e) {
const tooltipEl = document.getElementById('chartjs-tooltip');
if (tooltipEl && window.innerWidth >= 768) {
if (e.clientX > 0.66 * window.innerWidth) {
tooltipEl.style.right = (window.innerWidth - e.clientX) + window.pageXOffset + 'px'
tooltipEl.style.left = null;
} else {
tooltipEl.style.right = null;
tooltipEl.style.left = e.clientX + window.pageXOffset + 'px'
}
tooltipEl.style.top = e.clientY + window.pageYOffset + 'px'
tooltipEl.style.opacity = 1;
}
}
componentDidMount() {
if (this.props.graphData) {
this.chart = this.regenerateChart();
}
window.addEventListener('mousemove', this.repositionTooltip);
}
componentDidUpdate(prevProps) {
const { graphData, darkTheme } = this.props;
const tooltip = document.getElementById('chartjs-tooltip');
if (
graphData !== prevProps.graphData ||
darkTheme !== prevProps.darkTheme
) {
if (graphData) {
if (this.chart) {
this.chart.destroy();
}
this.chart = this.regenerateChart();
this.chart.update();
}
if (tooltip) {
tooltip.style.display = 'none';
}
}
if (!graphData) {
if (this.chart) {
this.chart.destroy();
}
if (tooltip) {
tooltip.style.display = 'none';
}
}
}
componentWillUnmount() {
// Ensure that the tooltip doesn't hang around when we are loading more data
const tooltip = document.getElementById('chartjs-tooltip');
if (tooltip) {
tooltip.style.opacity = 0;
tooltip.style.display = 'none';
}
window.removeEventListener('mousemove', this.repositionTooltip)
}
/**
* The current ticks' limits are set to treat iPad (regular/Mini/Pro) as a regular screen.
* @param {*} chart - The chart instance.
* @param {*} dimensions - An object containing the new dimensions *of the chart.*
*/
updateWindowDimensions(chart, dimensions) {
chart.options.scales.x.ticks.maxTicksLimit = dimensions.width < 720 ? 5 : 8
}
maybeHopToHoveredPeriod(e) {
const element = this.chart.getElementsAtEventForMode(e, 'index', { intersect: false })[0]
const date = this.props.graphData.labels[element.index] || this.props.graphData.comparison_labels[element.index]
if (this.props.graphData.interval === 'month') {
navigateToQuery(this.props.history, this.props.query, { period: 'month', date })
} else if (this.props.graphData.interval === 'date') {
navigateToQuery(this.props.history, this.props.query, { period: 'day', date })
}
}
render() {
const { graphData } = this.props
const canvasClass = classNames('mt-4 select-none', { 'cursor-pointer': !['minute', 'hour'].includes(graphData?.interval) })
return (
<FadeIn show={graphData}>
<div className="relative h-96 print:h-auto print:pb-8 w-full z-0">
<canvas id="main-graph-canvas" className={canvasClass}></canvas>
</div>
</FadeIn>
)
}
}
export default withRouter(LineGraph)

@ -1,17 +0,0 @@
import React from "react"
export default function SamplingNotice({topStatData}) {
const samplePercent = topStatData?.samplePercent
if (samplePercent && samplePercent < 100) {
return (
<div tooltip={`Stats based on a ${samplePercent}% sample of all visitors`} className="cursor-pointer w-4 h-4 mx-2">
<svg className="absolute w-4 h-4 dark:text-gray-300 text-gray-700" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
</svg>
</div>
)
} else {
return null
}
}

@ -1,53 +0,0 @@
import React, { useState } from "react"
import * as api from '../../api'
import { getCurrentInterval } from "./interval-picker"
export default function StatsExport({site, query}) {
const [exporting, setExporting] = useState(false)
function startExport() {
setExporting(true)
document.cookie = "exporting="
pollExportReady()
}
function pollExportReady() {
if (document.cookie.includes('exporting')) {
setTimeout(pollExportReady, 1000)
} else {
setExporting(false)
}
}
function renderLoading() {
return (
<svg className="animate-spin h-4 w-4 text-indigo-500" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
<circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4"></circle>
<path className="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
</svg>
)
}
function renderExportLink() {
const interval = getCurrentInterval(site, query)
const queryParams = api.serializeQuery(query, [{ interval }])
const endpoint = `/${encodeURIComponent(site.domain)}/export${queryParams}`
return (
<a href={endpoint} download onClick={startExport}>
<svg className="absolute text-gray-700 feather dark:text-gray-300 hover:text-indigo-600 dark:hover:text-indigo-600" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
<path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"></path>
<polyline points="7 10 12 15 17 10"></polyline>
<line x1="12" y1="15" x2="12" y2="3"></line>
</svg>
</a>
)
}
return (
<div className="w-4 h-4 mx-2">
{exporting && renderLoading()}
{!exporting && renderExportLink()}
</div>
)
}

@ -3,9 +3,8 @@ import { Tooltip } from '../../util/tooltip'
import { SecondsSinceLastLoad } from '../../util/seconds-since-last-load' import { SecondsSinceLastLoad } from '../../util/seconds-since-last-load'
import classNames from "classnames"; import classNames from "classnames";
import numberFormatter, { durationFormatter } from '../../util/number-formatter' import numberFormatter, { durationFormatter } from '../../util/number-formatter'
import * as storage from '../../util/storage' import { METRIC_MAPPING } from './graph-util'
import { formatDateRange } from '../../util/date.js' import { formatDateRange } from '../../util/date.js'
import { getGraphableMetrics } from "./graph-util.js";
function Maybe({condition, children}) { function Maybe({condition, children}) {
if (condition) { if (condition) {
@ -15,7 +14,8 @@ function Maybe({condition, children}) {
} }
} }
function renderPercentageComparison(name, comparison, forceDarkBg = false) { export default class TopStats extends React.Component {
renderPercentageComparison(name, comparison, forceDarkBg = false) {
const formattedComparison = numberFormatter(Math.abs(comparison)) const formattedComparison = numberFormatter(Math.abs(comparison))
const defaultClassName = classNames({ const defaultClassName = classNames({
@ -41,7 +41,7 @@ function renderPercentageComparison(name, comparison, forceDarkBg = false) {
} }
} }
function topStatNumberShort(name, value) { topStatNumberShort(name, value) {
if (['visit duration', 'time on page'].includes(name.toLowerCase())) { if (['visit duration', 'time on page'].includes(name.toLowerCase())) {
return durationFormatter(value) return durationFormatter(value)
} else if (['bounce rate', 'conversion rate'].includes(name.toLowerCase())) { } else if (['bounce rate', 'conversion rate'].includes(name.toLowerCase())) {
@ -53,7 +53,7 @@ function topStatNumberShort(name, value) {
} }
} }
function topStatNumberLong(name, value) { topStatNumberLong(name, value) {
if (['visit duration', 'time on page'].includes(name.toLowerCase())) { if (['visit duration', 'time on page'].includes(name.toLowerCase())) {
return durationFormatter(value) return durationFormatter(value)
} else if (['bounce rate', 'conversion rate'].includes(name.toLowerCase())) { } else if (['bounce rate', 'conversion rate'].includes(name.toLowerCase())) {
@ -65,53 +65,48 @@ function topStatNumberLong(name, value) {
} }
} }
export default function TopStats(props) { topStatTooltip(stat, query) {
const {site, query, data, onMetricUpdate, tooltipBoundary, lastLoadTimestamp} = props
function tooltip(stat) {
let statName = stat.name.toLowerCase() let statName = stat.name.toLowerCase()
statName = stat.value === 1 ? statName.slice(0, -1) : statName statName = stat.value === 1 ? statName.slice(0, -1) : statName
return ( return (
<div> <div>
{query.comparison && <div className="whitespace-nowrap"> {query.comparison && <div className="whitespace-nowrap">
{topStatNumberLong(stat.name, stat.value)} vs. {topStatNumberLong(stat.name, stat.comparison_value)} {statName} {this.topStatNumberLong(stat.name, stat.value)} vs. {this.topStatNumberLong(stat.name, stat.comparison_value)} {statName}
<span className="ml-2">{renderPercentageComparison(stat.name, stat.change, true)}</span> <span className="ml-2">{this.renderPercentageComparison(stat.name, stat.change, true)}</span>
</div>} </div>}
{!query.comparison && <div className="whitespace-nowrap"> {!query.comparison && <div className="whitespace-nowrap">
{topStatNumberLong(stat.name, stat.value)} {statName} {this.topStatNumberLong(stat.name, stat.value)} {statName}
</div>} </div>}
{stat.name === 'Current visitors' && <p className="font-normal text-xs">Last updated <SecondsSinceLastLoad lastLoadTimestamp={lastLoadTimestamp}/>s ago</p>} {stat.name === 'Current visitors' && <p className="font-normal text-xs">Last updated <SecondsSinceLastLoad lastLoadTimestamp={this.props.lastLoadTimestamp}/>s ago</p>}
</div> </div>
) )
} }
function canMetricBeGraphed(stat) { canMetricBeGraphed(stat) {
const graphableMetrics = getGraphableMetrics(query, site) const isTotalUniqueVisitors = this.props.query.filters.goal && stat.name === 'Unique visitors'
return stat.graph_metric && graphableMetrics.includes(stat.graph_metric) const isKnownMetric = Object.keys(METRIC_MAPPING).includes(stat.name)
return isKnownMetric && !isTotalUniqueVisitors
} }
function maybeUpdateMetric(stat) { maybeUpdateMetric(stat) {
if (canMetricBeGraphed(stat)) { if (this.canMetricBeGraphed(stat)) {
storage.setItem(`metric__${site.domain}`, stat.graph_metric) this.props.updateMetric(METRIC_MAPPING[stat.name])
onMetricUpdate(stat.graph_metric)
} }
} }
function blinkingDot() { blinkingDot() {
return ( return (
<div key="dot" className="block pulsating-circle" style={{ left: '125px', top: '52px' }}></div> <div key="dot" className="block pulsating-circle" style={{ left: '125px', top: '52px' }}></div>
) )
} }
function getStoredMetric() { renderStatName(stat) {
return storage.getItem(`metric__${site.domain}`) const { metric } = this.props
} const isSelected = metric === METRIC_MAPPING[stat.name]
function renderStatName(stat) {
const isSelected = stat.graph_metric === getStoredMetric()
const [statDisplayName, statExtraName] = stat.name.split(/(\(.+\))/g) const [statDisplayName, statExtraName] = stat.name.split(/(\(.+\))/g)
@ -128,45 +123,48 @@ export default function TopStats(props) {
) )
} }
function renderStat(stat, index) { render() {
const { topStatData, query, site } = this.props
const stats = topStatData && topStatData.top_stats.map((stat, index) => {
const className = classNames('px-4 md:px-6 w-1/2 my-4 lg:w-auto group select-none', { const className = classNames('px-4 md:px-6 w-1/2 my-4 lg:w-auto group select-none', {
'cursor-pointer': canMetricBeGraphed(stat), 'cursor-pointer': this.canMetricBeGraphed(stat),
'lg:border-l border-gray-300': index > 0, 'lg:border-l border-gray-300': index > 0,
'border-r lg:border-r-0': index % 2 === 0 'border-r lg:border-r-0': index % 2 === 0
}) })
return ( return (
<Tooltip key={stat.name} info={tooltip(stat, query)} className={className} onClick={() => { maybeUpdateMetric(stat) }} boundary={tooltipBoundary}> <Tooltip key={stat.name} info={this.topStatTooltip(stat, query)} className={className} onClick={() => { this.maybeUpdateMetric(stat) }} boundary={this.props.tooltipBoundary}>
{renderStatName(stat)} {this.renderStatName(stat)}
<div className="my-1 space-y-2"> <div className="my-1 space-y-2">
<div> <div>
<span className="flex items-center justify-between whitespace-nowrap"> <span className="flex items-center justify-between whitespace-nowrap">
<p className="font-bold text-xl dark:text-gray-100" id={stat.graph_metric}>{topStatNumberShort(stat.name, stat.value)}</p> <p className="font-bold text-xl dark:text-gray-100" id={METRIC_MAPPING[stat.name]}>{this.topStatNumberShort(stat.name, stat.value)}</p>
<Maybe condition={!query.comparison}> <Maybe condition={!query.comparison}>
{ renderPercentageComparison(stat.name, stat.change) } { this.renderPercentageComparison(stat.name, stat.change) }
</Maybe> </Maybe>
</span> </span>
<Maybe condition={query.comparison}> <Maybe condition={query.comparison}>
<p className="text-xs dark:text-gray-100">{ formatDateRange(site, data.from, data.to) }</p> <p className="text-xs dark:text-gray-100">{ formatDateRange(site, topStatData.from, topStatData.to) }</p>
</Maybe> </Maybe>
</div> </div>
<Maybe condition={query.comparison}> <Maybe condition={query.comparison}>
<div> <div>
<p className="font-bold text-xl text-gray-500 dark:text-gray-400">{ topStatNumberShort(stat.name, stat.comparison_value) }</p> <p className="font-bold text-xl text-gray-500 dark:text-gray-400">{ this.topStatNumberShort(stat.name, stat.comparison_value) }</p>
<p className="text-xs text-gray-500 dark:text-gray-400">{ formatDateRange(site, data.comparing_from, data.comparing_to) }</p> <p className="text-xs text-gray-500 dark:text-gray-400">{ formatDateRange(site, topStatData.comparing_from, topStatData.comparing_to) }</p>
</div> </div>
</Maybe> </Maybe>
</div> </div>
</Tooltip> </Tooltip>
) )
} })
const stats = data && data.top_stats.map(renderStat)
if (stats && query.period === 'realtime') { if (stats && query && query.period === 'realtime') {
stats.push(blinkingDot()) stats.push(this.blinkingDot())
} }
return stats || null; return stats || null;
} }
}

@ -1,154 +1,533 @@
import React, { useState, useEffect, useRef, useCallback } from 'react'; import React from 'react';
import { withRouter, Link } from 'react-router-dom'
import Chart from 'chart.js/auto';
import { navigateToQuery } from '../../query'
import * as api from '../../api' import * as api from '../../api'
import * as storage from '../../util/storage' import * as storage from '../../util/storage'
import { getGraphableMetrics } from './graph-util' import LazyLoader from '../../components/lazy-loader'
import GraphTooltip from './graph-tooltip'
import { buildDataSet, METRIC_MAPPING, METRIC_LABELS, METRIC_FORMATTER, LoadingState } from './graph-util'
import dateFormatter from './date-formatter';
import TopStats from './top-stats'; import TopStats from './top-stats';
import { IntervalPicker, getCurrentInterval } from './interval-picker' import { IntervalPicker, getStoredInterval, storeInterval } from './interval-picker';
import StatsExport from './stats-export'
import WithImportedSwitch from './with-imported-switch';
import SamplingNotice from './sampling-notice';
import FadeIn from '../../fade-in'; import FadeIn from '../../fade-in';
import * as url from '../../util/url' import * as url from '../../util/url'
import classNames from 'classnames';
import { monthsBetweenDates, parseNaiveDate, isBefore } from '../../util/date'
import { isComparisonEnabled } from '../../comparison-input' import { isComparisonEnabled } from '../../comparison-input'
import LineGraphWithRouter from './line-graph' import { BarsArrowUpIcon } from '@heroicons/react/20/solid'
function fetchTopStats(site, query) { const calculateMaximumY = function(dataset) {
const q = { ...query } const yAxisValues = dataset
.flatMap((item) => item.data)
.map((item) => item || 0)
if (!isComparisonEnabled(q.comparison)) { if (yAxisValues) {
q.comparison = 'previous_period' return Math.max(...yAxisValues)
} else {
return 1
}
} }
return api.get(url.apiPath(site, '/top-stats'), q) class LineGraph extends React.Component {
constructor(props) {
super(props);
this.boundary = React.createRef()
this.regenerateChart = this.regenerateChart.bind(this);
this.updateWindowDimensions = this.updateWindowDimensions.bind(this);
this.state = {
exported: false
};
} }
function fetchMainGraph(site, query, metric, interval) { regenerateChart() {
const params = {metric, interval} const { graphData, metric, query } = this.props
return api.get(url.apiPath(site, '/main-graph'), query, params) const graphEl = document.getElementById("main-graph-canvas")
this.ctx = graphEl.getContext('2d');
const dataSet = buildDataSet(graphData.plot, graphData.comparison_plot, graphData.present_index, this.ctx, METRIC_LABELS[metric])
return new Chart(this.ctx, {
type: 'line',
data: {
labels: graphData.labels,
datasets: dataSet
},
options: {
animation: false,
plugins: {
legend: { display: false },
tooltip: {
enabled: false,
mode: 'index',
intersect: false,
position: 'average',
external: GraphTooltip(graphData, metric, query)
},
},
responsive: true,
maintainAspectRatio: false,
onResize: this.updateWindowDimensions,
elements: { line: { tension: 0 }, point: { radius: 0 } },
onClick: this.onClick.bind(this),
scale: {
ticks: { precision: 0, maxTicksLimit: 8 }
},
scales: {
y: {
min: 0,
suggestedMax: calculateMaximumY(dataSet),
ticks: {
callback: METRIC_FORMATTER[metric],
color: this.props.darkTheme ? 'rgb(243, 244, 246)' : undefined
},
grid: {
zeroLineColor: 'transparent',
drawBorder: false,
} }
},
yComparison: {
min: 0,
suggestedMax: calculateMaximumY(dataSet),
display: false,
grid: { display: false },
},
x: {
grid: { display: false },
ticks: {
callback: function(val, _index, _ticks) {
if (this.getLabelForValue(val) == "__blank__") return ""
export default function VisitorGraph(props) { const hasMultipleYears =
const {site, query, lastLoadTimestamp} = props graphData.labels
const isRealtime = query.period === 'realtime' .filter((date) => typeof date === 'string')
const isDarkTheme = document.querySelector('html').classList.contains('dark') || false .map(date => date.split('-')[0])
.filter((value, index, list) => list.indexOf(value) === index)
.length > 1
const topStatsBoundary = useRef(null) if (graphData.interval === 'hour' && query.period !== 'day') {
const date = dateFormatter({
interval: "date",
longForm: false,
period: query.period,
shouldShowYear: hasMultipleYears,
})(this.getLabelForValue(val))
const [topStatData, setTopStatData] = useState(null) const hour = dateFormatter({
const [topStatsLoading, setTopStatsLoading] = useState(true) interval: graphData.interval,
const [graphData, setGraphData] = useState(null) longForm: false,
const [graphLoading, setGraphLoading] = useState(true) period: query.period,
shouldShowYear: hasMultipleYears,
})(this.getLabelForValue(val))
// This state is explicitly meant for the situation where either graph interval // Returns a combination of date and hour. This is because
// or graph metric is changed. That results in behaviour where Top Stats stay // small intervals like hour may return multiple days
// intact, but the graph container alone will display a loading spinner for as // depending on the query period.
// long as new graph data is fetched. return `${date}, ${hour}`
const [graphRefreshing, setGraphRefreshing] = useState(false) }
if (graphData.interval === 'minute' && query.period !== 'realtime') {
return dateFormatter({
interval: "hour", longForm: false, period: query.period,
})(this.getLabelForValue(val))
}
const onIntervalUpdate = useCallback((newInterval) => { return dateFormatter({
setGraphData(null) interval: graphData.interval, longForm: false, period: query.period, shouldShowYear: hasMultipleYears,
setGraphRefreshing(true) })(this.getLabelForValue(val))
fetchGraphData(getStoredMetric(), newInterval) },
}, [query]) color: this.props.darkTheme ? 'rgb(243, 244, 246)' : undefined
}
}
},
interaction: {
mode: 'index',
intersect: false,
}
}
});
}
repositionTooltip(e) {
const tooltipEl = document.getElementById('chartjs-tooltip');
if (tooltipEl && window.innerWidth >= 768) {
if (e.clientX > 0.66 * window.innerWidth) {
tooltipEl.style.right = (window.innerWidth - e.clientX) + window.pageXOffset + 'px'
tooltipEl.style.left = null;
} else {
tooltipEl.style.right = null;
tooltipEl.style.left = e.clientX + window.pageXOffset + 'px'
}
tooltipEl.style.top = e.clientY + window.pageYOffset + 'px'
tooltipEl.style.opacity = 1;
}
}
componentDidMount() {
if (this.props.graphData) {
this.chart = this.regenerateChart();
}
window.addEventListener('mousemove', this.repositionTooltip);
}
const onMetricUpdate = useCallback((newMetric) => { componentDidUpdate(prevProps) {
setGraphData(null) const { graphData, darkTheme } = this.props;
setGraphRefreshing(true) const tooltip = document.getElementById('chartjs-tooltip');
fetchGraphData(newMetric, getCurrentInterval(site, query))
}, [query])
useEffect(() => { if (
setTopStatData(null) graphData !== prevProps.graphData ||
setTopStatsLoading(true) darkTheme !== prevProps.darkTheme
setGraphData(null) ) {
setGraphLoading(true)
fetchTopStatsAndGraphData()
if (isRealtime) { if (graphData) {
document.addEventListener('tick', fetchTopStatsAndGraphData) if (this.chart) {
this.chart.destroy();
}
this.chart = this.regenerateChart();
this.chart.update();
} }
return () => { if (tooltip) {
document.removeEventListener('tick', fetchTopStatsAndGraphData) tooltip.style.display = 'none';
}
} }
}, [query])
useEffect(() => { if (!graphData) {
if (topStatData) { storeTopStatsContainerHeight() } if (this.chart) {
}, [topStatData]) this.chart.destroy();
}
function fetchTopStatsAndGraphData() { if (tooltip) {
fetchTopStats(site, query) tooltip.style.display = 'none';
.then((res) => { }
setTopStatData(res) }
setTopStatsLoading(false) }
})
let metric = getStoredMetric() componentWillUnmount() {
const availableMetrics = getGraphableMetrics(query, site) // Ensure that the tooltip doesn't hang around when we are loading more data
const tooltip = document.getElementById('chartjs-tooltip');
if (tooltip) {
tooltip.style.opacity = 0;
tooltip.style.display = 'none';
}
window.removeEventListener('mousemove', this.repositionTooltip)
}
if (!availableMetrics.includes(metric)) { /**
metric = availableMetrics[0] * The current ticks' limits are set to treat iPad (regular/Mini/Pro) as a regular screen.
storage.setItem(`metric__${site.domain}`, metric) * @param {*} chart - The chart instance.
* @param {*} dimensions - An object containing the new dimensions *of the chart.*
*/
updateWindowDimensions(chart, dimensions) {
chart.options.scales.x.ticks.maxTicksLimit = dimensions.width < 720 ? 5 : 8
} }
const interval = getCurrentInterval(site, query) onClick(e) {
const element = this.chart.getElementsAtEventForMode(e, 'index', { intersect: false })[0]
const date = this.props.graphData.labels[element.index] || this.props.graphData.comparison_labels[element.index]
fetchGraphData(metric, interval) if (this.props.graphData.interval === 'month') {
navigateToQuery(this.props.history, this.props.query, { period: 'month', date })
} else if (this.props.graphData.interval === 'date') {
navigateToQuery(this.props.history, this.props.query, { period: 'day', date })
}
} }
function fetchGraphData(metric, interval) { pollExportReady() {
fetchMainGraph(site, query, metric, interval) if (document.cookie.includes('exporting')) {
.then((res) => { setTimeout(this.pollExportReady.bind(this), 1000);
setGraphData(res) } else {
setGraphLoading(false) this.setState({ exported: false })
setGraphRefreshing(false) }
}) }
downloadSpinner() {
this.setState({ exported: true });
document.cookie = "exporting=";
setTimeout(this.pollExportReady.bind(this), 1000);
}
downloadLink() {
if (this.props.query.period !== 'realtime') {
if (this.state.exported) {
return (
<div className="w-4 h-4 mx-2">
<svg className="animate-spin h-4 w-4 text-indigo-500" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
<circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4"></circle>
<path className="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
</svg>
</div>
)
} else {
const interval = this.props.graphData?.interval
const queryParams = api.serializeQuery(this.props.query, [{ interval }])
const endpoint = `/${encodeURIComponent(this.props.site.domain)}/export${queryParams}`
return (
<a className="w-4 h-4 mx-2" href={endpoint} download onClick={this.downloadSpinner.bind(this)}>
<svg className="absolute text-gray-700 feather dark:text-gray-300 hover:text-indigo-600 dark:hover:text-indigo-600" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"></path><polyline points="7 10 12 15 17 10"></polyline><line x1="12" y1="15" x2="12" y2="3"></line></svg>
</a>
)
}
}
}
samplingNotice() {
const samplePercent = this.props.topStatData && this.props.topStatData.sample_percent
if (samplePercent < 100) {
return (
<div tooltip={`Stats based on a ${samplePercent}% sample of all visitors`} className="cursor-pointer w-4 h-4 mx-2">
<svg className="absolute w-4 h-4 dark:text-gray-300 text-gray-700" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
</svg>
</div>
)
}
} }
function getStoredMetric() { importedNotice() {
return storage.getItem(`metric__${site.domain}`) if (!this.props.topStatData?.imports_exist) return
const isBeforeNativeStats = (date) => {
if (!date) return false
const nativeStatsBegin = parseNaiveDate(this.props.site.nativeStatsBegin)
const parsedDate = parseNaiveDate(date)
return isBefore(parsedDate, nativeStatsBegin, "day")
} }
function storeTopStatsContainerHeight() { const isQueryingImportedPeriod = isBeforeNativeStats(this.props.topStatData.from)
storage.setItem(`topStatsHeight__${site.domain}`, document.getElementById('top-stats-container').clientHeight) const isComparingImportedPeriod = isBeforeNativeStats(this.props.topStatData.comparing_from)
if (isQueryingImportedPeriod || isComparingImportedPeriod) {
const withImported = this.props.topStatData.with_imported;
const toggleColor = withImported ? " dark:text-gray-300 text-gray-700" : " dark:text-gray-500 text-gray-400"
const target = url.setQuery('with_imported', !withImported)
const tip = withImported ? "" : "do not ";
return (
<Link to={target} className="w-4 h-4 mx-2">
<div tooltip={`Stats ${tip}include imported data.`} className="cursor-pointer w-4 h-4">
<BarsArrowUpIcon className={"absolute " + toggleColor} />
</div>
</Link>
)
}
} }
// This function is used for maintaining the main-graph/top-stats container height in the // This function is used for maintaining the main-graph/top-stats container height in the
// loading process. The container height depends on how many top stat metrics are returned // loading process. The container height depends on how many top stat metrics are returned
// from the API, but in the loading state, we don't know that yet. We can use localStorage // from the API, but in the loading state, we don't know that yet. We can use localStorage
// to keep track of the Top Stats container height. // to keep track of the Top Stats container height.
function getTopStatsHeight() { getTopStatsHeight() {
if (topStatData) { if (this.props.topStatData) {
return 'auto' return 'auto'
} else { } else {
return `${storage.getItem(`topStatsHeight__${site.domain}`) || 89}px` return `${storage.getItem(`topStatsHeight__${this.props.site.domain}`) || 89}px`
} }
} }
render() {
const { mainGraphRefreshing, updateMetric, updateInterval, metric, topStatData, query, site, graphData, lastLoadTimestamp } = this.props
const canvasClass = classNames('mt-4 select-none', { 'cursor-pointer': !['minute', 'hour'].includes(graphData?.interval) })
return ( return (
<div className={"relative w-full mt-2 bg-white rounded shadow-xl dark:bg-gray-825"}> <div>
{(topStatsLoading || graphLoading) && renderLoader()} <div id="top-stats-container" className="flex flex-wrap" ref={this.boundary} style={{ height: this.getTopStatsHeight() }}>
<FadeIn show={!(topStatsLoading || graphLoading)}> <TopStats site={site} query={query} metric={metric} updateMetric={updateMetric} topStatData={topStatData} tooltipBoundary={this.boundary.current} lastLoadTimestamp={lastLoadTimestamp} />
<div id="top-stats-container" className="flex flex-wrap" ref={topStatsBoundary} style={{ height: getTopStatsHeight() }}>
<TopStats site={site} query={query} data={topStatData} onMetricUpdate={onMetricUpdate} tooltipBoundary={topStatsBoundary.current} lastLoadTimestamp={lastLoadTimestamp} />
</div> </div>
<div className="relative px-2"> <div className="relative px-2">
{graphRefreshing && renderLoader()} {mainGraphRefreshing && renderLoader()}
<div className="absolute right-4 -top-8 py-1 flex items-center"> <div className="absolute right-4 -top-8 py-1 flex items-center">
{!isRealtime && <StatsExport site={site} query={query} />} {this.downloadLink()}
<SamplingNotice samplePercent={topStatData}/> {this.samplingNotice()}
<WithImportedSwitch site={site} topStatData={topStatData} /> {this.importedNotice()}
<IntervalPicker site={site} query={query} onIntervalUpdate={onIntervalUpdate} /> <IntervalPicker site={site} query={query} graphData={graphData} metric={metric} updateInterval={updateInterval} />
</div> </div>
<LineGraphWithRouter graphData={graphData} darkTheme={isDarkTheme} query={query} /> <FadeIn show={graphData}>
<div className="relative h-96 print:h-auto print:pb-8 w-full z-0">
<canvas id="main-graph-canvas" className={canvasClass}></canvas>
</div> </div>
</FadeIn> </FadeIn>
</div> </div>
</div>
) )
} }
}
const LineGraphWithRouter = withRouter(LineGraph)
export default class VisitorGraph extends React.Component {
constructor(props) {
super(props)
this.state = {
topStatsLoadingState: LoadingState.loading,
mainGraphLoadingState: LoadingState.loading,
metric: storage.getItem(`metric__${this.props.site.domain}`) || 'visitors'
}
this.onVisible = this.onVisible.bind(this)
this.updateMetric = this.updateMetric.bind(this)
this.fetchTopStatData = this.fetchTopStatData.bind(this)
this.fetchGraphData = this.fetchGraphData.bind(this)
this.updateInterval = this.updateInterval.bind(this)
}
isIntervalValid(interval) {
const { query, site } = this.props
const validIntervals = site.validIntervalsByPeriod[query.period] || []
return validIntervals.includes(interval)
}
getIntervalFromStorage() {
const { query, site } = this.props
let interval = getStoredInterval(query.period, site.domain)
if (interval !== "week" && interval !== "month" && query.period === "custom" && monthsBetweenDates(query.from, query.to) > 12) {
interval = "month"
}
if (this.isIntervalValid(interval)) {
return interval
} else {
return null
}
}
updateInterval(interval) {
if (this.isIntervalValid(interval)) {
storeInterval(this.props.query.period, this.props.site.domain, interval)
this.setState({ mainGraphLoadingState: LoadingState.refreshing, graphData: null }, this.fetchGraphData)
}
}
onVisible() {
this.setState({ mainGraphLoadingState: LoadingState.loading }, this.fetchGraphData)
this.fetchTopStatData()
if (this.props.query.period === 'realtime') {
document.addEventListener('tick', this.fetchGraphData)
document.addEventListener('tick', this.fetchTopStatData)
}
}
componentDidUpdate(prevProps, prevState) {
const { metric } = this.state;
const { query } = this.props
if (query !== prevProps.query) {
this.setState({ mainGraphLoadingState: LoadingState.loading, topStatsLoadingState: LoadingState.loading, graphData: null, topStatData: null }, this.fetchGraphData)
this.fetchTopStatData()
}
if (metric !== prevState.metric) {
this.setState({ mainGraphLoadingState: LoadingState.refreshing }, this.fetchGraphData)
}
}
resetMetric() {
const { topStatData } = this.state
const { query, site } = this.props
const savedMetric = storage.getItem(`metric__${site.domain}`)
const selectableMetrics = topStatData && topStatData.top_stats.map(({ name }) => METRIC_MAPPING[name]).filter(name => name)
const canSelectSavedMetric = selectableMetrics && selectableMetrics.includes(savedMetric)
if (query.filters.goal && !['conversion_rate', 'events'].includes(savedMetric)) {
this.setState({ metric: 'conversions' })
} else if (canSelectSavedMetric) {
this.setState({ metric: savedMetric })
} else {
this.setState({ metric: 'visitors' })
}
}
componentWillUnmount() {
document.removeEventListener('tick', this.fetchGraphData)
document.removeEventListener('tick', this.fetchTopStatData)
}
storeTopStatsContainerHeight() {
storage.setItem(`topStatsHeight__${this.props.site.domain}`, document.getElementById('top-stats-container').clientHeight)
}
updateMetric(clickedMetric) {
if (this.state.metric == clickedMetric) return
storage.setItem(`metric__${this.props.site.domain}`, clickedMetric)
this.setState({ metric: clickedMetric, graphData: null })
}
fetchGraphData() {
const url = `/api/stats/${encodeURIComponent(this.props.site.domain)}/main-graph`
let params = { metric: this.state.metric }
const interval = this.getIntervalFromStorage()
if (interval) { params.interval = interval }
api.get(url, this.props.query, params)
.then((res) => {
this.setState({ mainGraphLoadingState: LoadingState.loaded, graphData: res })
return res
})
.catch((err) => {
console.log(err)
this.setState({ mainGraphLoadingState: LoadingState.loaded, graphData: false })
})
}
fetchTopStatData() {
const query = { ...this.props.query }
if (!isComparisonEnabled(query.comparison)) query.comparison = 'previous_period'
api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/top-stats`, query)
.then((res) => {
this.setState({ topStatsLoadingState: LoadingState.loaded, topStatData: res }, () => {
this.storeTopStatsContainerHeight()
this.resetMetric()
})
return res
})
}
renderInner() {
const { query, site } = this.props;
const { graphData, metric, topStatData, topStatsLoadingState, mainGraphLoadingState } = this.state;
const theme = document.querySelector('html').classList.contains('dark') || false
const mainGraphRefreshing = (mainGraphLoadingState === LoadingState.refreshing)
const topStatAndGraphLoaded = !!(topStatData && graphData)
const shouldShow =
topStatsLoadingState === LoadingState.loaded &&
LoadingState.isLoadedOrRefreshing(mainGraphLoadingState) &&
(topStatData && mainGraphRefreshing || topStatAndGraphLoaded)
return (
<FadeIn show={shouldShow}>
<LineGraphWithRouter mainGraphRefreshing={mainGraphRefreshing} graphData={graphData} topStatData={topStatData} site={site} query={query} darkTheme={theme} metric={metric} updateMetric={this.updateMetric} updateInterval={this.updateInterval} lastLoadTimestamp={this.props.lastLoadTimestamp} />
</FadeIn>
)
}
render() {
const { mainGraphLoadingState, topStatsLoadingState } = this.state
const showLoader =
[mainGraphLoadingState, topStatsLoadingState].includes(LoadingState.loading) &&
mainGraphLoadingState !== LoadingState.refreshing
return (
<LazyLoader onVisible={this.onVisible}>
<div className={"relative w-full mt-2 bg-white rounded shadow-xl dark:bg-gray-825"}>
{showLoader && renderLoader()}
{this.renderInner()}
</div>
</LazyLoader>
)
}
}
function renderLoader() { function renderLoader() {
return ( return (

@ -1,40 +0,0 @@
import React from "react"
import { parseNaiveDate, isBefore } from '../../util/date'
import { Link } from 'react-router-dom'
import * as url from '../../util/url'
import { BarsArrowUpIcon } from '@heroicons/react/20/solid'
export default function WithImportedSwitch({site, topStatData}) {
if (!topStatData?.imports_exist) {
return null
}
function isBeforeNativeStats(date) {
if (!date) return false
const nativeStatsBegin = parseNaiveDate(site.nativeStatsBegin)
const parsedDate = parseNaiveDate(date)
return isBefore(parsedDate, nativeStatsBegin, "day")
}
const isQueryingImportedPeriod = isBeforeNativeStats(topStatData.from)
const isComparingImportedPeriod = isBeforeNativeStats(topStatData.comparing_from)
if (isQueryingImportedPeriod || isComparingImportedPeriod) {
const withImported = topStatData.with_imported;
const toggleColor = withImported ? " dark:text-gray-300 text-gray-700" : " dark:text-gray-500 text-gray-400"
const target = url.setQuery('with_imported', !withImported)
const tip = withImported ? "" : "do not ";
return (
<Link to={target} className="w-4 h-4 mx-2">
<div tooltip={`Stats ${tip}include imported data.`} className="cursor-pointer w-4 h-4">
<BarsArrowUpIcon className={"absolute " + toggleColor} />
</div>
</Link>
)
} else {
return null
}
}

@ -10,11 +10,11 @@ export const FILTER_GROUPS = {
'utm': ['utm_medium', 'utm_source', 'utm_campaign', 'utm_term', 'utm_content'], 'utm': ['utm_medium', 'utm_source', 'utm_campaign', 'utm_term', 'utm_content'],
'goal': ['goal'], 'goal': ['goal'],
'props': ['prop_key', 'prop_value'], 'props': ['prop_key', 'prop_value'],
...(flags.hostname_filter ? { 'hostname': ['hostname'] } : {}) ...(flags.hostname_filter ? { 'hostname': ['hostname', 'experimental_hostname_filter'] } : {})
} }
export const NO_CONTAINS_OPERATOR = new Set(['goal', 'screen'].concat(FILTER_GROUPS['location'])) export const NO_CONTAINS_OPERATOR = new Set(['experimental_hostname_filter', 'goal', 'screen'].concat(FILTER_GROUPS['location']))
export const FILTER_OPERATIONS = { export const FILTER_OPERATIONS = {
isNot: 'is not', isNot: 'is not',
@ -29,7 +29,7 @@ export const OPERATION_PREFIX = {
}; };
export function supportsIsNot(filterName) { export function supportsIsNot(filterName) {
return !['goal', 'prop_key'].includes(filterName) return !['goal', 'prop_key', 'experimental_hostname_filter'].includes(filterName)
} }
export function isFreeChoiceFilter(filterName) { export function isFreeChoiceFilter(filterName) {
@ -157,6 +157,7 @@ export const formattedFilters = {
'city': 'City', 'city': 'City',
'page': 'Page', 'page': 'Page',
'hostname': 'Hostname', 'hostname': 'Hostname',
'experimental_hostname_filter': 'Treat hostname as entry/exit hostname',
'entry_page': 'Entry Page', 'entry_page': 'Entry Page',
'exit_page': 'Exit Page', 'exit_page': 'Exit Page',
} }

@ -38,7 +38,7 @@ config :tailwind,
config :ua_inspector, config :ua_inspector,
database_path: "priv/ua_inspector", database_path: "priv/ua_inspector",
remote_release: "6.3.0" remote_release: "6.2.1"
config :ref_inspector, config :ref_inspector,
database_path: "priv/ref_inspector" database_path: "priv/ref_inspector"

@ -100,6 +100,7 @@ defmodule Plausible.Application do
opts = [strategy: :one_for_one, name: Plausible.Supervisor] opts = [strategy: :one_for_one, name: Plausible.Supervisor]
setup_request_logging()
setup_sentry() setup_sentry()
setup_opentelemetry() setup_opentelemetry()
@ -175,6 +176,15 @@ defmodule Plausible.Application do
end end
end end
def setup_request_logging() do
:telemetry.attach(
"plausible-request-logging",
[:phoenix, :router_dispatch, :stop],
&Plausible.RequestLogger.log_request/4,
%{}
)
end
def setup_sentry() do def setup_sentry() do
Logger.add_backend(Sentry.LoggerBackend) Logger.add_backend(Sentry.LoggerBackend)

@ -72,17 +72,17 @@ defmodule Plausible.DataMigration.SiteImports do
end_date = imported_stats_end_date(site.id, import_ids) end_date = imported_stats_end_date(site.id, import_ids)
end_date =
if !end_date do if !end_date do
IO.puts( IO.puts(
"Site import #{site_import.id} (site ID #{site.id}) does not have any recorded stats. Removing it." "Site import #{site_import.id} (site ID #{site.id}) does not have any recorded stats. Setting end date to minimum."
) )
if site_import.legacy do Date.add(site_import.start_date, 2)
clear_imported_data(site, dry_run?) else
end_date
end end
delete!(site_import, dry_run?)
else
end_date = end_date =
if Date.compare(end_date, site_import.end_date) in [:lt, :eq] do if Date.compare(end_date, site_import.end_date) in [:lt, :eq] do
end_date end_date
@ -102,7 +102,6 @@ defmodule Plausible.DataMigration.SiteImports do
"End date of site import #{site_import.id} (site ID #{site.id}) adjusted to #{end_date}" "End date of site import #{site_import.id} (site ID #{site.id}) adjusted to #{end_date}"
) )
end end
end
IO.puts("Done processing site ID #{site.id}") IO.puts("Done processing site ID #{site.id}")
end end
@ -150,14 +149,6 @@ defmodule Plausible.DataMigration.SiteImports do
end end
end end
defp clear_imported_data(site, false = _dry_run?) do
Repo.update_all(from(s in Site, where: s.id == ^site.id), set: [imported_data: nil])
end
defp clear_imported_data(site, true = _dry_run?) do
%{site | imported_data: nil}
end
defp update!(changeset, false = _dry_run?) do defp update!(changeset, false = _dry_run?) do
Repo.update!(changeset) Repo.update!(changeset)
end end
@ -170,14 +161,6 @@ defmodule Plausible.DataMigration.SiteImports do
end end
end end
defp delete!(entity, false = _dry_run?) do
Repo.delete!(entity)
end
defp delete!(entity, true = _dry_run?) do
entity
end
defp max_date_query(schema, site_id, import_ids) do defp max_date_query(schema, site_id, import_ids) do
from(q in schema, from(q in schema,
where: q.site_id == ^site_id, where: q.site_id == ^site_id,

@ -80,14 +80,6 @@ defmodule Plausible.Goals do
def find_or_create(_, %{"goal_type" => "page"}), do: {:missing, "page_path"} def find_or_create(_, %{"goal_type" => "page"}), do: {:missing, "page_path"}
def list_revenue_goals(site) do
from(g in Plausible.Goal,
where: g.site_id == ^site.id and not is_nil(g.currency),
select: %{event_name: g.event_name, currency: g.currency}
)
|> Plausible.Repo.all()
end
def for_site(site, opts \\ []) do def for_site(site, opts \\ []) do
site site
|> for_site_query(opts) |> for_site_query(opts)

@ -140,10 +140,7 @@ defmodule Plausible.Google.GA4.HTTP do
{:error, %HTTPClient.Non200Error{} = error} when error.reason.status in [401, 403] -> {:error, %HTTPClient.Non200Error{} = error} when error.reason.status in [401, 403] ->
{:error, :authentication_failed} {:error, :authentication_failed}
{:error, %{reason: :timeout}} -> {:error, %HTTPClient.Non200Error{} = error} ->
{:error, :timeout}
{:error, error} ->
Sentry.capture_message("Error listing GA4 accounts for user", extra: %{error: error}) Sentry.capture_message("Error listing GA4 accounts for user", extra: %{error: error})
{:error, :unknown} {:error, :unknown}
end end
@ -164,10 +161,7 @@ defmodule Plausible.Google.GA4.HTTP do
{:error, %HTTPClient.Non200Error{} = error} when error.reason.status in [404] -> {:error, %HTTPClient.Non200Error{} = error} when error.reason.status in [404] ->
{:error, :not_found} {:error, :not_found}
{:error, %{reason: :timeout}} -> {:error, %HTTPClient.Non200Error{} = error} ->
{:error, :timeout}
{:error, error} ->
Sentry.capture_message("Error retrieving GA4 property #{property}", Sentry.capture_message("Error retrieving GA4 property #{property}",
extra: %{error: error} extra: %{error: error}
) )
@ -227,10 +221,7 @@ defmodule Plausible.Google.GA4.HTTP do
{:error, %HTTPClient.Non200Error{} = error} when error.reason.status in [401, 403] -> {:error, %HTTPClient.Non200Error{} = error} when error.reason.status in [401, 403] ->
{:error, :authentication_failed} {:error, :authentication_failed}
{:error, %{reason: :timeout}} -> {:error, %HTTPClient.Non200Error{} = error} ->
{:error, :timeout}
{:error, error} ->
Sentry.capture_message("Error retrieving GA4 #{edge} date", Sentry.capture_message("Error retrieving GA4 #{edge} date",
extra: %{error: error} extra: %{error: error}
) )

@ -108,10 +108,7 @@ defmodule Plausible.Google.UA.HTTP do
{:error, %HTTPClient.Non200Error{} = error} when error.reason.status in [401, 403] -> {:error, %HTTPClient.Non200Error{} = error} when error.reason.status in [401, 403] ->
{:error, :authentication_failed} {:error, :authentication_failed}
{:error, %{reason: :timeout}} -> {:error, %HTTPClient.Non200Error{} = error} ->
{:error, :timeout}
{:error, error} ->
Sentry.capture_message("Error listing UA views for user", extra: %{error: error}) Sentry.capture_message("Error listing UA views for user", extra: %{error: error})
{:error, :unknown} {:error, :unknown}
end end
@ -173,10 +170,7 @@ defmodule Plausible.Google.UA.HTTP do
{:error, %HTTPClient.Non200Error{} = error} when error.reason.status in [401, 403] -> {:error, %HTTPClient.Non200Error{} = error} when error.reason.status in [401, 403] ->
{:error, :authentication_failed} {:error, :authentication_failed}
{:error, %{reason: :timeout}} -> {:error, %HTTPClient.Non200Error{} = error} ->
{:error, :timeout}
{:error, error} ->
Sentry.capture_message("Error retrieving UA #{edge} date", Sentry.capture_message("Error retrieving UA #{edge} date",
extra: %{error: error} extra: %{error: error}
) )

@ -62,9 +62,9 @@ defmodule Plausible.Imported do
} }
end end
@spec get_import(Site.t(), non_neg_integer()) :: SiteImport.t() | nil @spec get_import(non_neg_integer()) :: SiteImport.t() | nil
def get_import(site, import_id) do def get_import(import_id) do
Repo.get_by(SiteImport, id: import_id, site_id: site.id) Repo.get(SiteImport, import_id)
end end
defdelegate listen(), to: Imported.Importer defdelegate listen(), to: Imported.Importer
@ -83,16 +83,6 @@ defmodule Plausible.Imported do
end end
end end
@spec other_imports_in_progress?(SiteImport.t()) :: boolean()
def other_imports_in_progress?(site_import) do
Repo.exists?(
from(i in SiteImport,
where: i.site_id == ^site_import.site_id and i.id != ^site_import.id,
where: i.status in ^[SiteImport.pending(), SiteImport.importing()]
)
)
end
defp maybe_filter_by_status(query, nil), do: query defp maybe_filter_by_status(query, nil), do: query
defp maybe_filter_by_status(query, status) do defp maybe_filter_by_status(query, status) do

@ -91,7 +91,6 @@ defmodule Plausible.Imported.Importer do
like LiveView, where notifications can be listened for via `handle_info/2`. like LiveView, where notifications can be listened for via `handle_info/2`.
""" """
alias Plausible.Imported
alias Plausible.Imported.SiteImport alias Plausible.Imported.SiteImport
alias Plausible.Repo alias Plausible.Repo
@ -99,7 +98,7 @@ defmodule Plausible.Imported.Importer do
@callback label() :: String.t() @callback label() :: String.t()
@callback email_template() :: String.t() @callback email_template() :: String.t()
@callback parse_args(map()) :: Keyword.t() @callback parse_args(map()) :: Keyword.t()
@callback import_data(SiteImport.t(), Keyword.t()) :: :ok | {:error, any()} @callback import_data(Plausible.Imported.SiteImport.t(), Keyword.t()) :: :ok | {:error, any()}
@callback before_start(SiteImport.t()) :: :ok | {:ok, map()} | {:error, any()} @callback before_start(SiteImport.t()) :: :ok | {:ok, map()} | {:error, any()}
@callback on_success(SiteImport.t(), map()) :: :ok @callback on_success(SiteImport.t(), map()) :: :ok
@callback on_failure(SiteImport.t()) :: :ok @callback on_failure(SiteImport.t()) :: :ok
@ -109,7 +108,7 @@ defmodule Plausible.Imported.Importer do
@behaviour Plausible.Imported.Importer @behaviour Plausible.Imported.Importer
@spec new_import(Plausible.Site.t(), Plausible.Auth.User.t(), Keyword.t()) :: @spec new_import(Plausible.Site.t(), Plausible.Auth.User.t(), Keyword.t()) ::
{:ok, Oban.Job.t()} | {:error, Ecto.Changeset.t() | :import_in_progress} {:ok, Oban.Job.t()} | {:error, Ecto.Changeset.t()}
def new_import(site, user, opts) do def new_import(site, user, opts) do
Plausible.Imported.Importer.new_import(name(), site, user, opts, &before_start/1) Plausible.Imported.Importer.new_import(name(), site, user, opts, &before_start/1)
end end
@ -223,15 +222,11 @@ defmodule Plausible.Imported.Importer do
:ok = listen() :ok = listen()
end end
if not Imported.other_imports_in_progress?(site_import) do
opts opts
|> Keyword.put(:import_id, site_import.id) |> Keyword.put(:import_id, site_import.id)
|> Map.new() |> Map.new()
|> Plausible.Workers.ImportAnalytics.new() |> Plausible.Workers.ImportAnalytics.new()
|> Oban.insert() |> Oban.insert()
else
{:error, :import_in_progress}
end
end end
defp mark_complete(site_import, extra_data, on_success_fun) do defp mark_complete(site_import, extra_data, on_success_fun) do

@ -0,0 +1,19 @@
defmodule Plausible.RequestLogger do
@moduledoc """
Custom request logger which:
- Includes query parameters on the same line
- Includes request duration on the same line
"""
require Logger
def log_request(_, %{duration: duration}, %{conn: conn}, _) do
duration_ms = System.convert_time_unit(duration, :native, :millisecond)
path = path_with_params(conn.request_path, conn.query_string)
Logger.info("(#{conn.status}) #{conn.method} #{path} took #{duration_ms}ms")
end
defp path_with_params(request_path, ""), do: request_path
defp path_with_params(request_path, query_string), do: request_path <> "?" <> query_string
end

@ -118,6 +118,10 @@ defmodule Plausible.Stats.FilterSuggestions do
end) end)
end end
def filter_suggestions(_site, _query, "experimental_hostname_filter", _filter_search) do
wrap_suggestions(["true", "false"])
end
def filter_suggestions(site, _query, "goal", filter_search) do def filter_suggestions(site, _query, "goal", filter_search) do
site site
|> Plausible.Goals.for_site() |> Plausible.Goals.for_site()

@ -10,7 +10,8 @@ defmodule Plausible.Stats.Query do
include_imported: false, include_imported: false,
now: nil, now: nil,
experimental_session_count?: false, experimental_session_count?: false,
experimental_reduced_joins?: false experimental_reduced_joins?: false,
experimental_hostname_filter?: false
require OpenTelemetry.Tracer, as: Tracer require OpenTelemetry.Tracer, as: Tracer
alias Plausible.Stats.{Filters, Interval} alias Plausible.Stats.{Filters, Interval}
@ -25,6 +26,7 @@ defmodule Plausible.Stats.Query do
|> struct!(now: now) |> struct!(now: now)
|> put_experimental_session_count(site, params) |> put_experimental_session_count(site, params)
|> put_experimental_reduced_joins(site, params) |> put_experimental_reduced_joins(site, params)
|> put_experimental_hostname_filter(params)
|> put_period(site, params) |> put_period(site, params)
|> put_interval(params) |> put_interval(params)
|> put_parsed_filters(params) |> put_parsed_filters(params)
@ -62,6 +64,16 @@ defmodule Plausible.Stats.Query do
end end
end end
defp put_experimental_hostname_filter(query, params) do
if Map.has_key?(params, "experimental_hostname_filter") do
struct!(query,
experimental_hostname_filter?: Map.get(params, "experimental_hostname_filter") == "true"
)
else
query
end
end
defp put_period(query, site, %{"period" => "realtime"}) do defp put_period(query, site, %{"period" => "realtime"}) do
date = today(site.timezone) date = today(site.timezone)

@ -129,7 +129,6 @@ defmodule PlausibleWeb.Api.StatsController do
full_intervals = build_full_intervals(query, labels) full_intervals = build_full_intervals(query, labels)
json(conn, %{ json(conn, %{
metric: metric,
plot: plot_timeseries(timeseries_result, metric), plot: plot_timeseries(timeseries_result, metric),
labels: labels, labels: labels,
comparison_plot: comparison_result && plot_timeseries(comparison_result, metric), comparison_plot: comparison_result && plot_timeseries(comparison_result, metric),
@ -295,12 +294,10 @@ defmodule PlausibleWeb.Api.StatsController do
}, },
%{ %{
name: "Unique conversions (last 30 min)", name: "Unique conversions (last 30 min)",
graph_metric: :visitors,
value: unique_conversions value: unique_conversions
}, },
%{ %{
name: "Total conversions (last 30 min)", name: "Total conversions (last 30 min)",
graph_metric: :events,
value: total_conversions value: total_conversions
} }
] ]
@ -323,12 +320,10 @@ defmodule PlausibleWeb.Api.StatsController do
}, },
%{ %{
name: "Unique visitors (last 30 min)", name: "Unique visitors (last 30 min)",
graph_metric: :visitors,
value: visitors value: visitors
}, },
%{ %{
name: "Pageviews (last 30 min)", name: "Pageviews (last 30 min)",
graph_metric: :pageviews,
value: pageviews value: pageviews
} }
] ]
@ -345,21 +340,15 @@ defmodule PlausibleWeb.Api.StatsController do
[ [
top_stats_entry(results, comparison, "Unique visitors", :total_visitors), top_stats_entry(results, comparison, "Unique visitors", :total_visitors),
top_stats_entry(results, comparison, "Unique conversions", :visitors, graphable?: true), top_stats_entry(results, comparison, "Unique conversions", :visitors),
top_stats_entry(results, comparison, "Total conversions", :events, graphable?: true), top_stats_entry(results, comparison, "Total conversions", :events),
on_full_build do on_full_build do
top_stats_entry(results, comparison, "Average revenue", :average_revenue, top_stats_entry(results, comparison, "Average revenue", :average_revenue, &format_money/1)
formatter: &format_money/1,
graphable?: true
)
end, end,
on_full_build do on_full_build do
top_stats_entry(results, comparison, "Total revenue", :total_revenue, top_stats_entry(results, comparison, "Total revenue", :total_revenue, &format_money/1)
formatter: &format_money/1,
graphable?: true
)
end, end,
top_stats_entry(results, comparison, "Conversion rate", :conversion_rate, graphable?: true) top_stats_entry(results, comparison, "Conversion rate", :conversion_rate)
] ]
|> Enum.reject(&is_nil/1) |> Enum.reject(&is_nil/1)
|> then(&{&1, 100}) |> then(&{&1, 100})
@ -393,63 +382,39 @@ defmodule PlausibleWeb.Api.StatsController do
stats = stats =
[ [
top_stats_entry(current_results, prev_results, "Unique visitors", :visitors, top_stats_entry(current_results, prev_results, "Unique visitors", :visitors),
graphable?: true top_stats_entry(current_results, prev_results, "Total visits", :visits),
), top_stats_entry(current_results, prev_results, "Total pageviews", :pageviews),
top_stats_entry(current_results, prev_results, "Total visits", :visits, graphable?: true), top_stats_entry(current_results, prev_results, "Views per visit", :views_per_visit),
top_stats_entry(current_results, prev_results, "Total pageviews", :pageviews, top_stats_entry(current_results, prev_results, "Bounce rate", :bounce_rate),
graphable?: true top_stats_entry(current_results, prev_results, "Visit duration", :visit_duration),
), top_stats_entry(current_results, prev_results, "Time on page", :time_on_page, fn
top_stats_entry(current_results, prev_results, "Views per visit", :views_per_visit,
graphable?: true
),
top_stats_entry(current_results, prev_results, "Bounce rate", :bounce_rate,
graphable?: true
),
top_stats_entry(current_results, prev_results, "Visit duration", :visit_duration,
graphable?: true
),
top_stats_entry(current_results, prev_results, "Time on page", :time_on_page,
formatter: fn
nil -> 0 nil -> 0
value -> value value -> value
end end)
)
] ]
|> Enum.filter(& &1) |> Enum.filter(& &1)
{stats, current_results[:sample_percent][:value]} {stats, current_results[:sample_percent][:value]}
end end
defp top_stats_entry(current_results, prev_results, name, key, opts \\ []) do defp top_stats_entry(current_results, prev_results, name, key, formatter \\ & &1) do
if current_results[key] do if current_results[key] do
formatter = Keyword.get(opts, :formatter, & &1)
value = get_in(current_results, [key, :value]) value = get_in(current_results, [key, :value])
%{name: name, value: formatter.(value)}
|> maybe_put_graph_metric(opts, key)
|> maybe_put_comparison(prev_results, key, value, formatter)
end
end
defp maybe_put_graph_metric(entry, opts, key) do
if Keyword.get(opts, :graphable?) do
entry |> Map.put(:graph_metric, key)
else
entry
end
end
defp maybe_put_comparison(entry, prev_results, key, value, formatter) do
if prev_results do if prev_results do
prev_value = get_in(prev_results, [key, :value]) prev_value = get_in(prev_results, [key, :value])
change = Stats.Compare.calculate_change(key, prev_value, value) change = Stats.Compare.calculate_change(key, prev_value, value)
entry %{
|> Map.put(:comparison_value, formatter.(prev_value)) name: name,
|> Map.put(:change, change) value: formatter.(value),
comparison_value: formatter.(prev_value),
change: change
}
else else
entry %{name: name, value: formatter.(value)}
end
end end
end end
@ -459,7 +424,7 @@ defmodule PlausibleWeb.Api.StatsController do
pagination = parse_pagination(params) pagination = parse_pagination(params)
query = query =
if query.filters["event:hostname"] do if query.experimental_hostname_filter? and query.filters["event:hostname"] do
Query.put_filter(query, "visit:entry_page_hostname", query.filters["event:hostname"]) Query.put_filter(query, "visit:entry_page_hostname", query.filters["event:hostname"])
else else
query query
@ -771,7 +736,7 @@ defmodule PlausibleWeb.Api.StatsController do
metrics = breakdown_metrics(query, [:visits, :visit_duration]) metrics = breakdown_metrics(query, [:visits, :visit_duration])
query = query =
if query.filters["event:hostname"] do if query.experimental_hostname_filter? and query.filters["event:hostname"] do
Query.put_filter(query, "visit:entry_page_hostname", query.filters["event:hostname"]) Query.put_filter(query, "visit:entry_page_hostname", query.filters["event:hostname"])
else else
query query
@ -808,7 +773,7 @@ defmodule PlausibleWeb.Api.StatsController do
metrics = breakdown_metrics(query, [:visits]) metrics = breakdown_metrics(query, [:visits])
query = query =
if query.filters["event:hostname"] do if query.experimental_hostname_filter? and query.filters["event:hostname"] do
Query.put_filter(query, "visit:exit_page_hostname", query.filters["event:hostname"]) Query.put_filter(query, "visit:exit_page_hostname", query.filters["event:hostname"])
else else
query query

@ -96,14 +96,6 @@ defmodule PlausibleWeb.GoogleAnalyticsController do
) )
|> redirect(external: redirect_route) |> redirect(external: redirect_route)
{:error, :timeout} ->
conn
|> put_flash(
:error,
"Google Analytics API has timed out. Please try again."
)
|> redirect(external: redirect_route)
{:error, _any} -> {:error, _any} ->
conn conn
|> put_flash( |> put_flash(
@ -176,14 +168,6 @@ defmodule PlausibleWeb.GoogleAnalyticsController do
) )
|> redirect(external: redirect_route) |> redirect(external: redirect_route)
{:error, :timeout} ->
conn
|> put_flash(
:error,
"Google Analytics API has timed out. Please try again."
)
|> redirect(external: redirect_route)
{:error, _any} -> {:error, _any} ->
conn conn
|> put_flash( |> put_flash(
@ -241,14 +225,6 @@ defmodule PlausibleWeb.GoogleAnalyticsController do
) )
|> redirect(external: redirect_route) |> redirect(external: redirect_route)
{:error, :timeout} ->
conn
|> put_flash(
:error,
"Google Analytics API has timed out. Please try again."
)
|> redirect(external: redirect_route)
{:error, :not_found} -> {:error, :not_found} ->
conn conn
|> put_flash( |> put_flash(
@ -289,7 +265,27 @@ defmodule PlausibleWeb.GoogleAnalyticsController do
Routes.site_path(conn, :settings_imports_exports, site.domain) Routes.site_path(conn, :settings_imports_exports, site.domain)
end end
import_opts = [ case Imported.check_dates(site, start_date, end_date) do
{:ok, start_date, end_date} ->
if Google.API.property?(property_or_view) do
{:ok, _} =
Imported.GoogleAnalytics4.new_import(
site,
current_user,
property: property_or_view,
label: property_or_view,
start_date: start_date,
end_date: end_date,
access_token: access_token,
refresh_token: refresh_token,
token_expires_at: expires_at
)
else
{:ok, _} =
Imported.UniversalAnalytics.new_import(
site,
current_user,
view_id: property_or_view,
label: property_or_view, label: property_or_view,
start_date: start_date, start_date: start_date,
end_date: end_date, end_date: end_date,
@ -297,15 +293,13 @@ defmodule PlausibleWeb.GoogleAnalyticsController do
refresh_token: refresh_token, refresh_token: refresh_token,
token_expires_at: expires_at, token_expires_at: expires_at,
legacy: legacy == "true" legacy: legacy == "true"
] )
end
with {:ok, start_date, end_date} <- Imported.check_dates(site, start_date, end_date),
import_opts = [{:start_date, start_date}, {:end_date, end_date} | import_opts],
{:ok, _} <- schedule_job(site, current_user, property_or_view, import_opts) do
conn conn
|> put_flash(:success, "Import scheduled. An email will be sent when it completes.") |> put_flash(:success, "Import scheduled. An email will be sent when it completes.")
|> redirect(external: redirect_route) |> redirect(external: redirect_route)
else
{:error, :no_time_window} -> {:error, :no_time_window} ->
conn conn
|> put_flash( |> put_flash(
@ -313,24 +307,6 @@ defmodule PlausibleWeb.GoogleAnalyticsController do
"Import failed. No data could be imported because date range overlaps with existing data." "Import failed. No data could be imported because date range overlaps with existing data."
) )
|> redirect(external: redirect_route) |> redirect(external: redirect_route)
{:error, :import_in_progress} ->
conn
|> put_flash(
:error,
"There's another import still in progress. Please wait until it's completed or cancel it before starting a new one."
)
|> redirect(external: redirect_route)
end
end
defp schedule_job(site, current_user, property_or_view, opts) do
if Google.API.property?(property_or_view) do
opts = Keyword.put(opts, :property, property_or_view)
Imported.GoogleAnalytics4.new_import(site, current_user, opts)
else
opts = Keyword.put(opts, :view_id, property_or_view)
Imported.UniversalAnalytics.new_import(site, current_user, opts)
end end
end end
end end

@ -652,7 +652,7 @@ defmodule PlausibleWeb.SiteController do
|> Plausible.Site.remove_imported_data() |> Plausible.Site.remove_imported_data()
|> Repo.update!() |> Repo.update!()
site_import = Plausible.Imported.get_import(site, import_id) -> site_import = Plausible.Imported.get_import(import_id) ->
Oban.cancel_all_jobs( Oban.cancel_all_jobs(
from(j in Oban.Job, from(j in Oban.Job,
where: where:

@ -64,7 +64,6 @@ defmodule PlausibleWeb.StatsController do
|> render("stats.html", |> render("stats.html",
site: site, site: site,
has_goals: Plausible.Sites.has_goals?(site), has_goals: Plausible.Sites.has_goals?(site),
revenue_goals: list_revenue_goals(site),
funnels: list_funnels(site), funnels: list_funnels(site),
has_props: Plausible.Props.configured?(site), has_props: Plausible.Props.configured?(site),
stats_start_date: stats_start_date, stats_start_date: stats_start_date,
@ -93,13 +92,10 @@ defmodule PlausibleWeb.StatsController do
defp list_funnels(site) do defp list_funnels(site) do
Plausible.Funnels.list(site) Plausible.Funnels.list(site)
end end
defp list_revenue_goals(site) do
Plausible.Goals.list_revenue_goals(site)
end
else else
defp list_funnels(_site), do: [] defp list_funnels(_site) do
defp list_revenue_goals(_site), do: [] []
end
end end
@doc """ @doc """
@ -323,7 +319,6 @@ defmodule PlausibleWeb.StatsController do
|> render("stats.html", |> render("stats.html",
site: shared_link.site, site: shared_link.site,
has_goals: Sites.has_goals?(shared_link.site), has_goals: Sites.has_goals?(shared_link.site),
revenue_goals: list_revenue_goals(shared_link.site),
funnels: list_funnels(shared_link.site), funnels: list_funnels(shared_link.site),
has_props: Plausible.Props.configured?(shared_link.site), has_props: Plausible.Props.configured?(shared_link.site),
stats_start_date: stats_start_date, stats_start_date: stats_start_date,

@ -69,7 +69,7 @@ defmodule PlausibleWeb.Endpoint do
plug(Plug.RequestId) plug(Plug.RequestId)
plug(PromEx.Plug, prom_ex_module: Plausible.PromEx) plug(PromEx.Plug, prom_ex_module: Plausible.PromEx)
plug(Plug.Telemetry, event_prefix: [:phoenix, :endpoint]) plug(Plug.Telemetry, event_prefix: [:phoenix, :endpoint], log: false)
plug(Plug.Parsers, plug(Plug.Parsers,
parsers: [:urlencoded, :multipart, :json], parsers: [:urlencoded, :multipart, :json],

@ -42,39 +42,7 @@ defmodule PlausibleWeb.Live.ImportsExportsSettings do
end end
def render(assigns) do def render(assigns) do
import_in_progress? =
Enum.any?(
assigns.site_imports,
&(&1.live_status in [SiteImport.pending(), SiteImport.importing()])
)
assigns = assign(assigns, :import_in_progress?, import_in_progress?)
~H""" ~H"""
<div class="mt-5 flex gap-x-4">
<.button_link
class="w-36 h-20"
theme="bright"
disabled={@import_in_progress?}
href={Plausible.Google.API.import_authorize_url(@site.id, "import", legacy: false)}
>
<img src="/images/icon/google_analytics_logo.svg" alt="Google Analytics import" />
</.button_link>
<.button_link
class="w-36 h-20"
theme="bright"
disabled={@import_in_progress?}
href={"/#{URI.encode_www_form(@site.domain)}/settings/import"}
>
<img class="h-16" src="/images/icon/csv_logo.svg" alt="New CSV import" />
</.button_link>
</div>
<p :if={@import_in_progress?} class="mt-4 text-red-400 text-sm">
No new imports can be started until the import in progress is completed or cancelled.
</p>
<header class="relative border-b border-gray-200 pb-4"> <header class="relative border-b border-gray-200 pb-4">
<h3 class="mt-8 text-md leading-6 font-medium text-gray-900 dark:text-gray-100"> <h3 class="mt-8 text-md leading-6 font-medium text-gray-900 dark:text-gray-100">
Existing Imports Existing Imports

@ -10,6 +10,24 @@
<PlausibleWeb.Components.Generic.docs_info slug="google-analytics-import" /> <PlausibleWeb.Components.Generic.docs_info slug="google-analytics-import" />
</header> </header>
<div class="mt-5 flex gap-x-4">
<PlausibleWeb.Components.Generic.button_link
class="w-36 h-20"
theme="bright"
href={Plausible.Google.API.import_authorize_url(@site.id, "import", legacy: false)}
>
<img src="/images/icon/google_analytics_logo.svg" alt="Google Analytics import" />
</PlausibleWeb.Components.Generic.button_link>
<PlausibleWeb.Components.Generic.button_link
class="w-36 h-20"
theme="bright"
href={"/#{URI.encode_www_form(@site.domain)}/settings/import"}
>
<img class="h-16" src="/images/icon/csv_logo.svg" alt="New CSV import" />
</PlausibleWeb.Components.Generic.button_link>
</div>
<%= live_render(@conn, PlausibleWeb.Live.ImportsExportsSettings, <%= live_render(@conn, PlausibleWeb.Live.ImportsExportsSettings,
session: %{"domain" => @site.domain} session: %{"domain" => @site.domain}
) %> ) %>

@ -28,11 +28,11 @@
Please subscribe to the appropriate tier with the link below to access the stats again. Please subscribe to the appropriate tier with the link below to access the stats again.
</p> </p>
<p class="mt-6 text-sm text-gray-500"> <p class="mt-6 text-sm text-gray-500">
You can configure your You can check the
<.styled_link href={Routes.site_path(@conn, :settings_general, @site.domain)}> <.styled_link href={Routes.site_path(@conn, :settings_general, @site.domain)}>
site settings site settings
</.styled_link> </.styled_link>
but your access to the dashboard is restricted. and we're still counting the stats but your access to the dashboard is restricted.
</p> </p>
</div> </div>
<div class="mt-6 w-full text-center"> <div class="mt-6 w-full text-center">

@ -27,7 +27,6 @@
data-props-available={ data-props-available={
to_string(Plausible.Billing.Feature.Props.check_availability(@site.owner) == :ok) to_string(Plausible.Billing.Feature.Props.check_availability(@site.owner) == :ok)
} }
data-revenue-goals={Jason.encode!(@revenue_goals)}
data-funnels={Jason.encode!(@funnels)} data-funnels={Jason.encode!(@funnels)}
data-has-props={to_string(@has_props)} data-has-props={to_string(@has_props)}
data-logged-in={to_string(!!@conn.assigns[:current_user])} data-logged-in={to_string(!!@conn.assigns[:current_user])}

@ -147,7 +147,7 @@
"timex": {:hex, :timex, "3.7.11", "bb95cb4eb1d06e27346325de506bcc6c30f9c6dea40d1ebe390b262fad1862d1", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:gettext, "~> 0.20", [hex: :gettext, repo: "hexpm", optional: false]}, {:tzdata, "~> 1.1", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm", "8b9024f7efbabaf9bd7aa04f65cf8dcd7c9818ca5737677c7b76acbc6a94d1aa"}, "timex": {:hex, :timex, "3.7.11", "bb95cb4eb1d06e27346325de506bcc6c30f9c6dea40d1ebe390b262fad1862d1", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:gettext, "~> 0.20", [hex: :gettext, repo: "hexpm", optional: false]}, {:tzdata, "~> 1.1", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm", "8b9024f7efbabaf9bd7aa04f65cf8dcd7c9818ca5737677c7b76acbc6a94d1aa"},
"tls_certificate_check": {:hex, :tls_certificate_check, "1.21.0", "042ab2c0c860652bc5cf69c94e3a31f96676d14682e22ec7813bd173ceff1788", [:rebar3], [{:ssl_verify_fun, "~> 1.1", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm", "6cee6cffc35a390840d48d463541d50746a7b0e421acaadb833cfc7961e490e7"}, "tls_certificate_check": {:hex, :tls_certificate_check, "1.21.0", "042ab2c0c860652bc5cf69c94e3a31f96676d14682e22ec7813bd173ceff1788", [:rebar3], [{:ssl_verify_fun, "~> 1.1", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm", "6cee6cffc35a390840d48d463541d50746a7b0e421acaadb833cfc7961e490e7"},
"tzdata": {:hex, :tzdata, "1.1.1", "20c8043476dfda8504952d00adac41c6eda23912278add38edc140ae0c5bcc46", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "a69cec8352eafcd2e198dea28a34113b60fdc6cb57eb5ad65c10292a6ba89787"}, "tzdata": {:hex, :tzdata, "1.1.1", "20c8043476dfda8504952d00adac41c6eda23912278add38edc140ae0c5bcc46", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "a69cec8352eafcd2e198dea28a34113b60fdc6cb57eb5ad65c10292a6ba89787"},
"ua_inspector": {:hex, :ua_inspector, "3.9.0", "2021bbddb1ee41f202da7f006fb09f5c5617ad579108b7b9bcf1881828462f04", [:mix], [{:hackney, "~> 1.0", [hex: :hackney, repo: "hexpm", optional: false]}, {:yamerl, "~> 0.7", [hex: :yamerl, repo: "hexpm", optional: false]}], "hexpm", "0f2d1b9806e78b14b91b6f20eaaa4a68f8989f4f2a99a376b874c295ac50a30d"}, "ua_inspector": {:hex, :ua_inspector, "3.8.0", "c0b0d13200a9bd509225f15ea8cf275c0bec27390a21c355746ff8b8a88c3e4d", [:mix], [{:hackney, "~> 1.0", [hex: :hackney, repo: "hexpm", optional: false]}, {:yamerl, "~> 0.7", [hex: :yamerl, repo: "hexpm", optional: false]}], "hexpm", "7c980bae82a4754075b933e0f383935a681e5a2628856ad3ecf6eb80d8139539"},
"unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"}, "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"},
"uuid": {:hex, :uuid, "1.1.8", "e22fc04499de0de3ed1116b770c7737779f226ceefa0badb3592e64d5cfb4eb9", [:mix], [], "hexpm", "c790593b4c3b601f5dc2378baae7efaf5b3d73c4c6456ba85759905be792f2ac"}, "uuid": {:hex, :uuid, "1.1.8", "e22fc04499de0de3ed1116b770c7737779f226ceefa0badb3592e64d5cfb4eb9", [:mix], [], "hexpm", "c790593b4c3b601f5dc2378baae7efaf5b3d73c4c6456ba85759905be792f2ac"},
"websock": {:hex, :websock, "0.5.3", "2f69a6ebe810328555b6fe5c831a851f485e303a7c8ce6c5f675abeb20ebdadc", [:mix], [], "hexpm", "6105453d7fac22c712ad66fab1d45abdf049868f253cf719b625151460b8b453"}, "websock": {:hex, :websock, "0.5.3", "2f69a6ebe810328555b6fe5c831a851f485e303a7c8ce6c5f675abeb20ebdadc", [:mix], [], "hexpm", "6105453d7fac22c712ad66fab1d45abdf049868f253cf719b625151460b8b453"},

File diff suppressed because it is too large Load Diff

@ -8,13 +8,13 @@
- regex: 'NetFront' - regex: 'NetFront'
name: 'NetFront' name: 'NetFront'
- regex: 'Edge/' - regex: 'Edge'
name: 'Edge' name: 'Edge'
- regex: 'Trident' - regex: 'Trident'
name: 'Trident' name: 'Trident'
- regex: 'Chrome/(?!1?\d\.|2[0-7]\.)' - regex: '(?<!SmartHu)Blink'
name: 'Blink' name: 'Blink'
- regex: '(?:Apple)?WebKit' - regex: '(?:Apple)?WebKit'

@ -5,82 +5,6 @@
# @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
############### ###############
# Quick Search TV (https://play.google.com/store/apps/details?id=com.aospstudio.tvsearch)
- regex: 'Quick Search TV(?:/(?:Wild Moon Edition )?(\d+[\.\d]+))?'
name: 'Quick Search TV'
version: '$1'
# Skye (https://innatical.com/)
- regex: 'Skye/(\d+\.[\.\d]+)'
name: 'Skye'
version: '$1'
engine:
default: 'Blink'
# VD Browser (vpn.video.downloader)
- regex: 'VD/\d+'
name: 'VD Browser'
version: ''
engine:
default: 'Blink'
# SecureX (https://play.google.com/store/apps/details?id=com.securex.browser)
- regex: '\[(?:HB/29|PB/(?:66|81))\]'
name: 'SecureX'
version: ''
engine:
default: 'Blink'
# HotBrowser (https://play.google.com/store/apps/details?id=com.hotsurf.browser)
- regex: '\[HS/\d+\]'
name: 'HotBrowser'
version: ''
engine:
default: 'Blink'
# Proxy Browser (https://play.google.com/store/apps/details?id=proxy.browser.unblock.sites.proxybrowser.unblocksites)
- regex: '\[PB/\d+\]'
name: 'Proxy Browser'
version: ''
engine:
default: 'Blink'
# Onion Browser (https://apps.apple.com/us/app/onion-browser/id519296448)
- regex: '^Normalized (?:iPad|iPhone) \(iOS Safari\)'
name: 'Onion Browser'
version: ''
engine:
default: 'WebKit'
# fGet (https://apps.apple.com/us/app/fget-file-manager-browser/id1582654012)
- regex: 'fGet/'
name: 'fGet'
version: ''
# Nuviu (https://www.nuviu-browser.com/)
- regex: 'Nuviu/(?:(\d+[\.\d]+))?'
name: 'Nuviu'
version: '$1'
# DoCoMo (https://play.google.com/store/apps/details?id=com.airfind.browser)
- regex: 'DoCoMo/(?:(\d+[\.\d]+))?'
name: 'DoCoMo'
version: '$1'
# Airfind Secure Browser (https://play.google.com/store/apps/details?id=com.airfind.browser)
- regex: 'com.airfind.browser/(?:(\d+[\.\d]+))?'
name: 'Airfind Secure Browser'
version: '$1'
engine:
default: 'Blink'
# Arc (https://arc.net/)
- regex: 'ArcMobile2/.+CFNetwork'
name: 'Arc'
version: ''
engine:
default: 'WebKit'
# Nuanti Meta (http://meta.nuanti.com/) # Nuanti Meta (http://meta.nuanti.com/)
- regex: 'Nuanti(?:Meta)?/(\d+\.[\.\d]+)' - regex: 'Nuanti(?:Meta)?/(\d+\.[\.\d]+)'
name: 'Nuanti Meta' name: 'Nuanti Meta'
@ -195,11 +119,6 @@
version: '$1' version: '$1'
engine: engine:
default: 'Blink' default: 'Blink'
- regex: 'Lilo/.+CFNetwork'
name: 'Lilo'
version: ''
engine:
default: 'WebKit'
# Lexi Browser (https://play.google.com/store/apps/details?id=com.lexi.browser) # Lexi Browser (https://play.google.com/store/apps/details?id=com.lexi.browser)
- regex: 'lexi/(\d+[\.\d]+)' - regex: 'lexi/(\d+[\.\d]+)'
@ -383,7 +302,7 @@
name: 'Edge WebView' name: 'Edge WebView'
version: '$1' version: '$1'
engine: engine:
default: 'Blink' default: 'WebKit'
# Mandarin (https://mandarin-browser.com/) # Mandarin (https://mandarin-browser.com/)
- regex: 'Mandarin Browser/(\d+[\.\d]+)' - regex: 'Mandarin Browser/(\d+[\.\d]+)'
@ -931,7 +850,7 @@
name: 'Firefox Reality' name: 'Firefox Reality'
version: '' version: ''
# AVG Secure Browser (https://www.avg.com/en-us/secure-browser | https://play.google.com/store/apps/details?id=com.avg.android.secure.browser) # AVG Secure Browser (https://www.avg.com/en-us/secure-browser)
- regex: 'AVG(?:/(\d+[\.\d]+))?' - regex: 'AVG(?:/(\d+[\.\d]+))?'
name: 'AVG Secure Browser' name: 'AVG Secure Browser'
version: '$1' version: '$1'
@ -939,11 +858,6 @@
default: 'WebKit' default: 'WebKit'
versions: versions:
28: 'Blink' 28: 'Blink'
- regex: 'AT/(\d+[\.\d]+)'
name: 'AVG Secure Browser'
version: '$1'
engine:
default: 'Blink'
# START Internet Browser (https://play.google.com/store/apps/details?id=fyi.start.web.browser) # START Internet Browser (https://play.google.com/store/apps/details?id=fyi.start.web.browser)
- regex: 'Start/(?:(\d+[\.\d]+))?' - regex: 'Start/(?:(\d+[\.\d]+))?'
@ -1197,16 +1111,11 @@
version: '$1' version: '$1'
engine: engine:
default: 'WebKit' default: 'WebKit'
- regex: 'Chrome/.*QwantMobile(?:/(\d+[\.\d]+))?'
name: 'Qwant Mobile'
version: '$1'
engine:
default: 'Blink'
- regex: 'QwantMobile(?:/(\d+[\.\d]+))?' - regex: 'QwantMobile(?:/(\d+[\.\d]+))?'
name: 'Qwant Mobile' name: 'Qwant Mobile'
version: '$1' version: '$1'
engine: engine:
default: '' # multiple (Gecko on Android, WebKit on iOS) default: 'Gecko'
- regex: 'Qwant/(\d+[\.\d]+)' - regex: 'Qwant/(\d+[\.\d]+)'
name: 'Qwant Mobile' name: 'Qwant Mobile'
version: '$1' version: '$1'
@ -1277,7 +1186,7 @@
name: 'Sailfish Browser' name: 'Sailfish Browser'
version: '$1' version: '$1'
engine: engine:
default: '' default: 'Gecko'
# IceCat # IceCat
- regex: 'IceCat(?:/(\d+[\.\d]+))?' - regex: 'IceCat(?:/(\d+[\.\d]+))?'
@ -1810,7 +1719,7 @@
default: '' # multi engine default: '' # multi engine
#Comodo Dragon #Comodo Dragon
- regex: '(?:Comodo[ _])?Dragon/(\d+[\.\d]+)' - regex: '(?:Comodo[ _])?Dragon(?!fruit)(?:/(\d+[\.\d]+))?'
name: 'Comodo Dragon' name: 'Comodo Dragon'
version: '$1' version: '$1'
engine: engine:
@ -1923,7 +1832,7 @@
engine: engine:
default: 'WebKit' default: 'WebKit'
versions: versions:
'4.2': 'Blink' '4.5': 'Blink'
- regex: '(?:Maxthon(?:%20Browser)?|MxBrowser(?:-inhouse|-iPhone)?|MXiOS)[ /](\d+[\.\d]+)?' - regex: '(?:Maxthon(?:%20Browser)?|MxBrowser(?:-inhouse|-iPhone)?|MXiOS)[ /](\d+[\.\d]+)?'
name: 'Maxthon' name: 'Maxthon'
version: '$1' version: '$1'
@ -1959,7 +1868,7 @@
versions: versions:
28: 'Blink' 28: 'Blink'
- regex: 'Iron/(\d+[\.\d]+)' - regex: 'Iron(?:/(\d+[\.\d]+))?'
name: 'Iron' name: 'Iron'
version: '$1' version: '$1'
engine: engine:
@ -2067,14 +1976,14 @@
name: 'Streamy' name: 'Streamy'
version: '$1' version: '$1'
engine: engine:
default: '' default: 'WebKit'
#Isivioo (Android version is Chrome based) #Isivioo (Android version is Chrome based)
- regex: 'isivioo' - regex: 'isivioo'
name: 'Isivioo' name: 'Isivioo'
version: '' version: ''
engine: engine:
default: '' default: 'WebKit'
#UC Browser #UC Browser
- regex: 'UC[ ]?Browser(?:[ /]?(\d+[\.\d]+))?' - regex: 'UC[ ]?Browser(?:[ /]?(\d+[\.\d]+))?'
@ -2123,12 +2032,12 @@
name: 'Web Explorer' name: 'Web Explorer'
version: '$1' version: '$1'
engine: engine:
default: 'Blink' default: 'WebKit'
- regex: 'webexplorer/(\d+)' - regex: 'webexplorer/(\d+)'
name: 'Web Explorer' name: 'Web Explorer'
version: '$1' version: '$1'
engine: engine:
default: '' default: 'WebKit'
# Seznam Browser # Seznam Browser
- regex: 'Chrome.+SznProhlizec/(\d+[\.\d]+)' - regex: 'Chrome.+SznProhlizec/(\d+[\.\d]+)'
@ -2284,28 +2193,28 @@
name: 'Quark' name: 'Quark'
version: '$1' version: '$1'
engine: engine:
default: 'Blink' default: 'WebKit'
# Monument Browser # Monument Browser
- regex: 'MonumentBrowser(?:/(\d+[\.\d]+))?' - regex: 'MonumentBrowser(?:/(\d+[\.\d]+))?'
name: 'Monument Browser' name: 'Monument Browser'
version: '$1' version: '$1'
engine: engine:
default: 'Blink' default: 'WebKit'
# Blue Browser # Blue Browser
- regex: 'BlueBrowser(?:/(\d+[\.\d]+))?' - regex: 'BlueBrowser(?:/(\d+[\.\d]+))?'
name: 'Blue Browser' name: 'Blue Browser'
version: '$1' version: '$1'
engine: engine:
default: 'Blink' default: 'WebKit'
# Japan Browser (https://play.google.com/store/apps/details?id=com.japan.browser.anti.blokir) # Japan Browser (https://play.google.com/store/apps/details?id=com.japan.browser.anti.blokir)
- regex: 'JAPAN Browser(?:/(\d+[\.\d]+))?' - regex: 'JAPAN Browser(?:/(\d+[\.\d]+))?'
name: 'Japan Browser' name: 'Japan Browser'
version: '$1' version: '$1'
engine: engine:
default: 'Blink' default: 'WebKit'
- regex: 'OpenFin/(?:(\d+[\.\d]+))' - regex: 'OpenFin/(?:(\d+[\.\d]+))'
name: 'OpenFin' name: 'OpenFin'

@ -198,7 +198,6 @@
- regex: 'Faraday(?: v(\d+[\.\d]+))?' - regex: 'Faraday(?: v(\d+[\.\d]+))?'
name: 'Faraday' name: 'Faraday'
version: '$1' version: '$1'
url: 'https://github.com/lostisland/faraday'
- regex: '(?:Go-http-client|Go )/?(?:(\d+[\.\d]+))?(?: package http)?' - regex: '(?:Go-http-client|Go )/?(?:(\d+[\.\d]+))?(?: package http)?'
name: 'Go-http-client' name: 'Go-http-client'
@ -521,48 +520,3 @@
- regex: 'AppleCoreMedia/1\.0\.0' - regex: 'AppleCoreMedia/1\.0\.0'
name: 'iOS Application' name: 'iOS Application'
version: '' version: ''
- regex: 'cpp-httplib(?:/(\d+[\.\d]+))?'
name: 'cpp-httplib'
version: '$1'
url: 'https://github.com/yhirose/cpp-httplib'
- regex: 'Definitely-Not-Requests'
name: 'Requests'
version: ''
url: 'https://github.com/psf/requests'
- regex: 'Stealer ([\d\.]+)'
name: 'Stealer'
version: '$1'
url: 'https://github.com/hotrush/stealer/'
- regex: 'Mandrill-PHP(?:/(\d+[\.\d]+))?'
name: 'Mandrill PHP'
version: '$1'
url: 'https://bitbucket.org/mailchimp/mandrill-api-php/src/master/'
- regex: 'babashka.http-client(?:/(\d+[\.\d]+))?'
name: 'Babashka HTTP Client'
version: '$1'
url: 'https://github.com/babashka/http-client'
- regex: 'http.rb(?:/(\d+[\.\d]+))?'
name: 'http.rb'
version: '$1'
url: 'https://github.com/httprb/http'
- regex: 'node-superagent(?:/(\d+[\.\d]+))?'
name: 'superagent'
version: '$1'
url: 'https://github.com/ladjs/superagent'
- regex: 'CakePHP'
name: 'CakePHP'
version: ''
url: 'https://www.cakephp.org/'
- regex: 'request.js'
name: 'request'
version: ''
url: 'https://github.com/request/request'

@ -171,41 +171,11 @@
name: '$1' name: '$1'
version: '$2' version: '$2'
# Signal uses WhatsApp user agent
- regex: 'WhatsApp(?:/2)?$'
name: 'Signal'
version: ''
# WhatsApp Business
- regex: 'WhatsApp/([\d\.]+).+CloudAPI'
name: 'WhatsApp Business'
version: '$1'
# WhatsApp # WhatsApp
- regex: 'WhatsApp(?:Electron|\-app|\-linux-app)?(?:[ /]([\d\.]+))?' - regex: 'WhatsApp(?:[ /]([\d\.]+))?'
name: 'WhatsApp' name: 'WhatsApp'
version: '$1' version: '$1'
# WhatsApp+2
- regex: 'YoWhatsApp2Plus(?:/(\d+[\.\d]+))?'
name: 'WhatsApp+2'
version: '$1'
# FM WhatsApp
- regex: 'YoFMWhatsApp(?:/(\d+[\.\d]+))?'
name: 'FM WhatsApp'
version: '$1'
# GBWhatsApp
- regex: '(?:Yo)?GBWhatsApp(?:/(\d+[\.\d]+))?'
name: 'GBWhatsApp'
version: '$1'
# Yo WhatsApp
- regex: 'YoYoWhatsApp(?:/(\d+[\.\d]+))?'
name: 'Yo WhatsApp'
version: '$1'
# Line # Line
- regex: 'Line(?:[ /]([\d\.]+))' - regex: 'Line(?:[ /]([\d\.]+))'
name: 'Line' name: 'Line'
@ -499,7 +469,7 @@
version: '$1' version: '$1'
# TikTok (https://apps.apple.com/app/id835599320 | https://play.google.com/store/apps/details?id=com.zhiliaoapp.musically) # TikTok (https://apps.apple.com/app/id835599320 | https://play.google.com/store/apps/details?id=com.zhiliaoapp.musically)
- regex: '(?:TikTok[/ ]|com.zhiliaoapp.musically|musical_ly_|AppName/musical_ly app_version/)(\d+\.(?:[\.\d]+))?' - regex: '(?:TikTok[/ ]|musical_ly_|AppName/musical_ly app_version/)(\d+\.(?:[\.\d]+))?'
name: 'TikTok' name: 'TikTok'
version: '$1' version: '$1'
@ -1116,6 +1086,11 @@
name: 'Focus Keeper' name: 'Focus Keeper'
version: '$1' version: '$1'
# Quick Search TV (https://play.google.com/store/apps/details?id=com.aospstudio.tvsearch)
- regex: 'Quick Search TV/(\d+\.[\.\d]+)'
name: 'Quick Search TV'
version: '$1'
# Microsoft Store (https://www.microsoft.com/en-us/store/apps/windows) # Microsoft Store (https://www.microsoft.com/en-us/store/apps/windows)
- regex: 'WindowsStoreSDK' - regex: 'WindowsStoreSDK'
name: 'Microsoft Store' name: 'Microsoft Store'
@ -1137,7 +1112,7 @@
version: '$1' version: '$1'
# Microsoft Bing Search (https://play.google.com/store/apps/details?id=com.microsoft.bing | https://apps.apple.com/us/app/microsoft-bing-search/id345323231) # Microsoft Bing Search (https://play.google.com/store/apps/details?id=com.microsoft.bing | https://apps.apple.com/us/app/microsoft-bing-search/id345323231)
- regex: '(?:Bing)?Sapphire/(\d+\.[\.\d]+)' - regex: 'BingSapphire/(\d+\.[\.\d]+)'
name: 'Microsoft Bing Search' name: 'Microsoft Bing Search'
version: '$1' version: '$1'
@ -1157,7 +1132,7 @@
version: '$1' version: '$1'
# F-Secure SAFE (https://apps.apple.com/app/f-secure-safe/id572847748) # F-Secure SAFE (https://apps.apple.com/app/f-secure-safe/id572847748)
- regex: 'FSCDCSafe[ /](\d+\.[\.\d]+)' - regex: 'FSCDCSafe (\d+\.[\.\d]+)'
name: 'F-Secure SAFE' name: 'F-Secure SAFE'
version: '$1' version: '$1'
@ -1408,11 +1383,22 @@
name: 'Amazon Music' name: 'Amazon Music'
version: '$1' version: '$1'
# Klarna (https://apps.apple.com/us/app/klarna-shop-now-pay-later/id1115120118) # Klarna (https://apps.apple.com/us/app/klarna-shop-now-pay-later/id1115120118)
- regex: 'Klarna/(\d+\.[.\d]+)?' - regex: 'Klarna/(\d+\.[.\d]+)'
name: 'Klarna' name: 'Klarna'
version: '$1' version: '$1'
# WhatsApp+2
- regex: 'YoWhatsApp2Plus(?:/(\d+[\.\d]+))?'
name: 'WhatsApp+2'
version: '$1'
# GBWhatsApp
- regex: 'GBWhatsApp(?:/(\d+[\.\d]+))?'
name: 'GBWhatsApp'
version: '$1'
# R (https://www.r-project.org/) # R (https://www.r-project.org/)
- regex: '^R/(\d+[\.\d]+)' - regex: '^R/(\d+[\.\d]+)'
name: 'R' name: 'R'
@ -2195,6 +2181,11 @@
name: 'NPR One' name: 'NPR One'
version: '$1' version: '$1'
# unsure what this is, but is used quite a bit
- regex: 'Trackable/([\d\.]+)'
name: 'Trackable'
version: '$1'
- regex: 'Uforia/([\d\.]+)' - regex: 'Uforia/([\d\.]+)'
name: 'Uforia' name: 'Uforia'
version: '$1' version: '$1'
@ -2203,7 +2194,7 @@
name: 'L.A. Times' name: 'L.A. Times'
version: '' version: ''
- regex: '(?:^NYT(?: |%20)?Audio(?:-iOS)?|nytios)/([\d.]+)' - regex: '(?:^NYT(?: |%20)?Audio|nytios)/([\d.]+)'
name: 'The New York Times' name: 'The New York Times'
version: '$1' version: '$1'
@ -2222,63 +2213,3 @@
- regex: 'IPTV/([\d\.]+)' - regex: 'IPTV/([\d\.]+)'
name: 'IPTV' name: 'IPTV'
version: '$1' version: '$1'
# IPTV Pro (https://play.google.com/store/apps/details?id=ru.iptvremote.android.iptv.pro)
- regex: 'IPTV Pro/([\d\.]+)'
name: 'IPTV Pro'
version: '$1'
# MetaMask (https://apps.apple.com/us/app/metamask-blockchain-wallet/id1438144202)
- regex: 'MetaMask/'
name: 'MetaMask'
version: ''
# +Simple (https://play.google.com/store/apps/details?id=com.massimple.nacion.gcba.es)
- regex: '\+Simple Browser'
name: '+Simple'
version: ''
# Bitwarden (https://bitwarden.com/)
- regex: 'Bitwarden_Mobile/([\d\.]+)'
name: 'Bitwarden'
version: '$1'
# MX Player (https://play.google.com/store/apps/details?id=com.mxtech.videoplayer.ad)
- regex: 'MXPlayer/([\d\.]+)'
name: 'MX Player'
version: '$1'
# HistoryHound
- regex: 'HistoryHound/([\d\.]+)'
name: 'HistoryHound'
version: '$1'
# Quicksilver (https://qsapp.com/)
- regex: 'Quicksilver'
name: 'Quicksilver'
version: ''
# CamScanner (https://play.google.com/store/apps/details?id=com.intsig.camscanner)
- regex: 'CamScanner/([\d\.]+)'
name: 'CamScanner'
version: '$1'
# OBS Studio (https://obsproject.com/)
- regex: 'OBS/(\d+[\.\d]+)'
name: 'OBS Studio'
version: '$1'
# XSplit Broadcaster (https://www.xsplit.com/broadcaster)
- regex: 'XSplitBroadcaster/(\d+[\.\d]+)'
name: 'XSplit Broadcaster'
version: '$1'
# Twitch Studio (https://www.twitch.tv/broadcast/studio)
- regex: 'twitch-desktop-electron-platform.*spotlight/(\d+[\.\d]+)'
name: 'Twitch Studio'
version: '$1'
# Stream Master (https://www.lovense.com/stream-master)
- regex: 'Stream Master$'
name: 'Stream Master'
version: ''

@ -88,7 +88,6 @@
'de.twokit.video.tv.cast.browser.lg': 'TV Cast' 'de.twokit.video.tv.cast.browser.lg': 'TV Cast'
'de.twokit.video.tv.cast.browser.samsung': 'TV Cast' 'de.twokit.video.tv.cast.browser.samsung': 'TV Cast'
'com.cleanmaster.security': 'CM Security' 'com.cleanmaster.security': 'CM Security'
'com.antivirus.master.cmsecurity': 'CM Security'
'idm.video.free': 'IDM Video Download Manager' 'idm.video.free': 'IDM Video Download Manager'
'mobi.deallauncher.coupons.shopping': 'Coupons & Deals' 'mobi.deallauncher.coupons.shopping': 'Coupons & Deals'
'com.wukongtv.wkcast.intl': 'Quick Cast' 'com.wukongtv.wkcast.intl': 'Quick Cast'
@ -96,11 +95,6 @@
'com.fsecure.ms.kpn.veilig': 'KPN Veilig' 'com.fsecure.ms.kpn.veilig': 'KPN Veilig'
'com.fsecure.ms.actshield': 'ACT Shield' 'com.fsecure.ms.actshield': 'ACT Shield'
'com.fsecure.ms.talktalksa': 'TalkTalk SuperSafe' 'com.fsecure.ms.talktalksa': 'TalkTalk SuperSafe'
'com.fsecure.ms.dnafi': 'DNA Digiturva'
'com.fsecure.ms.teliasweden': 'Telia Trygg'
'com.fsecure.ms.upc.ch': 'UPC Internet Security'
'com.fsecure.ms.sfr': 'SFR Sécurité'
'com.fsecure.ms.sonera': 'Telia Turvapaketti'
'com.bifrostwallet.app': 'Bifrost Wallet' 'com.bifrostwallet.app': 'Bifrost Wallet'
'com.anydesk.anydeskandroid': 'AnyDesk Remote Desktop' 'com.anydesk.anydeskandroid': 'AnyDesk Remote Desktop'
'com.google.android.youtube': 'YouTube' 'com.google.android.youtube': 'YouTube'
@ -122,10 +116,6 @@
'com.box.video.downloader': 'BOX Video Downloader' 'com.box.video.downloader': 'BOX Video Downloader'
'com.oxoo.kinogo': 'Kinogo.ge' 'com.oxoo.kinogo': 'Kinogo.ge'
'com.tradron.hdvideodownloader': 'Download Hub' 'com.tradron.hdvideodownloader': 'Download Hub'
'net.daum.android.daum': 'Daum'
'com.massimple.nacion.gcba.es': '+Simple'
'com.massimple.nacion.parana.es': '+Simple'
'com.microsoft.math': 'Microsoft Math Solver'
# Vpns # Vpns
'org.torproject.android': 'Orbot' 'org.torproject.android': 'Orbot'
@ -135,6 +125,3 @@
'com.surfshark.vpnclient.android': 'Surfshark' 'com.surfshark.vpnclient.android': 'Surfshark'
'com.omshyapps.vpn': 'Omshy VPN' 'com.omshyapps.vpn': 'Omshy VPN'
'com.kuto.vpn': 'KUTO VPN' 'com.kuto.vpn': 'KUTO VPN'
'com.ezt.vpn': 'EZVPN'
'com.nocardteam.nocardvpn': 'NoCard VPN'
'com.nocardteam.nocardvpn.lite': 'NoCard VPN Lite'

@ -1,8 +1,5 @@
# Browsers # Browsers
'mark.via.gg': 'Via'
'mark.via.gp': 'Via' 'mark.via.gp': 'Via'
'mark.via.gq': 'Via'
'mark.via.pm': 'Via'
'com.pure.mini.browser': 'Pure Mini Browser' 'com.pure.mini.browser': 'Pure Mini Browser'
'pure.lite.browser': 'Pure Lite Browser' 'pure.lite.browser': 'Pure Lite Browser'
'acr.browser.Hexa': 'Hexa Web Browser' 'acr.browser.Hexa': 'Hexa Web Browser'
@ -98,7 +95,6 @@
'com.zeesitech.bitchutebrowser': 'Bitchute Browser' 'com.zeesitech.bitchutebrowser': 'Bitchute Browser'
'nova.all.video.downloader': 'Nova Video Downloader Pro' 'nova.all.video.downloader': 'Nova Video Downloader Pro'
'tukidev.pronhubbrowser.tanpavpn': 'PronHub Browser' 'tukidev.pronhubbrowser.tanpavpn': 'PronHub Browser'
'com.crowbar.beaverlite': 'Frost'
'com.crowbar.beaverbrowser': 'Frost+' 'com.crowbar.beaverbrowser': 'Frost+'
'com.lenovo.browser': 'Lenovo Browser' 'com.lenovo.browser': 'Lenovo Browser'
'com.transsion.phoenix': 'Phoenix Browser' 'com.transsion.phoenix': 'Phoenix Browser'
@ -144,8 +140,6 @@
'com.security.xvpn.z35kb.amazon': 'X-VPN' 'com.security.xvpn.z35kb.amazon': 'X-VPN'
'com.security.xvpn.z35kb.huawei': 'X-VPN' 'com.security.xvpn.z35kb.huawei': 'X-VPN'
'com.yandex.browser.lite': 'Yandex Browser Lite' 'com.yandex.browser.lite': 'Yandex Browser Lite'
'com.yandex.browser.beta': 'Yandex Browser'
'com.yandex.browser.alpha': 'Yandex Browser'
'cz.seznam.sbrowser': 'Seznam Browser' 'cz.seznam.sbrowser': 'Seznam Browser'
'com.morrisxar.nav88': 'Office Browser' 'com.morrisxar.nav88': 'Office Browser'
'com.rabbit.incognito.browser': 'Rabbit Private Browser' 'com.rabbit.incognito.browser': 'Rabbit Private Browser'
@ -155,7 +149,7 @@
'id.browser.vivid3': 'Vivid Browser Mini' 'id.browser.vivid3': 'Vivid Browser Mini'
'com.browser.yo.indian': 'Yo Browser' 'com.browser.yo.indian': 'Yo Browser'
'com.mercandalli.android.browser': 'G Browser' 'com.mercandalli.android.browser': 'G Browser'
'com.bf.browser': 'BXE Browser' 'com.bf.browser': 'BF Browser'
'com.qihoo.browser': '360 Browser' 'com.qihoo.browser': '360 Browser'
'com.qihoo.haosou': '360 Browser' 'com.qihoo.haosou': '360 Browser'
'com.qihoo.padbrowser': '360 Browser' 'com.qihoo.padbrowser': '360 Browser'
@ -208,7 +202,6 @@
'com.internet.tvbrowser': 'LUJO TV Browser' 'com.internet.tvbrowser': 'LUJO TV Browser'
'com.logicui.tvbrowser2': 'LogicUI TV Browser' 'com.logicui.tvbrowser2': 'LogicUI TV Browser'
'com.opera.browser.afin': 'Opera' 'com.opera.browser.afin': 'Opera'
'com.opera.browser.beta': 'Opera'
'com.quark.browser': 'Quark' 'com.quark.browser': 'Quark'
'jp.co.yahoo.android.ybrowser': 'Yahoo! Japan Browser' 'jp.co.yahoo.android.ybrowser': 'Yahoo! Japan Browser'
'com.tv.browser.open': 'Open TV Browser' 'com.tv.browser.open': 'Open TV Browser'
@ -232,21 +225,3 @@
'com.cavebrowser': 'Cave Browser' 'com.cavebrowser': 'Cave Browser'
'com.zordo.browser': 'Zordo Browser' 'com.zordo.browser': 'Zordo Browser'
'freedom.theanarch.org.freedom': 'Freedom Browser' 'freedom.theanarch.org.freedom': 'Freedom Browser'
'com.lechneralexander.privatebrowser': 'Private Internet Browser'
'com.airfind.browser': 'Airfind Secure Browser'
'com.securex.browser': 'SecureX'
'com.sec.android.app.sbrowser.beta': 'Samsung Browser'
'threads.thor': 'Thor'
'com.androidbull.incognito.browser': 'Incognito Browser'
'com.mosoft.godzilla': 'Godzilla Browser'
'com.oceanbrowser.mobile.android': 'Ocean Browser'
'com.qmamu.browser': 'Qmamu'
'com.techlastudio.bfbrowser': 'BF Browser'
'com.befaster.bfbrowser': 'BF Browser'
'app.nextinnovations.brokeep': 'BroKeep Browser'
'org.lilo.app': 'Lilo'
'proxy.browser.unblock.sites.proxybrowser.unblocksites': 'Proxy Browser'
'com.hotsurf.browser': 'HotBrowser'
'vpn.video.downloader': 'VD Browser'
'com.aospstudio.tvsearch': 'Quick Search TV'
'com.go.browser': 'GO Browser'

@ -5,22 +5,6 @@
# @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
############### ###############
# BMW (https://www.bmw.com/)
BMW:
regex: 'AFTLBT962E2(?:[);/ ]|$)'
device: 'car browser'
models:
- regex: 'AFTLBT962E2(?:[);/ ]|$)'
model: 'Car (2022)'
# Jeep (https://www.jeep.com/)
Jeep:
regex: 'AFTLFT962X3(?:[);/ ]|$)'
device: 'car browser'
models:
- regex: 'AFTLFT962X3(?:[);/ ]|$)'
model: 'Wagoneer'
# Tesla Model S # Tesla Model S
Tesla: Tesla:
regex: '(?:Tesla/(?:(?:develop|feature|terminal-das-fsd-eap)-)?[0-9.]+|QtCarBrowser)' regex: '(?:Tesla/(?:(?:develop|feature|terminal-das-fsd-eap)-)?[0-9.]+|QtCarBrowser)'

@ -46,7 +46,7 @@ JXD:
model: 'S601 WiFi' model: 'S601 WiFi'
Sony: Sony:
regex: '(?:PlayStation ?(4 Pro|[2-5]|Portable|Vita)|sony_tv;ps5;|\(PS3\))' regex: '(?:PlayStation ?(2|3|4 Pro|4|5|Portable|Vita)|sony_tv;ps5;|\(PS3\))'
device: 'console' device: 'console'
models: models:
- regex: 'sony_tv;ps5;' - regex: 'sony_tv;ps5;'
@ -55,7 +55,7 @@ Sony:
model: 'PlayStation 4 Pro' model: 'PlayStation 4 Pro'
- regex: '\(PS3\)' - regex: '\(PS3\)'
model: 'PlayStation 3' model: 'PlayStation 3'
- regex: 'PlayStation ?(4 Pro|[2-5]|Portable|Vita)' - regex: 'PlayStation ?(2|3|4 Pro|4|5|Portable|Vita)'
model: 'PlayStation $1' model: 'PlayStation $1'
# Retroid Pocket (www.goretroid.com) # Retroid Pocket (www.goretroid.com)

File diff suppressed because it is too large Load Diff

@ -21,7 +21,7 @@ Apple:
model: 'iPod Touch 5' model: 'iPod Touch 5'
- regex: '(?:Apple-)?iPod7[C,_]?1' - regex: '(?:Apple-)?iPod7[C,_]?1'
model: 'iPod Touch 6' model: 'iPod Touch 6'
- regex: '(?:Apple-)?iPod9[C,_]?1|iPodTouch7' - regex: '(?:Apple-)?iPod9[C,_]?1'
model: 'iPod Touch 7' model: 'iPod Touch 7'
- regex: '(?:Apple-)?iPod' - regex: '(?:Apple-)?iPod'
model: 'iPod Touch' model: 'iPod Touch'

@ -952,11 +952,9 @@ Silva Schneider:
# Skyworth # Skyworth
Skyworth: Skyworth:
regex: 'Sky_worth|SWTV[;,]' regex: 'Sky_worth'
device: 'tv' device: 'tv'
models: models:
- regex: 'SKWE20E21'
model: 'SKWE20E21'
- regex: 'Sky_worth;([^);/]+)' - regex: 'Sky_worth;([^);/]+)'
model: '$1' model: '$1'
@ -988,6 +986,14 @@ Sony:
- regex: '(K[DM]L?-?[0-9]{2}[A-Z]{1,2}[0-9]{1,5})' - regex: '(K[DM]L?-?[0-9]{2}[A-Z]{1,2}[0-9]{1,5})'
model: '$1' model: '$1'
# SWTV
SWTV:
regex: 'SWTV[;,]'
device: 'tv'
models:
- regex: 'SKWE20E21'
model: 'SKWE20E21'
# TD Systems # TD Systems
'TD Systems': 'TD Systems':
regex: 'TDSystems[;,]' regex: 'TDSystems[;,]'

@ -5,15 +5,6 @@
# @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
############### ###############
# BrightSignOS (https://www.brightsign.biz/ecosystem/brightsign-os/)
##########
- regex: 'BrightSign/(?:[A-Z0-9]+)/(\d+[\.\d]+)'
name: 'BrightSignOS'
version: '$1'
- regex: 'BrightSign/(\d+[\.\d]+)'
name: 'BrightSignOS'
version: '$1'
########## ##########
# LuneOS (https://www.webos-ports.org/) # LuneOS (https://www.webos-ports.org/)
########## ##########
@ -435,7 +426,7 @@
name: 'Android' name: 'Android'
version: '$1' version: '$1'
- regex: '(?:(?:Orca-)?(?<!like |/|RadioPublic |Anghami |Callpod Keeper for )Android|Adr|AOSP)[ /]?(?:[a-z]+ )?(\d+[\.\d]*)' - regex: '(?:(?:Orca-)?(?<!like |/|RadioPublic |Anghami )Android|Adr|AOSP)[ /]?(?:[a-z]+ )?(\d+[\.\d]*)'
name: 'Android' name: 'Android'
version: '$1' version: '$1'
@ -459,7 +450,7 @@
name: 'Android' name: 'Android'
version: '$1' version: '$1'
- regex: 'BeyondPod|AntennaPod|Podkicker|DoggCatcher|Player FM|okhttp|Podcatcher Deluxe|Sonos/.+\(ACR_|Linux x86_64; Quest|.*WhatsApp/.*A$' - regex: 'BeyondPod|AntennaPod|Podkicker|DoggCatcher|Player FM|okhttp|Podcatcher Deluxe|Sonos/.+\(ACR_|Linux x86_64; Quest'
name: 'Android' name: 'Android'
version: '' version: ''
@ -723,7 +714,7 @@
name: 'Windows' name: 'Windows'
version: '$1' version: '$1'
- regex: 'mingw32|winhttp|WhatsApp/.*W$' - regex: 'mingw32|winhttp'
name: 'Windows' name: 'Windows'
version: '' version: ''
@ -842,7 +833,7 @@
name: 'iPadOS' name: 'iPadOS'
version: '$1.$2' version: '$1.$2'
- regex: 'iPad(?:; (?:iOS|iPadOS|iPhone OS)|.+CPU (?:iPad |iPhone )?OS) ((1[3-7])+(?:[_\.]\d+)*)' - regex: 'iPad(?:; (?:iOS|iPadOS|iPhone OS)|.+CPU OS) ((1[3-7])+(?:[_\.]\d+)*)'
name: 'iPadOS' name: 'iPadOS'
version: '$1' version: '$1'
@ -877,11 +868,9 @@
name: 'iOS' name: 'iOS'
version: '$1' version: '$1'
- regex: '^(?!com.apple.Safari.SearchHelper|Safari).*(?:CFNetwork|Mana)/.+ Darwin/(\d+[\.\d]+)(?!.*(?:x86_64|i386|PowerMac|Power%20Macintosh))' - regex: '^(?!com.apple.Safari.SearchHelper|Safari).*CFNetwork/.+ Darwin/(\d+[\.\d]+)(?!.*(?:x86_64|i386|PowerMac|Power%20Macintosh))'
name: 'iOS' name: 'iOS'
versions: versions:
- regex: 'Darwin/23.4.0'
version: '17.4'
- regex: 'Darwin/23.3.0' - regex: 'Darwin/23.3.0'
version: '17.3' version: '17.3'
- regex: 'Darwin/23.2.0' - regex: 'Darwin/23.2.0'
@ -1085,7 +1074,7 @@
name: 'iOS' name: 'iOS'
version: '$1' version: '$1'
- regex: '(?:Podcasts/(?:[\d\.]+)|Instacast(?:HD)?/(?:\d\.[\d\.abc]+)|Pocket Casts, iOS|\(iOS\)|iOS; Opera|Overcast|Castro|Podcat|iCatcher|RSSRadio/|MobileSafari/|WhatsApp/.*i$)(?!.*x86_64)' - regex: '(?:Podcasts/(?:[\d\.]+)|Instacast(?:HD)?/(?:\d\.[\d\.abc]+)|Pocket Casts, iOS|\(iOS\)|iOS; Opera|Overcast|Castro|Podcat|iCatcher|RSSRadio/|MobileSafari/)(?!.*x86_64)'
name: 'iOS' name: 'iOS'
version: '' version: ''
@ -1108,11 +1097,9 @@
########## ##########
# Mac # Mac
########## ##########
- regex: '(?:CFNetwork|Mana|StudioDisplay)/.+Darwin(?:/|; )(?:[\d\.]+).+(?:x86_64|i386|Power%20Macintosh)|(?:x86_64-apple-)?darwin(?:[\d\.]+)|PowerMac|com.apple.Safari.SearchHelper|^Safari' - regex: '(?:CFNetwork|StudioDisplay)/.+Darwin(?:/|; )(?:[\d\.]+).+(?:x86_64|i386|Power%20Macintosh)|(?:x86_64-apple-)?darwin(?:[\d\.]+)|PowerMac|com.apple.Safari.SearchHelper|^Safari'
name: 'Mac' name: 'Mac'
versions: versions:
- regex: '(?:x86_64-apple-)?Darwin(?:/|; )?23.4.0'
version: '14.4'
- regex: '(?:x86_64-apple-)?Darwin(?:/|; )?23.3.0' - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?23.3.0'
version: '14.3' version: '14.3'
- regex: '(?:x86_64-apple-)?Darwin(?:/|; )?23.2.0' - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?23.2.0'
@ -1306,7 +1293,7 @@
name: 'Mac' name: 'Mac'
version: '$1' version: '$1'
- regex: 'Darwin|Macintosh|Mac[ _]PowerPC|PPC|iMac|MacBook|macOS|AppleExchangeWebServices|com.apple.trustd|Sonos/.+\(MDCR_|WhatsApp/.*N$' - regex: 'Darwin|Macintosh|Mac_PowerPC|PPC|Mac PowerPC|iMac|MacBook|macOS|AppleExchangeWebServices|com.apple.trustd|Sonos/.+\(MDCR_'
name: 'Mac' name: 'Mac'
version: '' version: ''

@ -229,24 +229,6 @@
- "ZR" - "ZR"
- "D6" - "D6"
- "F6" - "F6"
- "RC"
- "WD"
- "P3"
- "FT"
- "A9"
- "X2"
- "N3"
- "GD"
- "O9"
- "Q3"
- "F7"
- "K2"
- "P5"
- "H5"
- "V3"
- "K3"
- "Q4"
- "G2"
- "" - ""
- "Firefox": - "Firefox":
- "AX" - "AX"
@ -279,6 +261,7 @@
- "PI" - "PI"
- "PX" - "PX"
- "QA" - "QA"
- "QM"
- "S5" - "S5"
- "SX" - "SX"
- "TF" - "TF"

@ -33,7 +33,6 @@
- "AB": "ABrowse" - "AB": "ABrowse"
- "BW": "AdBlock Browser" - "BW": "AdBlock Browser"
- "A7": "Adult Browser" - "A7": "Adult Browser"
- "A9": "Airfind Secure Browser"
- "AF": "ANT Fresco" - "AF": "ANT Fresco"
- "AG": "ANTGalio" - "AG": "ANTGalio"
- "AL": "Aloha Browser" - "AL": "Aloha Browser"
@ -54,7 +53,6 @@
- "AV": "Amiga Voyager" - "AV": "Amiga Voyager"
- "AW": "Amiga Aweb" - "AW": "Amiga Aweb"
- "PN": "APN Browser" - "PN": "APN Browser"
- "RA": "Arc"
- "AI": "Arvin" - "AI": "Arvin"
- "AK": "Ask.com" - "AK": "Ask.com"
- "AU": "Asus Browser" - "AU": "Asus Browser"
@ -67,7 +65,6 @@
- "A1": "AwoX" - "A1": "AwoX"
- "BA": "Beaker Browser" - "BA": "Beaker Browser"
- "BM": "Beamrise" - "BM": "Beamrise"
- "F7": "BF Browser"
- "BB": "BlackBerry Browser" - "BB": "BlackBerry Browser"
- "H1": "BrowseHere" - "H1": "BrowseHere"
- "B8": "Browser Hup Pro" - "B8": "Browser Hup Pro"
@ -90,7 +87,6 @@
- "BN": "Borealis Navigator" - "BN": "Borealis Navigator"
- "BR": "Brave" - "BR": "Brave"
- "BK": "BriskBard" - "BK": "BriskBard"
- "K2": "BroKeep Browser"
- "B3": "Browspeed Browser" - "B3": "Browspeed Browser"
- "BX": "BrowseX" - "BX": "BrowseX"
- "BZ": "Browzar" - "BZ": "Browzar"
@ -98,7 +94,7 @@
- "4B": "BrowsBit" - "4B": "BrowsBit"
- "BY": "Biyubi" - "BY": "Biyubi"
- "BF": "Byffox" - "BF": "Byffox"
- "B4": "BXE Browser" - "B4": "BF Browser"
- "CA": "Camino" - "CA": "Camino"
- "0C": "Cave Browser" - "0C": "Cave Browser"
- "CL": "CCleaner" - "CL": "CCleaner"
@ -133,7 +129,6 @@
- "C5": "Chromium GOST" - "C5": "Chromium GOST"
- "CY": "Cyberfox" - "CY": "Cyberfox"
- "CS": "Cheshire" - "CS": "Cheshire"
- "RC": "Crow Browser"
- "CT": "Crusta" - "CT": "Crusta"
- "CG": "Craving Explorer" - "CG": "Craving Explorer"
- "CZ": "Crazy Browser" - "CZ": "Crazy Browser"
@ -150,7 +145,6 @@
- "DT": "Delta Browser" - "DT": "Delta Browser"
- "D0": "Desi Browser" - "D0": "Desi Browser"
- "DS": "DeskBrowse" - "DS": "DeskBrowse"
- "D2": "DoCoMo"
- "DF": "Dolphin" - "DF": "Dolphin"
- "DZ": "Dolphin Zero" - "DZ": "Dolphin Zero"
- "DO": "Dorado" - "DO": "Dorado"
@ -173,7 +167,6 @@
- "EP": "GNOME Web" - "EP": "GNOME Web"
- "G1": "G Browser" - "G1": "G Browser"
- "ES": "Espial TV Browser" - "ES": "Espial TV Browser"
- "FG": "fGet"
- "FA": "Falkon" - "FA": "Falkon"
- "FX": "Faux Browser" - "FX": "Faux Browser"
- "F4": "Fiery Browser" - "F4": "Fiery Browser"
@ -199,7 +192,6 @@
- "F5": "Flyperlink" - "F5": "Flyperlink"
- "FU": "FreeU" - "FU": "FreeU"
- "F6": "Freedom Browser" - "F6": "Freedom Browser"
- "FT": "Frost"
- "F3": "Frost+" - "F3": "Frost+"
- "FI": "Fulldive" - "FI": "Fulldive"
- "GA": "Galeon" - "GA": "Galeon"
@ -207,12 +199,10 @@
- "GH": "Ghostery Privacy Browser" - "GH": "Ghostery Privacy Browser"
- "GI": "GinxDroid Browser" - "GI": "GinxDroid Browser"
- "GB": "Glass Browser" - "GB": "Glass Browser"
- "GD": "Godzilla Browser"
- "GE": "Google Earth" - "GE": "Google Earth"
- "GP": "Google Earth Pro" - "GP": "Google Earth Pro"
- "GO": "GOG Galaxy" - "GO": "GOG Galaxy"
- "GR": "GoBrowser" - "GR": "GoBrowser"
- "G2": "GO Browser"
- "HB": "Harman Browser" - "HB": "Harman Browser"
- "HS": "HasBrowser" - "HS": "HasBrowser"
- "HA": "Hawk Turbo Browser" - "HA": "Hawk Turbo Browser"
@ -222,7 +212,6 @@
- "HI": "Hi Browser" - "HI": "Hi Browser"
- "HO": "hola! Browser" - "HO": "hola! Browser"
- "H4": "Holla Web Browser" - "H4": "Holla Web Browser"
- "H5": "HotBrowser"
- "HJ": "HotJava" - "HJ": "HotJava"
- "HT": "HTC Browser" - "HT": "HTC Browser"
- "HU": "Huawei Browser Mobile" - "HU": "Huawei Browser Mobile"
@ -241,7 +230,6 @@
- "IV": "Isivioo" - "IV": "Isivioo"
- "I8": "IVVI Browser" - "I8": "IVVI Browser"
- "IW": "Iceweasel" - "IW": "Iceweasel"
- "N3": "Incognito Browser"
- "IN": "Inspect Browser" - "IN": "Inspect Browser"
- "I9": "Insta Browser" - "I9": "Insta Browser"
- "IE": "Internet Explorer" - "IE": "Internet Explorer"
@ -333,8 +321,6 @@
- "WR": "NextWord Browser" - "WR": "NextWord Browser"
- "NT": "NTENT Browser" - "NT": "NTENT Browser"
- "NU": "Nuanti Meta" - "NU": "Nuanti Meta"
- "NI": "Nuviu"
- "O9": "Ocean Browser"
- "OC": "Oculus Browser" - "OC": "Oculus Browser"
- "O6": "Odd Browser" - "O6": "Odd Browser"
- "O1": "Opera Mini iOS" - "O1": "Opera Mini iOS"
@ -347,7 +333,6 @@
- "O5": "Office Browser" - "O5": "Office Browser"
- "HH": "OhHai Browser" - "HH": "OhHai Browser"
- "OE": "ONE Browser" - "OE": "ONE Browser"
- "N4": "Onion Browser"
- "Y1": "Opera Crypto" - "Y1": "Opera Crypto"
- "OX": "Opera GX" - "OX": "Opera GX"
- "OG": "Opera Neon" - "OG": "Opera Neon"
@ -395,16 +380,12 @@
- "LY": "PolyBrowser" - "LY": "PolyBrowser"
- "PI": "PrivacyWall" - "PI": "PrivacyWall"
- "P4": "Privacy Explorer Fast Safe" - "P4": "Privacy Explorer Fast Safe"
- "P3": "Private Internet Browser"
- "P5": "Proxy Browser"
- "P2": "Pi Browser" - "P2": "Pi Browser"
- "P0": "PronHub Browser" - "P0": "PronHub Browser"
- "PC": "PSI Secure Browser" - "PC": "PSI Secure Browser"
- "RW": "Reqwireless WebViewer" - "RW": "Reqwireless WebViewer"
- "PS": "Microsoft Edge" - "PS": "Microsoft Edge"
- "QA": "Qazweb" - "QA": "Qazweb"
- "Q3": "Qmamu"
- "Q4": "Quick Search TV"
- "Q2": "QQ Browser Lite" - "Q2": "QQ Browser Lite"
- "Q1": "QQ Browser Mini" - "Q1": "QQ Browser Mini"
- "QQ": "QQ Browser" - "QQ": "QQ Browser"
@ -441,7 +422,6 @@
- "S1": "SimpleBrowser" - "S1": "SimpleBrowser"
- "3S": "SilverMob US" - "3S": "SilverMob US"
- "SY": "Sizzy" - "SY": "Sizzy"
- "K3": "Skye"
- "SK": "Skyfire" - "SK": "Skyfire"
- "SS": "Seraphic Sraf" - "SS": "Seraphic Sraf"
- "KK": "SiteKiosk" - "KK": "SiteKiosk"
@ -450,7 +430,6 @@
- "S7": "SP Browser" - "S7": "SP Browser"
- "9S": "Sony Small Browser" - "9S": "Sony Small Browser"
- "8S": "Secure Private Browser" - "8S": "Secure Private Browser"
- "X2": "SecureX"
- "T1": "Stampy Browser" - "T1": "Stampy Browser"
- "7S": "7Star" - "7S": "7Star"
- "SQ": "Smart Browser" - "SQ": "Smart Browser"
@ -481,7 +460,6 @@
- "TR": "T-Browser" - "TR": "T-Browser"
- "TO": "t-online.de Browser" - "TO": "t-online.de Browser"
- "TA": "Tao Browser" - "TA": "Tao Browser"
- "TH": "Thor"
- "1T": "Tor Browser" - "1T": "Tor Browser"
- "TF": "TenFourFox" - "TF": "TenFourFox"
- "TB": "Tenta Browser" - "TB": "Tenta Browser"
@ -505,9 +483,7 @@
- "UE": "Ume Browser" - "UE": "Ume Browser"
- "V0": "vBrowser" - "V0": "vBrowser"
- "VA": "Vast Browser" - "VA": "Vast Browser"
- "V3": "VD Browser"
- "VE": "Venus Browser" - "VE": "Venus Browser"
- "WD": "Vewd Browser"
- "N0": "Nova Video Downloader Pro" - "N0": "Nova Video Downloader Pro"
- "VS": "Viasat Browser" - "VS": "Viasat Browser"
- "VI": "Vivaldi" - "VI": "Vivaldi"

@ -1,6 +1,2 @@
- "Chrome": - "Chrome":
- "Google Chrome" - "Google Chrome"
- "Vewd Browser":
- "Vewd Core"
- "DuckDuckGo Privacy Browser":
- "DuckDuckGo"

@ -136,21 +136,3 @@
- "ZR" - "ZR"
- "D6" - "D6"
- "F6" - "F6"
- "P3"
- "FT"
- "A9"
- "X2"
- "NI"
- "FG"
- "TH"
- "N3"
- "GD"
- "O9"
- "Q3"
- "F7"
- "K2"
- "N4"
- "P5"
- "H5"
- "V3"
- "G2"

@ -111,7 +111,6 @@
- "ORA" - "ORA"
- "VID" - "VID"
- "TIV" - "TIV"
- "BSN"
- "" - ""
- "Mac": - "Mac":
- "MAC" - "MAC"

@ -12,7 +12,6 @@
- "QNX": "BlackBerry Tablet OS" - "QNX": "BlackBerry Tablet OS"
- "BOS": "Bliss OS" - "BOS": "Bliss OS"
- "BMP": "Brew" - "BMP": "Brew"
- "BSN": "BrightSignOS"
- "CAI": "Caixa Mágica" - "CAI": "Caixa Mágica"
- "CES": "CentOS" - "CES": "CentOS"
- "CST": "CentOS Stream" - "CST": "CentOS Stream"

@ -91,22 +91,6 @@ defmodule Plausible.DataMigration.SiteImportsTest do
assert site_import.source == :universal_analytics assert site_import.source == :universal_analytics
end end
test "removes site import when there are no stats" do
site =
insert(:site)
|> Site.start_import(~D[2021-01-02], ~D[2020-02-02], "Google Analytics", "ok")
|> Repo.update!()
_another_site_import = insert(:site_import, site: site)
assert capture_io(fn ->
assert :ok = SiteImports.run(dry_run?: false)
end) =~ "Processing 1 site"
site = Repo.reload!(site)
assert [] = Imported.list_all_imports(site)
end
test "leaves site and imports unchanged if everything fits" do test "leaves site and imports unchanged if everything fits" do
site = site =
insert(:site) insert(:site)

@ -92,24 +92,6 @@ defmodule Plausible.GoalsTest do
assert [currency: {"is invalid", _}] = changeset.errors assert [currency: {"is invalid", _}] = changeset.errors
end end
@tag :full_build_only
test "list_revenue_goals/1 lists event_names and currencies for each revenue goal" do
site = insert(:site)
Goals.create(site, %{"event_name" => "One", "currency" => "EUR"})
Goals.create(site, %{"event_name" => "Two", "currency" => "EUR"})
Goals.create(site, %{"event_name" => "Three", "currency" => "USD"})
Goals.create(site, %{"event_name" => "Four"})
Goals.create(site, %{"page_path" => "/some-page"})
revenue_goals = Goals.list_revenue_goals(site)
assert length(revenue_goals) == 3
assert %{event_name: "One", currency: :EUR} in revenue_goals
assert %{event_name: "Two", currency: :EUR} in revenue_goals
assert %{event_name: "Three", currency: :USD} in revenue_goals
end
test "create/2 clears currency for pageview goals" do test "create/2 clears currency for pageview goals" do
site = insert(:site) site = insert(:site)
{:ok, goal} = Goals.create(site, %{"page_path" => "/purchase", "currency" => "EUR"}) {:ok, goal} = Goals.create(site, %{"page_path" => "/purchase", "currency" => "EUR"})

@ -43,7 +43,7 @@ defmodule Plausible.Imported.GoogleAnalytics4Test do
token_expires_at: DateTime.to_iso8601(past) token_expires_at: DateTime.to_iso8601(past)
) )
site_import = Plausible.Imported.get_import(site, job.args.import_id) site_import = Plausible.Imported.get_import(job.args.import_id)
assert site_import.label == "properties/123456" assert site_import.label == "properties/123456"

@ -1384,8 +1384,7 @@ defmodule PlausibleWeb.Api.StatsController.PagesTest do
] ]
end end
test "returns top entry pages by visitors filtered by hostname", test "returns top entry pages by visitors filtered by hostname", %{conn: conn, site: site} do
%{conn: conn, site: site} do
populate_stats(site, [ populate_stats(site, [
build(:pageview, build(:pageview,
pathname: "/page1", pathname: "/page1",
@ -1430,6 +1429,58 @@ defmodule PlausibleWeb.Api.StatsController.PagesTest do
"/api/stats/#{site.domain}/entry-pages?period=day&date=2021-01-01&filters=#{filters}" "/api/stats/#{site.domain}/entry-pages?period=day&date=2021-01-01&filters=#{filters}"
) )
assert json_response(conn, 200) == [
%{"name" => "/page2", "visit_duration" => 480, "visitors" => 2, "visits" => 2},
%{"name" => "/page1", "visit_duration" => 0, "visitors" => 1, "visits" => 1}
]
end
test "returns top entry pages by visitors filtered by hostname with experimental_hostname_filter",
%{conn: conn, site: site} do
populate_stats(site, [
build(:pageview,
pathname: "/page1",
hostname: "en.example.com",
timestamp: ~N[2021-01-01 00:00:00]
),
build(:pageview,
pathname: "/page1",
hostname: "es.example.com",
timestamp: ~N[2021-01-01 00:00:00]
),
build(:pageview,
pathname: "/page2",
hostname: "en.example.com",
user_id: @user_id,
timestamp: ~N[2021-01-01 00:00:00]
),
build(:pageview,
pathname: "/page2",
hostname: "es.example.com",
user_id: @user_id,
timestamp: ~N[2021-01-01 00:15:00]
),
build(:pageview,
pathname: "/exit",
hostname: "es.example.com",
user_id: @user_id,
timestamp: ~N[2021-01-01 00:16:00]
),
build(:pageview,
pathname: "/page2",
hostname: "es.example.com",
timestamp: ~N[2021-01-01 23:15:00]
)
])
filters = Jason.encode!(%{"hostname" => "es.example.com"})
conn =
get(
conn,
"/api/stats/#{site.domain}/entry-pages?period=day&date=2021-01-01&filters=#{filters}&experimental_hostname_filter=true"
)
# We're going to only join sessions where the exit hostname matches the filter # We're going to only join sessions where the exit hostname matches the filter
assert json_response(conn, 200) == [ assert json_response(conn, 200) == [
%{"name" => "/page1", "visit_duration" => 0, "visitors" => 1, "visits" => 1}, %{"name" => "/page1", "visit_duration" => 0, "visitors" => 1, "visits" => 1},
@ -1587,8 +1638,7 @@ defmodule PlausibleWeb.Api.StatsController.PagesTest do
] ]
end end
test "returns top exit pages by visitors filtered by hostname", test "returns top exit pages by visitors filtered by hostname", %{conn: conn, site: site} do
%{conn: conn, site: site} do
populate_stats(site, [ populate_stats(site, [
build(:pageview, build(:pageview,
pathname: "/page1", pathname: "/page1",
@ -1628,6 +1678,54 @@ defmodule PlausibleWeb.Api.StatsController.PagesTest do
"/api/stats/#{site.domain}/exit-pages?period=day&date=2021-01-01&filters=#{filters}" "/api/stats/#{site.domain}/exit-pages?period=day&date=2021-01-01&filters=#{filters}"
) )
assert json_response(conn, 200) ==
[
%{"name" => "/exit", "visitors" => 1, "visits" => 1},
%{"name" => "/page1", "visitors" => 1, "visits" => 1}
]
end
test "returns top exit pages by visitors filtered by hostname with experimental_hostname_filter",
%{conn: conn, site: site} do
populate_stats(site, [
build(:pageview,
pathname: "/page1",
hostname: "en.example.com",
timestamp: ~N[2021-01-01 00:00:00]
),
build(:pageview,
pathname: "/page1",
hostname: "es.example.com",
timestamp: ~N[2021-01-01 00:00:00]
),
build(:pageview,
pathname: "/page1",
hostname: "en.example.com",
user_id: @user_id,
timestamp: ~N[2021-01-01 00:00:00]
),
build(:pageview,
pathname: "/page2",
hostname: "es.example.com",
user_id: @user_id,
timestamp: ~N[2021-01-01 00:15:00]
),
build(:pageview,
pathname: "/exit",
hostname: "en.example.com",
user_id: @user_id,
timestamp: ~N[2021-01-01 00:16:00]
)
])
filters = Jason.encode!(%{hostname: "es.example.com"})
conn =
get(
conn,
"/api/stats/#{site.domain}/exit-pages?period=day&date=2021-01-01&filters=#{filters}&experimental_hostname_filter=true"
)
# We're going to only join sessions where the entry hostname matches the filter # We're going to only join sessions where the entry hostname matches the filter
assert json_response(conn, 200) == assert json_response(conn, 200) ==
[%{"name" => "/page1", "visitors" => 1, "visits" => 1}] [%{"name" => "/page1", "visitors" => 1, "visits" => 1}]

@ -1221,8 +1221,7 @@ defmodule PlausibleWeb.Api.StatsController.SourcesTest do
] ]
end end
test "returns no top referrers for a custom goal and filtered by hostname", test "returns top referrers for a custom goal and filtered by hostname", %{
%{
conn: conn, conn: conn,
site: site site: site
} do } do
@ -1253,10 +1252,53 @@ defmodule PlausibleWeb.Api.StatsController.SourcesTest do
"/api/stats/#{site.domain}/sources?period=day&filters=#{filters}" "/api/stats/#{site.domain}/sources?period=day&filters=#{filters}"
) )
assert json_response(conn, 200) ==
[
%{
"conversion_rate" => 100.0,
"name" => "Facebook",
"total_visitors" => 1,
"visitors" => 1
}
]
end
test "returns no top referrers for a custom goal and filtered by hostname and experimental_hostname_filter",
%{
conn: conn,
site: site
} do
populate_stats(site, [
build(:pageview,
hostname: "blog.example.com",
referrer_source: "Facebook",
user_id: @user_id
),
build(:pageview,
hostname: "app.example.com",
pathname: "/register",
user_id: @user_id
),
build(:event,
name: "Signup",
hostname: "app.example.com",
pathname: "/register",
user_id: @user_id
)
])
filters = Jason.encode!(%{goal: "Signup", hostname: "app.example.com"})
conn =
get(
conn,
"/api/stats/#{site.domain}/sources?period=day&filters=#{filters}&experimental_hostname_filter=true"
)
assert json_response(conn, 200) == [] assert json_response(conn, 200) == []
end end
test "returns top referrers for a custom goal and filtered by hostname (2)", test "returns top referrers for a custom goal and filtered by hostname and experimental_hostname_filter",
%{ %{
conn: conn, conn: conn,
site: site site: site
@ -1281,7 +1323,7 @@ defmodule PlausibleWeb.Api.StatsController.SourcesTest do
conn = conn =
get( get(
conn, conn,
"/api/stats/#{site.domain}/sources?period=day&filters=#{filters}" "/api/stats/#{site.domain}/sources?period=day&filters=#{filters}&experimental_hostname_filter=true"
) )
assert json_response(conn, 200) == [ assert json_response(conn, 200) == [

@ -6,36 +6,6 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
describe "GET /api/stats/top-stats - default" do describe "GET /api/stats/top-stats - default" do
setup [:create_user, :log_in, :create_new_site] setup [:create_user, :log_in, :create_new_site]
test "returns graph_metric key for graphable top stats", %{conn: conn, site: site} do
[visitors, visits, pageviews, views_per_visit, bounce_rate, visit_duration] =
conn
|> get("/api/stats/#{site.domain}/top-stats")
|> json_response(200)
|> Map.get("top_stats")
assert %{"graph_metric" => "visitors"} = visitors
assert %{"graph_metric" => "visits"} = visits
assert %{"graph_metric" => "pageviews"} = pageviews
assert %{"graph_metric" => "views_per_visit"} = views_per_visit
assert %{"graph_metric" => "bounce_rate"} = bounce_rate
assert %{"graph_metric" => "visit_duration"} = visit_duration
end
test "returns graph_metric key for graphable top stats in realtime mode", %{
conn: conn,
site: site
} do
[current_visitors, unique_visitors, pageviews] =
conn
|> get("/api/stats/#{site.domain}/top-stats?period=realtime")
|> json_response(200)
|> Map.get("top_stats")
refute Map.has_key?(current_visitors, "graph_metric")
assert %{"graph_metric" => "visitors"} = unique_visitors
assert %{"graph_metric" => "pageviews"} = pageviews
end
test "counts distinct user ids", %{conn: conn, site: site} do test "counts distinct user ids", %{conn: conn, site: site} do
populate_stats(site, [ populate_stats(site, [
build(:pageview, user_id: @user_id), build(:pageview, user_id: @user_id),
@ -49,8 +19,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
assert %{ assert %{
"name" => "Unique visitors", "name" => "Unique visitors",
"value" => 2, "value" => 2
"graph_metric" => "visitors"
} in res["top_stats"] } in res["top_stats"]
end end
@ -67,8 +36,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
assert %{ assert %{
"name" => "Total pageviews", "name" => "Total pageviews",
"value" => 3, "value" => 3
"graph_metric" => "pageviews"
} in res["top_stats"] } in res["top_stats"]
end end
@ -91,16 +59,12 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
res = json_response(conn, 200) res = json_response(conn, 200)
assert res["top_stats"] == [ assert res["top_stats"] == [
%{"name" => "Unique visitors", "value" => 2, "graph_metric" => "visitors"}, %{"name" => "Unique visitors", "value" => 2},
%{"name" => "Total visits", "value" => 2, "graph_metric" => "visits"}, %{"name" => "Total visits", "value" => 2},
%{"name" => "Total pageviews", "value" => 2, "graph_metric" => "pageviews"}, %{"name" => "Total pageviews", "value" => 2},
%{ %{"name" => "Views per visit", "value" => 2.0},
"name" => "Views per visit", %{"name" => "Bounce rate", "value" => 0},
"value" => 2.0, %{"name" => "Visit duration", "value" => 120}
"graph_metric" => "views_per_visit"
},
%{"name" => "Bounce rate", "value" => 0, "graph_metric" => "bounce_rate"},
%{"name" => "Visit duration", "value" => 120, "graph_metric" => "visit_duration"}
] ]
end end
@ -116,9 +80,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Views per visit", "value" => 1.33, "graph_metric" => "views_per_visit"} in res[ assert %{"name" => "Views per visit", "value" => 1.33} in res["top_stats"]
"top_stats"
]
end end
test "calculates bounce rate", %{conn: conn, site: site} do test "calculates bounce rate", %{conn: conn, site: site} do
@ -132,9 +94,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Bounce rate", "value" => 50, "graph_metric" => "bounce_rate"} in res[ assert %{"name" => "Bounce rate", "value" => 50} in res["top_stats"]
"top_stats"
]
end end
test "calculates average visit duration", %{conn: conn, site: site} do test "calculates average visit duration", %{conn: conn, site: site} do
@ -156,9 +116,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Visit duration", "value" => 450, "graph_metric" => "visit_duration"} in res[ assert %{"name" => "Visit duration", "value" => 450} in res["top_stats"]
"top_stats"
]
end end
test "calculates time on page instead when filtered for page", %{conn: conn, site: site} do test "calculates time on page instead when filtered for page", %{conn: conn, site: site} do
@ -381,7 +339,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
filters = Jason.encode!(%{page: "/"}) filters = Jason.encode!(%{page: "/"})
path = "/api/stats/#{site.domain}/top-stats?period=day&date=2021-01-01&filters=#{filters}" path = "/api/stats/#{site.domain}/top-stats?period=day&date=2021-01-01&filters=#{filters}"
assert %{"name" => "Bounce rate", "value" => 0, "graph_metric" => "bounce_rate"} == assert %{"name" => "Bounce rate", "value" => 0} ==
conn conn
|> get(path) |> get(path)
|> json_response(200) |> json_response(200)
@ -477,17 +435,9 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Bounce rate", "value" => 0, "graph_metric" => "bounce_rate"} in res[ assert %{"name" => "Bounce rate", "value" => 0} in res["top_stats"]
"top_stats" assert %{"name" => "Views per visit", "value" => 0.0} in res["top_stats"]
] assert %{"name" => "Visit duration", "value" => 0} in res["top_stats"]
assert %{"name" => "Views per visit", "value" => 0.0, "graph_metric" => "views_per_visit"} in res[
"top_stats"
]
assert %{"name" => "Visit duration", "value" => 0, "graph_metric" => "visit_duration"} in res[
"top_stats"
]
end end
test "merges imported data into all top stat metrics", %{ test "merges imported data into all top stat metrics", %{
@ -518,16 +468,12 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
res = json_response(conn, 200) res = json_response(conn, 200)
assert res["top_stats"] == [ assert res["top_stats"] == [
%{"name" => "Unique visitors", "value" => 3, "graph_metric" => "visitors"}, %{"name" => "Unique visitors", "value" => 3},
%{"name" => "Total visits", "value" => 3, "graph_metric" => "visits"}, %{"name" => "Total visits", "value" => 3},
%{"name" => "Total pageviews", "value" => 4, "graph_metric" => "pageviews"}, %{"name" => "Total pageviews", "value" => 4},
%{ %{"name" => "Views per visit", "value" => 1.33},
"name" => "Views per visit", %{"name" => "Bounce rate", "value" => 33},
"value" => 1.33, %{"name" => "Visit duration", "value" => 303}
"graph_metric" => "views_per_visit"
},
%{"name" => "Bounce rate", "value" => 33, "graph_metric" => "bounce_rate"},
%{"name" => "Visit duration", "value" => 303, "graph_metric" => "visit_duration"}
] ]
end end
end end
@ -558,12 +504,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
conn = get(conn, "/api/stats/#{site.domain}/top-stats?period=realtime") conn = get(conn, "/api/stats/#{site.domain}/top-stats?period=realtime")
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Unique visitors (last 30 min)", "value" => 2} in res["top_stats"]
assert %{
"name" => "Unique visitors (last 30 min)",
"value" => 2,
"graph_metric" => "visitors"
} in res["top_stats"]
end end
test "shows pageviews (last 30 minutes)", %{conn: conn, site: site} do test "shows pageviews (last 30 minutes)", %{conn: conn, site: site} do
@ -577,10 +518,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
conn = get(conn, "/api/stats/#{site.domain}/top-stats?period=realtime") conn = get(conn, "/api/stats/#{site.domain}/top-stats?period=realtime")
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Pageviews (last 30 min)", "value" => 3} in res["top_stats"]
assert %{"name" => "Pageviews (last 30 min)", "value" => 3, "graph_metric" => "pageviews"} in res[
"top_stats"
]
end end
test "shows current visitors (last 5 min) with goal filter", %{conn: conn, site: site} do test "shows current visitors (last 5 min) with goal filter", %{conn: conn, site: site} do
@ -616,77 +554,14 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
conn = get(conn, "/api/stats/#{site.domain}/top-stats?period=realtime&filters=#{filters}") conn = get(conn, "/api/stats/#{site.domain}/top-stats?period=realtime&filters=#{filters}")
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Unique conversions (last 30 min)", "value" => 2} in res["top_stats"]
assert %{ assert %{"name" => "Total conversions (last 30 min)", "value" => 4} in res["top_stats"]
"name" => "Unique conversions (last 30 min)",
"value" => 2,
"graph_metric" => "visitors"
} in res["top_stats"]
assert %{
"name" => "Total conversions (last 30 min)",
"value" => 4,
"graph_metric" => "events"
} in res["top_stats"]
end end
end end
describe "GET /api/stats/top-stats - filters" do describe "GET /api/stats/top-stats - filters" do
setup [:create_user, :log_in, :create_new_site] setup [:create_user, :log_in, :create_new_site]
test "returns graph_metric key for graphable top stats with a page filter", %{
conn: conn,
site: site
} do
filters = Jason.encode!(%{page: "/A"})
[visitors, visits, pageviews, bounce_rate, time_on_page] =
conn
|> get("/api/stats/#{site.domain}/top-stats?filters=#{filters}")
|> json_response(200)
|> Map.get("top_stats")
assert %{"graph_metric" => "visitors"} = visitors
assert %{"graph_metric" => "visits"} = visits
assert %{"graph_metric" => "pageviews"} = pageviews
assert %{"graph_metric" => "bounce_rate"} = bounce_rate
refute Map.has_key?(time_on_page, "graph_metric")
end
test "returns graph_metric key for graphable top stats with a goal filter", %{
conn: conn,
site: site
} do
filters = Jason.encode!(%{goal: "Signup"})
[unique_visitors, unique_conversions, total_conversions, cr] =
conn
|> get("/api/stats/#{site.domain}/top-stats?filters=#{filters}")
|> json_response(200)
|> Map.get("top_stats")
refute Map.has_key?(unique_visitors, "graph_metric")
assert %{"graph_metric" => "visitors"} = unique_conversions
assert %{"graph_metric" => "events"} = total_conversions
assert %{"graph_metric" => "conversion_rate"} = cr
end
test "returns graph_metric key for graphable top stats with a goal filter in realtime mode",
%{conn: conn, site: site} do
filters = Jason.encode!(%{goal: "Signup"})
[current_visitors, unique_conversions, total_conversions] =
conn
|> get("/api/stats/#{site.domain}/top-stats?period=realtime&filters=#{filters}")
|> json_response(200)
|> Map.get("top_stats")
refute Map.has_key?(current_visitors, "graph_metric")
assert %{"graph_metric" => "visitors"} = unique_conversions
assert %{"graph_metric" => "events"} = total_conversions
end
test "returns only visitors from a country based on alpha2 code", %{conn: conn, site: site} do test "returns only visitors from a country based on alpha2 code", %{conn: conn, site: site} do
populate_stats(site, [ populate_stats(site, [
build(:pageview, country_code: "US"), build(:pageview, country_code: "US"),
@ -704,9 +579,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Unique visitors", "value" => 2, "graph_metric" => "visitors"} in res[ assert %{"name" => "Unique visitors", "value" => 2} in res["top_stats"]
"top_stats"
]
end end
test "page glob filter", %{conn: conn, site: site} do test "page glob filter", %{conn: conn, site: site} do
@ -726,9 +599,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Unique visitors", "value" => 2, "graph_metric" => "visitors"} in res[ assert %{"name" => "Unique visitors", "value" => 2} in res["top_stats"]
"top_stats"
]
end end
test "contains (~) filter", %{conn: conn, site: site} do test "contains (~) filter", %{conn: conn, site: site} do
@ -748,9 +619,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Unique visitors", "value" => 2, "graph_metric" => "visitors"} in res[ assert %{"name" => "Unique visitors", "value" => 2} in res["top_stats"]
"top_stats"
]
end end
test "returns only visitors with specific screen size", %{conn: conn, site: site} do test "returns only visitors with specific screen size", %{conn: conn, site: site} do
@ -770,9 +639,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Unique visitors", "value" => 2, "graph_metric" => "visitors"} in res[ assert %{"name" => "Unique visitors", "value" => 2} in res["top_stats"]
"top_stats"
]
end end
test "returns only visitors with specific screen size for a given hostname", %{ test "returns only visitors with specific screen size for a given hostname", %{
@ -803,13 +670,8 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
res = res =
json_response(conn, 200) json_response(conn, 200)
assert %{"name" => "Unique visitors", "value" => 3, "graph_metric" => "visitors"} in res[ assert %{"name" => "Unique visitors", "value" => 3} in res["top_stats"]
"top_stats" assert %{"name" => "Total visits", "value" => 3} in res["top_stats"]
]
assert %{"name" => "Total visits", "value" => 3, "graph_metric" => "visits"} in res[
"top_stats"
]
end end
test "returns only visitors with specific browser", %{conn: conn, site: site} do test "returns only visitors with specific browser", %{conn: conn, site: site} do
@ -829,9 +691,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Unique visitors", "value" => 2, "graph_metric" => "visitors"} in res[ assert %{"name" => "Unique visitors", "value" => 2} in res["top_stats"]
"top_stats"
]
end end
test "returns only visitors with specific operating system", %{conn: conn, site: site} do test "returns only visitors with specific operating system", %{conn: conn, site: site} do
@ -851,9 +711,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Unique visitors", "value" => 2, "graph_metric" => "visitors"} in res[ assert %{"name" => "Unique visitors", "value" => 2} in res["top_stats"]
"top_stats"
]
end end
test "returns number of visits from one specific referral source", %{conn: conn, site: site} do test "returns number of visits from one specific referral source", %{conn: conn, site: site} do
@ -886,9 +744,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Total visits", "value" => 2, "graph_metric" => "visits"} in res[ assert %{"name" => "Total visits", "value" => 2} in res["top_stats"]
"top_stats"
]
end end
test "does not return the views_per_visit metric when a page filter is applied", %{ test "does not return the views_per_visit metric when a page filter is applied", %{
@ -933,13 +789,8 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Unique visitors", "value" => 2, "graph_metric" => "visitors"} in res[ assert %{"name" => "Unique visitors", "value" => 2} in res["top_stats"]
"top_stats" assert %{"name" => "Total pageviews", "value" => 2} in res["top_stats"]
]
assert %{"name" => "Total pageviews", "value" => 2, "graph_metric" => "pageviews"} in res[
"top_stats"
]
end end
test "hostname glob filter", %{conn: conn, site: site} do test "hostname glob filter", %{conn: conn, site: site} do
@ -963,13 +814,8 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
res = res =
json_response(conn, 200) json_response(conn, 200)
assert %{"name" => "Unique visitors", "value" => 4, "graph_metric" => "visitors"} in res[ assert %{"name" => "Unique visitors", "value" => 4} in res["top_stats"]
"top_stats" assert %{"name" => "Total pageviews", "value" => 6} in res["top_stats"]
]
assert %{"name" => "Total pageviews", "value" => 6, "graph_metric" => "pageviews"} in res[
"top_stats"
]
end end
test "hostname glob subdomain filter", %{conn: conn, site: site} do test "hostname glob subdomain filter", %{conn: conn, site: site} do
@ -987,6 +833,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
]) ])
filters = Jason.encode!(%{hostname: "*.example.com"}) filters = Jason.encode!(%{hostname: "*.example.com"})
# filters = Jason.encode!(%{page: "/blog/*"})
conn = conn =
get( get(
@ -996,13 +843,8 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Unique visitors", "value" => 3, "graph_metric" => "visitors"} in res[ assert %{"name" => "Unique visitors", "value" => 3} in res["top_stats"]
"top_stats" assert %{"name" => "Total pageviews", "value" => 4} in res["top_stats"]
]
assert %{"name" => "Total pageviews", "value" => 4, "graph_metric" => "pageviews"} in res[
"top_stats"
]
end end
end end
@ -1048,9 +890,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Unique conversions", "value" => 1, "graph_metric" => "visitors"} in res[ assert %{"name" => "Unique conversions", "value" => 1} in res["top_stats"]
"top_stats"
]
end end
test "returns conversion rate", %{conn: conn, site: site} do test "returns conversion rate", %{conn: conn, site: site} do
@ -1071,9 +911,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Conversion rate", "value" => 33.3, "graph_metric" => "conversion_rate"} in res[ assert %{"name" => "Conversion rate", "value" => 33.3} in res["top_stats"]
"top_stats"
]
end end
test "returns conversion rate without change when comparison mode disallowed", %{ test "returns conversion rate without change when comparison mode disallowed", %{
@ -1097,9 +935,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Conversion rate", "value" => 33.3, "graph_metric" => "conversion_rate"} in res[ assert %{"name" => "Conversion rate", "value" => 33.3} in res["top_stats"]
"top_stats"
]
end end
@tag :full_build_only @tag :full_build_only
@ -1136,14 +972,12 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
assert %{ assert %{
"name" => "Average revenue", "name" => "Average revenue",
"value" => %{"long" => "$1,659.50", "short" => "$1.7K"}, "value" => %{"long" => "$1,659.50", "short" => "$1.7K"}
"graph_metric" => "average_revenue"
} in top_stats } in top_stats
assert %{ assert %{
"name" => "Total revenue", "name" => "Total revenue",
"value" => %{"long" => "$3,319.00", "short" => "$3.3K"}, "value" => %{"long" => "$3,319.00", "short" => "$3.3K"}
"graph_metric" => "total_revenue"
} in top_stats } in top_stats
end end
@ -1195,14 +1029,12 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
assert %{ assert %{
"name" => "Average revenue", "name" => "Average revenue",
"value" => %{"long" => "$1,659.50", "short" => "$1.7K"}, "value" => %{"long" => "$1,659.50", "short" => "$1.7K"}
"graph_metric" => "average_revenue"
} in top_stats } in top_stats
assert %{ assert %{
"name" => "Total revenue", "name" => "Total revenue",
"value" => %{"long" => "$6,638.00", "short" => "$6.6K"}, "value" => %{"long" => "$6,638.00", "short" => "$6.6K"}
"graph_metric" => "total_revenue"
} in top_stats } in top_stats
end end
@ -1269,7 +1101,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
describe "GET /api/stats/top-stats - with comparisons" do describe "GET /api/stats/top-stats - with comparisons" do
setup [:create_user, :log_in, :create_new_site, :add_imported_data] setup [:create_user, :log_in, :create_new_site, :add_imported_data]
test "does not return comparisons by default", %{site: site, conn: conn} do test "defaults to previous period when comparison is not set", %{site: site, conn: conn} do
populate_stats(site, [ populate_stats(site, [
build(:pageview, timestamp: ~N[2020-12-31 00:00:00]), build(:pageview, timestamp: ~N[2020-12-31 00:00:00]),
build(:pageview, timestamp: ~N[2020-12-31 00:00:00]), build(:pageview, timestamp: ~N[2020-12-31 00:00:00]),
@ -1282,9 +1114,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Total visits", "value" => 3, "graph_metric" => "visits"} in res[ assert %{"name" => "Total visits", "value" => 3} in res["top_stats"]
"top_stats"
]
end end
test "returns comparison data when mode is custom", %{site: site, conn: conn} do test "returns comparison data when mode is custom", %{site: site, conn: conn} do
@ -1306,13 +1136,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{ assert %{"change" => 0, "comparison_value" => 3, "name" => "Total visits", "value" => 3} in res[
"change" => 0,
"comparison_value" => 3,
"name" => "Total visits",
"value" => 3,
"graph_metric" => "visits"
} in res[
"top_stats" "top_stats"
] ]
end end
@ -1371,13 +1195,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
assert %{"top_stats" => top_stats, "with_imported" => true} = json_response(conn, 200) assert %{"top_stats" => top_stats, "with_imported" => true} = json_response(conn, 200)
assert %{ assert %{"change" => 100, "comparison_value" => 2, "name" => "Total visits", "value" => 4} in top_stats
"change" => 100,
"comparison_value" => 2,
"name" => "Total visits",
"value" => 4,
"graph_metric" => "visits"
} in top_stats
end end
test "does not compare imported data when with_imported is set to false", %{ test "does not compare imported data when with_imported is set to false", %{
@ -1412,13 +1230,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
assert %{"top_stats" => top_stats, "with_imported" => false} = json_response(conn, 200) assert %{"top_stats" => top_stats, "with_imported" => false} = json_response(conn, 200)
assert %{ assert %{"change" => 100, "comparison_value" => 0, "name" => "Total visits", "value" => 4} in top_stats
"change" => 100,
"comparison_value" => 0,
"name" => "Total visits",
"value" => 4,
"graph_metric" => "visits"
} in top_stats
end end
test "compares conversion rates", %{conn: conn, site: site} do test "compares conversion rates", %{conn: conn, site: site} do
@ -1446,8 +1258,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
"change" => -33.4, "change" => -33.4,
"comparison_value" => 66.7, "comparison_value" => 66.7,
"name" => "Conversion rate", "name" => "Conversion rate",
"value" => 33.3, "value" => 33.3
"graph_metric" => "conversion_rate"
} in res["top_stats"] } in res["top_stats"]
end end
end end

@ -139,38 +139,6 @@ defmodule PlausibleWeb.GoogleAnalyticsControllerTest do
"We were unable to authenticate your Google Analytics account" "We were unable to authenticate your Google Analytics account"
end end
test "redirects to #{view} on timeout error with flash error (legacy: #{legacy})", %{
conn: conn,
site: site
} do
expect(
Plausible.HTTPClient.Mock,
:get,
fn _url, _opts ->
{:error, %Mint.TransportError{reason: :timeout}}
end
)
conn =
conn
|> get("/#{site.domain}/import/google-analytics/property-or-view", %{
"access_token" => "token",
"refresh_token" => "foo",
"expires_at" => "2022-09-22T20:01:37.112777",
"legacy" => unquote(legacy)
})
assert redirected_to(conn, 302) ==
PlausibleWeb.Router.Helpers.site_path(
conn,
unquote(view),
site.domain
)
assert Phoenix.Flash.get(conn.assigns.flash, :error) =~
"Google Analytics API has timed out."
end
test "redirects to #{view} on list retrival failure with flash error (legacy: #{legacy})", test "redirects to #{view} on list retrival failure with flash error (legacy: #{legacy})",
%{ %{
conn: conn, conn: conn,
@ -492,40 +460,6 @@ defmodule PlausibleWeb.GoogleAnalyticsControllerTest do
assert Phoenix.Flash.get(conn.assigns.flash, :error) =~ assert Phoenix.Flash.get(conn.assigns.flash, :error) =~
"Google Analytics authentication seems to have expired." "Google Analytics authentication seems to have expired."
end end
test "redirects to #{view} on timeout with flash error (legacy: #{legacy})",
%{
conn: conn,
site: site
} do
expect(
Plausible.HTTPClient.Mock,
:post,
fn _url, _opts, _params ->
{:error, %Mint.TransportError{reason: :timeout}}
end
)
conn =
conn
|> post("/#{site.domain}/import/google-analytics/property-or-view", %{
"property_or_view" => "properties/428685906",
"access_token" => "token",
"refresh_token" => "foo",
"expires_at" => "2022-09-22T20:01:37.112777",
"legacy" => unquote(legacy)
})
assert redirected_to(conn, 302) ==
PlausibleWeb.Router.Helpers.site_path(
conn,
unquote(view),
site.domain
)
assert Phoenix.Flash.get(conn.assigns.flash, :error) =~
"Google Analytics API has timed out."
end
end end
end end
@ -690,42 +624,6 @@ defmodule PlausibleWeb.GoogleAnalyticsControllerTest do
assert Phoenix.Flash.get(conn.assigns.flash, :error) =~ assert Phoenix.Flash.get(conn.assigns.flash, :error) =~
"Google Analytics authentication seems to have expired." "Google Analytics authentication seems to have expired."
end end
test "redirects to #{view} on timeout with flash error (legacy: #{legacy})",
%{
conn: conn,
site: site
} do
expect(
Plausible.HTTPClient.Mock,
:get,
fn _url, _params ->
{:error, %Mint.TransportError{reason: :timeout}}
end
)
conn =
conn
|> get("/#{site.domain}/import/google-analytics/confirm", %{
"property_or_view" => "properties/428685906",
"access_token" => "token",
"refresh_token" => "foo",
"expires_at" => "2022-09-22T20:01:37.112777",
"start_date" => "2024-02-22",
"end_date" => "2024-02-26",
"legacy" => unquote(legacy)
})
assert redirected_to(conn, 302) ==
PlausibleWeb.Router.Helpers.site_path(
conn,
unquote(view),
site.domain
)
assert Phoenix.Flash.get(conn.assigns.flash, :error) =~
"Google Analytics API has timed out."
end
end end
end end
@ -855,46 +753,6 @@ defmodule PlausibleWeb.GoogleAnalyticsControllerTest do
) )
end end
test "does not start another import when there's any other in progress for the same site", %{
conn: conn,
site: site,
user: user
} do
{:ok, job} =
Plausible.Imported.NoopImporter.new_import(site, user,
start_date: ~D[2020-01-02],
end_date: ~D[2021-10-11]
)
post(conn, "/#{site.domain}/settings/google-import", %{
"property_or_view" => "properties/123456",
"start_date" => "2018-03-01",
"end_date" => "2022-03-01",
"access_token" => "token",
"refresh_token" => "foo",
"expires_at" => "2022-09-22T20:01:37.112777",
"legacy" => "false"
})
conn =
post(conn, "/#{site.domain}/settings/google-import", %{
"property_or_view" => "123456",
"start_date" => "2018-03-01",
"end_date" => "2022-03-01",
"access_token" => "token",
"refresh_token" => "foo",
"expires_at" => "2022-09-22T20:01:37.112777",
"legacy" => "true"
})
assert Phoenix.Flash.get(conn.assigns.flash, :error) =~
"There's another import still in progress."
assert [%{id: import_id, legacy: false}] = Plausible.Imported.list_all_imports(site)
assert job.args.import_id == import_id
end
for {legacy, view} <- [{"true", :settings_integrations}, {"false", :settings_imports_exports}] do for {legacy, view} <- [{"true", :settings_integrations}, {"false", :settings_imports_exports}] do
test "redirects to #{view} with no time window error flash error (legacy: #{legacy})", %{ test "redirects to #{view} with no time window error flash error (legacy: #{legacy})", %{
conn: conn, conn: conn,

@ -680,25 +680,6 @@ defmodule PlausibleWeb.SiteControllerTest do
assert resp =~ "Google Analytics (123456)" assert resp =~ "Google Analytics (123456)"
assert resp =~ "(98 page views)" assert resp =~ "(98 page views)"
end end
test "disables import buttons when there's import in progress", %{conn: conn, site: site} do
_site_import1 = insert(:site_import, site: site, status: SiteImport.completed())
_site_import2 = insert(:site_import, site: site, status: SiteImport.importing())
conn = get(conn, "/#{site.domain}/settings/imports-exports")
assert html_response(conn, 200) =~ "No new imports can be started"
end
test "enables import buttons when all imports are in completed or failed state", %{
conn: conn,
site: site
} do
_site_import1 = insert(:site_import, site: site, status: SiteImport.completed())
_site_import2 = insert(:site_import, site: site, status: SiteImport.failed())
conn = get(conn, "/#{site.domain}/settings/imports-exports")
refute html_response(conn, 200) =~ "No new imports can be started"
end
end end
describe "GET /:website/settings/integrations for self-hosting" do describe "GET /:website/settings/integrations for self-hosting" do

Loading…
Cancel
Save