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

Merge remote-tracking branch 'upstream/master' into fix-font-family

Browse source
This commit is contained in:
Minseo Lee 2024-08-29 14:49:32 +09:00
commit 01fc293d3f
19 changed files with 305 additions and 321 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/app/(main)/reports/retention/RetentionTable.tsx
View file

@ -58,13 +58,13 @@ export function RetentionTable({ days = DAYS }) {
if (totalDays - rowIndex < day) {
return null;
}
const percentage = records[day]?.percentage;
const percentage = records.filter(a => a.day === day)[0]?.percentage;
return (
<div
key={day}
className={classNames(styles.cell, { [styles.empty]: !percentage })}
>
{percentage ? `${percentage.toFixed(2)}%` : ''}
{percentage ? `${Number(percentage).toFixed(2)}%` : ''}
</div>
);
})}

2
src/app/(main)/websites/[websiteId]/WebsiteChartList.tsx
View file

@ -47,7 +47,7 @@ export default function WebsiteChartList({
</Button>
</Link>
</WebsiteHeader>
<WebsiteMetricsBar websiteId={id} />
<WebsiteMetricsBar websiteId={id} showChange={true} />
{showCharts && <WebsiteChart websiteId={id} />}
</div>
) : null;

2
src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsx
View file

@ -13,7 +13,7 @@ export default function EventsDataTable({
const queryResult = useWebsiteEvents(websiteId);
return (
<DataTable queryResult={queryResult} allowSearch={true}>
<DataTable queryResult={queryResult} allowSearch={true} autoFocus={false}>
{({ data }) => <EventsTable data={data} />}
</DataTable>
);