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

Fixed properties queries.

Browse source
This commit is contained in:
Mike Cao 2025-07-15 01:31:08 -07:00
parent 465a03f987
commit 5e6799a715
38 changed files with 139 additions and 499 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/api/websites/[websiteId]/event-data/events/route.ts
View file

@ -26,7 +26,7 @@ export async function GET(
}
const { event } = query;
const filters = await getQueryFilters(query);
const filters = await getQueryFilters(query, websiteId);
const data = await getEventDataEvents(websiteId, {
...filters,

2
src/app/api/websites/[websiteId]/event-data/fields/route.ts
View file

@ -25,7 +25,7 @@ export async function GET(
return unauthorized();
}
const filters = await getQueryFilters(query);
const filters = await getQueryFilters(query, websiteId);
const data = await getEventDataFields(websiteId, filters);

2
src/app/api/websites/[websiteId]/event-data/properties/route.ts
View file

@ -27,7 +27,7 @@ export async function GET(
}
const { propertyName } = query;
const filters = await getQueryFilters(query);
const filters = await getQueryFilters(query, websiteId);
const data = await getEventDataProperties(websiteId, { ...filters, propertyName });

2
src/app/api/websites/[websiteId]/event-data/stats/route.ts
View file

@ -26,7 +26,7 @@ export async function GET(
return unauthorized();
}
const filters = await getQueryFilters(query);
const filters = await getQueryFilters(query, websiteId);
const data = await getEventDataStats(websiteId, filters);

2
src/app/api/websites/[websiteId]/event-data/values/route.ts
View file

@ -28,7 +28,7 @@ export async function GET(
}
const { eventName, propertyName } = query;
const filters = await getQueryFilters(query);
const filters = await getQueryFilters(query, websiteId);
const data = await getEventDataValues(websiteId, {
...filters,

5
src/app/api/websites/[websiteId]/session-data/properties/route.ts
View file

@ -21,13 +21,14 @@ export async function GET(
}
const { websiteId } = await params;
const { propertyName } = query;
const filters = await getQueryFilters(query);
if (!(await canViewWebsite(auth, websiteId))) {
return unauthorized();
}
const { propertyName } = query;
const filters = await getQueryFilters(query, websiteId);
const data = await getSessionDataProperties(websiteId, { ...filters, propertyName });
return json(data);

7
src/app/api/websites/[websiteId]/session-data/values/route.ts
View file

@ -1,5 +1,5 @@
import { canViewWebsite } from '@/lib/auth';
import { getQueryFilters, parseRequest, setWebsiteDate } from '@/lib/request';
import { getQueryFilters, parseRequest } from '@/lib/request';
import { json, unauthorized } from '@/lib/response';
import { getSessionDataValues } from '@/queries';
import { z } from 'zod';
@ -20,14 +20,15 @@ export async function GET(
return error();
}
const { propertyName } = query;
const { websiteId } = await params;
const filters = await setWebsiteDate(websiteId, await getQueryFilters(query));
if (!(await canViewWebsite(auth, websiteId))) {
return unauthorized();
}
const { propertyName } = query;
const filters = await getQueryFilters(query, websiteId);
const data = await getSessionDataValues(websiteId, {
...filters,
propertyName,

2
src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.ts
View file

@ -25,7 +25,7 @@ export async function GET(
return unauthorized();
}
const filters = await getQueryFilters(query);
const filters = await getQueryFilters(query, websiteId);
const data = await getSessionActivity(websiteId, sessionId, filters);

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

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

4
src/app/api/websites/[websiteId]/sessions/stats/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 } from '@/lib/schema';
@ -27,7 +27,7 @@ export async function GET(
return unauthorized();
}
const filters = await setWebsiteDate(websiteId, await getQueryFilters(query));
const filters = await getQueryFilters(query, websiteId);
const metrics = await getWebsiteSessionStats(websiteId, filters);

2
src/app/api/websites/[websiteId]/sessions/weekly/route.ts
View file

@ -28,7 +28,7 @@ export async function GET(
return unauthorized();
}
const filters = await getQueryFilters(query);
const filters = await getQueryFilters(query, websiteId);
const data = await getWebsiteSessionsWeekly(websiteId, filters);

2
src/app/api/websites/[websiteId]/values/route.ts
View file

@ -39,7 +39,7 @@ export async function GET(
if (FILTER_GROUPS[type]) {
values = (await getWebsiteSegments(websiteId, type)).map(segment => ({ value: segment.name }));
} else {
const filters = await getQueryFilters(query);
const filters = await getQueryFilters(query, websiteId);
values = await getValues(websiteId, FILTER_COLUMNS[type], filters);
}