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
Prepare FE feature flag for launching smoothly (#5146)
Artur Pata75e46bf54b47
diff --git a/assets/js/dashboard/nav-menu/top-bar.test.tsx b/assets/js/dashboard/nav-menu/top-bar.test.tsxindex 89d7559cdb..078c9db99a 100644--- a/assets/js/dashboard/nav-menu/top-bar.test.tsx+++ b/assets/js/dashboard/nav-menu/top-bar.test.tsx@@ -14,7 +14,8 @@ import { TopBar } from './top-bar'import { MockAPI } from '../../../test-utils/mock-api'const flags = {- saved_segments: true+ saved_segments: true,+ saved_segments_fe: true}const domain = 'dummy.site'const domains = [domain, 'example.com', 'blog.example.com']diff --git a/assets/js/dashboard/nav-menu/top-bar.tsx b/assets/js/dashboard/nav-menu/top-bar.tsxindex fa6dd7f7e6..d27a87697e 100644--- a/assets/js/dashboard/nav-menu/top-bar.tsx+++ b/assets/js/dashboard/nav-menu/top-bar.tsx@@ -49,12 +49,12 @@ function TopBarStickyWrapper({ children }: { children: ReactNode }) {function TopBarInner({ showCurrentVisitors }: TopBarProps) {const site = useSiteContext()const user = useUserContext()- const { saved_segments } = site.flags+ const { saved_segments, saved_segments_fe } = site.flagsconst leftActionsRef = useRef<HTMLDivElement>(null)return (<div className="flex items-center w-full">- {saved_segments ? (+ {!!saved_segments && !!saved_segments_fe ? (<><divclassName="flex items-center gap-x-4 shrink-0"diff --git a/assets/js/dashboard/segments/routeless-segment-modals.tsx b/assets/js/dashboard/segments/routeless-segment-modals.tsxindex 7ffaad8cc6..d829e37189 100644--- a/assets/js/dashboard/segments/routeless-segment-modals.tsx+++ b/assets/js/dashboard/segments/routeless-segment-modals.tsx@@ -140,7 +140,11 @@ export const RoutelessSegmentModals = () => {}})- if (!user.loggedIn || !site.flags.saved_segments) {+ if (+ !user.loggedIn ||+ !site.flags.saved_segments ||+ !site.flags.saved_segments_fe+ ) {return null}diff --git a/assets/js/dashboard/site-context.tsx b/assets/js/dashboard/site-context.tsxindex 400181b260..ddb80b5267 100644--- a/assets/js/dashboard/site-context.tsx+++ b/assets/js/dashboard/site-context.tsx@@ -30,6 +30,7 @@ export function parseSiteFromDataset(dataset: DOMStringMap): PlausibleSite {type FeatureFlags = {channels?: booleansaved_segments?: boolean+ saved_segments_fe?: boolean}const siteContextDefaultValue = {diff --git a/assets/js/dashboard/util/filters.js b/assets/js/dashboard/util/filters.jsindex 4f6714d1d3..27ddcd8172 100644--- a/assets/js/dashboard/util/filters.js+++ b/assets/js/dashboard/util/filters.js@@ -22,7 +22,8 @@ export function getAvailableFilterModals(site) {return {...rest,...(site.propsAvailable && { props }),- ...(site.flags.saved_segments && { segment })+ ...(site.flags.saved_segments &&+ site.flags.saved_segments_fe && { segment })}}diff --git a/assets/js/dashboard/util/filters.test.ts b/assets/js/dashboard/util/filters.test.tsindex cd774b30f2..cf998ba46e 100644--- a/assets/js/dashboard/util/filters.test.ts+++ b/assets/js/dashboard/util/filters.test.ts@@ -7,7 +7,7 @@ describe(`${getAvailableFilterModals.name}`, () => {expect(getAvailableFilterModals({propsAvailable: false,- flags: { saved_segments: null }+ flags: { saved_segments: null, saved_segments_fe: null }})).toEqual({browser: ['browser', 'browser_version'],@@ -32,7 +32,7 @@ describe(`${getAvailableFilterModals.name}`, () => {expect(getAvailableFilterModals({propsAvailable: true,- flags: { saved_segments: true }+ flags: { saved_segments: true, saved_segments_fe: true }})).toEqual({browser: ['browser', 'browser_version'],diff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.exindex 016540bef5..fcd67f9395 100644--- a/lib/plausible_web/controllers/stats_controller.ex+++ b/lib/plausible_web/controllers/stats_controller.ex@@ -395,7 +395,7 @@ defmodule PlausibleWeb.StatsController dodefp get_flags(user, site),do:- [:saved_segments, :scroll_depth]+ [:saved_segments, :saved_segments_fe, :scroll_depth]|> Enum.map(fn flag ->{flag, FunWithFlags.enabled?(flag, for: user) || FunWithFlags.enabled?(flag, for: site)}end)diff --git a/lib/plausible_web/live/choose_plan.ex b/lib/plausible_web/live/choose_plan.exindex a53e724f41..6eef09e86d 100644--- a/lib/plausible_web/live/choose_plan.ex+++ b/lib/plausible_web/live/choose_plan.ex@@ -83,7 +83,8 @@ defmodule PlausibleWeb.Live.ChoosePlan doassigns.selected_business_plan || List.last(assigns.available_plans.business)saved_segments_enabled? =- FunWithFlags.enabled?(:saved_segments, for: assigns.current_user)+ FunWithFlags.enabled?(:saved_segments_fe, for: assigns.current_user) and+ FunWithFlags.enabled?(:saved_segments, for: assigns.current_user)growth_benefits =PlanBenefits.for_growth(growth_plan_to_render) ++