diff --git a/CHANGELOG.md b/CHANGELOG.md index 5048fab9a..5e1425a83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file. - Collect and display browser & OS versions plausible/analytics#397 - Simple notifications around traffic spikes plausible/analytics#453 - Dark theme option/system setting follow plausible/analytics#467 +- "Load More" capability to pages modal plausible/analytics#480 ### Changed - Use alpine as base image to decrease Docker image size plausible/analytics#353 diff --git a/assets/js/dashboard/stats/modals/pages.js b/assets/js/dashboard/stats/modals/pages.js index 3850995d7..e4f180da9 100644 --- a/assets/js/dashboard/stats/modals/pages.js +++ b/assets/js/dashboard/stats/modals/pages.js @@ -12,23 +12,35 @@ class PagesModal extends React.Component { super(props) this.state = { loading: true, - query: parseQuery(props.location.search, props.site) + query: parseQuery(props.location.search, props.site), + pages: [], + page: 1, + moreResultsAvailable: false } } componentDidMount() { + this.loadPages(); + } + + loadPages() { const include = this.showBounceRate() ? 'bounce_rate' : null + const {query, page, pages} = this.state; - const {filters} = this.state.query + const {filters} = query if (filters.source || filters.referrer) { - api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/entry-pages`, this.state.query, {limit: 100, include: include}) - .then((res) => this.setState({loading: false, pages: res})) + api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/entry-pages`, query, {limit: 100, page, include}) + .then((res) => this.setState((state) => ({loading: false, pages: state.pages.concat(res), moreResultsAvailable: res.length === 100}))) } else { - api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/pages`, this.state.query, {limit: 100, include: include}) - .then((res) => this.setState({loading: false, pages: res})) + api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/pages`, query, {limit: 100, page, include}) + .then((res) => this.setState((state) => ({loading: false, pages: state.pages.concat(res), moreResultsAvailable: res.length === 100}))) } } + loadMore() { + this.setState({loading: true, page: this.state.page + 1}, this.loadPages.bind(this)) + } + showBounceRate() { return this.state.query.period !== 'realtime' && !this.state.query.filters.goal } @@ -71,12 +83,22 @@ class PagesModal extends React.Component { return (filters.source || filters.referrer) ? 'Entry Pages' : 'Top Pages' } - renderBody() { + renderLoading() { if (this.state.loading) { + return
+ } else if (this.state.moreResultsAvailable) { return ( -
+
+ +
) - } else if (this.state.pages) { + } + } + + renderBody() { + if (this.state.pages) { return (

{this.title()}

@@ -106,6 +128,7 @@ class PagesModal extends React.Component { return ( { this.renderBody() } + { this.renderLoading() } ) } diff --git a/lib/plausible/stats/clickhouse.ex b/lib/plausible/stats/clickhouse.ex index 2142885d2..e5271f409 100644 --- a/lib/plausible/stats/clickhouse.ex +++ b/lib/plausible/stats/clickhouse.ex @@ -456,13 +456,16 @@ defmodule Plausible.Stats.Clickhouse do ) end - def entry_pages(site, query, limit, include) do + def entry_pages(site, query, limit, page \\ 1, include) do + offset = (page - 1) * limit + q = from( s in base_session_query(site, query), group_by: s.entry_page, order_by: [desc: fragment("count")], limit: ^limit, + offset: ^offset, select: %{ name: s.entry_page, count: fragment("uniq(?) as count", s.user_id) @@ -487,12 +490,15 @@ defmodule Plausible.Stats.Clickhouse do end end - def top_pages(site, %Query{period: "realtime"} = query, limit, _include) do + def top_pages(site, %Query{period: "realtime"} = query, limit, page, _include) do + offset = (page - 1) * limit + ClickhouseRepo.all( from s in base_session_query(site, query), group_by: s.exit_page, order_by: [desc: fragment("count")], limit: ^limit, + offset: ^offset, select: %{ name: fragment("? as name", s.exit_page), count: fragment("uniq(?) as count", s.user_id) @@ -500,13 +506,16 @@ defmodule Plausible.Stats.Clickhouse do ) end - def top_pages(site, query, limit, include) do + def top_pages(site, query, limit, page, include) do + offset = (page - 1) * limit + q = from( e in base_query(site, query), group_by: e.pathname, order_by: [desc: fragment("count")], limit: ^limit, + offset: ^offset, select: %{ name: fragment("? as name", e.pathname), count: fragment("uniq(?) as count", e.user_id), diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.ex index cb4ec2e10..c48b2f3bd 100644 --- a/lib/plausible_web/controllers/api/stats_controller.ex +++ b/lib/plausible_web/controllers/api/stats_controller.ex @@ -212,8 +212,9 @@ defmodule PlausibleWeb.Api.StatsController do query = Query.from(site.timezone, params) include = if params["include"], do: String.split(params["include"], ","), else: [] limit = if params["limit"], do: String.to_integer(params["limit"]) + page = if params["page"], do: String.to_integer(params["page"]) - json(conn, Stats.top_pages(site, query, limit || 9, include)) + json(conn, Stats.top_pages(site, query, limit || 9, page || 1, include)) end def entry_pages(conn, params) do @@ -221,8 +222,9 @@ defmodule PlausibleWeb.Api.StatsController do query = Query.from(site.timezone, params) include = if params["include"], do: String.split(params["include"], ","), else: [] limit = if params["limit"], do: String.to_integer(params["limit"]) + page = if params["page"], do: String.to_integer(params["page"]) - json(conn, Stats.entry_pages(site, query, limit || 9, include)) + json(conn, Stats.entry_pages(site, query, limit || 9, page || 1, include)) end def countries(conn, params) do diff --git a/lib/workers/send_email_report.ex b/lib/workers/send_email_report.ex index b3896b6b2..8b478c63c 100644 --- a/lib/workers/send_email_report.ex +++ b/lib/workers/send_email_report.ex @@ -56,7 +56,7 @@ defmodule Plausible.Workers.SendEmailReport do prev_bounce_rate = Stats.bounce_rate(site, Query.shift_back(query)) change_bounce_rate = if prev_bounce_rate > 0, do: bounce_rate - prev_bounce_rate referrers = Stats.top_sources(site, query, 5, 1, []) - pages = Stats.top_pages(site, query, 5, []) + pages = Stats.top_pages(site, query, 5, 1, []) user = Plausible.Auth.find_user_by(email: email) login_link = user && Plausible.Sites.is_owner?(user.id, site)