From c28c0223668e96d72ca596799d81ecb931cbdaf9 Mon Sep 17 00:00:00 2001 From: Francis Cao Date: Thu, 25 Sep 2025 11:31:16 -0700 Subject: [PATCH] update FilterEditForm for pixels/links, update attribution action dropdown --- .../(reports)/attribution/AttributionPage.tsx | 4 ++-- src/components/input/FilterEditForm.tsx | 21 ++++++++++++++----- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/app/(main)/websites/[websiteId]/(reports)/attribution/AttributionPage.tsx b/src/app/(main)/websites/[websiteId]/(reports)/attribution/AttributionPage.tsx index 6e7237a1..5b375bde 100644 --- a/src/app/(main)/websites/[websiteId]/(reports)/attribution/AttributionPage.tsx +++ b/src/app/(main)/websites/[websiteId]/(reports)/attribution/AttributionPage.tsx @@ -36,8 +36,8 @@ export function AttributionPage({ websiteId }: { websiteId: string }) { defaultValue={type} onChange={setType} > - {formatMessage(labels.page)} - {formatMessage(labels.event)} + {formatMessage(labels.viewedPage)} + {formatMessage(labels.triggeredEvent)} diff --git a/src/components/input/FilterEditForm.tsx b/src/components/input/FilterEditForm.tsx index bd8a7f86..4c9fa54a 100644 --- a/src/components/input/FilterEditForm.tsx +++ b/src/components/input/FilterEditForm.tsx @@ -1,8 +1,8 @@ -import { useState } from 'react'; -import { Column, Tabs, TabList, Tab, TabPanel, Row, Button } from '@umami/react-zen'; import { useFilters, useMessages, useNavigation } from '@/components/hooks'; import { FieldFilters } from '@/components/input/FieldFilters'; import { SegmentFilters } from '@/components/input/SegmentFilters'; +import { Button, Column, Row, Tab, TabList, TabPanel, Tabs } from '@umami/react-zen'; +import { useState } from 'react'; export interface FilterEditFormProps { websiteId?: string; @@ -13,6 +13,7 @@ export interface FilterEditFormProps { export function FilterEditForm({ websiteId, onChange, onClose }: FilterEditFormProps) { const { query: { segment, cohort }, + pathname, } = useNavigation(); const { filters } = useFilters(); const { formatMessage, labels } = useMessages(); @@ -22,6 +23,7 @@ export function FilterEditForm({ websiteId, onChange, onClose }: FilterEditFormP const panelProps = { style: { height: 500 }, }; + const excludeFilters = pathname.includes('/pixels') || pathname.includes('/links'); const handleReset = () => { setCurrentFilters([]); @@ -48,11 +50,20 @@ export function FilterEditForm({ websiteId, onChange, onClose }: FilterEditFormP {formatMessage(labels.fields)} - {formatMessage(labels.segments)} - {formatMessage(labels.cohorts)} + {!excludeFilters && ( + <> + {formatMessage(labels.segments)} + {formatMessage(labels.cohorts)} + + )} - +