mirror of
https://github.com/umami-software/umami.git
synced 2026-02-04 04:37:11 +01:00
Merge branch 'dev' into jajaja
# Conflicts: # db/postgresql/schema.prisma # pnpm-lock.yaml # src/app/(main)/websites/[websiteId]/WebsiteDetailsPage.tsx # src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx # src/app/api/reports/route.ts # src/app/api/websites/[websiteId]/events/series/route.ts # src/app/api/websites/[websiteId]/metrics/route.ts # src/app/api/websites/[websiteId]/pageviews/route.ts # src/app/api/websites/[websiteId]/sessions/stats/route.ts # src/app/api/websites/[websiteId]/stats/route.ts # src/app/api/websites/[websiteId]/values/route.ts # src/components/hooks/useFields.ts # src/components/hooks/useFilterParams.ts # src/lang/vi-VN.json # src/lib/clickhouse.ts # src/lib/detect.ts # src/lib/prisma.ts # src/lib/request.ts # src/lib/schema.ts # src/lib/types.ts # src/queries/sql/events/getEventDataFields.ts # src/queries/sql/events/getEventDataProperties.ts # src/queries/sql/events/getEventDataStats.ts # src/queries/sql/events/getEventDataValues.ts # src/queries/sql/events/getEventMetrics.ts # src/queries/sql/events/getWebsiteEvents.ts # src/queries/sql/getChannelMetrics.ts # src/queries/sql/getRealtimeActivity.ts # src/queries/sql/getWebsiteStats.ts # src/queries/sql/pageviews/getPageviewMetrics.ts # src/queries/sql/pageviews/getPageviewStats.ts # src/queries/sql/reports/getBreakdown.ts # src/queries/sql/sessions/getSessionDataProperties.ts # src/queries/sql/sessions/getSessionDataValues.ts # src/queries/sql/sessions/getSessionMetrics.ts # src/queries/sql/sessions/getSessionStats.ts # src/queries/sql/sessions/getWebsiteSessionStats.ts # src/queries/sql/sessions/getWebsiteSessions.ts
This commit is contained in:
commit
87449ece9e
49 changed files with 704 additions and 345 deletions
|
|
@ -28,7 +28,7 @@ export async function GET(
|
|||
}
|
||||
|
||||
const { eventName, propertyName } = query;
|
||||
const filters = await getQueryFilters(query);
|
||||
const filters = getQueryFilters(query);
|
||||
|
||||
const data = await getEventDataValues(websiteId, {
|
||||
...filters,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue