Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

update segmentParamSchema, add typing to getEntity

Francis Caof4eaa9fd0dc0
diff --git a/src/app/api/websites/[websiteId]/segments/route.ts b/src/app/api/websites/[websiteId]/segments/route.ts
index 10d47a81c..db34193ed 100644
--- a/src/app/api/websites/[websiteId]/segments/route.ts
+++ b/src/app/api/websites/[websiteId]/segments/route.ts
@@ -2,7 +2,7 @@ import { z } from 'zod';
import { uuid } from '@/lib/crypto';
import { getQueryFilters, parseRequest } from '@/lib/request';
import { json, unauthorized } from '@/lib/response';
-import { searchParams, segmentParametersSchema, segmentTypeParam } from '@/lib/schema';
+import { searchParams, segmentParamSchema, segmentTypeParam } from '@/lib/schema';
import { canUpdateWebsite, canViewWebsite } from '@/permissions';
import { createSegment, getWebsiteSegments } from '@/queries/prisma';
@@ -42,7 +42,7 @@ export async function POST(
const schema = z.object({
type: segmentTypeParam,
name: z.string().max(200),
- parameters: segmentParametersSchema,
+ parameters: segmentParamSchema,
});
const { auth, body, error } = await parseRequest(request, schema);
diff --git a/src/lib/entity.ts b/src/lib/entity.ts
index 1b64e5dd4..fd26252dd 100644
--- a/src/lib/entity.ts
+++ b/src/lib/entity.ts
@@ -1,6 +1,7 @@
+import type { Link, Pixel, Website } from '@/generated/prisma/client';
import { getLink, getPixel, getWebsite } from '@/queries/prisma';
-export async function getEntity(entityId: string) {
+export async function getEntity(entityId: string): Promise<Website | Link | Pixel | null> {
const website = await getWebsite(entityId);
const link = await getLink(entityId);
const pixel = await getPixel(entityId);
diff --git a/src/lib/schema.ts b/src/lib/schema.ts
index addce3a25..ac360a8e2 100644
--- a/src/lib/schema.ts
+++ b/src/lib/schema.ts
@@ -249,7 +249,7 @@ export const reportResultSchema = z.intersection(
export const segmentTypeParam = z.enum(['segment', 'cohort']);
-export const segmentParametersSchema = z.object({
+export const segmentParamSchema = z.object({
filters: z
.array(
z.object({