Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Release breakdown_comparisons_ui flag (#4774)

Karl-Aksel Puulmannaf5eb720db27
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95bced6531..f82896e45e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
## Unreleased
### Added
+- Dashboard shows comparisons for all reports
+
### Removed
### Changed
### Fixed
diff --git a/assets/js/dashboard/site-context.tsx b/assets/js/dashboard/site-context.tsx
index 24d0bee632..80e6f2ba52 100644
--- a/assets/js/dashboard/site-context.tsx
+++ b/assets/js/dashboard/site-context.tsx
@@ -27,7 +27,6 @@ export function parseSiteFromDataset(dataset: DOMStringMap): PlausibleSite {
type FeatureFlags = {
channels?: boolean
- breakdown_comparisons_ui?: boolean
saved_segments?: boolean
}
diff --git a/assets/js/dashboard/stats/modals/breakdown-modal.tsx b/assets/js/dashboard/stats/modals/breakdown-modal.tsx
index ef7206831e..e40d5db169 100644
--- a/assets/js/dashboard/stats/modals/breakdown-modal.tsx
+++ b/assets/js/dashboard/stats/modals/breakdown-modal.tsx
@@ -166,7 +166,8 @@ export default function BreakdownModal<TListItem extends { name: string }>({
orderByDictionary,
toggleSortByMetric,
renderIcon,
- getExternalLinkURL
+ getExternalLinkURL,
+ meta
]
)
diff --git a/assets/js/dashboard/stats/reports/metric-value.test.tsx b/assets/js/dashboard/stats/reports/metric-value.test.tsx
index 8e562cbd0b..ddd2db3acd 100644
--- a/assets/js/dashboard/stats/reports/metric-value.test.tsx
+++ b/assets/js/dashboard/stats/reports/metric-value.test.tsx
@@ -1,14 +1,8 @@
/** @format */
import React from 'react'
-import {
- render as libraryRender,
- screen,
- fireEvent,
- waitFor
-} from '@testing-library/react'
+import { render, screen, fireEvent, waitFor } from '@testing-library/react'
import MetricValue from './metric-value'
-import SiteContextProvider, { PlausibleSite } from '../../site-context'
jest.mock('@heroicons/react/24/solid', () => ({
ArrowUpRightIcon: () => <>↑</>,
@@ -254,13 +248,6 @@ function valueProps<T>(
} as any /* eslint-disable-line @typescript-eslint/no-explicit-any */
}
-function render(ui: React.ReactNode) {
- const site = {
- flags: { breakdown_comparisons_ui: true }
- } as unknown as PlausibleSite
- libraryRender(<SiteContextProvider site={site}>{ui}</SiteContextProvider>)
-}
-
async function renderWithTooltip(ui: React.ReactNode) {
render(ui)
await waitForTooltip()
diff --git a/assets/js/dashboard/stats/reports/metric-value.tsx b/assets/js/dashboard/stats/reports/metric-value.tsx
index 256c2aba1f..58ea1681b2 100644
--- a/assets/js/dashboard/stats/reports/metric-value.tsx
+++ b/assets/js/dashboard/stats/reports/metric-value.tsx
@@ -11,7 +11,6 @@ import {
} from './metric-formatter'
import { BreakdownResultMeta, DashboardQuery } from '../../query'
import { useQueryContext } from '../../query-context'
-import { PlausibleSite, useSiteContext } from '../../site-context'
type MetricValues = Record<Metric, ValueType>
@@ -19,15 +18,11 @@ type ListItem = MetricValues & {
comparison: MetricValues & { change: Record<Metric, number> }
}
-function valueRenderProps(
- listItem: ListItem,
- metric: Metric,
- site: PlausibleSite
-) {
+function valueRenderProps(listItem: ListItem, metric: Metric) {
const value = listItem[metric]
let comparison = null
- if (site.flags.breakdown_comparisons_ui && listItem.comparison) {
+ if (listItem.comparison) {
comparison = {
value: listItem.comparison[metric],
change: listItem.comparison.change[metric]
@@ -45,12 +40,11 @@ export default function MetricValue(props: {
meta: BreakdownResultMeta
}) {
const { query } = useQueryContext()
- const site = useSiteContext()
const { metric, listItem } = props
const { value, comparison } = useMemo(
- () => valueRenderProps(listItem, metric, site),
- [listItem, metric, site]
+ () => valueRenderProps(listItem, metric),
+ [listItem, metric]
)
const metricLabel = useMemo(() => props.renderLabel(query), [query, props])
const shortFormatter = props.formatter ?? MetricFormatterShort[metric]
diff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.ex
index 8a8d16218e..56968e7a97 100644
--- a/lib/plausible_web/controllers/stats_controller.ex
+++ b/lib/plausible_web/controllers/stats_controller.ex
@@ -366,7 +366,7 @@ defmodule PlausibleWeb.StatsController do
defp get_flags(user, site),
do:
- [:channels, :breakdown_comparisons_ui, :saved_segments]
+ [:channels, :saved_segments]
|> Enum.map(fn flag ->
{flag, FunWithFlags.enabled?(flag, for: user) || FunWithFlags.enabled?(flag, for: site)}
end)