mirror of
https://github.com/plausible/analytics.git
synced 2024-12-22 00:51: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
143 lines
5.0 KiB
JavaScript
143 lines
5.0 KiB
JavaScript
import React from 'react';
|
|
import FadeIn from '../../fade-in'
|
|
import Bar from '../bar'
|
|
import MoreLink from '../more-link'
|
|
import numberFormatter from '../../util/number-formatter'
|
|
import RocketIcon from '../modals/rocket-icon'
|
|
import * as api from '../../api'
|
|
import LazyLoader from '../../components/lazy-loader'
|
|
|
|
export default class SearchTerms extends React.Component {
|
|
constructor(props) {
|
|
super(props)
|
|
this.state = {loading: true}
|
|
this.onVisible = this.onVisible.bind(this)
|
|
this.fetchSearchTerms = this.fetchSearchTerms.bind(this)
|
|
}
|
|
|
|
onVisible() {
|
|
this.fetchSearchTerms()
|
|
if (this.props.query.period === 'realtime') {
|
|
document.addEventListener('tick', this.fetchSearchTerms)
|
|
}
|
|
}
|
|
|
|
componentDidUpdate(prevProps) {
|
|
if (this.props.query !== prevProps.query) {
|
|
this.setState({loading: true, terms: null})
|
|
this.fetchSearchTerms()
|
|
}
|
|
}
|
|
|
|
componentWillUnmount() {
|
|
document.removeEventListener('tick', this.fetchSearchTerms)
|
|
}
|
|
|
|
fetchSearchTerms() {
|
|
api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/referrers/Google`, this.props.query)
|
|
.then((res) => this.setState({
|
|
loading: false,
|
|
searchTerms: res.search_terms || [],
|
|
notConfigured: res.not_configured,
|
|
isAdmin: res.is_admin
|
|
})).catch((error) =>
|
|
{
|
|
this.setState({ loading: false, searchTerms: [], notConfigured: true, error: true, isAdmin: error.payload.is_admin })
|
|
}
|
|
)
|
|
}
|
|
|
|
renderSearchTerm(term) {
|
|
return (
|
|
<div className="flex items-center justify-between my-1 text-sm" key={term.name}>
|
|
<Bar
|
|
count={term.visitors}
|
|
all={this.state.searchTerms}
|
|
bg="bg-blue-50 dark:bg-gray-500 dark:bg-opacity-15"
|
|
maxWidthDeduction="4rem"
|
|
>
|
|
<span className="flex px-2 py-1.5 dark:text-gray-300 z-9 relative break-all">
|
|
<span className="md:truncate block">
|
|
{ term.name }
|
|
</span>
|
|
</span>
|
|
</Bar>
|
|
<span className="font-medium dark:text-gray-200">{numberFormatter(term.visitors)}</span>
|
|
</div>
|
|
)
|
|
}
|
|
|
|
renderList() {
|
|
if (this.props.query.filters.goal) {
|
|
return (
|
|
<div className="text-center text-gray-700 dark:text-gray-300 text-sm mt-20">
|
|
<RocketIcon />
|
|
<div>Sorry, we cannot show which keywords converted best for goal <b>{this.props.query.filters.goal}</b></div>
|
|
<div>Google does not share this information</div>
|
|
</div>
|
|
)
|
|
|
|
} else if (this.state.notConfigured) {
|
|
return (
|
|
<div className="text-center text-gray-700 dark:text-gray-300 text-sm mt-20">
|
|
<RocketIcon />
|
|
<div>
|
|
This site is not connected to Search Console so we cannot show the search phrases.
|
|
{this.state.isAdmin && this.state.error && <><br/><br/><p>Please click below to connect your Search Console account.</p></>}
|
|
</div>
|
|
{this.state.isAdmin && <a href={`/${encodeURIComponent(this.props.site.domain)}/settings/search-console`} className="button mt-4">Connect with Google</a> }
|
|
</div>
|
|
)
|
|
} else if (this.state.searchTerms.length > 0) {
|
|
const valLabel = this.props.query.period === 'realtime' ? 'Current visitors' : 'Visitors'
|
|
|
|
return (
|
|
<React.Fragment>
|
|
<div className="flex items-center mt-3 mb-2 justify-between text-gray-500 dark:text-gray-400 text-xs font-bold tracking-wide">
|
|
<span>Search term</span>
|
|
<span>{valLabel}</span>
|
|
</div>
|
|
|
|
{this.state.searchTerms.map(this.renderSearchTerm.bind(this))}
|
|
</React.Fragment>
|
|
)
|
|
} else {
|
|
return (
|
|
<div className="text-center text-gray-700 dark:text-gray-300 text-sm mt-20">
|
|
<RocketIcon />
|
|
<div>Could not find any search terms for this period</div>
|
|
<div>Google Search Console data is sampled and delayed by 24-36h</div>
|
|
<div>Read more on <a href="https://plausible.io/docs/google-search-console-integration#i-dont-see-google-search-query-data-in-my-dashboard" target="_blank" rel="noreferrer" className="hover:underline text-indigo-700 dark:text-indigo-500">our documentation</a></div>
|
|
</div>
|
|
)
|
|
}
|
|
}
|
|
|
|
renderContent() {
|
|
if (this.state.searchTerms) {
|
|
return (
|
|
<React.Fragment>
|
|
<h3 className="font-bold dark:text-gray-100">Search Terms</h3>
|
|
{ this.renderList() }
|
|
<MoreLink site={this.props.site} list={this.state.searchTerms} endpoint="referrers/Google" />
|
|
</React.Fragment>
|
|
)
|
|
}
|
|
}
|
|
|
|
render() {
|
|
return (
|
|
<div
|
|
className="stats-item flex flex-col relative bg-white dark:bg-gray-825 shadow-xl rounded p-4 mt-6 w-full"
|
|
>
|
|
{ this.state.loading && <div className="loading mt-44 mx-auto"><div></div></div> }
|
|
<FadeIn show={!this.state.loading} className="flex-grow">
|
|
<LazyLoader onVisible={this.onVisible}>
|
|
{ this.renderContent() }
|
|
</LazyLoader>
|
|
</FadeIn>
|
|
</div>
|
|
)
|
|
}
|
|
}
|