diff --git a/assets/js/dashboard/api.js b/assets/js/dashboard/api.js index 454d9ee09..c9c21ffd5 100644 --- a/assets/js/dashboard/api.js +++ b/assets/js/dashboard/api.js @@ -48,7 +48,7 @@ export function serializeQuery(query, extraQuery=[]) { if (query.comparison) { queryObj.comparison = query.comparison - queryObj.comparison_from = query.comparison_from + queryObj.compare_from = query.compare_from } Object.assign(queryObj, ...extraQuery) diff --git a/assets/js/dashboard/comparison-input.js b/assets/js/dashboard/comparison-input.js index fd07f895d..1863d45af 100644 --- a/assets/js/dashboard/comparison-input.js +++ b/assets/js/dashboard/comparison-input.js @@ -88,12 +88,12 @@ const ComparisonInput = function({ site, query, history }) { const updateMode = (mode, from = null) => { storeComparisonMode(site.domain, mode) - navigateToQuery(history, query, { comparison: mode, comparison_from: from }) + navigateToQuery(history, query, { comparison: mode, compare_from: from }) } const buildLabel = (query) => { if (query.comparison == "custom") { - const date = parseUTCDate(query.comparison_from) + const date = parseUTCDate(query.compare_from) return formatDayShort(date, true) } else { return COMPARISON_MODES[query.comparison] diff --git a/assets/js/dashboard/query.js b/assets/js/dashboard/query.js index 4c93274ff..2e1d57358 100644 --- a/assets/js/dashboard/query.js +++ b/assets/js/dashboard/query.js @@ -25,7 +25,7 @@ export function parseQuery(querystring, site) { return { period, comparison, - comparison_from: q.get('comparison_from'), + compare_from: q.get('compare_from'), date: q.get('date') ? parseUTCDate(q.get('date')) : nowForSite(site), from: q.get('from') ? parseUTCDate(q.get('from')) : undefined, to: q.get('to') ? parseUTCDate(q.get('to')) : undefined, diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.ex index 9df33a165..be7b1d752 100644 --- a/lib/plausible_web/controllers/api/stats_controller.ex +++ b/lib/plausible_web/controllers/api/stats_controller.ex @@ -115,9 +115,7 @@ defmodule PlausibleWeb.Api.StatsController do full_intervals = build_full_intervals(query, labels) comparison_result = - case Comparisons.compare(site, query, params["comparison"], - from: params["comparison_from"] - ) do + case Comparisons.compare(site, query, params["comparison"], from: params["compare_from"]) do {:ok, comparison_query} -> Stats.timeseries(site, comparison_query, [selected_metric]) {:error, :not_supported} -> nil end @@ -177,7 +175,7 @@ defmodule PlausibleWeb.Api.StatsController do with :ok <- validate_params(params) do comparison_mode = params["comparison"] || "previous_period" - comparison_opts = [from: params["comparison_from"]] + comparison_opts = [from: params["compare_from"]] query = Query.from(site, params) |> Filters.add_prefix()