Skip to content

armgit / umami

Public Imported from GitHub
0

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.

add eventchart and metrictable to sharepage

Francis Cao64b5a729632c
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a5f094e3e..c3ed59b06 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -364,8 +364,6 @@ importers:
specifier: ^5.9.3
version: 5.9.3
- dist: {}
-
packages:
'@ampproject/[email protected]':
diff --git a/src/app/(main)/websites/[websiteId]/WebsitePanels.tsx b/src/app/(main)/websites/[websiteId]/WebsitePanels.tsx
index 97f8f9531..16dd50022 100644
--- a/src/app/(main)/websites/[websiteId]/WebsitePanels.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsitePanels.tsx
@@ -1,13 +1,15 @@
-import { Grid, Tabs, Tab, TabList, TabPanel, Heading, Row } from '@umami/react-zen';
import { GridRow } from '@/components/common/GridRow';
import { Panel } from '@/components/common/Panel';
-import { WorldMap } from '@/components/metrics/WorldMap';
+import { useMessages, useNavigation } from '@/components/hooks';
+import { EventsChart } from '@/components/metrics/EventsChart';
import { MetricsTable } from '@/components/metrics/MetricsTable';
import { WeeklyTraffic } from '@/components/metrics/WeeklyTraffic';
-import { useMessages } from '@/components/hooks';
+import { WorldMap } from '@/components/metrics/WorldMap';
+import { Grid, Heading, Row, Tab, TabList, TabPanel, Tabs } from '@umami/react-zen';
export function WebsitePanels({ websiteId }: { websiteId: string }) {
const { formatMessage, labels } = useMessages();
+ const { pathname } = useNavigation();
const tableProps = {
websiteId,
limit: 10,
@@ -16,6 +18,7 @@ export function WebsitePanels({ websiteId }: { websiteId: string }) {
metric: formatMessage(labels.visitors),
};
const rowProps = { minHeight: '570px' };
+ const isSharePage = pathname.includes('/share/');
return (
<Grid gap="3">
@@ -113,6 +116,23 @@ export function WebsitePanels({ websiteId }: { websiteId: string }) {
<WeeklyTraffic websiteId={websiteId} />
</Panel>
</GridRow>
+ {isSharePage && (
+ <GridRow layout="two-one" {...rowProps}>
+ <Panel>
+ <MetricsTable
+ websiteId={websiteId}
+ type="event"
+ title={formatMessage(labels.events)}
+ metric={formatMessage(labels.count)}
+ limit={15}
+ filterLink={false}
+ />
+ </Panel>
+ <Panel gridColumn="span 2">
+ <EventsChart websiteId={websiteId} />
+ </Panel>
+ </GridRow>
+ )}
</Grid>
);
}
diff --git a/src/components/metrics/MetricsTable.tsx b/src/components/metrics/MetricsTable.tsx
index b84fef236..57f4fb282 100644
--- a/src/components/metrics/MetricsTable.tsx
+++ b/src/components/metrics/MetricsTable.tsx
@@ -1,12 +1,12 @@
-import { useEffect, useMemo } from 'react';
-import { Icon, Row, Text } from '@umami/react-zen';
import { LinkButton } from '@/components/common/LinkButton';
import { LoadingPanel } from '@/components/common/LoadingPanel';
import { useMessages, useNavigation, useWebsiteMetricsQuery } from '@/components/hooks';
import { Maximize } from '@/components/icons';
+import { MetricLabel } from '@/components/metrics/MetricLabel';
import { percentFilter } from '@/lib/filters';
+import { Icon, Row, Text } from '@umami/react-zen';
+import { useEffect, useMemo } from 'react';
import { ListTable, ListTableProps } from './ListTable';
-import { MetricLabel } from '@/components/metrics/MetricLabel';
export interface MetricsTableProps extends ListTableProps {
websiteId: string;
@@ -14,6 +14,7 @@ export interface MetricsTableProps extends ListTableProps {
dataFilter?: (data: any) => any;
limit?: number;
showMore?: boolean;
+ filterLink?: boolean;
params?: Record<string, any>;
onDataLoad?: (data: any) => void;
}
@@ -24,6 +25,7 @@ export function MetricsTable({
dataFilter,
limit,
showMore = false,
+ filterLink = true,
params,
onDataLoad,
...props
@@ -64,7 +66,7 @@ export function MetricsTable({
}, [data]);
const renderLabel = (row: any) => {
- return <MetricLabel type={type} data={row} />;
+ return filterLink ? <MetricLabel type={type} data={row} /> : row.label;
};
return (