watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-06 13:47:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Updated packages. Fixed loading errors.

Browse source
This commit is contained in:
Mike Cao 2025-06-01 01:38:37 -07:00
parent da8c7e99c5
commit f444c6373d
7 changed files with 532 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/(main)/websites/[websiteId]/reports/goals/GoalsPage.tsx
View file

@ -20,7 +20,7 @@ export function GoalsPage({ websiteId }: { websiteId: string }) {
<SectionHeader>
<GoalAddButton websiteId={websiteId} />
</SectionHeader>
<LoadingPanel data={result.data} isLoading={query.isLoading} error={query.error}>
<LoadingPanel data={result?.data} isLoading={query?.isLoading} error={query?.error}>
<Grid columns="1fr 1fr" gap>
{result?.data?.map((report: any) => (
<Panel key={report.id}>

37
src/app/(main)/websites/[websiteId]/reports/retention/Retention.tsx
View file

@ -27,24 +27,25 @@ export function Retention({ websiteId, days = DAYS, startDate, endDate }: Retent
},
});
const rows = data.reduce((arr: any[], row: { date: any; visitors: any; day: any }) => {
const { date, visitors, day } = row;
if (day === 0) {
return arr.concat({
date,
visitors,
records: days
.reduce((arr, day) => {
arr[day] = data.find(
(x: { date: any; day: number }) => x.date === date && x.day === day,
);
return arr;
}, [])
.filter(n => n),
});
}
return arr;
}, []);
const rows =
data?.reduce((arr: any[], row: { date: any; visitors: any; day: any }) => {
const { date, visitors, day } = row;
if (day === 0) {
return arr.concat({
date,
visitors,
records: days
.reduce((arr, day) => {
arr[day] = data.find(
(x: { date: any; day: number }) => x.date === date && x.day === day,
);
return arr;
}, [])
.filter(n => n),
});
}
return arr;
}, []) || [];
const totalDays = rows.length;

1
src/app/(main)/websites/[websiteId]/reports/revenue/Revenue.tsx
View file

@ -131,6 +131,7 @@ export function Revenue({ websiteId, startDate, endDate }: RevenueProps) {
stacked={true}
currency={currency}
renderXLabel={renderDateLabels(unit, locale)}
height="400px"
/>
</Panel>
<Panel>

62
src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx
View file

@ -21,36 +21,38 @@ export function SessionDetailsPage({
return (
<LoadingPanel data={data} isLoading={isLoading} error={error}>
<Grid columns="260px 1fr" gap>
<Column gap="6">
<Row justifyContent="center">
<Avatar seed={data?.id} size={128} />
</Row>
<SessionInfo data={data} />
</Column>
<Column gap>
<SessionStats data={data} />
<Panel>
<Tabs>
<TabList>
<Tab id="activity">{formatMessage(labels.activity)}</Tab>
<Tab id="properties">{formatMessage(labels.properties)}</Tab>
</TabList>
<TabPanel id="activity">
<SessionActivity
websiteId={websiteId}
sessionId={sessionId}
startDate={data?.firstAt}
endDate={data?.lastAt}
/>
</TabPanel>
<TabPanel id="properties">
<SessionData sessionId={sessionId} websiteId={websiteId} />
</TabPanel>
</Tabs>
</Panel>
</Column>
</Grid>
{data && (
<Grid columns="260px 1fr" gap>
<Column gap="6">
<Row justifyContent="center">
<Avatar seed={data?.id} size={128} />
</Row>
<SessionInfo data={data} />
</Column>
<Column gap>
<SessionStats data={data} />
<Panel>
<Tabs>
<TabList>
<Tab id="activity">{formatMessage(labels.activity)}</Tab>
<Tab id="properties">{formatMessage(labels.properties)}</Tab>
</TabList>
<TabPanel id="activity">
<SessionActivity
websiteId={websiteId}
sessionId={sessionId}
startDate={data?.firstAt}
endDate={data?.lastAt}
/>
</TabPanel>
<TabPanel id="properties">
<SessionData sessionId={sessionId} websiteId={websiteId} />
</TabPanel>
</Tabs>
</Panel>
</Column>
</Grid>
)}
</LoadingPanel>
);
}