mirror of
https://github.com/plausible/analytics.git
synced 2024-12-22 17:11:36 +03:00
47e21121db
* add a new realtime-update-timer module * hook to the new 'tick' event in ListReport for auto-updates This commit fixes the bug where all reports using the `ListReport` component did not auto-update in realtime mode. Those reports are: - Pages (Top / Entry / Exit) - Locations (Countries / Regions / Cities) - Devices (Screen Sizes / Browsers + versions / OS-s + versions) * fetch data for ListReports only when scrolled into view * refactor fetching data in ListReport * refer to one source of truth for utm tags * make the 'All' tab in Sources auto-update * make all UTM tabs in Sources auto-update * fetch UTM data only when scrolled into view * auto-update Referrers with the new timer * auto-update google search terms * auto-update Conversions * make countries map auto-update * auto-update visitor-graph and top stats with new timer * use new tick event for current visitors (in Historical) * remove the old timer class * update changelog * Visual improvements to automatic realtime updates (#2532) * minor consistency fix for text color in dark mode * use FlipMove in goal conversions report * use FlipMove in ListReports * set main graph and top stats loading state correctly * refactor isIntervalValid function * enforce intervals are valid when set and stored * remove duplicate data fetching on interval change Fetching new data is handled by the `fetchGraphData` callback in `updateInterval` * refactor updateMetric function * make it clearer why 'metric' can be a faulty value * extract 'query' and 'site' variables from 'this.props' * reset interval state only when period is changed The 'maybeRollbackInterval' function was also used to fetch data. This commit replaces all those function calls with 'fetchGraphData' which better describes the actual behavior. We should only worry about rolling back the interval if 'query.period' has changed. This commit also stops the graph from flickering when it is updated in realtime. * update names of two variables * remove unnecessary negation * make collapsed graph state more explicit * consider stored invalid intervals when graph mounts * fix not showing loading spinner regression * remove interval state from VisitorGraph (#2540) * Realtime prop breakdown (#2535) * disable load more in realtime mode * extract doFetch function * separate fetchPropBreakdown and fetchNextPage functions * subscribe for auto-updates in realtime * improve readability with function name changes
367 lines
12 KiB
JavaScript
367 lines
12 KiB
JavaScript
import React from 'react';
|
|
import { Link } from 'react-router-dom'
|
|
import FlipMove from 'react-flip-move';
|
|
|
|
import * as storage from '../../util/storage'
|
|
import FadeIn from '../../fade-in'
|
|
import Bar from '../bar'
|
|
import MoreLink from '../more-link'
|
|
import numberFormatter from '../../util/number-formatter'
|
|
import * as api from '../../api'
|
|
import * as url from '../../util/url'
|
|
import LazyLoader from '../../components/lazy-loader'
|
|
|
|
class AllSources extends React.Component {
|
|
constructor(props) {
|
|
super(props)
|
|
this.onVisible = this.onVisible.bind(this)
|
|
this.fetchReferrers = this.fetchReferrers.bind(this)
|
|
this.state = { loading: true }
|
|
}
|
|
|
|
onVisible() {
|
|
this.fetchReferrers()
|
|
if (this.props.query.period === 'realtime') {
|
|
document.addEventListener('tick', this.fetchReferrers)
|
|
}
|
|
}
|
|
|
|
componentDidUpdate(prevProps) {
|
|
if (this.props.query !== prevProps.query) {
|
|
this.setState({ loading: true, referrers: null })
|
|
this.fetchReferrers()
|
|
}
|
|
}
|
|
|
|
componentWillUnmount() {
|
|
document.removeEventListener('tick', this.fetchReferrers)
|
|
}
|
|
|
|
showConversionRate() {
|
|
return !!this.props.query.filters.goal
|
|
}
|
|
|
|
fetchReferrers() {
|
|
api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/sources`, this.props.query)
|
|
.then((res) => this.setState({ loading: false, referrers: res }))
|
|
}
|
|
|
|
renderReferrer(referrer) {
|
|
const maxWidthDeduction = this.showConversionRate() ? "10rem" : "5rem"
|
|
|
|
return (
|
|
<div
|
|
className="flex items-center justify-between my-1 text-sm"
|
|
key={referrer.name}
|
|
>
|
|
<Bar
|
|
count={referrer.visitors}
|
|
all={this.state.referrers}
|
|
bg="bg-blue-50 dark:bg-gray-500 dark:bg-opacity-15"
|
|
maxWidthDeduction={maxWidthDeduction}
|
|
>
|
|
<span className="flex px-2 py-1.5 dark:text-gray-300 relative z-9 break-all">
|
|
<Link
|
|
className="md:truncate block hover:underline"
|
|
to={url.setQuery('source', referrer.name)}
|
|
>
|
|
<img
|
|
src={`/favicon/sources/${encodeURIComponent(referrer.name)}`}
|
|
className="inline w-4 h-4 mr-2 -mt-px align-middle"
|
|
/>
|
|
{referrer.name}
|
|
</Link>
|
|
</span>
|
|
</Bar>
|
|
<span className="font-medium dark:text-gray-200 w-20 text-right" tooltip={referrer.visitors}>{numberFormatter(referrer.visitors)}</span>
|
|
{this.showConversionRate() && <span className="font-medium dark:text-gray-200 w-20 text-right">{referrer.conversion_rate}%</span>}
|
|
</div>
|
|
)
|
|
}
|
|
|
|
label() {
|
|
if (this.props.query.period === 'realtime') {
|
|
return 'Current visitors'
|
|
}
|
|
|
|
if (this.showConversionRate()) {
|
|
return 'Conversions'
|
|
}
|
|
|
|
return 'Visitors'
|
|
}
|
|
|
|
renderList() {
|
|
if (this.state.referrers && this.state.referrers.length > 0) {
|
|
return (
|
|
<React.Fragment>
|
|
<div className="flex items-center justify-between mt-3 mb-2 text-xs font-bold tracking-wide text-gray-500">
|
|
<span>Source</span>
|
|
<div className="text-right">
|
|
<span className="inline-block w-20">{this.label()}</span>
|
|
{this.showConversionRate() && <span className="inline-block w-20">CR</span>}
|
|
</div>
|
|
</div>
|
|
|
|
<FlipMove className="flex-grow">
|
|
{this.state.referrers.map(this.renderReferrer.bind(this))}
|
|
</FlipMove>
|
|
<MoreLink site={this.props.site} list={this.state.referrers} endpoint="sources" />
|
|
</React.Fragment>
|
|
)
|
|
} else {
|
|
return <div className="font-medium text-center text-gray-500 mt-44 dark:text-gray-400">No data yet</div>
|
|
}
|
|
}
|
|
|
|
renderContent() {
|
|
return (
|
|
<LazyLoader className="flex flex-col flex-grow" onVisible={this.onVisible}>
|
|
<div id="sources" className="flex justify-between w-full">
|
|
<h3 className="font-bold dark:text-gray-100">Top Sources</h3>
|
|
{this.props.renderTabs()}
|
|
</div>
|
|
{this.state.loading && <div className="mx-auto loading mt-44"><div></div></div>}
|
|
<FadeIn show={!this.state.loading} className="flex flex-col flex-grow">
|
|
{this.renderList()}
|
|
</FadeIn>
|
|
</LazyLoader>
|
|
)
|
|
}
|
|
|
|
render() {
|
|
return (
|
|
<div
|
|
className="relative p-4 bg-white rounded shadow-xl stats-item flex flex-col mt-6 w-full dark:bg-gray-825"
|
|
>
|
|
{this.renderContent()}
|
|
</div>
|
|
)
|
|
}
|
|
}
|
|
|
|
const UTM_TAGS = {
|
|
utm_medium: { label: 'UTM Medium', shortLabel: 'UTM Medium', endpoint: 'utm_mediums' },
|
|
utm_source: { label: 'UTM Source', shortLabel: 'UTM Source', endpoint: 'utm_sources' },
|
|
utm_campaign: { label: 'UTM Campaign', shortLabel: 'UTM Campai', endpoint: 'utm_campaigns' },
|
|
utm_content: { label: 'UTM Content', shortLabel: 'UTM Conten', endpoint: 'utm_contents' },
|
|
utm_term: { label: 'UTM Term', shortLabel: 'UTM Term', endpoint: 'utm_terms' },
|
|
}
|
|
|
|
class UTMSources extends React.Component {
|
|
constructor(props) {
|
|
super(props)
|
|
this.onVisible = this.onVisible.bind(this)
|
|
this.fetchReferrers = this.fetchReferrers.bind(this)
|
|
this.state = { loading: true }
|
|
}
|
|
|
|
onVisible() {
|
|
this.fetchReferrers()
|
|
if (this.props.query.period === 'realtime') {
|
|
document.addEventListener('tick', this.fetchReferrers)
|
|
}
|
|
}
|
|
|
|
componentDidUpdate(prevProps) {
|
|
if (this.props.query !== prevProps.query || this.props.tab !== prevProps.tab) {
|
|
this.setState({ loading: true, referrers: null })
|
|
this.fetchReferrers()
|
|
}
|
|
}
|
|
|
|
componentWillUnmount() {
|
|
document.removeEventListener('tick', this.fetchReferrers)
|
|
}
|
|
|
|
showNoRef() {
|
|
return this.props.query.period === 'realtime'
|
|
}
|
|
|
|
showConversionRate() {
|
|
return !!this.props.query.filters.goal
|
|
}
|
|
|
|
fetchReferrers() {
|
|
const endpoint = UTM_TAGS[this.props.tab].endpoint
|
|
api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/${endpoint}`, this.props.query)
|
|
.then((res) => this.setState({ loading: false, referrers: res }))
|
|
}
|
|
|
|
renderReferrer(referrer) {
|
|
const maxWidthDeduction = this.showConversionRate() ? "10rem" : "5rem"
|
|
|
|
return (
|
|
<div
|
|
className="flex items-center justify-between my-1 text-sm"
|
|
key={referrer.name}
|
|
>
|
|
<Bar
|
|
count={referrer.visitors}
|
|
all={this.state.referrers}
|
|
bg="bg-blue-50 dark:bg-gray-500 dark:bg-opacity-15"
|
|
maxWidthDeduction={maxWidthDeduction}
|
|
>
|
|
|
|
<span className="flex px-2 py-1.5 dark:text-gray-300 relative z-9 break-all">
|
|
<Link
|
|
className="md:truncate block hover:underline"
|
|
to={url.setQuery(this.props.tab, referrer.name)}
|
|
>
|
|
{referrer.name}
|
|
</Link>
|
|
</span>
|
|
</Bar>
|
|
<span className="font-medium dark:text-gray-200 w-20 text-right" tooltip={referrer.visitors}>{numberFormatter(referrer.visitors)}</span>
|
|
{this.showConversionRate() && <span className="font-medium dark:text-gray-200 w-20 text-right">{referrer.conversion_rate}%</span>}
|
|
</div>
|
|
)
|
|
}
|
|
|
|
label() {
|
|
if (this.props.query.period === 'realtime') {
|
|
return 'Current visitors'
|
|
}
|
|
|
|
if (this.showConversionRate()) {
|
|
return 'Conversions'
|
|
}
|
|
|
|
return 'Visitors'
|
|
}
|
|
|
|
renderList() {
|
|
if (this.state.referrers && this.state.referrers.length > 0) {
|
|
return (
|
|
<div className="flex flex-col flex-grow">
|
|
<div className="flex items-center justify-between mt-3 mb-2 text-xs font-bold tracking-wide text-gray-500 dark:text-gray-400">
|
|
<span>{UTM_TAGS[this.props.tab].label}</span>
|
|
<div className="text-right">
|
|
<span className="inline-block w-20">{this.label()}</span>
|
|
{this.showConversionRate() && <span className="inline-block w-20">CR</span>}
|
|
</div>
|
|
</div>
|
|
|
|
<FlipMove className="flex-grow">
|
|
{this.state.referrers.map(this.renderReferrer.bind(this))}
|
|
</FlipMove>
|
|
<MoreLink site={this.props.site} list={this.state.referrers} endpoint={UTM_TAGS[this.props.tab].endpoint} />
|
|
</div>
|
|
)
|
|
} else {
|
|
return <div className="font-medium text-center text-gray-500 mt-44 dark:text-gray-400">No data yet</div>
|
|
}
|
|
}
|
|
|
|
renderContent() {
|
|
return (
|
|
<LazyLoader onVisible={this.onVisible}>
|
|
<div className="flex justify-between w-full">
|
|
<h3 className="font-bold dark:text-gray-100">Top Sources</h3>
|
|
{this.props.renderTabs()}
|
|
</div>
|
|
{this.state.loading && <div className="mx-auto loading mt-44"><div></div></div>}
|
|
<FadeIn show={!this.state.loading} className="flex flex-col flex-grow">
|
|
{this.renderList()}
|
|
</FadeIn>
|
|
</LazyLoader>
|
|
)
|
|
}
|
|
|
|
render() {
|
|
return (
|
|
<div
|
|
className="relative p-4 bg-white rounded shadow-xl stats-item flex flex-col dark:bg-gray-825 mt-6 w-full"
|
|
>
|
|
{this.renderContent()}
|
|
</div>
|
|
)
|
|
}
|
|
}
|
|
|
|
import { Fragment } from 'react'
|
|
import { Menu, Transition } from '@headlessui/react'
|
|
import { ChevronDownIcon } from '@heroicons/react/20/solid'
|
|
import classNames from 'classnames'
|
|
|
|
export default class SourceList extends React.Component {
|
|
constructor(props) {
|
|
super(props)
|
|
this.tabKey = 'sourceTab__' + props.site.domain
|
|
const storedTab = storage.getItem(this.tabKey)
|
|
this.state = {
|
|
tab: storedTab || 'all'
|
|
}
|
|
}
|
|
|
|
setTab(tab) {
|
|
return () => {
|
|
storage.setItem(this.tabKey, tab)
|
|
this.setState({ tab })
|
|
}
|
|
}
|
|
|
|
renderTabs() {
|
|
const activeClass = 'inline-block h-5 text-indigo-700 dark:text-indigo-500 font-bold active-prop-heading truncate text-left'
|
|
const defaultClass = 'hover:text-indigo-600 cursor-pointer truncate text-left'
|
|
const dropdownOptions = Object.keys(UTM_TAGS)
|
|
let buttonText = UTM_TAGS[this.state.tab] ? UTM_TAGS[this.state.tab].label : 'Campaigns'
|
|
|
|
return (
|
|
<div className="flex text-xs font-medium text-gray-500 dark:text-gray-400 space-x-2">
|
|
<div className={this.state.tab === 'all' ? activeClass : defaultClass} onClick={this.setTab('all')}>All</div>
|
|
|
|
<Menu as="div" className="relative inline-block text-left">
|
|
<div>
|
|
<Menu.Button className="inline-flex justify-between focus:outline-none">
|
|
<span className={this.state.tab.startsWith('utm_') ? activeClass : defaultClass}>{buttonText}</span>
|
|
<ChevronDownIcon className="-mr-1 ml-1 h-4 w-4" aria-hidden="true" />
|
|
</Menu.Button>
|
|
</div>
|
|
|
|
<Transition
|
|
as={Fragment}
|
|
enter="transition ease-out duration-100"
|
|
enterFrom="transform opacity-0 scale-95"
|
|
enterTo="transform opacity-100 scale-100"
|
|
leave="transition ease-in duration-75"
|
|
leaveFrom="transform opacity-100 scale-100"
|
|
leaveTo="transform opacity-0 scale-95"
|
|
>
|
|
<Menu.Items className="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">
|
|
<div className="py-1">
|
|
{dropdownOptions.map((option) => {
|
|
return (
|
|
<Menu.Item key={option}>
|
|
{({ active }) => (
|
|
<span
|
|
onClick={this.setTab(option)}
|
|
className={classNames(
|
|
active ? 'bg-gray-100 dark:bg-gray-900 text-gray-900 dark:text-gray-200 cursor-pointer' : 'text-gray-700 dark:text-gray-200',
|
|
'block px-4 py-2 text-sm',
|
|
this.state.tab === option ? 'font-bold' : ''
|
|
)}
|
|
>
|
|
{UTM_TAGS[option].label}
|
|
</span>
|
|
)}
|
|
</Menu.Item>
|
|
)
|
|
})}
|
|
</div>
|
|
</Menu.Items>
|
|
</Transition>
|
|
</Menu>
|
|
</div>
|
|
)
|
|
}
|
|
|
|
render() {
|
|
if (this.state.tab === 'all') {
|
|
return <AllSources tab={this.state.tab} setTab={this.setTab.bind(this)} renderTabs={this.renderTabs.bind(this)} {...this.props} />
|
|
} else if (Object.keys(UTM_TAGS).includes(this.state.tab)) {
|
|
return <UTMSources tab={this.state.tab} setTab={this.setTab.bind(this)} renderTabs={this.renderTabs.bind(this)} {...this.props} />
|
|
}
|
|
}
|
|
}
|