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

Updated segment handling.

Browse source
This commit is contained in:
Mike Cao 2025-07-31 02:33:35 -07:00
parent 554c627a58
commit fba7e12c36
13 changed files with 59 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/lib/request.ts
View file

@ -1,5 +1,5 @@
import { z } from 'zod/v4';
import { FILTER_COLUMNS, DEFAULT_PAGE_SIZE, FILTER_GROUPS } from '@/lib/constants';
import { FILTER_COLUMNS, DEFAULT_PAGE_SIZE } from '@/lib/constants';
import { badRequest, unauthorized } from '@/lib/response';
import { getAllowedUnits, getMinimumUnit, maxDate } from '@/lib/date';
import { checkAuth } from '@/lib/auth';
@ -79,16 +79,6 @@ export function getRequestFilters(query: Record<string, any>) {
return result;
}
export async function getRequestSegments(websiteId: string, query: Record<string, any>) {
for (const key of Object.keys(FILTER_GROUPS)) {
const value = query[key];
if (value !== undefined) {
return getWebsiteSegment(websiteId, key, value);
}
}
}
export async function setWebsiteDate(websiteId: string, data: Record<string, any>) {
const website = await fetchWebsite(websiteId);
@ -109,7 +99,13 @@ export async function getQueryFilters(
if (websiteId) {
await setWebsiteDate(websiteId, dateRange);
Object.assign(filters, await getRequestSegments(websiteId, params));
if (params.segment) {
Object.assign(filters, (await getWebsiteSegment(websiteId, params.segment))?.parameters);
}
if (params.cohort) {
filters.cohortFilters = (await getWebsiteSegment(websiteId, params.cohort))?.parameters;
}
}
return {