Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Moved bounce filter to filter form.
Mike Cao877b45357731
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteControls.tsx b/src/app/(main)/websites/[websiteId]/WebsiteControls.tsxindex ea993ac0d..86394afa1 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteControls.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteControls.tsx@@ -1,5 +1,4 @@import { Column, Grid, Row } from '@umami/react-zen';-import { BounceFilter } from '@/components/input/BounceFilter';import { ExportButton } from '@/components/input/ExportButton';import { FilterBar } from '@/components/input/FilterBar';import { MonthFilter } from '@/components/input/MonthFilter';@@ -9,7 +8,6 @@ import { WebsiteFilterButton } from '@/components/input/WebsiteFilterButton';export function WebsiteControls({websiteId,allowFilter = true,- allowBounceFilter = false,allowDateFilter = true,allowMonthFilter,allowDownload = false,@@ -28,7 +26,6 @@ export function WebsiteControls({<Grid columns={{ xs: '1fr', md: 'auto 1fr' }} gap><Row alignItems="center" justifyContent="flex-start" gap="4">{allowFilter && <WebsiteFilterButton websiteId={websiteId} />}- {allowBounceFilter && <BounceFilter />}</Row><Row alignItems="center" justifyContent={{ xs: 'flex-start', md: 'flex-end' }}>{allowDateFilter && (diff --git a/src/components/input/WebsiteFilterButton.tsx b/src/components/input/WebsiteFilterButton.tsxindex 7db850a19..99d4a5fd3 100644--- a/src/components/input/WebsiteFilterButton.tsx+++ b/src/components/input/WebsiteFilterButton.tsx@@ -1,3 +1,5 @@+import { Checkbox, Row } from '@umami/react-zen';+import { useState } from 'react';import { useMessages, useNavigation } from '@/components/hooks';import { ListFilter } from '@/components/icons';import { DialogButton } from '@/components/input/DialogButton';@@ -12,12 +14,18 @@ export function WebsiteFilterButton({alignment?: 'end' | 'center' | 'start';}) {const { formatMessage, labels } = useMessages();- const { updateParams, router } = useNavigation();+ const { updateParams, router, query } = useNavigation();+ const [excludeBounce, setExcludeBounce] = useState(!!query.excludeBounce);const handleChange = ({ filters, segment, cohort }: any) => {const params = filtersArrayToObject(filters);- const url = updateParams({ ...params, segment, cohort });+ const url = updateParams({+ ...params,+ segment,+ cohort,+ excludeBounce: excludeBounce ? 'true' : undefined,+ });router.push(url);};@@ -25,7 +33,18 @@ export function WebsiteFilterButton({return (<DialogButton icon={<ListFilter />} label={formatMessage(labels.filter)} variant="outline">{({ close }) => {- return <FilterEditForm websiteId={websiteId} onChange={handleChange} onClose={close} />;+ return (+ <>+ <Row position="absolute" top="30px" right="30px">+ <Row alignItems="center" gap>+ <Checkbox value={excludeBounce ? 'true' : ''} onChange={setExcludeBounce}>+ {formatMessage(labels.excludeBounce)}+ </Checkbox>+ </Row>+ </Row>+ <FilterEditForm websiteId={websiteId} onChange={handleChange} onClose={close} />+ </>+ );}}</DialogButton>);