OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.
fix: project settings overrides each other
Carl-Gerhard Lindesvärdeec1ed40631a
diff --git a/packages/trpc/src/routers/project.ts b/packages/trpc/src/routers/project.tsindex 5c515ba5c..7e5c63e36 100644--- a/packages/trpc/src/routers/project.ts+++ b/packages/trpc/src/routers/project.ts@@ -12,7 +12,11 @@ import {getProjectWithClients,getProjectsByOrganizationId,} from '@openpanel/db';-import { zOnboardingProject, zProject } from '@openpanel/validation';+import {+ zOnboardingProject,+ zProject,+ zProjectUpdate,+} from '@openpanel/validation';import { addHours } from 'date-fns';import { getProjectAccess } from '../access';import { TRPCAccessError, TRPCBadRequestError } from '../errors';@@ -50,12 +54,8 @@ export const projectRouter = createTRPCRouter({}),update: protectedProcedure- .input(zProject.partial())+ .input(zProjectUpdate).mutation(async ({ input, ctx }) => {- if (!input.id) {- throw new Error('Project ID is required to update a project');- }-const access = await getProjectAccess({userId: ctx.session.userId,projectId: input.id,@@ -72,6 +72,7 @@ export const projectRouter = createTRPCRouter({data: {name: input.name,crossDomain: input.crossDomain,+ allowUnsafeRevenueTracking: input.allowUnsafeRevenueTracking,filters:input.filters === undefined ? undefined : input.filters || [],domain:@@ -84,7 +85,6 @@ export const projectRouter = createTRPCRouter({input.cors === undefined? undefined: input.cors.map((c) => stripTrailingSlash(c)) || [],- allowUnsafeRevenueTracking: input.allowUnsafeRevenueTracking,},include: {clients: {diff --git a/packages/validation/src/index.ts b/packages/validation/src/index.tsindex a9897002f..0b48c6bc6 100644--- a/packages/validation/src/index.ts+++ b/packages/validation/src/index.ts@@ -484,6 +484,17 @@ export const zProject = z.object({});export type IProjectEdit = z.infer<typeof zProject>;+export const zProjectUpdate = z.object({+ id: z.string(),+ name: z.string().min(1).optional(),+ filters: z.array(zProjectFilters).optional(),+ domain: z.string().url().or(z.literal('').or(z.null())).optional(),+ cors: z.array(z.string()).optional(),+ crossDomain: z.boolean().optional(),+ allowUnsafeRevenueTracking: z.boolean().optional(),+});+export type IProjectUpdate = z.infer<typeof zProjectUpdate>;+export const zPassword = z.string().min(8);export const zSignInEmail = z.object({