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

Fixed paging in events/sessions.

Browse source
This commit is contained in:
Mike Cao 2025-07-13 21:10:59 -07:00
parent 8c26e310f7
commit 465a03f987
9 changed files with 26 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,7 @@ export function WebsiteTabs() {
},
{
id: 'sessions',
label: formatMessage(labels.users),
label: formatMessage(labels.sessions),
icon: <User />,
path: '/sessions',
},

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

@ -13,7 +13,7 @@ export function EventsDataTable({
children?: ReactNode;
}) {
const { formatMessage, labels } = useMessages();
const queryResult = useWebsiteEventsQuery(websiteId);
const query = useWebsiteEventsQuery(websiteId);
const [view, setView] = useState('all');
const buttons = [
@ -22,12 +22,12 @@ export function EventsDataTable({
label: formatMessage(labels.all),
},
{
id: 'page',
label: formatMessage(labels.page),
id: 'views',
label: formatMessage(labels.views),
},
{
id: 'event',
label: formatMessage(labels.event),
id: 'events',
label: formatMessage(labels.events),
},
];
@ -37,7 +37,7 @@ export function EventsDataTable({
return (
<DataGrid
query={queryResult}
query={query}
allowSearch={true}
autoFocus={false}
allowPaging={true}

5
src/app/api/websites/[websiteId]/events/route.ts
View file

@ -2,7 +2,7 @@ import { z } from 'zod';
import { getQueryFilters, parseRequest } from '@/lib/request';
import { unauthorized, json } from '@/lib/response';
import { canViewWebsite } from '@/lib/auth';
import { dateRangeParams, pagingParams, filterParams } from '@/lib/schema';
import { dateRangeParams, pagingParams, filterParams, searchParams } from '@/lib/schema';
import { getWebsiteEvents } from '@/queries';
export async function GET(
@ -13,6 +13,7 @@ export async function GET(
...dateRangeParams,
...filterParams,
...pagingParams,
...searchParams,
});
const { auth, query, error } = await parseRequest(request, schema);
@ -27,7 +28,7 @@ export async function GET(
return unauthorized();
}
const filters = await getQueryFilters(query);
const filters = await getQueryFilters(query, websiteId);
const data = await getWebsiteEvents(websiteId, filters);

4
src/app/api/websites/[websiteId]/events/series/route.ts
View file

@ -1,5 +1,5 @@
import { z } from 'zod';
import { parseRequest, getQueryFilters, setWebsiteDate } from '@/lib/request';
import { parseRequest, getQueryFilters } from '@/lib/request';
import { unauthorized, json } from '@/lib/response';
import { canViewWebsite } from '@/lib/auth';
import { filterParams, timezoneParam, unitParam } from '@/lib/schema';
@ -29,7 +29,7 @@ export async function GET(
return unauthorized();
}
const filters = await setWebsiteDate(websiteId, await getQueryFilters(query));
const filters = await getQueryFilters(query, websiteId);
const data = await getEventMetrics(websiteId, filters);