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
Clean up Saved Segments feature flags (#5228)
Artur Pataf698bbbf574d
diff --git a/assets/js/dashboard/filters.js b/assets/js/dashboard/filters.jsdeleted file mode 100644index 6b4ef30ddd..0000000000--- a/assets/js/dashboard/filters.js+++ /dev/null@@ -1,290 +0,0 @@-import React, { Fragment, useEffect, useState } from 'react';-import { useQueryContext } from './query-context';-import { useSiteContext } from './site-context';-import { filterRoute } from './router';-import { AppNavigationLink, useAppNavigate } from './navigation/use-app-navigate';-import { AdjustmentsVerticalIcon, MagnifyingGlassIcon, XMarkIcon, PencilSquareIcon } from '@heroicons/react/20/solid';-import classNames from 'classnames';-import { Menu, Transition } from '@headlessui/react';--import {- FILTER_GROUP_TO_MODAL_TYPE,- cleanLabels,- formatFilterGroup,- EVENT_PROPS_PREFIX,- getAvailableFilterModals-} from "./util/filters"-import { plainFilterText, styledFilterText } from "./util/filter-text"--const WRAPSTATE = { unwrapped: 0, waiting: 1, wrapped: 2 }--function removeFilter(filterIndex, navigate, query) {- const newFilters = query.filters.filter((_filter, index) => filterIndex != index)- const newLabels = cleanLabels(newFilters, query.labels)-- navigate({- search: (search) => ({- ...search,- filters: newFilters,- labels: newLabels- })- })-}--function clearAllFilters(navigate) {- navigate({- search: (search) => ({- ...search,- filters: null,- labels: null- })- })-}--function AppliedFilterPillVertical({filterIndex, filter}) {- const { query } = useQueryContext();- const navigate = useAppNavigate();- const [_operation, filterKey, _clauses] = filter-- const type = filterKey.startsWith(EVENT_PROPS_PREFIX) ? 'props' : filterKey-- return (- <Menu.Item key={filterIndex}>- <div className="px-3 md:px-4 sm:py-2 py-3 text-sm leading-tight flex items-center justify-between" key={filterIndex}>- <AppNavigationLink- title={`Edit filter: ${plainFilterText(query, filter)}`}- path={filterRoute.path}- params={{field: FILTER_GROUP_TO_MODAL_TYPE[type]}}- search={(search) => search}- className="group flex w-full justify-between items-center"- style={{ width: 'calc(100% - 1.5rem)' }}- >- <span className="inline-block w-full truncate">{styledFilterText(query, filter)}</span>- <PencilSquareIcon className="w-4 h-4 ml-1 cursor-pointer group-hover:text-indigo-700 dark:group-hover:text-indigo-500" />- </AppNavigationLink>- <b- title={`Remove filter: ${plainFilterText(query, filter)}`}- className="ml-2 cursor-pointer hover:text-indigo-700 dark:hover:text-indigo-500"- onClick={() => removeFilter(filterIndex, navigate, query)}- >- <XMarkIcon className="w-4 h-4" />- </b>- </div>- </Menu.Item>- )-}--function OpenFilterGroupOptionsButton({option}) {- return (- <Menu.Item>- {({ active }) => (- <AppNavigationLink- path={filterRoute.path}- params={{field: option}}- search={(search) => search}- className={classNames(- active ? 'bg-gray-100 dark:bg-gray-900 text-gray-900 dark:text-gray-100' : 'text-gray-800 dark:text-gray-300',- 'block px-4 py-2 text-sm font-medium'- )}- >- {formatFilterGroup(option)}- </AppNavigationLink>- )}- </Menu.Item>- )-}--function DropdownContent({ wrapped }) {- const navigate = useAppNavigate();- const site = useSiteContext();- const { query } = useQueryContext();- const [addingFilter, setAddingFilter] = useState(false);-- if (wrapped === WRAPSTATE.unwrapped || addingFilter) {- return <>{Object.keys(getAvailableFilterModals(site)).map((option) => <OpenFilterGroupOptionsButton key={option} option={option} />)}</>- }-- return (- <>- <div className="border-b border-gray-200 dark:border-gray-500 px-4 sm:py-2 py-3 text-sm leading-tight hover:text-indigo-700 dark:hover:text-indigo-500 hover:cursor-pointer" onClick={() => setAddingFilter(true)}>- + Add filter- </div>- {query.filters.map((filter, index) => <AppliedFilterPillVertical key={index} filterIndex={index} filter={filter}/>)}- <Menu.Item key="clear">- <div className="border-t border-gray-200 dark:border-gray-500 px-4 sm:py-2 py-3 text-sm leading-tight hover:text-indigo-700 dark:hover:text-indigo-500 hover:cursor-pointer" onClick={() => clearAllFilters(navigate)}>- Clear All Filters- </div>- </Menu.Item>- </>- )-}--function Filters() {- const navigate = useAppNavigate();- const { query } = useQueryContext();-- const [wrapped, setWrapped] = useState(WRAPSTATE.waiting)- const [viewport, setViewport] = useState(1080)-- useEffect(() => {- handleResize()-- window.addEventListener('resize', handleResize, false)-- return () => {- window.removeEventListener('resize', handleResize, false)- }- // eslint-disable-next-line react-hooks/exhaustive-deps- }, [])-- useEffect(() => {- setWrapped(WRAPSTATE.waiting)- }, [query, viewport])-- useEffect(() => {- if (wrapped === WRAPSTATE.waiting) { updateDisplayMode() }- // eslint-disable-next-line react-hooks/exhaustive-deps- }, [wrapped])-- function handleResize() {- setViewport(window.innerWidth || 639)- }-- // Checks if the filter container is wrapping items- function updateDisplayMode() {- const container = document.getElementById('filters')- const children = container && [...container.childNodes] || []-- // Always wrap on mobile- if (query.filters.length > 0 && viewport <= 768) {- setWrapped(WRAPSTATE.wrapped)- return- }-- setWrapped(WRAPSTATE.unwrapped)-- // Check for different y value between all child nodes - this indicates a wrap- children.forEach(child => {- const currentChildY = child.getBoundingClientRect().top- const firstChildY = children[0].getBoundingClientRect().top- if (currentChildY !== firstChildY) {- setWrapped(WRAPSTATE.wrapped)- }- })- }-- function AppliedFilterPillHorizontal({filterIndex, filter}) {- const { query } = useQueryContext();- const [_operation, filterKey, _clauses] = filter- const type = filterKey.startsWith(EVENT_PROPS_PREFIX) ? 'props' : filterKey- return (- <span className="flex bg-white dark:bg-gray-800 text-gray-700 dark:text-gray-300 shadow text-sm rounded mr-2 items-center">- <AppNavigationLink- title={`Edit filter: ${plainFilterText(query, filter)}`}- className="flex w-full h-full items-center py-2 pl-3"- path={filterRoute.path}- params={{field: FILTER_GROUP_TO_MODAL_TYPE[type]}}- search={(search)=> search}- >- <span className="inline-block max-w-2xs md:max-w-xs truncate">{styledFilterText(query, filter)}</span>- </AppNavigationLink>- <span- title={`Remove filter: ${plainFilterText(query, filter)}`}- className="flex h-full w-full px-2 cursor-pointer hover:text-indigo-700 dark:hover:text-indigo-500 items-center"- onClick={() => removeFilter(filterIndex, navigate, query)}- >- <XMarkIcon className="w-4 h-4" />- </span>- </span>- )- }-- function renderDropdownButton() {- if (wrapped === WRAPSTATE.wrapped) {- const filterCount = query.filters.length- return (- <>- <AdjustmentsVerticalIcon className="-ml-1 mr-1 h-4 w-4 shrink-0" aria-hidden="true" />- {filterCount} Filter{filterCount === 1 ? '' : 's'}- </>- )- }-- return (- <>- <MagnifyingGlassIcon className="-ml-1 mr-1 h-4 w-4 shrink-0" aria-hidden="true" />- {/* This would have been a good use-case for JSX! But in the interest of keeping the breakpoint width logic with TailwindCSS, this is a better long-term way to deal with it. */}- <span className="sm:hidden">Filter</span><span className="hidden sm:inline-block">Filter</span>- </>- )- }-- function trackFilterMenu() {- if (window.trackCustomEvent) {- window.trackCustomEvent('Filter Menu: Open')- }- }-- function renderDropDown() {- return (- <Menu as="div" className="md:relative ml-auto shrink-0">- {({ open }) => (- <>- <div>- <Menu.Button onClick={trackFilterMenu} className="flex items-center text-xs md:text-sm font-medium leading-tight px-3 py-2 cursor-pointer ml-auto text-gray-500 dark:text-gray-200 hover:bg-gray-200 dark:hover:bg-gray-900 rounded whitespace-nowrap">- {renderDropdownButton()}- </Menu.Button>- </div>-- <Transition- show={open}- as={Fragment}- enter="transition ease-out duration-100"- enterFrom="opacity-0 scale-95"- enterTo="opacity-100 scale-100"- leave="transition ease-in duration-75"- leaveFrom="opacity-100 scale-100"- leaveTo="opacity-0 scale-95"- >- <Menu.Items- static- className="absolute w-full left-0 right-0 md:w-72 md:absolute md:top-auto md:left-auto md:right-0 mt-2 origin-top-right z-10"- >- <div- className="rounded-md shadow-lg bg-white dark:bg-gray-800 ring-1 ring-black ring-opacity-5- font-medium text-gray-800 dark:text-gray-200"- >- <DropdownContent wrapped={wrapped} />- </div>- </Menu.Items>- </Transition>- </>- )}- </Menu>- );- }-- function renderFilterList() {- // The filters are rendered even when `wrapped === WRAPSTATE.waiting`.- // Otherwise, if they don't exist in the DOM, we can't check whether- // the flex-wrap is actually putting them on multiple lines.- if (wrapped !== WRAPSTATE.wrapped) {- return (- <div id="filters" className="flex flex-wrap">- {query.filters.map((filter, index) => <AppliedFilterPillHorizontal key={index} filterIndex={index} filter={filter} />)}- </div>- )- }-- return null- }-- return (- <>- {renderFilterList()}- {renderDropDown()}- </>- )-}--export default Filters;diff --git a/assets/js/dashboard/nav-menu/top-bar.test.tsx b/assets/js/dashboard/nav-menu/top-bar.test.tsxindex 078c9db99a..762e080c35 100644--- a/assets/js/dashboard/nav-menu/top-bar.test.tsx+++ b/assets/js/dashboard/nav-menu/top-bar.test.tsx@@ -13,10 +13,6 @@ import { TestContextProviders } from '../../../test-utils/app-context-providers'import { TopBar } from './top-bar'import { MockAPI } from '../../../test-utils/mock-api'-const flags = {- saved_segments: true,- saved_segments_fe: true-}const domain = 'dummy.site'const domains = [domain, 'example.com', 'blog.example.com']@@ -55,7 +51,7 @@ beforeEach(() => {test('user can open and close site switcher', async () => {render(<TopBar showCurrentVisitors={false} />, {wrapper: (props) => (- <TestContextProviders siteOptions={{ domain, flags }} {...props} />+ <TestContextProviders siteOptions={{ domain }} {...props} />)})@@ -77,7 +73,7 @@ test('user can open and close site switcher', async () => {test('user can open and close filters dropdown', async () => {render(<TopBar showCurrentVisitors={false} />, {wrapper: (props) => (- <TestContextProviders siteOptions={{ domain, flags }} {...props} />+ <TestContextProviders siteOptions={{ domain }} {...props} />)})@@ -102,7 +98,7 @@ test('current visitors renders when visitors are present and disappears after vimockAPI.get(`/api/stats/${domain}/current-visitors`, 500)render(<TopBar showCurrentVisitors={true} />, {wrapper: (props) => (- <TestContextProviders siteOptions={{ domain, flags }} {...props} />+ <TestContextProviders siteOptions={{ domain }} {...props} />)})diff --git a/assets/js/dashboard/nav-menu/top-bar.tsx b/assets/js/dashboard/nav-menu/top-bar.tsxindex d27a87697e..3116e6879e 100644--- a/assets/js/dashboard/nav-menu/top-bar.tsx+++ b/assets/js/dashboard/nav-menu/top-bar.tsx@@ -5,7 +5,6 @@ import SiteSwitcher from '../site-switcher'import { useSiteContext } from '../site-context'import { useUserContext } from '../user-context'import CurrentVisitors from '../stats/current-visitors'-import Filters from '../filters'import classNames from 'classnames'import { useInView } from 'react-intersection-observer'import { FilterMenu } from './filter-menu'@@ -49,66 +48,39 @@ function TopBarStickyWrapper({ children }: { children: ReactNode }) {function TopBarInner({ showCurrentVisitors }: TopBarProps) {const site = useSiteContext()const user = useUserContext()- const { saved_segments, saved_segments_fe } = site.flagsconst leftActionsRef = useRef<HTMLDivElement>(null)return (<div className="flex items-center w-full">- {!!saved_segments && !!saved_segments_fe ? (- <>- <div- className="flex items-center gap-x-4 shrink-0"- ref={leftActionsRef}- >- <SiteSwitcher- site={site}- loggedIn={user.loggedIn}- currentUserRole={user.role}- />- {showCurrentVisitors && (- <CurrentVisitors tooltipBoundaryRef={leftActionsRef} />- )}- </div>- <div className="flex w-full">- <FiltersBar- accessors={{- topBar: (filtersBarElement) =>- filtersBarElement?.parentElement?.parentElement,- leftSection: (filtersBarElement) =>- filtersBarElement?.parentElement?.parentElement- ?.firstElementChild as HTMLElement,- rightSection: (filtersBarElement) =>- filtersBarElement?.parentElement?.parentElement- ?.lastElementChild as HTMLElement- }}- />- </div>- <div className="flex gap-x-4 shrink-0">- <FilterMenu />- <SegmentMenu />- <QueryPeriodsPicker />- </div>- </>- ) : (- <>- <div className="flex items-center w-full" ref={leftActionsRef}>- <SiteSwitcher- className="mr-2 sm:mr-4"- site={site}- loggedIn={user.loggedIn}- currentUserRole={user.role}- />- {showCurrentVisitors && (- <CurrentVisitors- className="ml-1 mr-auto"- tooltipBoundaryRef={leftActionsRef}- />- )}- <Filters />- </div>- <QueryPeriodsPicker className="ml-auto pl-2" />- </>- )}+ <div className="flex items-center gap-x-4 shrink-0" ref={leftActionsRef}>+ <SiteSwitcher+ site={site}+ loggedIn={user.loggedIn}+ currentUserRole={user.role}+ />+ {showCurrentVisitors && (+ <CurrentVisitors tooltipBoundaryRef={leftActionsRef} />+ )}+ </div>+ <div className="flex w-full">+ <FiltersBar+ accessors={{+ topBar: (filtersBarElement) =>+ filtersBarElement?.parentElement?.parentElement,+ leftSection: (filtersBarElement) =>+ filtersBarElement?.parentElement?.parentElement+ ?.firstElementChild as HTMLElement,+ rightSection: (filtersBarElement) =>+ filtersBarElement?.parentElement?.parentElement+ ?.lastElementChild as HTMLElement+ }}+ />+ </div>+ <div className="flex gap-x-4 shrink-0">+ <FilterMenu />+ <SegmentMenu />+ <QueryPeriodsPicker />+ </div></div>)}diff --git a/assets/js/dashboard/segments/routeless-segment-modals.tsx b/assets/js/dashboard/segments/routeless-segment-modals.tsxindex 181247b500..f99a129247 100644--- a/assets/js/dashboard/segments/routeless-segment-modals.tsx+++ b/assets/js/dashboard/segments/routeless-segment-modals.tsx@@ -145,11 +145,7 @@ export const RoutelessSegmentModals = () => {}})- if (- !user.loggedIn ||- !site.flags.saved_segments ||- !site.flags.saved_segments_fe- ) {+ if (!user.loggedIn) {return null}diff --git a/assets/js/dashboard/segments/segment-modals.test.tsx b/assets/js/dashboard/segments/segment-modals.test.tsxindex 030f525556..cf0b7f636d 100644--- a/assets/js/dashboard/segments/segment-modals.test.tsx+++ b/assets/js/dashboard/segments/segment-modals.test.tsx@@ -19,8 +19,6 @@ beforeEach(() => {document.body.appendChild(modalRoot)})-const flags = { saved_segments: true, saved_segments_fe: true }-describe('Segment details modal - errors', () => {const anySiteSegment: SavedSegment & { segment_data: SegmentData } = {id: 1,@@ -56,7 +54,7 @@ describe('Segment details modal - errors', () => {segmentId: 202020,user: { loggedIn: true, id: 1, role: Role.owner },message: `Segment not found with with ID "202020"`,- siteOptions: { flags, siteSegmentsAvailable: true }+ siteOptions: { siteSegmentsAvailable: true }},{case: 'site segment is in list but not listable because site segments are not available',@@ -64,7 +62,7 @@ describe('Segment details modal - errors', () => {segmentId: anySiteSegment.id,user: { loggedIn: true, id: 1, role: Role.owner },message: `Segment not found with with ID "${anySiteSegment.id}"`,- siteOptions: { flags, siteSegmentsAvailable: false }+ siteOptions: { siteSegmentsAvailable: false }},{case: 'personal segment is in list but not listable because it is a public dashboard',@@ -72,7 +70,7 @@ describe('Segment details modal - errors', () => {segmentId: anyPersonalSegment.id,user: { loggedIn: false, id: null, role: Role.public },message: `Segment not found with with ID "${anyPersonalSegment.id}"`,- siteOptions: { flags, siteSegmentsAvailable: true }+ siteOptions: { siteSegmentsAvailable: true }},{case: 'segment is in list and listable, but detailed view is not available because user is not logged in',@@ -80,7 +78,7 @@ describe('Segment details modal - errors', () => {segmentId: anySiteSegment.id,user: { loggedIn: false, id: null, role: Role.public },message: 'Not enough permissions to see segment details',- siteOptions: { flags, siteSegmentsAvailable: true }+ siteOptions: { siteSegmentsAvailable: true }}]it.each(cases)(@@ -126,7 +124,7 @@ describe('Segment details modal - other cases', () => {preloaded={{segments: [anySiteSegment]}}- siteOptions={{ flags, siteSegmentsAvailable: true }}+ siteOptions={{ siteSegmentsAvailable: true }}{...props}/>)diff --git a/assets/js/dashboard/site-context.tsx b/assets/js/dashboard/site-context.tsxindex bd263d94f2..406c4a1763 100644--- a/assets/js/dashboard/site-context.tsx+++ b/assets/js/dashboard/site-context.tsx@@ -28,8 +28,6 @@ export function parseSiteFromDataset(dataset: DOMStringMap): PlausibleSite {}type FeatureFlags = {- saved_segments?: boolean- saved_segments_fe?: booleannew_time_on_page?: boolean}diff --git a/assets/js/dashboard/util/filters.js b/assets/js/dashboard/util/filters.jsindex cab611e506..ca5a92719a 100644--- a/assets/js/dashboard/util/filters.js+++ b/assets/js/dashboard/util/filters.js@@ -18,12 +18,10 @@ export const FILTER_MODAL_TO_FILTER_GROUP = {}export function getAvailableFilterModals(site) {- const { props, segment, ...rest } = FILTER_MODAL_TO_FILTER_GROUP+ const { props, ...rest } = FILTER_MODAL_TO_FILTER_GROUPreturn {...rest,- ...(site.propsAvailable && { props }),- ...(site.flags.saved_segments &&- site.flags.saved_segments_fe && { segment })+ ...(site.propsAvailable && { props })}}diff --git a/assets/js/dashboard/util/filters.test.ts b/assets/js/dashboard/util/filters.test.tsindex cf998ba46e..67ad93874e 100644--- a/assets/js/dashboard/util/filters.test.ts+++ b/assets/js/dashboard/util/filters.test.ts@@ -3,11 +3,10 @@import { getAvailableFilterModals, serializeApiFilters } from './filters'describe(`${getAvailableFilterModals.name}`, () => {- it('gives limited object when props and segments are not available', () => {+ it('gives limited object when props are not available', () => {expect(getAvailableFilterModals({- propsAvailable: false,- flags: { saved_segments: null, saved_segments_fe: null }+ propsAvailable: false})).toEqual({browser: ['browser', 'browser_version'],@@ -24,15 +23,15 @@ describe(`${getAvailableFilterModals.name}`, () => {'utm_campaign','utm_term','utm_content'- ]+ ],+ segment: ['segment']})})it('gives full object when props and segments are available', () => {expect(getAvailableFilterModals({- propsAvailable: true,- flags: { saved_segments: true, saved_segments_fe: true }+ propsAvailable: true})).toEqual({browser: ['browser', 'browser_version'],diff --git a/lib/plausible_web/components/billing/plan_benefits.ex b/lib/plausible_web/components/billing/plan_benefits.exindex 32c5e0d71e..3a2822d6ab 100644--- a/lib/plausible_web/components/billing/plan_benefits.ex+++ b/lib/plausible_web/components/billing/plan_benefits.ex@@ -48,6 +48,7 @@ defmodule PlausibleWeb.Components.Billing.PlanBenefits do"Google Analytics import"]|> Kernel.++(feature_benefits(plan))+ |> Kernel.++(["Saved Segments"])|> Enum.filter(& &1)enddiff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.exindex 0f3b4432d8..4e671f8784 100644--- a/lib/plausible_web/controllers/stats_controller.ex+++ b/lib/plausible_web/controllers/stats_controller.ex@@ -394,7 +394,7 @@ defmodule PlausibleWeb.StatsController dodefp get_flags(user, site),do:- [:saved_segments, :saved_segments_fe, :new_time_on_page]+ [:new_time_on_page]|> 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 28b155c461..e824d72aea 100644--- a/lib/plausible_web/live/choose_plan.ex+++ b/lib/plausible_web/live/choose_plan.ex@@ -82,26 +82,11 @@ defmodule PlausibleWeb.Live.ChoosePlan dobusiness_plan_to_render =assigns.selected_business_plan || List.last(assigns.available_plans.business)- saved_segments_enabled? =- 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) ++- if(saved_segments_enabled?, do: ["Segments"], else: [])+ PlanBenefits.for_growth(growth_plan_to_render)business_benefits =- PlanBenefits.for_business(- if(saved_segments_enabled?,- do: business_plan_to_render,- else:- struct!(business_plan_to_render,- features:- business_plan_to_render.features -- [Plausible.Billing.Feature.SiteSegments]- )- ),- growth_benefits- )+ PlanBenefits.for_business(business_plan_to_render, growth_benefits)enterprise_benefits = PlanBenefits.for_enterprise(business_benefits)diff --git a/test/test_helper.exs b/test/test_helper.exsindex f2114ce256..fef0ce84c6 100644--- a/test/test_helper.exs+++ b/test/test_helper.exs@@ -9,7 +9,6 @@ Application.ensure_all_started(:double)FunWithFlags.enable(:channels)FunWithFlags.enable(:scroll_depth)FunWithFlags.enable(:teams)-FunWithFlags.enable(:saved_segments)Ecto.Adapters.SQL.Sandbox.mode(Plausible.Repo, :manual)