Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Remove `visits_metric` feature flag (#2898)
Uku Tahteec842c46be1
diff --git a/assets/js/dashboard/stats/graph/visitor-graph.js b/assets/js/dashboard/stats/graph/visitor-graph.jsindex d2d392c511..fddd1ed08a 100644--- a/assets/js/dashboard/stats/graph/visitor-graph.js+++ b/assets/js/dashboard/stats/graph/visitor-graph.js@@ -480,7 +480,6 @@ export default class VisitorGraph extends React.Component {api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/top-stats`, query).then((res) => {- res.top_stats = this.maybeRemoveFeatureFlaggedMetrics(res.top_stats)this.setState({ topStatsLoadingState: LoadingState.loaded, topStatData: res }, () => {this.storeTopStatsContainerHeight()this.resetMetric()@@ -489,14 +488,6 @@ export default class VisitorGraph extends React.Component {})}- maybeRemoveFeatureFlaggedMetrics(top_stats) {- if (this.props.site.flags.visits_metric) {- return top_stats- } else {- return top_stats.filter((stat) => {return !(["Total visits", "Views per visit"].includes(stat.name))})- }- }-renderInner() {const { query, site } = this.props;const { graphData, metric, topStatData, topStatsLoadingState, mainGraphLoadingState } = this.state;diff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.exindex 74b4c2d69a..1aa6b2bfa8 100644--- a/lib/plausible_web/controllers/stats_controller.ex+++ b/lib/plausible_web/controllers/stats_controller.ex@@ -97,15 +97,10 @@ defmodule PlausibleWeb.StatsController doquery = Query.from(site, params) |> Filters.add_prefix()metrics =- cond do- query.filters["event:goal"] ->- [:visitors]-- FunWithFlags.enabled?(:visits_metric, for: conn.assigns[:current_user]) ->- [:visitors, :pageviews, :visits, :views_per_visit, :bounce_rate, :visit_duration]-- true ->- [:visitors, :pageviews, :bounce_rate, :visit_duration]+ if query.filters["event:goal"] do+ [:visitors]+ else+ [:visitors, :pageviews, :visits, :views_per_visit, :bounce_rate, :visit_duration]endgraph = Plausible.Stats.timeseries(site, query, metrics)@@ -332,7 +327,6 @@ defmodule PlausibleWeb.StatsController dodefp get_flags(user) do%{custom_dimension_filter: FunWithFlags.enabled?(:custom_dimension_filter, for: user),- visits_metric: FunWithFlags.enabled?(:visits_metric, for: user),views_per_visit_metric: FunWithFlags.enabled?(:views_per_visit_metric, for: user)}enddiff --git a/test/test_helper.exs b/test/test_helper.exsindex 795c7ce28e..24c338df27 100644--- a/test/test_helper.exs+++ b/test/test_helper.exs@@ -1,6 +1,5 @@{:ok, _} = Application.ensure_all_started(:ex_machina)Mox.defmock(Plausible.HTTPClient.Mock, for: Plausible.HTTPClient.Interface)-FunWithFlags.enable(:visits_metric)Application.ensure_all_started(:double)Ecto.Adapters.SQL.Sandbox.mode(Plausible.Repo, :manual)ExUnit.configure(exclude: [:slow])