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
Merge branch 'dev' of https://github.com/umami-software/umami into dev
Mike Cao274d65483376
diff --cc src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsxindex baf59452d,0825c663e..fedcc2459--- a/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx+++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx@@@ -6,31 -8,48 +6,36 @@@ import { WebsiteShareForm } from './Webimport { WebsiteTrackingCode } from './WebsiteTrackingCode';import { WebsiteData } from './WebsiteData';import { WebsiteEditForm } from './WebsiteEditForm';-import { LinkButton } from '@/components/common/LinkButton';++import { SegmentsDataTable } from '@/app/(main)/websites/[websiteId]/segments/SegmentsDataTable';-export function WebsiteSettings({- websiteId,- openExternal = false,-}: {- websiteId: string;- openExternal?: boolean;-}) {+export function WebsiteSettings({ websiteId }: { websiteId: string; openExternal?: boolean }) {const website = useContext(WebsiteContext);const { formatMessage, labels } = useMessages();return (- <>- <SectionHeader title={website?.name} icon={<Globe />}>- <LinkButton href={`/websites/${websiteId}`} target={openExternal ? '_blank' : null}>- <Icon>- <Eye />- </Icon>- <Text>{formatMessage(labels.view)}</Text>- </LinkButton>- </SectionHeader>- <Tabs>- <TabList>- <Tab id="details">{formatMessage(labels.details)}</Tab>- <Tab id="tracking">{formatMessage(labels.trackingCode)}</Tab>- <Tab id="share"> {formatMessage(labels.shareUrl)}</Tab>- <Tab id="manage">{formatMessage(labels.manage)}</Tab>- </TabList>- <TabPanel id="details" style={{ width: 500 }}>- <WebsiteEditForm websiteId={websiteId} />- </TabPanel>- <TabPanel id="tracking">- <WebsiteTrackingCode websiteId={websiteId} />- </TabPanel>- <TabPanel id="share" style={{ width: 500 }}>- <WebsiteShareForm websiteId={websiteId} shareId={website.shareId} />- </TabPanel>- <TabPanel id="manage">- <WebsiteData websiteId={websiteId} />- </TabPanel>- </Tabs>- </>+ <Tabs>+ <TabList>+ <Tab id="details">{formatMessage(labels.details)}</Tab>+ <Tab id="tracking">{formatMessage(labels.trackingCode)}</Tab>+ <Tab id="share"> {formatMessage(labels.shareUrl)}</Tab>++ <Tab id="segments"> {formatMessage(labels.segments)}</Tab>+ <Tab id="manage">{formatMessage(labels.manage)}</Tab>+ </TabList>+ <TabPanel id="details" style={{ width: 500 }}>+ <WebsiteEditForm websiteId={websiteId} />+ </TabPanel>+ <TabPanel id="tracking">+ <WebsiteTrackingCode websiteId={websiteId} />+ </TabPanel>+ <TabPanel id="share" style={{ width: 500 }}>+ <WebsiteShareForm websiteId={websiteId} shareId={website.shareId} />+ </TabPanel>++ <TabPanel id="segments">++ <SegmentsDataTable websiteId={websiteId} />++ </TabPanel>+ <TabPanel id="manage">+ <WebsiteData websiteId={websiteId} />+ </TabPanel>+ </Tabs>);}diff --cc src/app/(main)/websites/[websiteId]/(reports)/breakdown/FieldSelectForm.tsxindex 9d828c7d4,9d828c7d4..bbf69a5b5--- a/src/app/(main)/websites/[websiteId]/(reports)/breakdown/FieldSelectForm.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/breakdown/FieldSelectForm.tsx@@@ -25,7 -25,7 +25,7 @@@ export function FieldSelectForm(};return (-- <Column width="300px" gap="6">++ <Column gap="6"><List value={selected} onChange={handleChange} selectionMode="multiple">{fields.map(({ name, label }) => {return (diff --cc src/app/(main)/websites/[websiteId]/WebsiteNav.tsxindex 54cfe0bbd,9ba78662e..799ba76c8--- a/src/app/(main)/websites/[websiteId]/WebsiteNav.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteNav.tsx@@@ -11,11 -12,11 +11,9 @@@ importTag,Money,Network,-- UserPlus,-- ChartPie,} from '@/components/icons';import { useMessages, useNavigation } from '@/components/hooks';-import Link from 'next/link';+import { SideMenu } from '@/components/common/SideMenu';import { WebsiteSelect } from '@/components/input/WebsiteSelect';export function WebsiteNav({ websiteId }: { websiteId: string }) {diff --cc src/components/input/FilterBar.tsxindex 3ce302944,51409b26a..b9f3e7684--- a/src/components/input/FilterBar.tsx+++ b/src/components/input/FilterBar.tsx@@@ -76,37 -58,16 +76,44 @@@ export function FilterBar({ websiteId });})}</Row>- <TooltipTrigger delay={0}>- <Button variant="zero" onPress={handleResetFilter} style={{ alignSelf: 'flex-start' }}>- <Icon>- <Close />- </Icon>- </Button>- <Tooltip>- <Text>{formatMessage(labels.clearAll)}</Text>- </Tooltip>- </TooltipTrigger>+ <Row alignItems="center">+ <DialogTrigger>+ <TooltipTrigger delay={0}>+ <Button variant="zero">+ <Icon>+ <Bookmark />+ </Icon>+ </Button>+ <Tooltip>+ <Text>{formatMessage(labels.saveSegment)}</Text>+ </Tooltip>+ </TooltipTrigger>+ <Modal>- <Dialog title={formatMessage(labels.segment)} style={{ width: 800 }}>++ <Dialog title={formatMessage(labels.segment)} style={{ width: 400 }}>+ {({ close }) => {- return <SegmentEditForm websiteId={websiteId} onClose={close} />;++ return (++ <SegmentEditForm++ websiteId={websiteId}++ onClose={close}++ filters={filters}++ showFilters={false}++ />++ );+ }}+ </Dialog>+ </Modal>+ </DialogTrigger>+ <TooltipTrigger delay={0}>+ <Button variant="zero" onPress={handleResetFilter}>+ <Icon>+ <Close />+ </Icon>+ </Button>+ <Tooltip>+ <Text>{formatMessage(labels.clearAll)}</Text>+ </Tooltip>+ </TooltipTrigger>+ </Row></Row>);}diff --cc src/components/messages.tsindex c06f4a028,e0e8413e5..92409f25a--- a/src/components/messages.ts+++ b/src/components/messages.ts@@@ -342,10 -342,6 +342,11 @@@ export const labels = defineMessages(traffic: { id: 'label.traffic', defaultMessage: 'Traffic' },behavior: { id: 'label.behavior', defaultMessage: 'Behavior' },growth: { id: 'label.growth', defaultMessage: 'Growth' },+ account: { id: 'label.account', defaultMessage: 'Account' },+ application: { id: 'label.application', defaultMessage: 'Application' },- saveSegment: { id: 'label.save-segment', defaultMessage: 'Save segment' },- saveCohort: { id: 'label.save-cohort', defaultMessage: 'Save cohort' },++ saveSegment: { id: 'label.save-segment', defaultMessage: 'Save as segment' },++ saveCohort: { id: 'label.save-cohort', defaultMessage: 'Save as cohort' },++ analysis: { id: 'label.analysis', defaultMessage: 'Analysis' },});export const messages = defineMessages({diff --cc src/components/metrics/ReferrersTable.tsxindex 8990db1a3,718f13ee7..fdfc34698--- a/src/components/metrics/ReferrersTable.tsx+++ b/src/components/metrics/ReferrersTable.tsx@@@ -1,11 -1,11 +1,11 @@@- import { Row } from '@umami/react-zen';- import { FilterLink } from '@/components/common/FilterLink';import { Favicon } from '@/components/common/Favicon';-import { FilterButtons } from '@/components/common/FilterButtons';+import { FilterButtons } from '@/components/input/FilterButtons';+ import { FilterLink } from '@/components/common/FilterLink';import { useMessages, useNavigation } from '@/components/hooks';- import { MetricsTable, MetricsTableProps } from './MetricsTable';- import thenby from 'thenby';import { GROUPED_DOMAINS } from '@/lib/constants';+ import { emptyFilter } from '@/lib/filters';+ import { Row } from '@umami/react-zen';+ import { MetricsTable, MetricsTableProps } from './MetricsTable';export interface ReferrersTableProps extends MetricsTableProps {allowFilter?: boolean;