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:
Mike Cao 2025-07-08 22:03:55 -07:00
commit 87449ece9e
49 changed files with 704 additions and 345 deletions

View file

@ -21,7 +21,7 @@ export async function GET(
return unauthorized();
}
const filters = await getQueryFilters({
const filters = getQueryFilters({
...query,
websiteId,
startAt: subMinutes(startOfMinute(new Date()), REALTIME_RANGE).getTime(),

View file

@ -22,7 +22,7 @@ export async function GET(request: Request, { params }: { params: Promise<{ user
}
const { userId } = await params;
const filters = await getQueryFilters(query);
const filters = getQueryFilters(query);
const websites = await getAllUserWebsitesIncludingTeamOwner(userId);

View file

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

View file

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

View file

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

View file

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

View file

@ -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,

View file

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

View file

@ -0,0 +1,92 @@
import { canDeleteWebsite, canUpdateWebsite, canViewWebsite } from '@/lib/auth';
import { parseRequest } from '@/lib/request';
import { json, notFound, ok, unauthorized } from '@/lib/response';
import { segmentTypeParam } from '@/lib/schema';
import { deleteSegment, getSegment, updateSegment } from '@/queries';
import { z } from 'zod';
export async function GET(
request: Request,
{ params }: { params: Promise<{ websiteId: string; segmentId: string }> },
) {
const { auth, error } = await parseRequest(request);
if (error) {
return error();
}
const { websiteId, segmentId } = await params;
const segment = await getSegment(segmentId);
if (websiteId && !(await canViewWebsite(auth, websiteId))) {
return unauthorized();
}
return json(segment);
}
export async function POST(
request: Request,
{ params }: { params: Promise<{ websiteId: string; segmentId: string }> },
) {
const schema = z.object({
type: segmentTypeParam,
name: z.string().max(200),
parameters: z.object({}).passthrough(),
});
const { auth, body, error } = await parseRequest(request, schema);
if (error) {
return error();
}
const { websiteId, segmentId } = await params;
const { type, name, parameters } = body;
const segment = await getSegment(segmentId);
if (!segment) {
return notFound();
}
if (!(await canUpdateWebsite(auth, websiteId))) {
return unauthorized();
}
const result = await updateSegment(segmentId, {
type,
name,
parameters,
} as any);
return json(result);
}
export async function DELETE(
request: Request,
{ params }: { params: Promise<{ websiteId: string; segmentId: string }> },
) {
const { auth, error } = await parseRequest(request);
if (error) {
return error();
}
const { websiteId, segmentId } = await params;
const segment = await getSegment(segmentId);
if (!segment) {
return notFound();
}
if (!(await canDeleteWebsite(auth, websiteId))) {
return unauthorized();
}
await deleteSegment(segmentId);
return ok();
}

View file

@ -0,0 +1,67 @@
import { canUpdateWebsite, canViewWebsite } from '@/lib/auth';
import { uuid } from '@/lib/crypto';
import { parseRequest } from '@/lib/request';
import { json, unauthorized } from '@/lib/response';
import { segmentTypeParam } from '@/lib/schema';
import { createSegment, getWebsiteSegments } from '@/queries';
import { z } from 'zod';
export async function GET(
request: Request,
{ params }: { params: Promise<{ websiteId: string }> },
) {
const schema = z.object({
type: segmentTypeParam,
});
const { auth, query, error } = await parseRequest(request, schema);
if (error) {
return error();
}
const { websiteId } = await params;
const { type } = query;
if (websiteId && !(await canViewWebsite(auth, websiteId))) {
return unauthorized();
}
const segments = await getWebsiteSegments(websiteId, type);
return json(segments);
}
export async function POST(
request: Request,
{ params }: { params: Promise<{ websiteId: string }> },
) {
const schema = z.object({
type: segmentTypeParam,
name: z.string().max(200),
parameters: z.object({}).passthrough(),
});
const { auth, body, error } = await parseRequest(request, schema);
if (error) {
return error();
}
const { websiteId } = await params;
const { type, name, parameters } = body;
if (!(await canUpdateWebsite(auth, websiteId))) {
return unauthorized();
}
const result = await createSegment({
id: uuid(),
websiteId,
type,
name,
parameters,
} as any);
return json(result);
}

View file

@ -22,7 +22,7 @@ export async function GET(
const { websiteId } = await params;
const { propertyName } = query;
const filters = await getQueryFilters(query);
const filters = getQueryFilters(query);
if (!(await canViewWebsite(auth, websiteId))) {
return unauthorized();

View file

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

View file

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

View file

@ -1,9 +1,10 @@
import { z } from 'zod';
import { canViewWebsite } from '@/lib/auth';
import { EVENT_COLUMNS, FILTER_COLUMNS, SESSION_COLUMNS } from '@/lib/constants';
import { getValues } from '@/queries';
import { parseRequest, getQueryFilters } from '@/lib/request';
import { EVENT_COLUMNS, FILTER_COLUMNS, FILTER_GROUPS, SESSION_COLUMNS } from '@/lib/constants';
import { getQueryFilters, parseRequest } from '@/lib/request';
import { badRequest, json, unauthorized } from '@/lib/response';
import { getWebsiteSegments, getValues } from '@/queries';
import { z } from 'zod';
import { dateRangeParams, searchParams } from '@/lib/schema';
export async function GET(
request: Request,
@ -11,9 +12,8 @@ export async function GET(
) {
const schema = z.object({
type: z.string(),
startAt: z.coerce.number().int(),
endAt: z.coerce.number().int(),
search: z.string().optional(),
...dateRangeParams,
...searchParams,
});
const { auth, query, error } = await parseRequest(request, schema);
@ -23,19 +23,25 @@ export async function GET(
}
const { websiteId } = await params;
const { type } = query;
if (!(await canViewWebsite(auth, websiteId))) {
return unauthorized();
}
if (!SESSION_COLUMNS.includes(type) && !EVENT_COLUMNS.includes(type)) {
const { type } = query;
if (!SESSION_COLUMNS.includes(type) && !EVENT_COLUMNS.includes(type) && !FILTER_GROUPS[type]) {
return badRequest('Invalid type.');
}
const filters = await getQueryFilters(query);
let values;
const values = await getValues(websiteId, FILTER_COLUMNS[type], { ...filters });
if (FILTER_GROUPS[type]) {
values = (await getWebsiteSegments(websiteId, type)).map(segment => ({ value: segment.name }));
} else {
const filters = getQueryFilters(query);
values = await getValues(websiteId, FILTER_COLUMNS[type], filters);
}
return json(values.filter(n => n).sort());
}

View file

@ -13,6 +13,7 @@ export async function POST(request: Request) {
domain: z.string().max(500),
shareId: z.string().max(50).nullable().optional(),
teamId: z.string().nullable().optional(),
id: z.string().uuid().nullable().optional(),
});
const { auth, body, error } = await parseRequest(request, schema);
@ -21,14 +22,14 @@ export async function POST(request: Request) {
return error();
}
const { name, domain, shareId, teamId } = body;
const { id, name, domain, shareId, teamId } = body;
if ((teamId && !(await canCreateTeamWebsite(auth, teamId))) || !(await canCreateWebsite(auth))) {
return unauthorized();
}
const data: any = {
id: uuid(),
id: id ?? uuid(),
createdBy: auth.user.id,
name,
domain,