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

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Mike Cao 2025-10-14 21:59:45 -07:00
commit 5c3a6ce8ce
12 changed files with 91 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/app/api/admin/teams/route.ts
View file

@ -24,22 +24,26 @@ export async function GET(request: Request) {
const teams = await getTeams(
{
include: {
_count: {
select: {
members: true,
websites: true,
},
},
members: {
select: {
include: {
user: {
omit: {
password: true,
select: {
id: true,
username: true,
},
},
},
where: {
role: 'team-owner',
},
_count: {
select: {
websites: {
where: { deletedAt: null },
},
members: {
where: {
user: { deletedAt: null },
},
},
},
},
},

4
src/app/api/reports/route.ts
View file

@ -1,6 +1,6 @@
import { z } from 'zod';
import { uuid } from '@/lib/crypto';
import { pagingParams, reportSchema } from '@/lib/schema';
import { pagingParams, reportSchema, reportTypeParam } from '@/lib/schema';
import { parseRequest } from '@/lib/request';
import { canViewWebsite, canUpdateWebsite } from '@/permissions';
import { unauthorized, json } from '@/lib/response';
@ -9,7 +9,7 @@ import { getReports, createReport } from '@/queries/prisma';
export async function GET(request: Request) {
const schema = z.object({
websiteId: z.uuid(),
type: z.string().optional(),
type: reportTypeParam.optional(),
...pagingParams,
});

4
src/app/api/users/[userId]/route.ts
View file

@ -26,9 +26,9 @@ export async function GET(request: Request, { params }: { params: Promise<{ user
export async function POST(request: Request, { params }: { params: Promise<{ userId: string }> }) {
const schema = z.object({
username: z.string().max(255),
username: z.string().max(255).optional(),
password: z.string().max(255).optional(),
role: userRoleParam,
role: userRoleParam.optional(),
});
const { auth, body, error } = await parseRequest(request, schema);

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

@ -3,15 +3,16 @@ import { getQueryFilters, parseRequest } from '@/lib/request';
import { unauthorized, json } from '@/lib/response';
import { canViewWebsite } from '@/permissions';
import { getEventDataProperties } from '@/queries/sql';
import { dateRangeParams, filterParams } from '@/lib/schema';
export async function GET(
request: Request,
{ params }: { params: Promise<{ websiteId: string }> },
) {
const schema = z.object({
startAt: z.coerce.number().int(),
endAt: z.coerce.number().int(),
propertyName: z.string().optional(),
...dateRangeParams,
...filterParams,
});
const { auth, query, error } = await parseRequest(request, schema);

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

@ -3,16 +3,17 @@ import { getQueryFilters, parseRequest } from '@/lib/request';
import { unauthorized, json } from '@/lib/response';
import { canViewWebsite } from '@/permissions';
import { getEventDataValues } from '@/queries/sql';
import { dateRangeParams, filterParams } from '@/lib/schema';
export async function GET(
request: Request,
{ params }: { params: Promise<{ websiteId: string }> },
) {
const schema = z.object({
startAt: z.coerce.number().int(),
endAt: z.coerce.number().int(),
eventName: z.string().optional(),
propertyName: z.string().optional(),
...dateRangeParams,
...filterParams,
});
const { auth, query, error } = await parseRequest(request, schema);