watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-19 12:05:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'umami-software:master' into master

Browse source
This commit is contained in:
Viet-Tien 2024-08-28 12:44:04 +07:00 • committed by GitHub
commit 712d3026de
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
21 changed files with 308 additions and 324 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>
);

4
src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
View file

@ -3,7 +3,7 @@ import Empty from 'components/common/Empty';
import FilterButtons from 'components/common/FilterButtons';
import { useCountryNames, useLocale, useMessages, useTimezone } from 'components/hooks';
import Icons from 'components/icons';
import { BROWSERS } from 'lib/constants';
import { BROWSERS, OS_NAMES } from 'lib/constants';
import { stringToColor } from 'lib/format';
import { RealtimeData } from 'lib/types';
import { safeDecodeURI } from 'next-basics';
@ -111,7 +111,7 @@ export function RealtimeLog({ data }: { data: RealtimeData }) {
values={{
country: <b>{countryNames[country] || formatMessage(labels.unknown)}</b>,
browser: <b>{BROWSERS[browser]}</b>,
os: <b>{os}</b>,
os: <b>{OS_NAMES[os] || os}</b>,
device: <b>{formatMessage(labels[device] || labels.unknown)}</b>,
}}
/>