mirror of
https://github.com/umami-software/umami.git
synced 2026-02-06 05:37:20 +01:00
Fixed paging in events/sessions.
This commit is contained in:
parent
8c26e310f7
commit
465a03f987
9 changed files with 26 additions and 19 deletions
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue