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
Move the segment actions to the segment pill and simplify edit mode (#6719)
Sanne de Vries603d5fe03d98
diff --git a/assets/js/dashboard/components/icons.tsx b/assets/js/dashboard/components/icons.tsxindex 56451e9e8b..9d616c0859 100644--- a/assets/js/dashboard/components/icons.tsx+++ b/assets/js/dashboard/components/icons.tsx@@ -82,7 +82,7 @@ export const RefreshIcon = ({ className }: { className?: string }) => (export const PencilIcon = ({ className }: { className?: string }) => (<svgxmlns="http://www.w3.org/2000/svg"- viewBox="0 0 18 18"+ viewBox="0 0 24 24"fill="none"className={className}>@@ -91,7 +91,7 @@ export const PencilIcon = ({ className }: { className?: string }) => (strokeLinecap="round"strokeLinejoin="round"strokeWidth="1.5"- d="m10.547 4.422 3.031 3.031M2.75 15.25s3.599-.568 4.546-1.515l7.327-7.327a2.142 2.142 0 1 0-3.03-3.03l-7.327 7.327c-.947.947-1.515 4.546-1.515 4.546h0Z"+ d="m14.25 5.25 5 5M9.25 20.25l-7 2 2-7L16.664 2.836a2 2 0 0 1 2.828 0l2.172 2.172a2 2 0 0 1 0 2.828z"/></svg>)diff --git a/assets/js/dashboard/components/popover.tsx b/assets/js/dashboard/components/popover.tsxindex ddcb663aff..d5f691ac3c 100644--- a/assets/js/dashboard/components/popover.tsx+++ b/assets/js/dashboard/components/popover.tsx@@ -46,9 +46,11 @@ const toggleButton = {}}+const staticRow = 'px-4 py-2.5 text-sm rounded-md'+const navigationLink = classNames('flex items-center justify-between',- 'px-4 py-2.5 text-sm rounded-md',+ staticRow,'cursor-pointer')@@ -66,9 +68,11 @@ const hoverLink = classNames(const items = {classNames: {+ staticRow,navigationLink,hoverLink,label: 'flex-1 min-w-0 truncate',+ description: 'font-normal text-xs text-gray-500 dark:text-gray-400',/** Full-width row that holds a leading icon and a `label` span. */iconRow: classNames(navigationLink, hoverLink, 'gap-x-2 w-full text-left'),selectedOption: classNames(diff --git a/assets/js/dashboard/filtering/segments.test.ts b/assets/js/dashboard/filtering/segments.test.tsindex b3b2c49b7b..2103481739 100644--- a/assets/js/dashboard/filtering/segments.test.ts+++ b/assets/js/dashboard/filtering/segments.test.ts@@ -11,6 +11,7 @@ import {SavedSegment,SegmentData,canExpandSegment,+ getNavigationToExpandSegment,getSegmentAuthorship,getAttributionDateLabel} from './segments'@@ -383,3 +384,34 @@ describe(`${canExpandSegment.name}`, () => {})})++describe(`${getNavigationToExpandSegment.name}`, () => {+ it('sets filters from segment data and puts the segment in location state', () => {+ const segment: SavedSegment & { segment_data: SegmentData } = {+ id: 9,+ name: 'Blog',+ type: SegmentType.personal,+ owner_id: 1,+ owner_name: 'Jane',+ inserted_at: '2025-03-13T13:00:00',+ updated_at: '2025-03-13T13:00:00',+ segment_data: {+ filters: [['is', 'page', ['/blog']]],+ labels: {}+ }+ }++ const navigation = getNavigationToExpandSegment(segment)++ expect(navigation.state.expandedSegment).toBe(segment)+ expect(+ navigation.search!({+ filters: [['is', 'segment', [9]]],+ labels: { 'segment-9': 'Blog' }+ })+ ).toEqual({+ filters: [['is', 'page', ['/blog']]],+ labels: {}+ })+ })+})diff --git a/assets/js/dashboard/filtering/segments.ts b/assets/js/dashboard/filtering/segments.tsindex d42733fe02..c79c5d5b70 100644--- a/assets/js/dashboard/filtering/segments.ts+++ b/assets/js/dashboard/filtering/segments.ts@@ -116,22 +116,6 @@ export const parseApiSegmentData = ({...rest})-export function getSearchToRemoveSegmentFilter(): Required<AppNavigationTarget>['search'] {- return (searchRecord) => {- const updatedFilters = (- (Array.isArray(searchRecord.filters)- ? searchRecord.filters- : []) as Filter[]- ).filter((f) => !isSegmentFilter(f))- const currentLabels = searchRecord.labels ?? {}- return {- ...searchRecord,- filters: updatedFilters,- labels: cleanLabels(updatedFilters, currentLabels)- }- }-}-export function getSearchToSetSegmentFilter(segment: Pick<SavedSegment, 'id' | 'name'>,options: { omitAllOtherFilters?: boolean } = {}@@ -272,8 +256,21 @@ export function isListableSegment({return false}-export function canSeeSegmentDetails({ user }: { user: UserContextValue }) {- return user.loggedIn && user.role !== Role.public+export function getNavigationToExpandSegment(+ segment: SavedSegments[number]+): Pick<AppNavigationTarget, 'search'> & {+ state: { expandedSegment: SavedSegments[number] }+} {+ return {+ search: (s) => ({+ ...s,+ filters: segment.segment_data.filters,+ labels: segment.segment_data.labels+ }),+ state: {+ expandedSegment: segment+ }+ }}export function canRemoveFilter(@@ -288,15 +285,3 @@ export function canRemoveFilter(}return true}--export function findAppliedSegmentFilter({ filters }: { filters: Filter[] }) {- const segmentFilter = filters.find(isSegmentFilter)- if (!segmentFilter) {- return undefined- }- const [_operation, _dimension, clauses] = segmentFilter- if (clauses.length !== 1) {- throw new Error('Dashboard can be filtered by only one segment')- }- return segmentFilter-}diff --git a/assets/js/dashboard/nav-menu/dashboard-options-menu.tsx b/assets/js/dashboard/nav-menu/dashboard-options-menu.tsxindex 8c57eb5fb7..b9a0390ea4 100644--- a/assets/js/dashboard/nav-menu/dashboard-options-menu.tsx+++ b/assets/js/dashboard/nav-menu/dashboard-options-menu.tsx@@ -148,6 +148,7 @@ export function DashboardOptionsMenu() {return (<buttondisabled+ data-testid="dashboard-options-menu"className={classNames(popover.toggleButton.classNames.rounded,popover.toggleButton.classNames.ghost,diff --git a/assets/js/dashboard/nav-menu/filter-pill.tsx b/assets/js/dashboard/nav-menu/filter-pill.tsxindex ef812b15a6..73a361c4c2 100644--- a/assets/js/dashboard/nav-menu/filter-pill.tsx+++ b/assets/js/dashboard/nav-menu/filter-pill.tsx@@ -1,15 +1,26 @@-import React, { ReactNode } from 'react'+import React, {+ ReactNode,+ useCallback,+ useEffect,+ useRef,+ useState+} from 'react'+import { createPortal } from 'react-dom'+import { Popover, Transition } from '@headlessui/react'+import { usePopper } from 'react-popper'import {AppNavigationLink,AppNavigationTarget} from '../navigation/use-app-navigate'import { XMarkIcon } from '@heroicons/react/24/outline'import classNames from 'classnames'+import { BlurMenuButtonOnEscape, popover } from '../components/popover'-export type FilterPillAction = {- type: 'link'- navigationTarget: AppNavigationTarget-}+type RenderMenu = (closeMenu: () => void) => ReactNode++export type FilterPillAction =+ | { type: 'link'; navigationTarget: AppNavigationTarget }+ | { type: 'menu'; renderMenu: RenderMenu }export type FilterPillProps = {plainText: string@@ -27,6 +38,104 @@ const PillContent = ({ children }: { children?: ReactNode }) => (const contentBaseClassName ='flex w-full h-full items-center rounded-l-md pl-2.5'+const PillMenuPanel = ({+ open,+ buttonElement,+ children+}: {+ open: boolean+ buttonElement: HTMLButtonElement | null+ children: ReactNode+}) => {+ const [panelElement, setPanelElement] = useState<HTMLDivElement | null>(null)++ const { styles, attributes, update } = usePopper(+ buttonElement,+ panelElement,+ {+ placement: 'bottom-start',+ modifiers: [+ { name: 'offset', options: { offset: [-1, 8] } },+ { name: 'preventOverflow', options: { padding: 8 } }+ ]+ }+ )++ // the pill can move while the menu is closed, e.g. when the top bar changes+ useEffect(() => {+ if (open) {+ update?.()+ }+ }, [open, update])++ return createPortal(+ <div+ ref={setPanelElement}+ style={styles.popper}+ {...attributes.popper}+ className="z-20"+ >+ <Transition+ as="div"+ {...popover.transition.props}+ className="origin-top-left"+ >+ <Popover.Panel+ className={classNames(+ popover.panel.classNames.roundedSheet,+ 'w-72 max-w-[calc(100vw-1rem)]'+ )}+ >+ {children}+ </Popover.Panel>+ </Transition>+ </div>,+ document.body+ )+}++const PillMenu = ({+ className,+ plainText,+ renderMenu,+ children+}: {+ className: string+ plainText: string+ renderMenu: RenderMenu+ children: ReactNode+}) => {+ const buttonRef = useRef<HTMLButtonElement | null>(null)+ const [buttonElement, setButtonElement] = useState<HTMLButtonElement | null>(+ null+ )+ const setButton = useCallback((element: HTMLButtonElement | null) => {+ buttonRef.current = element+ setButtonElement(element)+ }, [])++ return (+ <Popover className="flex h-full">+ {({ open, close }) => (+ <>+ {open && <div className="fixed top-0 left-0 w-full h-full"></div>}+ <BlurMenuButtonOnEscape targetRef={buttonRef} />+ <Popover.Button+ ref={setButton}+ className={classNames(className, 'cursor-pointer relative')}+ title={plainText}+ >+ <PillContent>{children}</PillContent>+ </Popover.Button>+ <PillMenuPanel open={open} buttonElement={buttonElement}>+ {renderMenu(close)}+ </PillMenuPanel>+ </>+ )}+ </Popover>+ )+}+export function FilterPill({plainText,children,@@ -40,7 +149,7 @@ export function FilterPill({return (<div className="flex h-8 rounded-md bg-white border border-gray-200 dark:border-gray-700 dark:bg-gray-800 text-gray-800 dark:text-gray-100 text-sm items-center">- {action ? (+ {action?.type === 'link' ? (<AppNavigationLinkclassName={contentClassName}title={`Edit filter: ${plainText}`}@@ -48,6 +157,14 @@ export function FilterPill({><PillContent>{children}</PillContent></AppNavigationLink>+ ) : action?.type === 'menu' ? (+ <PillMenu+ className={contentClassName}+ plainText={plainText}+ renderMenu={action.renderMenu}+ >+ {children}+ </PillMenu>) : (<div className={contentClassName} title={plainText}><PillContent>{children}</PillContent>diff --git a/assets/js/dashboard/nav-menu/filter-pills-list.tsx b/assets/js/dashboard/nav-menu/filter-pills-list.tsxindex 6e3c4d61f4..af9ab65450 100644--- a/assets/js/dashboard/nav-menu/filter-pills-list.tsx+++ b/assets/js/dashboard/nav-menu/filter-pills-list.tsx@@ -1,13 +1,14 @@import React, { CSSProperties } from 'react'import { useDashboardStateContext } from '../dashboard-state-context'-import { FilterPill, FilterPillAction, FilterPillProps } from './filter-pill'+import { FilterPill, FilterPillAction } from './filter-pill'import { cleanLabels, EVENT_PROPS_PREFIX } from '../util/filters'import { styledFilterText, plainFilterText } from '../util/filter-text'import { useAppNavigate } from '../navigation/use-app-navigate'import classNames from 'classnames'import { filterRoute } from '../router'-import { canRemoveFilter } from '../filtering/segments'+import { canRemoveFilter, isSegmentFilter } from '../filtering/segments'import { useSegmentsContext } from '../filtering/segments-context'+import { SegmentPillMenu } from './segments/segment-pill-menu'import { Filter } from '../dashboard-state'export const AppliedFilterPillsList = React.forwardRef<@@ -15,19 +16,36 @@ export const AppliedFilterPillsList = React.forwardRef<{ className?: string; style?: CSSProperties }>(({ className, style }, ref) => {const { dashboardState } = useDashboardStateContext()- const { limitedToSegment } = useSegmentsContext()+ const { segments, limitedToSegment } = useSegmentsContext()const navigate = useAppNavigate()- const getPillAction = (filter: Filter): FilterPillAction => ({- type: 'link',- navigationTarget: {- path: filterRoute.path,- search: (s) => s,- params: {- field: filter[1].startsWith(EVENT_PROPS_PREFIX) ? 'props' : filter[1]+ const getPillAction = (filter: Filter): FilterPillAction | undefined => {+ if (!isSegmentFilter(filter)) {+ return {+ type: 'link',+ navigationTarget: {+ path: filterRoute.path,+ search: (s) => s,+ params: {+ field: filter[1].startsWith(EVENT_PROPS_PREFIX)+ ? 'props'+ : filter[1]+ }+ }}}- })+ const [_operation, _dimension, [id]] = filter+ const segment = segments.find((s) => String(s.id) === String(id))+ if (!segment) {+ return undefined+ }+ return {+ type: 'menu',+ renderMenu: (closeMenu) => (+ <SegmentPillMenu segment={segment} closeMenu={closeMenu} />+ )+ }+ }return (// the negative margin hides the inner padding, which keeps@@ -68,17 +86,3 @@ export const AppliedFilterPillsList = React.forwardRef<</div>)})--export const FilterPillsList = ({- className,- pills-}: {- className?: string- pills: FilterPillProps[]-}) => (- <div className={classNames('flex gap-2', className)}>- {pills.map((pill, index) => (- <FilterPill key={index} {...pill} />- ))}- </div>-)diff --git a/assets/js/dashboard/nav-menu/filters-bar.test.tsx b/assets/js/dashboard/nav-menu/filters-bar.test.tsxindex abf774b4ba..1109a02227 100644--- a/assets/js/dashboard/nav-menu/filters-bar.test.tsx+++ b/assets/js/dashboard/nav-menu/filters-bar.test.tsx@@ -3,6 +3,13 @@ import { render, screen } from '../../../test-utils'import userEvent from '@testing-library/user-event'import { TestContextProviders } from '../../../test-utils/app-context-providers'import { FiltersBar } from './filters-bar'+import {+ formatSegmentIdAsLabelKey,+ SavedSegment,+ SegmentData,+ SegmentType+} from '../filtering/segments'+import { Role, UserContextValue } from '../user-context'import { getRouterBasepath } from '../router'import { stringifySearch } from '../util/url-search-params'import { mockAnimationsApi, mockResizeObserver } from 'jsdom-testing-mocks'@@ -12,12 +19,40 @@ mockResizeObserver()const domain = 'dummy.site'+type SegmentWithData = SavedSegment & { segment_data: SegmentData }++const makeSegment = (+ overrides: Partial<+ Pick<SegmentWithData, 'name' | 'type' | 'segment_data'>+ > = {}+): SegmentWithData => ({+ id: 1,+ name: 'Mac users',+ type: SegmentType.personal,+ owner_id: 1,+ owner_name: 'Jane Smith',+ inserted_at: '2025-03-13T13:00:00',+ updated_at: '2025-03-13T13:00:00',+ segment_data: {+ filters: [['is', 'os', ['Mac']]],+ labels: {}+ },+ ...overrides+})++const getSegmentFilterSearch = (segment: SegmentWithData) => ({+ filters: [['is', 'segment', [segment.id]]],+ labels: { [formatSegmentIdAsLabelKey(segment.id)]: segment.name }+})+const renderFiltersBar = ({searchRecord,+ expandedSegment,siteOptions,...providerProps}: {searchRecord: Record<string, unknown>+ expandedSegment?: SegmentWithData} & Omit<ComponentProps<typeof TestContextProviders>, 'children'>) =>render(<FiltersBar />, {wrapper: (props) => (@@ -26,7 +61,8 @@ const renderFiltersBar = ({initialEntries: [{pathname: getRouterBasepath({ domain, shared: false }),- search: stringifySearch(searchRecord)+ search: stringifySearch(searchRecord),+ state: expandedSegment ? { expandedSegment } : undefined}]}}@@ -109,3 +145,174 @@ test('action tooltips show the keybind and the docs link', async () => {'https://plausible.io/docs/filters-segments#how-to-save-a-segment')})++test('the segment pill opens a menu with the segment details and actions', async () => {+ const segment = makeSegment({+ segment_data: {+ filters: [+ ['is', 'os', ['Mac']],+ ['is', 'country', ['DE']],+ ['is', 'source', ['Google']],+ ['is', 'page', ['/blog']]+ ],+ labels: { DE: 'Germany' }+ }+ })++ renderFiltersBar({+ searchRecord: getSegmentFilterSearch(segment),+ preloaded: { segments: [segment] }+ })++ expect(screen.getByRole('link', { name: 'Clear all filters' })).toBeVisible()+ expect(+ screen.queryByRole('link', { name: 'Save as segment' })+ ).not.toBeInTheDocument()++ await userEvent.click(+ screen.getByRole('button', { name: 'Segment is Mac users' })+ )++ expect(screen.getByText('Created on 13 Mar by Jane Smith')).toBeVisible()+ expect(screen.queryByText('Country is')).not.toBeInTheDocument()++ await userEvent.click(screen.getByRole('button', { name: 'View filters' }))+ const filters = screen.getByRole('group', { name: 'View filters' })+ expect(filters).toHaveTextContent(+ [+ 'Operating system is',+ 'Mac',+ 'Country is',+ 'Germany',+ 'Source is',+ 'Google',+ 'Page is',+ '/blog'+ ].join('')+ )++ expect(screen.getByRole('link', { name: 'Edit segment' })).toBeVisible()+ expect(+ screen.getByRole('button', { name: 'Duplicate segment' })+ ).toBeVisible()+ expect(screen.getByRole('button', { name: 'Delete segment' })).toBeVisible()++ await userEvent.click(screen.getByRole('link', { name: 'Edit segment' }))+ expect(screen.getByRole('button', { name: 'Save' })).toBeVisible()+ expect(+ screen.getByRole('link', { hidden: false, name: 'Page is /blog' })+ ).toBeVisible()+})++const loggedInUser = (role: Role): UserContextValue => ({+ loggedIn: true,+ role,+ id: 1,+ team: { identifier: null, hasConsolidatedView: false }+})++const publicUser: UserContextValue = {+ loggedIn: false,+ role: Role.public,+ id: null,+ team: { identifier: null, hasConsolidatedView: false }+}++describe('segment pill menu actions depend on the user', () => {+ const segmentActions = ['Edit segment', 'Duplicate segment', 'Delete segment']++ it.each([+ {+ case: 'public user sees no actions and no author',+ user: publicUser,+ siteSegmentsAvailable: true,+ authorship: 'Created on 13 Mar',+ expectedActions: []+ },+ {+ case: 'viewer can only duplicate a site segment',+ user: loggedInUser(Role.viewer),+ siteSegmentsAvailable: true,+ authorship: 'Created on 13 Mar by Jane Smith',+ expectedActions: ['Duplicate segment']+ },+ {+ case: 'owner can edit a site segment even if site segments are not on the plan',+ user: loggedInUser(Role.owner),+ siteSegmentsAvailable: false,+ authorship: 'Created on 13 Mar by Jane Smith',+ expectedActions: segmentActions+ }+ ])(+ '$case',+ async ({ user, siteSegmentsAvailable, authorship, expectedActions }) => {+ const segment = makeSegment({ type: SegmentType.site })++ renderFiltersBar({+ searchRecord: getSegmentFilterSearch(segment),+ preloaded: { segments: [segment] },+ siteOptions: { siteSegmentsAvailable },+ user+ })++ await userEvent.click(+ screen.getByRole('button', { name: 'Segment is Mac users' })+ )++ expect(screen.getByText(authorship)).toBeVisible()+ expect(+ segmentActions.filter((action) => screen.queryByText(action))+ ).toEqual(expectedActions)+ }+ )+})++test('the segment pill has no remove button when the dashboard is limited to the segment', () => {+ const segment = makeSegment({ type: SegmentType.site })++ renderFiltersBar({+ searchRecord: getSegmentFilterSearch(segment),+ preloaded: { segments: [segment] },+ limitedToSegment: segment,+ user: publicUser+ })++ expect(+ screen.getByRole('button', { name: 'Segment is Mac users' })+ ).toBeVisible()+ expect(+ screen.queryByRole('button', {+ name: 'Remove filter: Segment is Mac users'+ })+ ).not.toBeInTheDocument()+})++test('shows Add filter, Save and Cancel in segment edit mode', async () => {+ const segment = makeSegment({+ name: 'Country, source, page',+ segment_data: {+ filters: [+ ['is', 'country', ['DE']],+ ['is', 'source', ['Google']],+ ['is', 'page', ['/blog']]+ ],+ labels: { DE: 'Germany' }+ }+ })++ renderFiltersBar({+ searchRecord: segment.segment_data,+ expandedSegment: segment,+ preloaded: { segments: [segment] }+ })++ expect(+ screen.getByRole('link', { hidden: false, name: 'Country is Germany' })+ ).toBeVisible()+ expect(screen.getByRole('button', { name: 'Add filter' })).toBeVisible()+ expect(screen.getByRole('button', { name: 'Save' })).toBeVisible()+ expect(screen.getByRole('link', { name: 'Cancel' })).toBeVisible()+ for (const action of ['Save as segment', 'Clear all filters']) {+ expect(screen.queryByRole('link', { name: action })).not.toBeInTheDocument()+ }+})diff --git a/assets/js/dashboard/nav-menu/filters-bar.tsx b/assets/js/dashboard/nav-menu/filters-bar.tsxindex 7f7067c45a..cdab6ef9ef 100644--- a/assets/js/dashboard/nav-menu/filters-bar.tsx+++ b/assets/js/dashboard/nav-menu/filters-bar.tsx@@ -9,6 +9,7 @@ import React, {} from 'react'import { AppliedFilterPillsList } from './filter-pills-list'import { FilterMenu } from './filter-menu'+import { SegmentMenu } from './segments/segment-menu'import { useDashboardStateContext } from '../dashboard-state-context'import { AppNavigationLink } from '../navigation/use-app-navigate'import { popover } from '../components/popover'@@ -27,8 +28,10 @@ const SCROLL_FADE_PX = 32type ScrollOverflow = { start: boolean; end: boolean }const canShowClearAllAction = ({- filters-}: Pick<DashboardState, 'filters'>): boolean => filters.length >= 1+ filters,+ isEditingSegment+}: Pick<DashboardState, 'filters'> & { isEditingSegment: boolean }): boolean =>+ filters.length >= 1 && !isEditingSegmentconst canShowSaveAsSegmentAction = ({filters,@@ -41,7 +44,8 @@ export const FiltersBar = () => {const user = useUserContext()const showingClearAll = canShowClearAllAction({- filters: dashboardState.filters+ filters: dashboardState.filters,+ isEditingSegment: !!expandedSegment})const showingSaveAsSegment =canShowSaveAsSegmentAction({@@ -64,7 +68,7 @@ export const FiltersBar = () => {<ScrollableFilterPills /><div className="flex shrink-0 items-center gap-x-1"><FilterMenu compact />- {hasActions && (+ {(hasActions || !!expandedSegment) && (<divaria-hidden="true"className="mx-1 h-4 w-px bg-gray-300 dark:bg-gray-600"@@ -72,6 +76,7 @@ export const FiltersBar = () => {)}{showingSaveAsSegment && <SaveAsSegmentAction />}{showingClearAll && <ClearAction />}+ <SegmentMenu /></div></div>)diff --git a/assets/js/dashboard/nav-menu/segments/segment-menu.tsx b/assets/js/dashboard/nav-menu/segments/segment-menu.tsxindex 8d8404c4f7..d2dc1fe5a3 100644--- a/assets/js/dashboard/nav-menu/segments/segment-menu.tsx+++ b/assets/js/dashboard/nav-menu/segments/segment-menu.tsx@@ -1,29 +1,26 @@import React, { useEffect } from 'react'import classNames from 'classnames'-import { Popover, Transition } from '@headlessui/react'import { popover } from '../../components/popover'import {AppNavigationLink,useAppNavigate} from '../../navigation/use-app-navigate'-import {- Square2StackIcon,- TrashIcon,- XMarkIcon-} from '@heroicons/react/24/outline'-import { ChevronDownIcon } from '@heroicons/react/20/solid'import { useDashboardStateContext } from '../../dashboard-state-context'import { useRoutelessModalsContext } from '../../navigation/routeless-modals-context'-import { SavedSegment } from '../../filtering/segments'+import {+ getSearchToSetSegmentFilter,+ SavedSegment+} from '../../filtering/segments'import { DashboardState } from '../../dashboard-state'-const linkClassName = classNames(- popover.items.classNames.navigationLink,- popover.items.classNames.selectedOption,- popover.items.classNames.hoverLink+const primaryButtonClassName = classNames(+ popover.toggleButton.classNames.rounded,+ 'px-2.5 font-medium whitespace-nowrap text-white bg-indigo-600 hover:bg-indigo-700')-const buttonClassName = classNames(- 'text-white font-medium bg-indigo-600 hover:bg-indigo-700'+const secondaryButtonClassName = classNames(+ popover.toggleButton.classNames.rounded,+ popover.toggleButton.classNames.outline,+ 'px-2.5 font-medium whitespace-nowrap')export const useClearExpandedSegmentModeOnFilterClear = ({@@ -57,101 +54,23 @@ export const SegmentMenu = () => {}return (- <div className="flex shadow-sm">+ <div className="flex items-center gap-x-1 md:gap-x-2">+ <button+ type="button"+ className={primaryButtonClassName}+ onClick={() => setModal({ type: 'update-segment' })}+ >+ Save+ </button><AppNavigationLink- className={classNames(- popover.toggleButton.classNames.rounded,- buttonClassName,- 'rounded-r-none',- 'position:relative focus:z-10'- )}- search={(s) => s}- state={{ expandedSegment }}- onClick={() => {- setModal({ type: 'update-segment' })- }}+ className={secondaryButtonClassName}+ search={getSearchToSetSegmentFilter(expandedSegment, {+ omitAllOtherFilters: true+ })}+ state={{ expandedSegment: null }}>- <span className="px-2 whitespace-nowrap">Update segment</span>+ Cancel</AppNavigationLink>- <Popover className="md:relative">- {({ close: closeDropdown }) => (- <>- <Popover.Button- className={classNames(- popover.toggleButton.classNames.rounded,- buttonClassName,- 'rounded-l-none',- 'border-1 border-l border-indigo-800',- 'w-9 justify-center'- )}- >- <ChevronDownIcon- data-testid="segment-menu"- className="w-4 h-4 md:h-5 md:w-5 block"- aria-hidden="true"- />- </Popover.Button>- <Transition- as="div"- {...popover.transition.props}- className={classNames(- popover.transition.classNames.fullwidth,- 'mt-2 md:w-auto md:left-auto md:origin-top-right'- )}- >- <Popover.Panel className={popover.panel.classNames.roundedSheet}>- <AppNavigationLink- className={linkClassName}- search={(s) => s}- state={{ expandedSegment }}- onClick={() => {- closeDropdown()- setModal({ type: 'create-segment' })- }}- >- <div className="flex items-center gap-x-2">- <Square2StackIcon className="w-4 h-4 block" />- <span className="whitespace-nowrap">- Save as a new segment- </span>- </div>- </AppNavigationLink>- <AppNavigationLink- className={linkClassName}- search={(s) => s}- state={{ expandedSegment }}- onClick={() => {- closeDropdown()- setModal({ type: 'delete-segment' })- }}- >- <div className="flex items-center gap-x-2">- <TrashIcon className="w-4 h-4 block" />- <span className="whitespace-nowrap">Delete segment</span>- </div>- </AppNavigationLink>- <AppNavigationLink- className={linkClassName}- search={(s) => ({- ...s,- filters: [],- labels: {}- })}- state={{ expandedSegment: null }}- onClick={closeDropdown}- >- <div className="flex items-center gap-x-2">- <XMarkIcon className="w-4 h-4 block" />- <span className="whitespace-nowrap">- Close without saving- </span>- </div>- </AppNavigationLink>- </Popover.Panel>- </Transition>- </>- )}- </Popover></div>)}diff --git a/assets/js/dashboard/nav-menu/segments/segment-pill-menu.tsx b/assets/js/dashboard/nav-menu/segments/segment-pill-menu.tsxnew file mode 100644index 0000000000..9f02d7202c--- /dev/null+++ b/assets/js/dashboard/nav-menu/segments/segment-pill-menu.tsx@@ -0,0 +1,166 @@+import React from 'react'+import classNames from 'classnames'+import { EyeIcon, Square2StackIcon } from '@heroicons/react/24/outline'+import {+ canExpandSegment,+ canSeeSaveAsSegmentAction,+ getNavigationToExpandSegment,+ SavedSegments+} from '../../filtering/segments'+import { plainFilterTextParts } from '../../util/filter-text'+import { SegmentAuthorship } from '../../segments/segment-authorship'+import { Role, useUserContext } from '../../user-context'+import { useRoutelessModalsContext } from '../../navigation/routeless-modals-context'+import { AppNavigationLink } from '../../navigation/use-app-navigate'+import { popover } from '../../components/popover'+import { PencilIcon, TrashIcon } from '../../components/icons'+import { MenuSeparator } from '../nav-menu-components'+import {+ SubmenuInPlace,+ SubmenuPanel,+ SubmenuRow,+ submenuIconClassName as iconClassName,+ useSubmenu+} from '../submenu'++const VIEW_FILTERS_LABEL = 'View filters'++const deleteClassName = classNames(+ popover.items.classNames.navigationLink,+ 'gap-x-2 w-full text-left text-red-600 dark:text-red-400',+ 'hover:bg-gray-100 focus-within:bg-gray-100 dark:hover:bg-gray-700 dark:focus-within:bg-gray-700'+)++const SegmentFilters = ({ segment }: { segment: SavedSegments[number] }) => (+ <>+ {segment.segment_data.filters.map((filter, index) => {+ const { subject, values } = plainFilterTextParts(+ segment.segment_data,+ filter+ )+ return (+ <div+ key={index}+ className={classNames(+ popover.items.classNames.staticRow,+ 'flex flex-col'+ )}+ >+ <span className={popover.items.classNames.description}>+ {subject}+ </span>+ <span className="break-words">{values}</span>+ </div>+ )+ })}+ </>+)++export const SegmentPillMenu = ({+ segment,+ closeMenu+}: {+ segment: SavedSegments[number]+ closeMenu: () => void+}) => {+ const user = useUserContext()+ const { setModal } = useRoutelessModalsContext()+ const submenu = useSubmenu<'filters'>()+ const canEdit = canExpandSegment({ segment, user })+ const canDuplicate = canSeeSaveAsSegmentAction({ user })+ const filtersOpen = submenu.openKey === 'filters'++ if (filtersOpen && !submenu.besideMenu) {+ return (+ <SubmenuInPlace submenu={submenu} label={VIEW_FILTERS_LABEL}>+ <SegmentFilters segment={segment} />+ </SubmenuInPlace>+ )+ }++ return (+ <div+ className="flex flex-col gap-y-0.5"+ onMouseLeave={submenu.scheduleClose}+ onKeyDown={submenu.handleEscape}+ >+ <div+ className={classNames(+ popover.items.classNames.staticRow,+ 'flex flex-col gap-y-0.5 font-semibold'+ )}+ >+ <span className="truncate" title={segment.name}>+ {segment.name}+ </span>+ <SegmentAuthorship+ className={popover.items.classNames.description}+ segment={segment}+ showOnlyPublicData={!user.loggedIn || user.role === Role.public}+ />+ </div>+ <MenuSeparator />+ <SubmenuRow+ label={VIEW_FILTERS_LABEL}+ Icon={EyeIcon}+ expanded={filtersOpen}+ submenuId={submenu.submenuId}+ onOpen={(anchor) => submenu.openWith('filters', anchor)}+ />+ {filtersOpen && (+ <SubmenuPanel submenu={submenu} label={VIEW_FILTERS_LABEL}>+ <SegmentFilters segment={segment} />+ </SubmenuPanel>+ )}+ {canEdit && (+ <AppNavigationLink+ className={popover.items.classNames.iconRow}+ onClick={closeMenu}+ onMouseEnter={submenu.scheduleClose}+ onFocus={submenu.scheduleClose}+ {...getNavigationToExpandSegment(segment)}+ >+ <PencilIcon className={iconClassName} />+ <span className={popover.items.classNames.label}>Edit segment</span>+ </AppNavigationLink>+ )}+ {canDuplicate && (+ <button+ type="button"+ className={popover.items.classNames.iconRow}+ onMouseEnter={submenu.scheduleClose}+ onFocus={submenu.scheduleClose}+ onClick={() => {+ closeMenu()+ setModal({ type: 'create-segment', segment })+ }}+ >+ <Square2StackIcon className={iconClassName} />+ <span className={popover.items.classNames.label}>+ Duplicate segment+ </span>+ </button>+ )}+ {canEdit && (+ <>+ <MenuSeparator />+ <button+ type="button"+ className={deleteClassName}+ onMouseEnter={submenu.scheduleClose}+ onFocus={submenu.scheduleClose}+ onClick={() => {+ closeMenu()+ setModal({ type: 'delete-segment', segment })+ }}+ >+ <TrashIcon className={iconClassName} />+ <span className={popover.items.classNames.label}>+ Delete segment+ </span>+ </button>+ </>+ )}+ </div>+ )+}diff --git a/assets/js/dashboard/nav-menu/segments/segments-submenu.tsx b/assets/js/dashboard/nav-menu/segments/segments-submenu.tsxindex 944bf31f12..9544a852cd 100644--- a/assets/js/dashboard/nav-menu/segments/segments-submenu.tsx+++ b/assets/js/dashboard/nav-menu/segments/segments-submenu.tsx@@ -138,7 +138,12 @@ const SegmentLink = ({<div className="truncate" title={name}>{name}</div>- <div className="flex items-baseline gap-x-1 font-normal text-xs text-gray-500 dark:text-gray-400">+ <div+ className={classNames(+ 'flex items-baseline gap-x-1',+ popover.items.classNames.description+ )}+ >{!!authorship && (<span className="truncate min-w-0">{authorship}</span>)}diff --git a/assets/js/dashboard/nav-menu/top-bar.test.tsx b/assets/js/dashboard/nav-menu/top-bar.test.tsxindex 171733023d..dc855c4e7e 100644--- a/assets/js/dashboard/nav-menu/top-bar.test.tsx+++ b/assets/js/dashboard/nav-menu/top-bar.test.tsx@@ -17,7 +17,9 @@ import {mockIntersectionObserver,mockViewportForTestGroup} from 'jsdom-testing-mocks'-import { SegmentType } from '../filtering/segments'+import { SavedSegment, SegmentData, SegmentType } from '../filtering/segments'+import { getRouterBasepath } from '../router'+import { stringifySearch } from '../util/url-search-params'mockAnimationsApi()mockResizeObserver()@@ -376,6 +378,64 @@ test.each([})+describe('segment edit mode', () => {+ const segment: SavedSegment & { segment_data: SegmentData } = {+ id: 1,+ name: 'Blog',+ type: SegmentType.personal,+ owner_id: 1,+ owner_name: 'Test User',+ inserted_at: '2025-02-26T10:00:00',+ updated_at: '2025-02-26T10:00:00',+ segment_data: {+ filters: [['is', 'page', ['/blog']]],+ labels: {}+ }+ }++ const renderTopBarWithSegmentFilters = ({ editing }: { editing: boolean }) =>+ render(<TopBar showCurrentVisitors={false} />, {+ wrapper: (props) => (+ <TestContextProviders+ siteOptions={{ domain }}+ preloaded={{ segments: [segment] }}+ routerProps={{+ initialEntries: [+ {+ pathname: getRouterBasepath({ domain, shared: false }),+ search: stringifySearch(segment.segment_data),+ state: editing ? { expandedSegment: segment } : undefined+ }+ ]+ }}+ {...props}+ />+ )+ })++ const querySiteControls = () => [+ screen.queryByRole('button', { name: domain }),+ screen.queryByTestId('query-period-picker'),+ screen.queryByTestId('dashboard-options-menu')+ ]++ test('shows the site switcher, period picker and options menu outside edit mode', () => {+ renderTopBarWithSegmentFilters({ editing: false })++ for (const control of querySiteControls()) {+ expect(control).toBeInTheDocument()+ }+ })++ test('hides the site switcher, period picker and options menu in edit mode', () => {+ renderTopBarWithSegmentFilters({ editing: true })++ for (const control of querySiteControls()) {+ expect(control).not.toBeInTheDocument()+ }+ })+})+describe('narrow viewport (no room for a submenu beside the menu)', () => {mockViewportForTestGroup({ width: '500px', height: '800px' })diff --git a/assets/js/dashboard/nav-menu/top-bar.tsx b/assets/js/dashboard/nav-menu/top-bar.tsxindex 1aa47c1819..8b193699a4 100644--- a/assets/js/dashboard/nav-menu/top-bar.tsx+++ b/assets/js/dashboard/nav-menu/top-bar.tsx@@ -6,8 +6,8 @@ import classNames from 'classnames'import { useInView } from 'react-intersection-observer'import { FiltersBar } from './filters-bar'import { DashboardPeriodPicker } from './query-periods/dashboard-period-picker'-import { SegmentMenu } from './segments/segment-menu'import { DashboardOptionsMenu } from './dashboard-options-menu'+import { useDashboardStateContext } from '../dashboard-state-context'interface TopBarProps {showCurrentVisitors: boolean@@ -43,19 +43,20 @@ function TopBarStickyWrapper({ children }: { children: ReactNode }) {}function TopBarInner({ showCurrentVisitors }: TopBarProps) {+ const { expandedSegment } = useDashboardStateContext()+return (<div className="flex min-w-0 flex-nowrap items-center gap-x-1 overflow-x-auto md:overflow-visible w-full touch-pan-x md:touch-auto [scrollbar-width:none] [-ms-overflow-style:none] [&::-webkit-scrollbar]:hidden py-1 -my-1 md:py-0 md:my-0">- <div className="flex shrink-0 items-center sm:gap-x-1 md:gap-x-2.5">- <SiteSwitcher />+ <div className="flex shrink-0 items-center sm:gap-x-1 md:gap-x-2.5 empty:hidden">+ {!expandedSegment && <SiteSwitcher />}{showCurrentVisitors && <CurrentVisitors />}</div><div className="flex flex-1 md:min-w-0"><FiltersBar /></div>- <div className="flex gap-x-1 shrink-0">- <SegmentMenu />- <DashboardPeriodPicker />- <DashboardOptionsMenu />+ <div className="flex gap-x-1 shrink-0 empty:hidden">+ {!expandedSegment && <DashboardPeriodPicker />}+ {!expandedSegment && <DashboardOptionsMenu />}</div></div>)diff --git a/assets/js/dashboard/segments/routeless-segment-modals.tsx b/assets/js/dashboard/segments/routeless-segment-modals.tsxindex b018ee96fe..d7dbf60aec 100644--- a/assets/js/dashboard/segments/routeless-segment-modals.tsx+++ b/assets/js/dashboard/segments/routeless-segment-modals.tsx@@ -4,7 +4,7 @@ import {DeleteSegmentModal,UpdateSegmentModal} from './segment-modals'-import { getSegmentNamePlaceholder } from '../filtering/segments'+import { getSegmentNamePlaceholder, SavedSegments } from '../filtering/segments'import { useSiteContext } from '../site-context'import { useDashboardStateContext } from '../dashboard-state-context'import { useUserContext } from '../user-context'@@ -16,9 +16,9 @@ import {} from './use-segment-mutations'export type RoutelessSegmentModal =- | { type: 'create-segment' }+ | { type: 'create-segment'; segment?: SavedSegments[number] }| { type: 'update-segment' }- | { type: 'delete-segment' }+ | { type: 'delete-segment'; segment: SavedSegments[number] }export const RoutelessSegmentModals = () => {const site = useSiteContext()@@ -65,8 +65,10 @@ export const RoutelessSegmentModals = () => {<CreateSegmentModaluser={user}siteSegmentsAvailable={site.siteSegmentsAvailable}- suggestedName={getSegmentNamePlaceholder(dashboardState)}- segment={expandedSegment ?? undefined}+ suggestedName={getSegmentNamePlaceholder(+ modal.segment?.segment_data ?? dashboardState+ )}+ segment={modal.segment}onClose={() => {setModal(null)createSegment.reset()@@ -75,7 +77,7 @@ export const RoutelessSegmentModals = () => {createSegment.mutate({name,type,- segment_data: {+ segment_data: modal.segment?.segment_data ?? {filters: dashboardState.filters,labels: dashboardState.labels}@@ -86,9 +88,9 @@ export const RoutelessSegmentModals = () => {reset={createSegment.reset}/>)}- {modal?.type === 'delete-segment' && expandedSegment && (+ {modal?.type === 'delete-segment' && (<DeleteSegmentModal- segment={expandedSegment}+ segment={modal.segment}onClose={() => {setModal(null)deleteSegment.reset()diff --git a/assets/js/dashboard/segments/segment-authorship.test.tsx b/assets/js/dashboard/segments/segment-authorship.test.tsxindex a366ecd6d6..b8c9030961 100644--- a/assets/js/dashboard/segments/segment-authorship.test.tsx+++ b/assets/js/dashboard/segments/segment-authorship.test.tsx@@ -22,7 +22,7 @@ describe('public (no "by <user>" shown)', () => {/>)- expect(screen.getByText('Created at 1 Feb')).toBeVisible()+ expect(screen.getByText('Created on 1 Feb')).toBeVisible()expect(screen.queryByText(/Last updated/)).toBeNull()expect(screen.queryByText(/by /)).toBeNull()})@@ -43,8 +43,8 @@ describe('public (no "by <user>" shown)', () => {/>)- expect(screen.getByText('Created at 1 Feb')).toBeVisible()- expect(screen.getByText('Last updated at 1 Feb')).toBeVisible()+ expect(screen.getByText('Created on 1 Feb')).toBeVisible()+ expect(screen.getByText('last updated on 1 Feb')).toBeVisible()expect(screen.queryByText(/by /)).toBeNull()})})@@ -68,7 +68,7 @@ describe('shown to a site member ("by <user>" shown)', () => {/>)- expect(screen.getByText('Created at 1 Feb by (Removed User)')).toBeVisible()+ expect(screen.getByText('Created on 1 Feb by (Removed User)')).toBeVisible()expect(screen.queryByText(/Last updated/)).toBeNull()})@@ -88,9 +88,9 @@ describe('shown to a site member ("by <user>" shown)', () => {/>)- expect(screen.getByText('Created at 1 Feb')).toBeVisible()+ expect(screen.getByText('Created on 1 Feb')).toBeVisible()expect(- screen.queryByText('Last updated at 5 Feb by Jane Smith')+ screen.queryByText('last updated on 5 Feb by Jane Smith')).toBeVisible()})})diff --git a/assets/js/dashboard/segments/segment-authorship.tsx b/assets/js/dashboard/segments/segment-authorship.tsxindex 19b3eb566c..9b846becb5 100644--- a/assets/js/dashboard/segments/segment-authorship.tsx+++ b/assets/js/dashboard/segments/segment-authorship.tsx@@ -24,14 +24,14 @@ export function SegmentAuthorship({return (<span className={className}><span>- {`Created at ${formatDayShort(parseNaiveDate(inserted_at))}`}+ {`Created on ${formatDayShort(parseNaiveDate(inserted_at))}`}{!showUpdatedAt && !!authorLabel && ` by ${authorLabel}`}</span>{showUpdatedAt && (<>{' • '}<span>- {`Last updated at ${formatDayShort(parseNaiveDate(updated_at))}`}+ {`last updated on ${formatDayShort(parseNaiveDate(updated_at))}`}{!!authorLabel && ` by ${authorLabel}`}</span></>diff --git a/assets/js/dashboard/segments/segment-modals.test.tsx b/assets/js/dashboard/segments/segment-modals.test.tsxindex 473ffc852a..84fea4bc80 100644--- a/assets/js/dashboard/segments/segment-modals.test.tsx+++ b/assets/js/dashboard/segments/segment-modals.test.tsx@@ -1,22 +1,11 @@import React from 'react'import { render, screen } from '@testing-library/react'import userEvent from '@testing-library/user-event'-import {- DeleteSegmentModal,- SegmentModal,- UpdateSegmentModal-} from './segment-modals'+import { DeleteSegmentModal, UpdateSegmentModal } from './segment-modals'import { TestContextProviders } from '../../../test-utils/app-context-providers'import { MockAPI } from '../../../test-utils/mock-api'-import {- SavedSegment,- SavedSegmentPublic,- SavedSegments,- SegmentData,- SegmentType-} from '../filtering/segments'+import { SavedSegment, SegmentData, SegmentType } from '../filtering/segments'import { Role, UserContextValue } from '../user-context'-import { PlausibleSite } from '../site-context'const domain = 'dummy.site'@@ -178,270 +167,3 @@ describe('Delete segment modal', () => {})})--describe('Segment details modal - errors', () => {- const anySegment: SavedSegment & { segment_data: SegmentData } = {- id: 1,- type: SegmentType.site,- owner_id: 1,- owner_name: 'Test User',- name: 'Blog or About',- segment_data: {- filters: [['is', 'page', ['/blog', '/about']]],- labels: {}- },- inserted_at: '2025-03-13T13:00:00',- updated_at: '2025-03-13T16:00:00'- }-- const anyPersonalSegment: SavedSegment & { segment_data: SegmentData } = {- ...anySegment,- id: 2,- type: SegmentType.personal- }-- const cases: {- case: string- segments: SavedSegments- segmentId: number- user: UserContextValue- message: string- siteOptions: Partial<PlausibleSite>- }[] = [- {- case: 'segment is not in list',- segments: [anyPersonalSegment, anySegment],- segmentId: 202020,- user: {- loggedIn: true,- id: 1,- role: Role.owner,- team: { identifier: null, hasConsolidatedView: false }- },- message: `Segment not found with with ID "202020"`,- siteOptions: { siteSegmentsAvailable: true }- }- ]- it.each(cases)(- 'shows error `$message` when $case',- ({ user, segments, segmentId, message, siteOptions }) => {- render(<SegmentModal id={segmentId} />, {- wrapper: (props) => (- <TestContextProviders- user={user}- preloaded={{ segments }}- siteOptions={siteOptions}- {...props}- />- )- })-- expect(screen.getByText(message)).toBeVisible()- expect(screen.queryByText(`Edit segment`)).not.toBeInTheDocument()- }- )-})--describe('Segment details modal - other cases', () => {- it.each([- [SegmentType.site, 'Site segment'],- [SegmentType.personal, 'Personal segment']- ])(- 'displays segment with type %s correctly for logged in user',- (segmentType, expectedSegmentTypeText) => {- const user: UserContextValue = {- loggedIn: true,- role: Role.editor,- id: 1,- team: { identifier: null, hasConsolidatedView: false }- }- const anySegment: SavedSegment & { segment_data: SegmentData } = {- id: 100,- type: segmentType,- owner_id: user.id,- owner_name: 'Jane Smith',- name: 'Blog or About',- segment_data: {- filters: [['is', 'page', ['/blog', '/about']]],- labels: {}- },- inserted_at: '2025-03-13T13:00:00',- updated_at: '2025-03-13T16:00:00'- }-- render(<SegmentModal id={anySegment.id} />, {- wrapper: (props) => (- <TestContextProviders- user={user}- preloaded={{- segments: [anySegment]- }}- siteOptions={{ siteSegmentsAvailable: true }}- {...props}- />- )- })- expect(screen.getByText(anySegment.name)).toBeVisible()- expect(screen.getByText(expectedSegmentTypeText)).toBeVisible()-- expect(screen.getByText('Filters in segment')).toBeVisible()- expect(screen.getByTitle('Page is /blog or /about')).toBeVisible()-- expect(- screen.getByText(`Last updated at 13 Mar by ${anySegment.owner_name}`)- ).toBeVisible()- expect(screen.getByText(`Created at 13 Mar`)).toBeVisible()-- expect(screen.getByText('Edit segment')).toBeVisible()- expect(screen.getByText('Remove filter')).toBeVisible()- }- )-- it.each([- [SegmentType.site, 'Site segment'],- [SegmentType.personal, 'Personal segment']- ])(- 'displays segment with type %s correctly for public role',- (segmentType, expectedSegmentTypeText) => {- const user: UserContextValue = {- loggedIn: false,- role: Role.public,- id: null,- team: { identifier: null, hasConsolidatedView: false }- }- const anySegment: SavedSegment & { segment_data: SegmentData } = {- id: 100,- type: segmentType,- owner_id: null,- owner_name: null,- name: 'Blog or About',- segment_data: {- filters: [['is', 'page', ['/blog', '/about']]],- labels: {}- },- inserted_at: '2025-03-13T13:00:00',- updated_at: '2025-03-13T16:00:00'- }-- render(<SegmentModal id={anySegment.id} />, {- wrapper: (props) => (- <TestContextProviders- user={user}- preloaded={{- segments: [anySegment]- }}- siteOptions={{ siteSegmentsAvailable: true }}- {...props}- />- )- })- expect(screen.getByText(anySegment.name)).toBeVisible()- expect(screen.getByText(expectedSegmentTypeText)).toBeVisible()-- expect(screen.getByText('Filters in segment')).toBeVisible()- expect(screen.getByTitle('Page is /blog or /about')).toBeVisible()-- expect(screen.getByText(`Last updated at 13 Mar`)).toBeVisible()- expect(screen.queryByText('by ')).toBeNull() // no segment author is shown to public role- expect(screen.getByText(`Created at 13 Mar`)).toBeVisible()-- expect(screen.getByText('Remove filter')).toBeVisible()- expect(screen.queryByText('Edit segment')).toBeNull()- }- )-- it('allows elevated roles to expand site segments even if site segments are not available on their plan (to update type to personal segment)', () => {- const user: UserContextValue = {- loggedIn: true,- role: Role.owner,- id: 1,- team: { identifier: null, hasConsolidatedView: false }- }- const anySegment: SavedSegmentPublic & { segment_data: SegmentData } = {- id: 100,- type: SegmentType.site,- owner_id: null,- owner_name: null,- name: 'Blog or About',- segment_data: {- filters: [['is', 'page', ['/blog', '/about']]],- labels: {}- },- inserted_at: '2025-03-13T13:00:00',- updated_at: '2025-03-13T16:00:00'- }-- render(<SegmentModal id={anySegment.id} />, {- wrapper: (props) => (- <TestContextProviders- user={user}- preloaded={{- segments: [anySegment]- }}- siteOptions={{ siteSegmentsAvailable: false }}- {...props}- />- )- })- expect(screen.getByText(anySegment.name)).toBeVisible()- expect(screen.getByText('Site segment')).toBeVisible()-- expect(screen.getByText('Filters in segment')).toBeVisible()- expect(screen.getByTitle('Page is /blog or /about')).toBeVisible()-- expect(- screen.getByText(`Last updated at 13 Mar by (Removed User)`)- ).toBeVisible()- expect(screen.getByText(`Created at 13 Mar`)).toBeVisible()-- expect(screen.getByText('Remove filter')).toBeVisible()- expect(screen.getByText('Edit segment')).toBeVisible()- })-- it('does not display clear filter button if the dashboard is limited to this segment', () => {- const user: UserContextValue = {- loggedIn: false,- role: Role.public,- id: null,- team: { identifier: null, hasConsolidatedView: false }- }- const anySegment: SavedSegmentPublic & { segment_data: SegmentData } = {- id: 100,- type: SegmentType.site,- owner_id: null,- owner_name: null,- name: 'Blog or About',- segment_data: {- filters: [['is', 'page', ['/blog', '/about']]],- labels: {}- },- inserted_at: '2025-03-13T13:00:00',- updated_at: '2025-03-13T16:00:00'- }-- render(<SegmentModal id={anySegment.id} />, {- wrapper: (props) => (- <TestContextProviders- user={user}- preloaded={{- segments: [anySegment]- }}- limitedToSegment={anySegment}- siteOptions={{ siteSegmentsAvailable: true }}- {...props}- />- )- })- expect(screen.getByText(anySegment.name)).toBeVisible()- expect(screen.getByText('Site segment')).toBeVisible()-- expect(screen.getByText('Filters in segment')).toBeVisible()- expect(screen.getByTitle('Page is /blog or /about')).toBeVisible()-- expect(screen.getByText(`Last updated at 13 Mar`)).toBeVisible()- expect(screen.getByText(`Created at 13 Mar`)).toBeVisible()-- expect(screen.queryByText('Remove filter')).toBeNull()- expect(screen.queryByText('Edit segment')).toBeNull()- })-})diff --git a/assets/js/dashboard/segments/segment-modals.tsx b/assets/js/dashboard/segments/segment-modals.tsxindex e478813026..ff606b4c57 100644--- a/assets/js/dashboard/segments/segment-modals.tsx+++ b/assets/js/dashboard/segments/segment-modals.tsx@@ -5,30 +5,16 @@ import {SaveButton} from '../components/modal-layout'import {- canRemoveFilter,- getSearchToRemoveSegmentFilter,- canExpandSegment,SavedSegment,SEGMENT_TYPE_LABELS,- SegmentData,SegmentType} from '../filtering/segments'-import {- AppNavigationLink,- useAppNavigate-} from '../navigation/use-app-navigate'-import { plainFilterText, styledFilterText } from '../util/filter-text'-import { rootRoute } from '../router'-import { FilterPillsList } from '../nav-menu/filter-pills-list'-import classNames from 'classnames'-import { SegmentAuthorship } from './segment-authorship'import { MutationStatus, useQuery } from '@tanstack/react-query'import { ApiError, get } from '../api'import { ErrorPanel } from '../components/error-panel'-import { useSegmentsContext } from '../filtering/segments-context'-import { Role, UserContextValue, useUserContext } from '../user-context'+import { Role, UserContextValue } from '../user-context'import { useSiteContext } from '../site-context'-import { Button, buttonClassName } from '../components/button'+import { Button } from '../components/button'import {Checkbox,getOptionDisabledMessage,@@ -36,11 +22,8 @@ import {OptionDisabledMessageType,TypeSelector} from '../components/form-elements'-import { Placeholder } from '../components/placeholder'import { UpgradePill } from '../components/pill'-const inModalSectionLabelClassName = 'text-sm font-semibold dark:text-gray-100'-const nameInputProps = { id: 'name', label: 'Segment name' }interface ApiRequestProps {@@ -411,141 +394,8 @@ export const UpdateSegmentModal = ({)}-const FiltersInSegment = ({- segment_data,- className-}: {- segment_data: SegmentData- className?: string-}) => {- return (- <div className={classNames('flex flex-col gap-y-2', className)}>- <p className={inModalSectionLabelClassName}>Filters in segment</p>- <FilterPillsList- className="flex-wrap"- pills={segment_data.filters.map((filter) => ({- plainText: plainFilterText({ labels: segment_data.labels }, filter),- children: styledFilterText({ labels: segment_data.labels }, filter)- }))}- />- </div>- )-}-const hasSiteSegmentPermission = (user: UserContextValue) => {return [Role.admin, Role.owner, Role.editor, 'super_admin'].includes(user.role)}--export const SegmentModal = ({ id }: { id: SavedSegment['id'] }) => {- const user = useUserContext()- const { segments, limitedToSegment } = useSegmentsContext()- const navigate = useAppNavigate()-- const segment = segments.find((s) => String(s.id) === String(id))-- let error: ApiError | null = null-- if (!segment) {- error = new ApiError(- `Segment not found with with ID "${id}"`,- {- error: `Segment not found with with ID "${id}"`- },- 404- )- }-- const data = !error ? segment : null-- const showClearButton = canRemoveFilter(- ['is', 'segment', [id]],- limitedToSegment- )-- const onClose = () => navigate({ path: rootRoute.path, search: (s) => s })-- return (- <ModalLayout title="Segment details" onClose={onClose}>- <div className="flex flex-col gap-y-6 dark:text-gray-100">- <div className="text-sm flex flex-col gap-y-0.5">- <h2 className="font-semibold break-all">- <Placeholder placeholder="Segment name">- {data?.name ?? false}- </Placeholder>- </h2>- <div className="text-gray-500 dark:text-gray-400">- <Placeholder placeholder="Segment type">- {data?.segment_data ? SEGMENT_TYPE_LABELS[data.type] : false}- </Placeholder>- {!!data?.segment_data && (- <>- {' • '}- <SegmentAuthorship- segment={data}- showOnlyPublicData={- !user.loggedIn || user.role === Role.public- }- />- </>- )}- </div>- </div>- {!!data?.segment_data && (- <>- <FiltersInSegment- segment_data={data.segment_data}- className="mb-4"- />-- <ModalFooter>- {showClearButton && (- <Button- theme="secondary"- size="sm"- onClick={() =>- navigate({- path: rootRoute.path,- search: getSearchToRemoveSegmentFilter()- })- }- >- Remove filter- </Button>- )}-- {canExpandSegment({ segment: data, user }) && (- <AppNavigationLink- className={buttonClassName({ size: 'sm' })}- path={rootRoute.path}- search={(s) => ({- ...s,- filters: data.segment_data.filters,- labels: data.segment_data.labels- })}- state={{- expandedSegment: data- }}- >- Edit segment- </AppNavigationLink>- )}- </ModalFooter>- </>- )}- {error !== null && (- <ErrorPanel- className="mt-4"- errorMessage={- error instanceof ApiError- ? error.message- : 'Something went wrong loading segment'- }- onRetry={() => window.location.reload()}- />- )}- </div>- </ModalLayout>- )-}diff --git a/assets/js/dashboard/stats/modals/filter-modal.js b/assets/js/dashboard/stats/modals/filter-modal.jsindex d55049a318..b2443b192c 100644--- a/assets/js/dashboard/stats/modals/filter-modal.js+++ b/assets/js/dashboard/stats/modals/filter-modal.js@@ -16,8 +16,6 @@ import { isModifierPressed, isTyping } from '../../keybinding'import FilterModalDimension from './filter-modal-dimension'import { rootRoute } from '../../router'import { useAppNavigate } from '../../navigation/use-app-navigate'-import { SegmentModal } from '../../segments/segment-modals'-import { findAppliedSegmentFilter } from '../../filtering/segments'import { Button } from '../../components/button'function partitionFilters(dimension, filters) {@@ -219,17 +217,12 @@ export default function FilterModalWithRouter(props) {const { field } = useParams()const { dashboardState } = useDashboardStateContext()const site = useSiteContext()- if (!getAvailableFilterDimensions(site).includes(field)) {+ if (+ field === 'segment' ||+ !getAvailableFilterDimensions(site).includes(field)+ ) {return null}- const appliedSegmentFilter =- field === 'segment'- ? findAppliedSegmentFilter({ filters: dashboardState.filters })- : null- if (appliedSegmentFilter) {- const [_operation, _dimension, [segmentId]] = appliedSegmentFilter- return <SegmentModal id={segmentId} />- }return (<FilterModal{...props}diff --git a/assets/js/dashboard/util/filter-text.tsx b/assets/js/dashboard/util/filter-text.tsxindex ba561b980b..b41a09a1df 100644--- a/assets/js/dashboard/util/filter-text.tsx+++ b/assets/js/dashboard/util/filter-text.tsx@@ -41,6 +41,32 @@ export function styledFilterText()}+/** e.g. { subject: 'Country is', values: 'Germany or Poland' } */+export function plainFilterTextParts(+ dashboardState: Pick<DashboardState, 'labels'>,+ [operation, filterKey, clauses]: Filter+) {+ const operationName = FILTER_OPERATIONS_DISPLAY_NAMES[operation]+ if (filterKey.startsWith(EVENT_PROPS_PREFIX)) {+ return {+ subject: `Property ${getPropertyKeyFromFilterKey(filterKey)} ${operationName}`,+ values: clauses.join(' or ')+ }+ }+ const formattedFilter = (+ formattedFilters as Record<string, string | undefined>+ )[filterKey]+ if (!formattedFilter) {+ throw new Error(`Unknown filter: ${filterKey}`)+ }+ return {+ subject: `${capitalize(formattedFilter)} ${operationName}`,+ values: clauses+ .map((value) => getLabel(dashboardState.labels, filterKey, value))+ .join(' or ')+ }+}+export function plainFilterText(dashboardState: Pick<DashboardState, 'labels'>,filter: Filterdiff --git a/e2e/tests/dashboard/segments.spec.ts b/e2e/tests/dashboard/segments.spec.tsindex dcaf51024e..876220d813 100644--- a/e2e/tests/dashboard/segments.spec.ts+++ b/e2e/tests/dashboard/segments.spec.ts@@ -41,7 +41,20 @@ const setupSiteAndStats = async ({return context}-const segmentMenu = (page: Page) => page.getByTestId('segment-menu')+const openSegmentPillMenu = async (page: Page, segmentName: string) => {+ await page+ .getByRole('button', { name: `Segment is ${segmentName}`, exact: true })+ .click()+}++const saveEditedSegmentButton = (page: Page) =>+ page.getByRole('button', { name: 'Save', exact: true })++const enterEditMode = async (page: Page, segmentName: string) => {+ await openSegmentPillMenu(page, segmentName)+ await page.getByRole('link', { name: 'Edit segment' }).click()+ await expect(saveEditedSegmentButton(page)).toBeVisible()+}const segmentItemButton = (page: Page, name: string) =>filterSubmenuSegmentItem(page, name)@@ -115,7 +128,9 @@ test('saving a segment', async ({ page, request }) => {await expect(page).toHaveURL(/f=is,segment,[0-9]+/)await expect(- page.getByRole('link', { name: 'Segment is Source is Facebook' })+ page.getByRole('button', {+ name: 'Remove filter: Segment is Source is Facebook'+ })).toBeVisible()await page@@ -152,7 +167,9 @@ test('saving a segment', async ({ page, request }) => {await expect(page).toHaveURL(/f=is,segment,[0-9]+/)await expect(- page.getByRole('link', { name: 'Segment is Traffic from Google' })+ page.getByRole('button', {+ name: 'Remove filter: Segment is Traffic from Google'+ })).toBeVisible()await page@@ -199,7 +216,9 @@ test('saving a segment', async ({ page, request }) => {await expect(page).toHaveURL(/f=is,segment,[0-9]+/)await expect(- page.getByRole('link', { name: 'Segment is Ads from Google' })+ page.getByRole('button', {+ name: 'Remove filter: Segment is Ads from Google'+ })).toBeVisible()await page@@ -235,7 +254,9 @@ test('creating a segment from a combination of segment and a filter is not allowpage.getByRole('link', { name: 'UTM source is Adwords' })).toBeVisible()await expect(- page.getByRole('link', { name: 'Segment is Traffic from Google' })+ page.getByRole('button', {+ name: 'Remove filter: Segment is Traffic from Google'+ })).toBeVisible()await expect(page).toHaveURL(/f=is,segment,[0-9]+/)@@ -254,19 +275,11 @@ test('editing an existing segment', async ({ page, request }) => {await addSourceFilter(page, 'Google')await createPersonalSegment(page, 'Traffic from Google')- await page- .getByRole('link', { name: 'Segment is Traffic from Google' })- .click()-- await expect(- modal(page).getByRole('heading', { name: 'Traffic from Google' })- ).toBeVisible()-- await modal(page).getByRole('link', { name: 'Edit segment' }).click()+ await enterEditMode(page, 'Traffic from Google')await addUtmSourceFilter(page, 'Adwords')- await page.getByRole('link', { name: 'Update segment' }).click()+ await saveEditedSegmentButton(page).click()await expect(modal(page).getByRole('heading', { name: 'Update segment' })@@ -280,12 +293,28 @@ test('editing an existing segment', async ({ page, request }) => {await modal(page).getByRole('button', { name: 'Save' }).click()- await page.getByRole('link', { name: 'Segment is Ads from Google' }).click()+ await expect(+ page.getByRole('button', {+ name: 'Remove filter: Segment is Ads from Google'+ })+ ).toBeVisible()- await expect(modal(page)).toContainText('UTM source is Adwords')- await expect(modal(page)).toContainText('Source is Google')+ await enterEditMode(page, 'Ads from Google')- await modal(page).getByRole('button', { name: 'Remove filter' }).click()+ await expect(+ page.getByRole('link', { name: 'UTM source is Adwords' })+ ).toBeVisible()+ await expect(+ page.getByRole('link', { name: 'Source is Google' })+ ).toBeVisible()++ await page.getByRole('link', { name: 'Cancel' }).click()++ await page+ .getByRole('button', {+ name: 'Remove filter: Segment is Ads from Google'+ })+ .click()await expect(page).not.toHaveURL(/f=is,segment,[0-9]+/)@@ -296,7 +325,7 @@ test('editing an existing segment', async ({ page, request }) => {await expect(segmentItemButton(page, 'Traffic from Google')).toBeHidden()})-test('saving edited segment as new', async ({ page, request }) => {+test('duplicating a segment', async ({ page, request }) => {const { domain } = await setupSiteAndStats({ page, request })await page.goto('/' + domain, { waitUntil: 'commit' })@@ -304,17 +333,9 @@ test('saving edited segment as new', async ({ page, request }) => {await addSourceFilter(page, 'Google')await createPersonalSegment(page, 'Traffic from Google')- await page- .getByRole('link', { name: 'Segment is Traffic from Google' })- .click()-- await modal(page).getByRole('link', { name: 'Edit segment' }).click()+ await openSegmentPillMenu(page, 'Traffic from Google')- await addUtmSourceFilter(page, 'Adwords')-- await segmentMenu(page).click()-- await page.getByRole('link', { name: 'Save as a new segment' }).click()+ await page.getByRole('button', { name: 'Duplicate segment' }).click()await expect(modal(page).getByRole('heading', { name: 'Create segment' })@@ -324,31 +345,29 @@ test('saving edited segment as new', async ({ page, request }) => {'Copy of Traffic from Google')- await modal(page).getByLabel('Segment name').fill('Ads from Google')+ await modal(page).getByLabel('Segment name').fill('Google copy')await modal(page).getByRole('button', { name: 'Save' }).click()- await page.getByRole('link', { name: 'Segment is Ads from Google' }).click()+ await enterEditMode(page, 'Google copy')- await expect(modal(page)).toContainText('UTM source is Adwords')- await expect(modal(page)).toContainText('Source is Google')+ await expect(+ page.getByRole('link', { name: 'Source is Google' })+ ).toBeVisible()++ await page.getByRole('link', { name: 'Cancel' }).click()- await modal(page).getByRole('button', { name: 'Remove filter' }).click()+ await page+ .getByRole('button', {+ name: 'Remove filter: Segment is Google copy'+ })+ .click()await filterButton(page).click()await openSegmentsSubmenu(page)- await expect(segmentItemButton(page, 'Ads from Google')).toBeVisible()+ await expect(segmentItemButton(page, 'Google copy')).toBeVisible()await expect(segmentItemButton(page, 'Traffic from Google')).toBeVisible()-- await segmentItemButton(page, 'Traffic from Google').click()-- await page- .getByRole('link', { name: 'Segment is Traffic from Google' })- .click()-- await expect(modal(page)).not.toContainText('UTM source is Adwords')- await expect(modal(page)).toContainText('Source is Google')})test('deleting segment', async ({ page, request }) => {@@ -359,15 +378,9 @@ test('deleting segment', async ({ page, request }) => {await addSourceFilter(page, 'Google')await createPersonalSegment(page, 'Traffic from Google')- await page- .getByRole('link', { name: 'Segment is Traffic from Google' })- .click()+ await openSegmentPillMenu(page, 'Traffic from Google')- await modal(page).getByRole('link', { name: 'Edit segment' }).click()-- await segmentMenu(page).click()-- await page.getByRole('link', { name: 'Delete segment' }).click()+ await page.getByRole('button', { name: 'Delete segment' }).click()await expect(modal(page).getByRole('heading', { name: 'Delete personal segment' })@@ -381,7 +394,7 @@ test('deleting segment', async ({ page, request }) => {await expect(filterSubmenuButton(page, 'Segment')).toBeHidden()})-test('closing edited segment without saving', async ({ page, request }) => {+test('cancelling edited segment without saving', async ({ page, request }) => {const { domain } = await setupSiteAndStats({ page, request })await page.goto('/' + domain, { waitUntil: 'commit' })@@ -389,27 +402,21 @@ test('closing edited segment without saving', async ({ page, request }) => {await addSourceFilter(page, 'Google')await createPersonalSegment(page, 'Traffic from Google')- await page- .getByRole('link', { name: 'Segment is Traffic from Google' })- .click()-- await modal(page).getByRole('link', { name: 'Edit segment' }).click()+ await enterEditMode(page, 'Traffic from Google')await addUtmSourceFilter(page, 'Adwords')- await segmentMenu(page).click()-- await page.getByRole('link', { name: 'Close without saving' }).click()-- await filterButton(page).click()- await openSegmentsSubmenu(page)+ await page.getByRole('link', { name: 'Cancel' }).click()- await segmentItemButton(page, 'Traffic from Google').click()+ await expect(page).toHaveURL(/f=is,segment,[0-9]+/)+ await expect(page).not.toHaveURL(/f=is,utm_source,Adwords/)- await page- .getByRole('link', { name: 'Segment is Traffic from Google' })- .click()+ await enterEditMode(page, 'Traffic from Google')- await expect(modal(page)).not.toContainText('UTM source is Adwords')- await expect(modal(page)).toContainText('Source is Google')+ await expect(+ page.getByRole('link', { name: 'UTM source is Adwords' })+ ).toBeHidden()+ await expect(+ page.getByRole('link', { name: 'Source is Google' })+ ).toBeVisible()})