diff --git a/assets/js/dashboard/stats/referrers.js b/assets/js/dashboard/stats/referrers.js index 9fdd9d6cc..e6bb3159a 100644 --- a/assets/js/dashboard/stats/referrers.js +++ b/assets/js/dashboard/stats/referrers.js @@ -38,7 +38,7 @@ export default class Referrers extends React.Component { fetchReferrers() { if (this.props.query.filters.source) { api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/referrers/${this.props.query.filters.source}`, this.props.query) - .then((res) => res.referrers) + .then((res) => res.search_terms || res.referrers) .then((referrers) => this.setState({loading: false, referrers: referrers})) } else if (this.props.query.filters.goal) { api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/goal/referrers`, this.props.query) @@ -50,7 +50,7 @@ export default class Referrers extends React.Component { } renderExternalLink(referrer) { - if (this.props.query.filters.source) { + if (this.props.query.filters.source && this.props.query.filters.source !== 'Google') { return ( @@ -60,6 +60,14 @@ export default class Referrers extends React.Component { return null } + renderFavicon(referrer) { + if (referrer.url) { + return ( + + ) + } + } + renderReferrer(referrer) { const query = new URLSearchParams(window.location.search) @@ -74,8 +82,8 @@ export default class Referrers extends React.Component {
- - + + { this.renderFavicon(referrer) } { referrer.name === '' ? '(no referrer)' : referrer.name } { this.renderExternalLink(referrer) } @@ -114,7 +122,7 @@ export default class Referrers extends React.Component { renderContent() { const source = this.props.query.filters.source - const title = source ? 'Top Referrers' : 'Top Sources' + const title = source === 'Google' ? 'Search terms' : source ? 'Top Referrers' : 'Top Sources' const endpoint = source ? 'referrers/' + source : 'referrers' if (this.state.referrers) { diff --git a/lib/plausible/google/api.ex b/lib/plausible/google/api.ex index 2bcb50282..74a4dfd9a 100644 --- a/lib/plausible/google/api.ex +++ b/lib/plausible/google/api.ex @@ -41,7 +41,7 @@ defmodule Plausible.Google.Api do |> Enum.map(fn url -> String.trim_trailing(url, "/") end) end - def fetch_stats(auth, query) do + def fetch_stats(auth, query, limit) do auth = refresh_if_needed(auth) property = URI.encode_www_form(auth.property) @@ -52,7 +52,7 @@ defmodule Plausible.Google.Api do startDate: Date.to_iso8601(query.date_range.first), endDate: Date.to_iso8601(query.date_range.last), dimensions: ["query"], - rowLimit: 20 + rowLimit: limit }), "Content-Type": "application/json", Authorization: "Bearer #{auth.access_token}" diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.ex index 813d906c4..57e9d541f 100644 --- a/lib/plausible_web/controllers/api/stats_controller.ex +++ b/lib/plausible_web/controllers/api/stats_controller.ex @@ -138,7 +138,7 @@ defmodule PlausibleWeb.Api.StatsController do search_terms = if site.google_auth && site.google_auth.property && !query.filters["goal"] do - @google_api.fetch_stats(site.google_auth, query) + @google_api.fetch_stats(site.google_auth, query, params["limit"] || 9) end case search_terms do