diff --git a/apps/api/scripts/mock.ts b/apps/api/scripts/mock.ts index 3619f9c4..28ef0024 100644 --- a/apps/api/scripts/mock.ts +++ b/apps/api/scripts/mock.ts @@ -183,12 +183,10 @@ async function createMock(file: string) { await db.project.create({ data: { organizationId: 'openpanel-dev', - organizationSlug: 'openpanel-dev', name: project.domain, clients: { create: { organizationId: 'openpanel-dev', - organizationSlug: 'openpanel-dev', name: project.domain, secret: await hashPassword('secret'), id: project.clientId, diff --git a/apps/api/src/controllers/export.controller.ts b/apps/api/src/controllers/export.controller.ts index 68b3ab2f..9dc30348 100644 --- a/apps/api/src/controllers/export.controller.ts +++ b/apps/api/src/controllers/export.controller.ts @@ -38,7 +38,7 @@ async function getProjectId( const project = await db.project.findUnique({ where: { - organizationId: request.client?.organizationSlug, + organizationId: request.client?.organizationId, id: projectId, }, }); diff --git a/apps/api/src/controllers/webhook.controller.ts b/apps/api/src/controllers/webhook.controller.ts index 65b0b14f..e8d3dd80 100644 --- a/apps/api/src/controllers/webhook.controller.ts +++ b/apps/api/src/controllers/webhook.controller.ts @@ -96,7 +96,6 @@ export async function clerkWebhook( data: access .filter((a) => typeof a === 'string') .map((projectId) => ({ - organizationSlug: membership.organizationId, organizationId: membership.organizationId, projectId: projectId, userId: user.id, @@ -114,7 +113,6 @@ export async function clerkWebhook( data: access .filter((a): a is string => typeof a === 'string') .map((projectId) => ({ - organizationSlug: payload.data.organization.slug, organizationId: payload.data.organization.slug, projectId: projectId, userId: payload.data.public_user_data.user_id, @@ -152,7 +150,7 @@ export async function clerkWebhook( if (payload.type === 'organizationMembership.deleted') { await db.projectAccess.deleteMany({ where: { - organizationSlug: payload.data.organization.slug, + organizationId: payload.data.organization.slug, userId: payload.data.public_user_data.user_id, }, }); diff --git a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/[dashboardId]/list-reports.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/[dashboardId]/list-reports.tsx index 0abb8019..359dd871 100644 --- a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/[dashboardId]/list-reports.tsx +++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/[dashboardId]/list-reports.tsx @@ -60,7 +60,7 @@ export function ListReports({ reports, dashboard }: ListReportsProps) { icon={PlusIcon} onClick={() => { router.push( - `/${params.organizationSlug}/${ + `/${params.organizationId}/${ params.projectId }/reports?${new URLSearchParams({ dashboardId: params.dashboardId, @@ -79,7 +79,7 @@ export function ListReports({ reports, dashboard }: ListReportsProps) { return (
@@ -163,7 +163,7 @@ export function ListReports({ reports, dashboard }: ListReportsProps) {