diff --git a/assets/js/dashboard/stats/behaviours/index.js b/assets/js/dashboard/stats/behaviours/index.js index 64217db38..5f3263a70 100644 --- a/assets/js/dashboard/stats/behaviours/index.js +++ b/assets/js/dashboard/stats/behaviours/index.js @@ -14,7 +14,7 @@ function Tabs({ tab, setTab, site }) { return (
setTab('conversions')}>Conversions
- {FunnelTab({ tab, setTab, site })} + {site.flags.funnels && FunnelTab({ tab, setTab, site })}
) } @@ -67,16 +67,21 @@ function FunnelTab({ tab, setTab, site }) { export default function Behaviours({ query, site }) { const [tab, setTab] = useState('conversions') - const tabs = - const selectedFunnel = site.funnels.find(funnel => funnel.name === tab) - const funnelNames = site.funnels.map(({ name }) => name) + if (site.flags.funnels) { + const selectedFunnel = site.funnels.find(funnel => funnel.name === tab) + const funnelNames = site.funnels.map(({ name }) => name) - return ( -
+ return ( +
+ {tab == 'conversions' && } + {funnelNames.includes(tab) && } +
+ ) + } else { + return
{tab == 'conversions' && } - {funnelNames.includes(tab) && }
- ) + } } diff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.ex index d32685662..3763e50b8 100644 --- a/lib/plausible_web/controllers/stats_controller.ex +++ b/lib/plausible_web/controllers/stats_controller.ex @@ -330,7 +330,8 @@ defmodule PlausibleWeb.StatsController do defp get_flags(user) do %{ custom_dimension_filter: FunWithFlags.enabled?(:custom_dimension_filter, for: user), - views_per_visit_metric: FunWithFlags.enabled?(:views_per_visit_metric, for: user) + views_per_visit_metric: FunWithFlags.enabled?(:views_per_visit_metric, for: user), + funnels: FunWithFlags.enabled?(:funnels, for: user) } end