mirror of
https://gh.wpcy.net/https://github.com/discourse/discourse.git
synced 2026-06-19 03:43:54 +08:00
69c905d8db
The "Daily engaged" KPI on the admin dashboard could show an upward trend while engagement was actually falling, because the current period was summed while the previous period it compared against was a daily average. This commit drives the average-versus-sum choice off each report's `average` flag instead of a hardcoded check, so average reports like `daily_engaged_users` average both periods while cumulative reports keep summing both.
47 lines
1.1 KiB
Ruby
Vendored
47 lines
1.1 KiB
Ruby
Vendored
# frozen_string_literal: true
|
|
|
|
class AdminDashboardHighlights
|
|
include AdminDashboardKpis
|
|
|
|
DEFAULT_RANGE_DAYS = 30
|
|
|
|
KPI_REPORTS = {
|
|
new_signups: "signups",
|
|
dau_mau: "dau_by_mau",
|
|
new_contributors: "new_contributors",
|
|
}.freeze
|
|
|
|
def self.build(start_date:, end_date:)
|
|
new(start_date: start_date, end_date: end_date).build
|
|
end
|
|
|
|
def initialize(start_date:, end_date:)
|
|
@start_date = parse_date(start_date) || DEFAULT_RANGE_DAYS.days.ago.beginning_of_day
|
|
@end_date = parse_date(end_date)&.end_of_day || Time.zone.now.end_of_day
|
|
end
|
|
|
|
def build
|
|
{ kpis: build_kpis }
|
|
end
|
|
|
|
private
|
|
|
|
attr_reader :start_date, :end_date
|
|
|
|
def parse_date(value)
|
|
return nil if value.blank?
|
|
Time.zone.parse(value.to_s)&.beginning_of_day
|
|
rescue ArgumentError, TypeError
|
|
nil
|
|
end
|
|
|
|
def build_kpis
|
|
core_kpis = KPI_REPORTS.map { |type, report| { type: type, report: report } }
|
|
all_kpis = core_kpis + DiscoursePluginRegistry.admin_dashboard_highlight_kpis
|
|
|
|
all_kpis.filter_map do |kpi|
|
|
next if kpi[:enabled].respond_to?(:call) && !kpi[:enabled].call
|
|
build_kpi(kpi[:type], kpi[:report])
|
|
end
|
|
end
|
|
end
|
