From cd16ac878d10013900fc35b87ebc0acee53ecaeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl-Gerhard=20Lindesv=C3=A4rd?=
 <1987198+lindesvard@users.noreply.github.com>
Date: Wed, 20 Nov 2024 14:04:55 +0100
Subject: [PATCH] chore(root): rename organizationSlug to organizationId (#91)

---
 apps/api/scripts/mock.ts                      |   2 -
 apps/api/src/controllers/export.controller.ts |   2 +-
 .../api/src/controllers/webhook.controller.ts |   4 +-
 .../dashboards/[dashboardId]/list-reports.tsx |   6 +-
 .../dashboards/[dashboardId]/page.tsx         |   1 -
 .../list-dashboards/list-dashboards.tsx       |   4 +-
 .../[projectId]/events/page.tsx               |   1 -
 .../layout-organization-selector.tsx          |   2 +-
 .../[projectId]/layout-project-selector.tsx   |  20 +--
 .../[projectId]/layout-sidebar.tsx            |   5 +-
 .../[organizationSlug]/[projectId]/layout.tsx |  10 +-
 .../[organizationSlug]/[projectId]/page.tsx   |   1 -
 .../[projectId]/profiles/[profileId]/page.tsx |   2 -
 .../[projectId]/profiles/page.tsx             |   1 -
 .../[projectId]/realtime/page.tsx             |   1 -
 .../organization/invites/create-invite.tsx    |   4 +-
 .../settings/organization/invites/index.tsx   |  10 +-
 .../settings/organization/members/index.tsx   |  10 +-
 .../settings/organization/page.tsx            |  14 +-
 .../[projectId]/settings/projects/page.tsx    |  15 +-
 .../[projectId]/settings/references/page.tsx  |   1 -
 .../src/app/(app)/[organizationSlug]/page.tsx |  12 +-
 .../onboarding/[projectId]/connect/page.tsx   |   4 +-
 .../[projectId]/verify/onboarding-verify.tsx  |   2 +-
 .../onboarding/[projectId]/verify/page.tsx    |   4 +-
 .../onboarding/onboarding-tracking.tsx        |   4 +-
 .../app/(public)/share/overview/[id]/page.tsx |   4 +-
 .../src/app/api/clerk/webhook/route.ts        |   4 +-
 .../src/components/events/event-list-item.tsx |   4 +-
 apps/dashboard/src/components/links.tsx       |   4 +-
 .../src/components/projects/project-card.tsx  |   4 +-
 .../components/settings/members/columns.tsx   |   2 +-
 apps/dashboard/src/hooks/useAppParams.ts      |   4 +-
 apps/dashboard/src/modals/AddClient.tsx       |   6 +-
 apps/dashboard/src/modals/AddDashboard.tsx    |   4 +-
 apps/dashboard/src/modals/AddProject.tsx      |   4 +-
 apps/dashboard/src/modals/SaveReport.tsx      |   4 +-
 .../src/modals/ShareOverviewModal.tsx         |   4 +-
 packages/db/prisma/schema.prisma              |  89 +++++-----
 packages/db/src/services/clients.service.ts   |   4 +-
 .../db/src/services/organization.service.ts   |  14 +-
 packages/db/src/services/project.service.ts   |  12 +-
 packages/trpc/src/access.ts                   |   6 +-
 packages/trpc/src/routers/client.ts           |   5 +-
 packages/trpc/src/routers/dashboard.ts        |   1 -
 packages/trpc/src/routers/onboarding.ts       |   6 +-
 packages/trpc/src/routers/organization.ts     |  13 +-
 packages/trpc/src/routers/project.ts          |  17 +-
 packages/trpc/src/routers/share.ts            |   3 +-
 packages/trpc/src/trpc.ts                     |  11 --
 packages/validation/src/index.ts              |  10 +-
 pnpm-lock.yaml                                | 155 ++----------------
 52 files changed, 176 insertions(+), 360 deletions(-)

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 (
             <div className="card" key={report.id}>
               <Link
-                href={`/${params.organizationSlug}/${params.projectId}/reports/${report.id}`}
+                href={`/${params.organizationId}/${params.projectId}/reports/${report.id}`}
                 className="flex items-center justify-between border-b border-border p-4 leading-none [&_svg]:hover:opacity-100"
                 shallow
               >
@@ -163,7 +163,7 @@ export function ListReports({ reports, dashboard }: ListReportsProps) {
             <Button
               onClick={() =>
                 router.push(
-                  `/${params.organizationSlug}/${
+                  `/${params.organizationId}/${
                     params.projectId
                   }/reports?${new URLSearchParams({
                     dashboardId: params.dashboardId,
diff --git a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/[dashboardId]/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/[dashboardId]/page.tsx
index 0fc967fe..5b5ef077 100644
--- a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/[dashboardId]/page.tsx
+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/[dashboardId]/page.tsx
@@ -7,7 +7,6 @@ import { ListReports } from './list-reports';
 
 interface PageProps {
   params: {
-    organizationSlug: string;
     projectId: string;
     dashboardId: string;
   };
diff --git a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/list-dashboards/list-dashboards.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/list-dashboards/list-dashboards.tsx
index 6dfeb3d9..24ef40b6 100644
--- a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/list-dashboards/list-dashboards.tsx
+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/list-dashboards/list-dashboards.tsx
@@ -37,7 +37,7 @@ interface ListDashboardsProps {
 export function ListDashboards({ dashboards }: ListDashboardsProps) {
   const router = useRouter();
   const params = useAppParams();
-  const { organizationSlug, projectId } = params;
+  const { organizationId, projectId } = params;
   const deletion = api.dashboard.delete.useMutation({
     onError: (error, variables) => {
       return handleErrorToastOptions({
@@ -87,7 +87,7 @@ export function ListDashboards({ dashboards }: ListDashboardsProps) {
             <Card key={item.id} hover>
               <div>
                 <Link
-                  href={`/${organizationSlug}/${projectId}/dashboards/${item.id}`}
+                  href={`/${organizationId}/${projectId}/dashboards/${item.id}`}
                   className="flex flex-col p-4 @container"
                 >
                   <div className="col gap-2">
diff --git a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/page.tsx
index a5bcab61..64c590f8 100644
--- a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/page.tsx
+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/page.tsx
@@ -9,7 +9,6 @@ import Events from './events';
 interface PageProps {
   params: {
     projectId: string;
-    organizationSlug: string;
   };
   searchParams: Record<string, string>;
 }
diff --git a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-organization-selector.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-organization-selector.tsx
index a440c964..6eabdaba 100644
--- a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-organization-selector.tsx
+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-organization-selector.tsx
@@ -18,7 +18,7 @@ export default function LayoutOrganizationSelector({
   const router = useRouter();
 
   const organization = organizations.find(
-    (item) => item.id === params.organizationSlug,
+    (item) => item.id === params.organizationId,
   );
 
   return (
diff --git a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-project-selector.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-project-selector.tsx
index 3ffca1e4..f29f2e30 100644
--- a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-project-selector.tsx
+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-project-selector.tsx
@@ -14,11 +14,9 @@ import {
 } from '@/components/ui/dropdown-menu';
 import { useAppParams } from '@/hooks/useAppParams';
 import { pushModal } from '@/modals';
-import { cn } from '@/utils/cn';
 import {
   Building2Icon,
   CheckIcon,
-  ChevronsUpDown,
   ChevronsUpDownIcon,
   PlusIcon,
 } from 'lucide-react';
@@ -27,12 +25,12 @@ import { useState } from 'react';
 
 import type {
   getCurrentOrganizations,
-  getProjectsByOrganizationSlug,
+  getProjectsByOrganizationId,
 } from '@openpanel/db';
 import Link from 'next/link';
 
 interface LayoutProjectSelectorProps {
-  projects: Awaited<ReturnType<typeof getProjectsByOrganizationSlug>>;
+  projects: Awaited<ReturnType<typeof getProjectsByOrganizationId>>;
   organizations?: Awaited<ReturnType<typeof getCurrentOrganizations>>;
   align?: 'start' | 'end';
 }
@@ -42,22 +40,22 @@ export default function LayoutProjectSelector({
   align = 'start',
 }: LayoutProjectSelectorProps) {
   const router = useRouter();
-  const { organizationSlug, projectId } = useAppParams();
+  const { organizationId, projectId } = useAppParams();
   const pathname = usePathname() || '';
   const [open, setOpen] = useState(false);
 
   const changeProject = (newProjectId: string) => {
-    if (organizationSlug && projectId) {
+    if (organizationId && projectId) {
       const split = pathname
         .replace(
-          `/${organizationSlug}/${projectId}`,
-          `/${organizationSlug}/${newProjectId}`,
+          `/${organizationId}/${projectId}`,
+          `/${organizationId}/${newProjectId}`,
         )
         .split('/');
       // slicing here will remove everything after /{orgId}/{projectId}/dashboards [slice here] /xxx/xxx/xxx
       router.push(split.slice(0, 4).join('/'));
     } else {
-      router.push(`/${organizationSlug}/${newProjectId}`);
+      router.push(`/${organizationId}/${newProjectId}`);
     }
   };
 
@@ -102,7 +100,7 @@ export default function LayoutProjectSelector({
           ))}
           {projects.length > 10 && (
             <DropdownMenuItem asChild>
-              <Link href={`/${organizationSlug}`}>All projects</Link>
+              <Link href={`/${organizationId}`}>All projects</Link>
             </DropdownMenuItem>
           )}
           <DropdownMenuItem
@@ -126,7 +124,7 @@ export default function LayoutProjectSelector({
                   onClick={() => changeOrganization(organization.id)}
                 >
                   {organization.name}
-                  {organization.id === organizationSlug && (
+                  {organization.id === organizationId && (
                     <DropdownMenuShortcut>
                       <CheckIcon size={16} />
                     </DropdownMenuShortcut>
diff --git a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-sidebar.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-sidebar.tsx
index 49d043c3..ad3b98ca 100644
--- a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-sidebar.tsx
+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-sidebar.tsx
@@ -11,7 +11,7 @@ import { useEffect, useState } from 'react';
 import type {
   IServiceDashboards,
   IServiceOrganization,
-  getProjectsByOrganizationSlug,
+  getProjectsByOrganizationId,
 } from '@openpanel/db';
 
 import LayoutMenu from './layout-menu';
@@ -20,9 +20,8 @@ import LayoutProjectSelector from './layout-project-selector';
 interface LayoutSidebarProps {
   organizations: IServiceOrganization[];
   dashboards: IServiceDashboards;
-  organizationSlug: string;
   projectId: string;
-  projects: Awaited<ReturnType<typeof getProjectsByOrganizationSlug>>;
+  projects: Awaited<ReturnType<typeof getProjectsByOrganizationId>>;
 }
 export function LayoutSidebar({
   organizations,
diff --git a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout.tsx
index 157f523b..5aeb6fb2 100644
--- a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout.tsx
+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout.tsx
@@ -13,22 +13,22 @@ import SideEffects from './side-effects';
 interface AppLayoutProps {
   children: React.ReactNode;
   params: {
-    organizationSlug: string;
+    organizationId: string;
     projectId: string;
   };
 }
 
 export default async function AppLayout({
   children,
-  params: { organizationSlug, projectId },
+  params: { organizationId, projectId },
 }: AppLayoutProps) {
   const [organizations, projects, dashboards] = await Promise.all([
     getCurrentOrganizations(),
-    getCurrentProjects(organizationSlug),
+    getCurrentProjects(organizationId),
     getDashboardsByProjectId(projectId),
   ]);
 
-  if (!organizations.find((item) => item.id === organizationSlug)) {
+  if (!organizations.find((item) => item.id === organizationId)) {
     return (
       <FullPageEmptyState title="Not found" className="min-h-screen">
         The organization you were looking for could not be found.
@@ -48,7 +48,7 @@ export default async function AppLayout({
     <div id="dashboard">
       <LayoutSidebar
         {...{
-          organizationSlug,
+          organizationId,
           projectId,
           organizations,
           projects,
diff --git a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/page.tsx
index acbf27b1..7a0a8f5b 100644
--- a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/page.tsx
+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/page.tsx
@@ -13,7 +13,6 @@ import { OverviewReportRange } from './overview-sticky-header';
 
 interface PageProps {
   params: {
-    organizationSlug: string;
     projectId: string;
   };
 }
diff --git a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/[profileId]/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/[profileId]/page.tsx
index 9484bf65..982c8dcc 100644
--- a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/[profileId]/page.tsx
+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/[profileId]/page.tsx
@@ -1,5 +1,4 @@
 import ClickToCopy from '@/components/click-to-copy';
-import { ListPropertiesIcon } from '@/components/events/list-properties-icon';
 import { ProfileAvatar } from '@/components/profiles/profile-avatar';
 import { Padding } from '@/components/ui/padding';
 import { getProfileName } from '@/utils/getters';
@@ -16,7 +15,6 @@ import ProfileMetrics from './profile-metrics';
 
 interface PageProps {
   params: {
-    organizationSlug: string;
     projectId: string;
     profileId: string;
   };
diff --git a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/page.tsx
index bfaa63ec..1f1bb38b 100644
--- a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/page.tsx
+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/page.tsx
@@ -8,7 +8,6 @@ import Profiles from './profiles';
 interface PageProps {
   params: {
     projectId: string;
-    organizationSlug: string;
   };
   searchParams: Record<string, string>;
 }
diff --git a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/realtime/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/realtime/page.tsx
index c190ad00..12e6485f 100644
--- a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/realtime/page.tsx
+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/realtime/page.tsx
@@ -13,7 +13,6 @@ import RealtimeReloader from './realtime-reloader';
 
 type Props = {
   params: {
-    organizationSlug: string;
     projectId: string;
   };
 };
diff --git a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/invites/create-invite.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/invites/create-invite.tsx
index bbf9ac6d..08c80575 100644
--- a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/invites/create-invite.tsx
+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/invites/create-invite.tsx
@@ -35,12 +35,12 @@ interface Props {
 
 export default function CreateInvite({ projects }: Props) {
   const router = useRouter();
-  const { organizationSlug } = useAppParams();
+  const { organizationId } = useAppParams();
 
   const { register, handleSubmit, formState, reset, control } = useForm<IForm>({
     resolver: zodResolver(zInviteUser),
     defaultValues: {
-      organizationSlug,
+      organizationId,
       access: [],
       role: 'org:member',
     },
diff --git a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/invites/index.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/invites/index.tsx
index 247eceb0..9484d973 100644
--- a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/invites/index.tsx
+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/invites/index.tsx
@@ -1,18 +1,18 @@
 import { TableButtons } from '@/components/data-table';
 import { InvitesTable } from '@/components/settings/invites';
 
-import { getInvites, getProjectsByOrganizationSlug } from '@openpanel/db';
+import { getInvites, getProjectsByOrganizationId } from '@openpanel/db';
 
 import CreateInvite from './create-invite';
 
 interface Props {
-  organizationSlug: string;
+  organizationId: string;
 }
 
-const InvitesServer = async ({ organizationSlug }: Props) => {
+const InvitesServer = async ({ organizationId }: Props) => {
   const [invites, projects] = await Promise.all([
-    getInvites(organizationSlug),
-    getProjectsByOrganizationSlug(organizationSlug),
+    getInvites(organizationId),
+    getProjectsByOrganizationId(organizationId),
   ]);
 
   return (
diff --git a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/members/index.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/members/index.tsx
index 1f485c02..971809b0 100644
--- a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/members/index.tsx
+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/members/index.tsx
@@ -1,15 +1,15 @@
 import { MembersTable } from '@/components/settings/members';
 
-import { getMembers, getProjectsByOrganizationSlug } from '@openpanel/db';
+import { getMembers, getProjectsByOrganizationId } from '@openpanel/db';
 
 interface Props {
-  organizationSlug: string;
+  organizationId: string;
 }
 
-const MembersServer = async ({ organizationSlug }: Props) => {
+const MembersServer = async ({ organizationId }: Props) => {
   const [members, projects] = await Promise.all([
-    getMembers(organizationSlug),
-    getProjectsByOrganizationSlug(organizationSlug),
+    getMembers(organizationId),
+    getProjectsByOrganizationId(organizationId),
   ]);
 
   return <MembersTable data={members} projects={projects} />;
diff --git a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/page.tsx
index 77d5e59b..696113d4 100644
--- a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/page.tsx
+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/page.tsx
@@ -14,13 +14,13 @@ import MembersServer from './members';
 
 interface PageProps {
   params: {
-    organizationSlug: string;
+    organizationId: string;
   };
   searchParams: Record<string, string>;
 }
 
 export default async function Page({
-  params: { organizationSlug },
+  params: { organizationId },
   searchParams,
 }: PageProps) {
   const tab = parseAsStringEnum(['org', 'members', 'invites'])
@@ -29,7 +29,7 @@ export default async function Page({
   const session = auth();
   const organization = await db.organization.findUnique({
     where: {
-      id: organizationSlug,
+      id: organizationId,
       members: {
         some: {
           userId: session.userId,
@@ -80,12 +80,8 @@ export default async function Page({
       </PageTabs>
 
       {tab === 'org' && <EditOrganization organization={organization} />}
-      {tab === 'members' && (
-        <MembersServer organizationSlug={organizationSlug} />
-      )}
-      {tab === 'invites' && (
-        <InvitesServer organizationSlug={organizationSlug} />
-      )}
+      {tab === 'members' && <MembersServer organizationId={organizationId} />}
+      {tab === 'invites' && <InvitesServer organizationId={organizationId} />}
     </Padding>
   );
 }
diff --git a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/projects/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/projects/page.tsx
index a0242f63..6d8cfc1b 100644
--- a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/projects/page.tsx
+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/projects/page.tsx
@@ -1,25 +1,22 @@
-import PageLayout from '@/app/(app)/[organizationSlug]/[projectId]/page-layout';
 import { Padding } from '@/components/ui/padding';
 
 import {
-  getClientsByOrganizationSlug,
-  getProjectsByOrganizationSlug,
+  getClientsByOrganizationId,
+  getProjectsByOrganizationId,
 } from '@openpanel/db';
 
 import ListProjects from './list-projects';
 
 interface PageProps {
   params: {
-    organizationSlug: string;
+    organizationId: string;
   };
 }
 
-export default async function Page({
-  params: { organizationSlug },
-}: PageProps) {
+export default async function Page({ params: { organizationId } }: PageProps) {
   const [projects, clients] = await Promise.all([
-    getProjectsByOrganizationSlug(organizationSlug),
-    getClientsByOrganizationSlug(organizationSlug),
+    getProjectsByOrganizationId(organizationId),
+    getClientsByOrganizationId(organizationId),
   ]);
 
   return (
diff --git a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/references/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/references/page.tsx
index c506cdec..e32df231 100644
--- a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/references/page.tsx
+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/references/page.tsx
@@ -4,7 +4,6 @@ import ListReferences from './list-references';
 
 interface PageProps {
   params: {
-    organizationSlug: string;
     projectId: string;
   };
 }
diff --git a/apps/dashboard/src/app/(app)/[organizationSlug]/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/page.tsx
index 0f9e0c1f..ab2cb501 100644
--- a/apps/dashboard/src/app/(app)/[organizationSlug]/page.tsx
+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/page.tsx
@@ -8,19 +8,17 @@ import { getCurrentOrganizations, getCurrentProjects } from '@openpanel/db';
 
 interface PageProps {
   params: {
-    organizationSlug: string;
+    organizationId: string;
   };
 }
 
-export default async function Page({
-  params: { organizationSlug },
-}: PageProps) {
+export default async function Page({ params: { organizationId } }: PageProps) {
   const [organizations, projects] = await Promise.all([
     getCurrentOrganizations(),
-    getCurrentProjects(organizationSlug),
+    getCurrentProjects(organizationId),
   ]);
 
-  const organization = organizations.find((org) => org.id === organizationSlug);
+  const organization = organizations.find((org) => org.id === organizationId);
 
   if (!organization) {
     return (
@@ -35,7 +33,7 @@ export default async function Page({
   }
 
   if (projects.length === 1 && projects[0]) {
-    return redirect(`/${organizationSlug}/${projects[0].id}`);
+    return redirect(`/${organizationId}/${projects[0].id}`);
   }
 
   return (
diff --git a/apps/dashboard/src/app/(onboarding)/onboarding/[projectId]/connect/page.tsx b/apps/dashboard/src/app/(onboarding)/onboarding/[projectId]/connect/page.tsx
index e0758b36..6a76ad71 100644
--- a/apps/dashboard/src/app/(onboarding)/onboarding/[projectId]/connect/page.tsx
+++ b/apps/dashboard/src/app/(onboarding)/onboarding/[projectId]/connect/page.tsx
@@ -10,8 +10,8 @@ type Props = {
 
 const Connect = async ({ params: { projectId } }: Props) => {
   const orgs = await getCurrentOrganizations();
-  const organizationSlug = orgs[0]?.id;
-  if (!organizationSlug) {
+  const organizationId = orgs[0]?.id;
+  if (!organizationId) {
     throw new Error('No organization found');
   }
   const project = await getProjectWithClients(projectId);
diff --git a/apps/dashboard/src/app/(onboarding)/onboarding/[projectId]/verify/onboarding-verify.tsx b/apps/dashboard/src/app/(onboarding)/onboarding/[projectId]/verify/onboarding-verify.tsx
index f512f057..28da18ad 100644
--- a/apps/dashboard/src/app/(onboarding)/onboarding/[projectId]/verify/onboarding-verify.tsx
+++ b/apps/dashboard/src/app/(onboarding)/onboarding/[projectId]/verify/onboarding-verify.tsx
@@ -72,7 +72,7 @@ const Verify = ({ project, events }: Props) => {
         <div className="flex items-center gap-8">
           {!verified && (
             <Link
-              href={`/${project.organizationSlug}/${project.id}`}
+              href={`/${project.organizationId}/${project.id}`}
               className=" text-muted-foreground underline"
             >
               Skip for now
diff --git a/apps/dashboard/src/app/(onboarding)/onboarding/[projectId]/verify/page.tsx b/apps/dashboard/src/app/(onboarding)/onboarding/[projectId]/verify/page.tsx
index 47632d28..422028c4 100644
--- a/apps/dashboard/src/app/(onboarding)/onboarding/[projectId]/verify/page.tsx
+++ b/apps/dashboard/src/app/(onboarding)/onboarding/[projectId]/verify/page.tsx
@@ -18,8 +18,8 @@ type Props = {
 
 const Verify = async ({ params: { projectId } }: Props) => {
   const orgs = await getCurrentOrganizations();
-  const organizationSlug = orgs[0]?.id;
-  if (!organizationSlug) {
+  const organizationId = orgs[0]?.id;
+  if (!organizationId) {
     throw new Error('No organization found');
   }
   const [project, events] = await Promise.all([
diff --git a/apps/dashboard/src/app/(onboarding)/onboarding/onboarding-tracking.tsx b/apps/dashboard/src/app/(onboarding)/onboarding/onboarding-tracking.tsx
index 4afc5ba2..db7e0aa3 100644
--- a/apps/dashboard/src/app/(onboarding)/onboarding/onboarding-tracking.tsx
+++ b/apps/dashboard/src/app/(onboarding)/onboarding/onboarding-tracking.tsx
@@ -100,7 +100,7 @@ const Tracking = ({
           {organizations.length > 0 ? (
             <Controller
               control={form.control}
-              name="organizationSlug"
+              name="organizationId"
               render={({ field, formState }) => {
                 return (
                   <div>
@@ -109,7 +109,7 @@ const Tracking = ({
                       className="w-full"
                       placeholder="Select workspace"
                       icon={Building}
-                      error={formState.errors.organizationSlug?.message}
+                      error={formState.errors.organizationId?.message}
                       value={field.value}
                       items={
                         organizations
diff --git a/apps/dashboard/src/app/(public)/share/overview/[id]/page.tsx b/apps/dashboard/src/app/(public)/share/overview/[id]/page.tsx
index 48f9aff7..9e540649 100644
--- a/apps/dashboard/src/app/(public)/share/overview/[id]/page.tsx
+++ b/apps/dashboard/src/app/(public)/share/overview/[id]/page.tsx
@@ -1,9 +1,7 @@
 import { StickyBelowHeader } from '@/app/(app)/[organizationSlug]/[projectId]/layout-sticky-below-header';
 import { OverviewReportRange } from '@/app/(app)/[organizationSlug]/[projectId]/overview-sticky-header';
-import { Logo } from '@/components/logo';
 import { OverviewFiltersButtons } from '@/components/overview/filters/overview-filters-buttons';
 import ServerLiveCounter from '@/components/overview/live-counter';
-import { OverviewLiveHistogram } from '@/components/overview/overview-live-histogram';
 import OverviewMetrics from '@/components/overview/overview-metrics';
 import OverviewTopDevices from '@/components/overview/overview-top-devices';
 import OverviewTopEvents from '@/components/overview/overview-top-events';
@@ -35,7 +33,7 @@ export default async function Page({
     return notFound();
   }
   const projectId = share.projectId;
-  const organization = await getOrganizationBySlug(share.organizationSlug);
+  const organization = await getOrganizationBySlug(share.organizationId);
 
   return (
     <div>
diff --git a/apps/dashboard/src/app/api/clerk/webhook/route.ts b/apps/dashboard/src/app/api/clerk/webhook/route.ts
index bcb32580..0148b2f9 100644
--- a/apps/dashboard/src/app/api/clerk/webhook/route.ts
+++ b/apps/dashboard/src/app/api/clerk/webhook/route.ts
@@ -54,7 +54,6 @@ export async function POST(request: Request) {
           data: access
             .filter((a) => typeof a === 'string')
             .map((projectId) => ({
-              organizationSlug: membership.organizationId,
               organizationId: membership.organizationId,
               projectId: projectId,
               userId: user.id,
@@ -72,7 +71,6 @@ export async function POST(request: Request) {
         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,
@@ -110,7 +108,7 @@ export async function POST(request: Request) {
   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/components/events/event-list-item.tsx b/apps/dashboard/src/components/events/event-list-item.tsx
index 4983a543..0faeaa28 100644
--- a/apps/dashboard/src/components/events/event-list-item.tsx
+++ b/apps/dashboard/src/components/events/event-list-item.tsx
@@ -16,7 +16,7 @@ import { EventIcon } from './event-icon';
 type EventListItemProps = IServiceEventMinimal | IServiceEvent;
 
 export function EventListItem(props: EventListItemProps) {
-  const { organizationSlug, projectId } = useAppParams();
+  const { organizationId, projectId } = useAppParams();
   const { createdAt, name, path, duration, meta } = props;
   const profile = 'profile' in props ? props.profile : null;
 
@@ -88,7 +88,7 @@ export function EventListItem(props: EventListItemProps) {
               onClick={(e) => {
                 e.stopPropagation();
               }}
-              href={`/${organizationSlug}/${projectId}/profiles/${profile?.id}`}
+              href={`/${organizationId}/${projectId}/profiles/${profile?.id}`}
               className="max-w-[80px] overflow-hidden text-ellipsis whitespace-nowrap  text-muted-foreground hover:underline"
             >
               {getProfileName(profile)}
diff --git a/apps/dashboard/src/components/links.tsx b/apps/dashboard/src/components/links.tsx
index 028ee400..6f3e3491 100644
--- a/apps/dashboard/src/components/links.tsx
+++ b/apps/dashboard/src/components/links.tsx
@@ -10,12 +10,12 @@ export function ProjectLink({
   className?: string;
   title?: string;
 }) {
-  const { organizationSlug, projectId } = useAppParams();
+  const { organizationId, projectId } = useAppParams();
   if (typeof props.href === 'string') {
     return (
       <Link
         {...props}
-        href={`/${organizationSlug}/${projectId}/${props.href.replace(
+        href={`/${organizationId}/${projectId}/${props.href.replace(
           /^\//,
           '',
         )}`}
diff --git a/apps/dashboard/src/components/projects/project-card.tsx b/apps/dashboard/src/components/projects/project-card.tsx
index 17a60649..500e32fa 100644
--- a/apps/dashboard/src/components/projects/project-card.tsx
+++ b/apps/dashboard/src/components/projects/project-card.tsx
@@ -8,13 +8,13 @@ import { TABLE_NAMES, chQuery } from '@openpanel/db';
 import { ChartSSR } from '../chart-ssr';
 import { FadeIn } from '../fade-in';
 
-function ProjectCard({ id, name, organizationSlug }: IServiceProject) {
+function ProjectCard({ id, name, organizationId }: IServiceProject) {
   // For some unknown reason I get when navigating back to this page when using <Link />
   // Should be solved: https://github.com/vercel/next.js/issues/61336
   // But still get the error
   return (
     <a
-      href={`/${organizationSlug}/${id}`}
+      href={`/${organizationId}/${id}`}
       className="card inline-flex flex-col gap-2 p-4 transition-transform hover:-translate-y-1"
     >
       <div className="font-medium">{name}</div>
diff --git a/apps/dashboard/src/components/settings/members/columns.tsx b/apps/dashboard/src/components/settings/members/columns.tsx
index 6c61c8de..2cb16848 100644
--- a/apps/dashboard/src/components/settings/members/columns.tsx
+++ b/apps/dashboard/src/components/settings/members/columns.tsx
@@ -96,7 +96,7 @@ function AccessCell({
         setAccess(newAccess);
         mutation.mutate({
           userId: row.original.user!.id,
-          organizationSlug: row.original.organizationId,
+          organizationId: row.original.organizationId,
           access: newAccess as string[],
         });
       }}
diff --git a/apps/dashboard/src/hooks/useAppParams.ts b/apps/dashboard/src/hooks/useAppParams.ts
index 875aa309..83e3de54 100644
--- a/apps/dashboard/src/hooks/useAppParams.ts
+++ b/apps/dashboard/src/hooks/useAppParams.ts
@@ -1,16 +1,14 @@
 import { useParams } from 'next/navigation';
 
 type AppParams = {
-  organizationSlug: string;
   organizationId: string;
   projectId: string;
 };
 
 export function useAppParams<T>() {
-  const params = useParams<T & AppParams>();
+  const params = useParams<T & AppParams & { organizationSlug: string }>();
   return {
     ...(params ?? {}),
-    organizationSlug: params?.organizationSlug,
     organizationId: params?.organizationSlug,
     projectId: params?.projectId,
   } as T & AppParams;
diff --git a/apps/dashboard/src/modals/AddClient.tsx b/apps/dashboard/src/modals/AddClient.tsx
index ad9deafb..314c83a0 100644
--- a/apps/dashboard/src/modals/AddClient.tsx
+++ b/apps/dashboard/src/modals/AddClient.tsx
@@ -39,7 +39,7 @@ interface Props {
   projectId: string;
 }
 export default function AddClient(props: Props) {
-  const { organizationSlug, projectId } = useAppParams();
+  const { organizationId, projectId } = useAppParams();
   const router = useRouter();
   const form = useForm<IForm>({
     resolver: zodResolver(validation),
@@ -60,7 +60,7 @@ export default function AddClient(props: Props) {
     },
   });
   const query = api.project.list.useQuery({
-    organizationSlug,
+    organizationId,
   });
   const onSubmit: SubmitHandler<IForm> = (values) => {
     if (hasDomain && values.cors === '') {
@@ -73,7 +73,7 @@ export default function AddClient(props: Props) {
       name: values.name,
       cors: hasDomain ? values.cors : null,
       projectId: values.projectId,
-      organizationSlug,
+      organizationId,
       type: values.type,
       crossDomain: values.crossDomain,
     });
diff --git a/apps/dashboard/src/modals/AddDashboard.tsx b/apps/dashboard/src/modals/AddDashboard.tsx
index 23fc1d5e..9dc5b518 100644
--- a/apps/dashboard/src/modals/AddDashboard.tsx
+++ b/apps/dashboard/src/modals/AddDashboard.tsx
@@ -19,7 +19,7 @@ const validator = z.object({
 type IForm = z.infer<typeof validator>;
 
 export default function AddDashboard() {
-  const { projectId, organizationSlug } = useAppParams();
+  const { projectId, organizationId } = useAppParams();
   const router = useRouter();
 
   const { register, handleSubmit, formState } = useForm<IForm>({
@@ -32,7 +32,7 @@ export default function AddDashboard() {
   const mutation = api.dashboard.create.useMutation({
     onError: handleError,
     onSuccess(res) {
-      router.push(`/${organizationSlug}/${projectId}/dashboards/${res.id}`);
+      router.push(`/${organizationId}/${projectId}/dashboards/${res.id}`);
       toast('Success', {
         description: 'Dashboard created.',
       });
diff --git a/apps/dashboard/src/modals/AddProject.tsx b/apps/dashboard/src/modals/AddProject.tsx
index 60eb71d0..af2be453 100644
--- a/apps/dashboard/src/modals/AddProject.tsx
+++ b/apps/dashboard/src/modals/AddProject.tsx
@@ -19,7 +19,7 @@ const validator = z.object({
 type IForm = z.infer<typeof validator>;
 
 export default function AddProject() {
-  const { organizationSlug } = useAppParams();
+  const { organizationId } = useAppParams();
   const router = useRouter();
   const mutation = api.project.create.useMutation({
     onError: handleError,
@@ -45,7 +45,7 @@ export default function AddProject() {
         onSubmit={handleSubmit((values) => {
           mutation.mutate({
             ...values,
-            organizationSlug,
+            organizationId,
           });
         })}
       >
diff --git a/apps/dashboard/src/modals/SaveReport.tsx b/apps/dashboard/src/modals/SaveReport.tsx
index 34426c89..efb7ed6b 100644
--- a/apps/dashboard/src/modals/SaveReport.tsx
+++ b/apps/dashboard/src/modals/SaveReport.tsx
@@ -30,7 +30,7 @@ type IForm = z.infer<typeof validator>;
 
 export default function SaveReport({ report }: SaveReportProps) {
   const router = useRouter();
-  const { organizationSlug, projectId } = useAppParams();
+  const { organizationId, projectId } = useAppParams();
   const searchParams = useSearchParams();
   const dashboardId = searchParams?.get('dashboardId') ?? undefined;
 
@@ -42,7 +42,7 @@ export default function SaveReport({ report }: SaveReportProps) {
       });
       popModal();
       router.push(
-        `/${organizationSlug}/${projectId}/reports/${
+        `/${organizationId}/${projectId}/reports/${
           res.id
         }?${searchParams?.toString()}`,
       );
diff --git a/apps/dashboard/src/modals/ShareOverviewModal.tsx b/apps/dashboard/src/modals/ShareOverviewModal.tsx
index 8db420bb..2efb20a6 100644
--- a/apps/dashboard/src/modals/ShareOverviewModal.tsx
+++ b/apps/dashboard/src/modals/ShareOverviewModal.tsx
@@ -20,7 +20,7 @@ const validator = zShareOverview;
 type IForm = z.infer<typeof validator>;
 
 export default function ShareOverviewModal() {
-  const { projectId, organizationSlug } = useAppParams();
+  const { projectId, organizationId } = useAppParams();
   const router = useRouter();
 
   const { register, handleSubmit, control } = useForm<IForm>({
@@ -29,7 +29,7 @@ export default function ShareOverviewModal() {
       public: true,
       password: '',
       projectId,
-      organizationSlug,
+      organizationId,
     },
   });
 
diff --git a/packages/db/prisma/schema.prisma b/packages/db/prisma/schema.prisma
index 6cede931..dbbf2476 100644
--- a/packages/db/prisma/schema.prisma
+++ b/packages/db/prisma/schema.prisma
@@ -74,13 +74,12 @@ model Member {
 }
 
 model Project {
-  id               String        @id @default(dbgenerated("gen_random_uuid()"))
-  name             String
-  organizationSlug String
-  organization     Organization? @relation(fields: [organizationId], references: [id])
-  organizationId   String?
-  eventsCount      Int           @default(0)
-  types            ProjectType[] @default([])
+  id             String        @id @default(dbgenerated("gen_random_uuid()"))
+  name           String
+  organization   Organization  @relation(fields: [organizationId], references: [id])
+  organizationId String
+  eventsCount    Int           @default(0)
+  types          ProjectType[] @default([])
 
   events     Event[]
   profiles   Profile[]
@@ -108,17 +107,16 @@ enum AccessLevel {
 }
 
 model ProjectAccess {
-  id               String        @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
-  projectId        String
-  project          Project       @relation(fields: [projectId], references: [id])
-  organizationSlug String
-  organization     Organization? @relation(fields: [organizationId], references: [id])
-  organizationId   String?
-  userId           String
-  user             User          @relation(fields: [userId], references: [id])
-  level            AccessLevel
-  createdAt        DateTime      @default(now())
-  updatedAt        DateTime      @default(now()) @updatedAt
+  id             String       @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
+  projectId      String
+  project        Project      @relation(fields: [projectId], references: [id])
+  organization   Organization @relation(fields: [organizationId], references: [id])
+  organizationId String
+  userId         String
+  user           User         @relation(fields: [userId], references: [id])
+  level          AccessLevel
+  createdAt      DateTime     @default(now())
+  updatedAt      DateTime     @default(now()) @updatedAt
 
   @@map("project_access")
 }
@@ -169,17 +167,16 @@ enum ClientType {
 }
 
 model Client {
-  id               String        @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
-  name             String
-  secret           String?
-  type             ClientType    @default(write)
-  projectId        String?
-  project          Project?      @relation(fields: [projectId], references: [id])
-  organizationSlug String
-  organization     Organization? @relation(fields: [organizationId], references: [id])
-  organizationId   String?
-  cors             String?
-  crossDomain      Boolean       @default(false)
+  id             String       @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
+  name           String
+  secret         String?
+  type           ClientType   @default(write)
+  projectId      String?
+  project        Project?     @relation(fields: [projectId], references: [id])
+  organization   Organization @relation(fields: [organizationId], references: [id])
+  organizationId String
+  cors           String?
+  crossDomain    Boolean      @default(false)
 
   createdAt DateTime @default(now())
   updatedAt DateTime @default(now()) @updatedAt
@@ -208,14 +205,13 @@ enum ChartType {
 }
 
 model Dashboard {
-  id               String        @id @default(dbgenerated("gen_random_uuid()"))
-  name             String
-  organizationSlug String
-  organization     Organization? @relation(fields: [organizationId], references: [id])
-  organizationId   String?
-  projectId        String
-  project          Project       @relation(fields: [projectId], references: [id])
-  reports          Report[]
+  id             String       @id @default(dbgenerated("gen_random_uuid()"))
+  name           String
+  organization   Organization @relation(fields: [organizationId], references: [id])
+  organizationId String
+  projectId      String
+  project        Project      @relation(fields: [projectId], references: [id])
+  reports        Report[]
 
   createdAt DateTime @default(now())
   updatedAt DateTime @default(now()) @updatedAt
@@ -269,16 +265,15 @@ model Waitlist {
 }
 
 model ShareOverview {
-  id               String        @unique
-  projectId        String        @unique
-  project          Project       @relation(fields: [projectId], references: [id])
-  organizationSlug String
-  organization     Organization? @relation(fields: [organizationId], references: [id])
-  organizationId   String?
-  public           Boolean       @default(false)
-  password         String?
-  createdAt        DateTime      @default(now())
-  updatedAt        DateTime      @default(now()) @updatedAt
+  id             String       @unique
+  projectId      String       @unique
+  project        Project      @relation(fields: [projectId], references: [id])
+  organization   Organization @relation(fields: [organizationId], references: [id])
+  organizationId String
+  public         Boolean      @default(false)
+  password       String?
+  createdAt      DateTime     @default(now())
+  updatedAt      DateTime     @default(now()) @updatedAt
 
   @@map("shares")
 }
diff --git a/packages/db/src/services/clients.service.ts b/packages/db/src/services/clients.service.ts
index 769f335d..65ea46b1 100644
--- a/packages/db/src/services/clients.service.ts
+++ b/packages/db/src/services/clients.service.ts
@@ -8,10 +8,10 @@ export type IServiceClientWithProject = Prisma.ClientGetPayload<{
   };
 }>;
 
-export async function getClientsByOrganizationSlug(organizationSlug: string) {
+export async function getClientsByOrganizationId(organizationId: string) {
   return db.client.findMany({
     where: {
-      organizationSlug,
+      organizationId,
     },
     include: {
       project: true,
diff --git a/packages/db/src/services/organization.service.ts b/packages/db/src/services/organization.service.ts
index 85c5519a..3d259923 100644
--- a/packages/db/src/services/organization.service.ts
+++ b/packages/db/src/services/organization.service.ts
@@ -66,10 +66,10 @@ export async function getOrganizationByProjectId(projectId: string) {
   return transformOrganization(project.organization);
 }
 
-export async function getInvites(organizationSlug: string) {
+export async function getInvites(organizationId: string) {
   return db.member.findMany({
     where: {
-      organizationId: organizationSlug,
+      organizationId,
       userId: null,
     },
     include: {
@@ -78,11 +78,11 @@ export async function getInvites(organizationSlug: string) {
   });
 }
 
-export async function getMembers(organizationSlug: string) {
+export async function getMembers(organizationId: string) {
   const [members, access] = await Promise.all([
     db.member.findMany({
       where: {
-        organizationId: organizationSlug,
+        organizationId,
         userId: {
           not: null,
         },
@@ -93,7 +93,7 @@ export async function getMembers(organizationSlug: string) {
     }),
     db.projectAccess.findMany({
       where: {
-        organizationSlug,
+        organizationId,
       },
     }),
   ]);
@@ -104,10 +104,10 @@ export async function getMembers(organizationSlug: string) {
   }));
 }
 
-export async function getMember(organizationSlug: string, userId: string) {
+export async function getMember(organizationId: string, userId: string) {
   return db.member.findFirst({
     where: {
-      organizationId: organizationSlug,
+      organizationId,
       userId,
     },
   });
diff --git a/packages/db/src/services/project.service.ts b/packages/db/src/services/project.service.ts
index de2bdc3a..c1784a5c 100644
--- a/packages/db/src/services/project.service.ts
+++ b/packages/db/src/services/project.service.ts
@@ -44,10 +44,10 @@ export async function getProjectWithClients(id: string) {
   return res;
 }
 
-export async function getProjectsByOrganizationSlug(organizationSlug: string) {
+export async function getProjectsByOrganizationId(organizationId: string) {
   return db.project.findMany({
     where: {
-      organizationSlug,
+      organizationId,
     },
     orderBy: {
       createdAt: 'desc',
@@ -55,7 +55,7 @@ export async function getProjectsByOrganizationSlug(organizationSlug: string) {
   });
 }
 
-export async function getCurrentProjects(organizationSlug: string) {
+export async function getCurrentProjects(organizationId: string) {
   const session = auth();
   if (!session.userId) {
     return [];
@@ -64,7 +64,7 @@ export async function getCurrentProjects(organizationSlug: string) {
   const [projects, members, access] = await Promise.all([
     db.project.findMany({
       where: {
-        organizationSlug,
+        organizationId,
       },
       orderBy: {
         eventsCount: 'desc',
@@ -73,13 +73,13 @@ export async function getCurrentProjects(organizationSlug: string) {
     db.member.findMany({
       where: {
         userId: session.userId,
-        organizationId: organizationSlug,
+        organizationId,
       },
     }),
     db.projectAccess.findMany({
       where: {
         userId: session.userId,
-        organizationId: organizationSlug,
+        organizationId,
       },
     }),
   ]);
diff --git a/packages/trpc/src/access.ts b/packages/trpc/src/access.ts
index 3c0b90b3..0cbfefe1 100644
--- a/packages/trpc/src/access.ts
+++ b/packages/trpc/src/access.ts
@@ -12,7 +12,7 @@ export async function getProjectAccess({
   try {
     // Check if user has access to the project
     const project = await getProjectById(projectId);
-    if (!project?.organizationSlug) {
+    if (!project?.organizationId) {
       return false;
     }
 
@@ -20,12 +20,12 @@ export async function getProjectAccess({
       db.projectAccess.findMany({
         where: {
           userId,
-          organizationId: project.organizationSlug,
+          organizationId: project.organizationId,
         },
       }),
       db.member.findFirst({
         where: {
-          organizationId: project.organizationSlug,
+          organizationId: project.organizationId,
           userId,
         },
       }),
diff --git a/packages/trpc/src/routers/client.ts b/packages/trpc/src/routers/client.ts
index 95d2eba9..981342ad 100644
--- a/packages/trpc/src/routers/client.ts
+++ b/packages/trpc/src/routers/client.ts
@@ -46,7 +46,7 @@ export const clientRouter = createTRPCRouter({
       z.object({
         name: z.string(),
         projectId: z.string(),
-        organizationSlug: z.string(),
+        organizationId: z.string(),
         cors: z.string().nullable(),
         crossDomain: z.boolean().optional(),
         type: z.enum(['read', 'write', 'root']).optional(),
@@ -55,8 +55,7 @@ export const clientRouter = createTRPCRouter({
     .mutation(async ({ input }) => {
       const secret = `sec_${crypto.randomBytes(10).toString('hex')}`;
       const data: Prisma.ClientCreateArgs['data'] = {
-        organizationSlug: input.organizationSlug,
-        organizationId: input.organizationSlug,
+        organizationId: input.organizationId,
         projectId: input.projectId,
         name: input.name,
         type: input.type ?? 'write',
diff --git a/packages/trpc/src/routers/dashboard.ts b/packages/trpc/src/routers/dashboard.ts
index daa836e6..315eec3d 100644
--- a/packages/trpc/src/routers/dashboard.ts
+++ b/packages/trpc/src/routers/dashboard.ts
@@ -50,7 +50,6 @@ export const dashboardRouter = createTRPCRouter({
         data: {
           id: await getId('dashboard', input.name),
           projectId: input.projectId,
-          organizationSlug: project.organizationId!,
           organizationId: project.organizationId,
           name: input.name,
         },
diff --git a/packages/trpc/src/routers/onboarding.ts b/packages/trpc/src/routers/onboarding.ts
index 733ccc39..beda7e74 100644
--- a/packages/trpc/src/routers/onboarding.ts
+++ b/packages/trpc/src/routers/onboarding.ts
@@ -13,8 +13,8 @@ async function createOrGetOrganization(
   input: z.infer<typeof zOnboardingProject>,
   userId: string,
 ) {
-  if (input.organizationSlug) {
-    return await getOrganizationBySlug(input.organizationSlug);
+  if (input.organizationId) {
+    return await getOrganizationBySlug(input.organizationId);
   }
 
   if (input.organization) {
@@ -92,7 +92,6 @@ export const onboardingRouter = createTRPCRouter({
         data: {
           id: await getId('project', input.project),
           name: input.project,
-          organizationSlug: organization.id,
           organizationId: organization.id,
           types,
         },
@@ -102,7 +101,6 @@ export const onboardingRouter = createTRPCRouter({
       const client = await db.client.create({
         data: {
           name: `${project.name} Client`,
-          organizationSlug: organization.id,
           organizationId: organization.id,
           projectId: project.id,
           type: 'write',
diff --git a/packages/trpc/src/routers/organization.ts b/packages/trpc/src/routers/organization.ts
index e27b493a..48fab2e6 100644
--- a/packages/trpc/src/routers/organization.ts
+++ b/packages/trpc/src/routers/organization.ts
@@ -42,7 +42,7 @@ export const organizationRouter = createTRPCRouter({
     .mutation(async ({ input, ctx }) => {
       const access = await getOrganizationAccess({
         userId: ctx.session.userId,
-        organizationId: input.organizationSlug,
+        organizationId: input.organizationId,
       });
 
       if (access?.role !== 'org:admin') {
@@ -72,7 +72,7 @@ export const organizationRouter = createTRPCRouter({
       return db.member.create({
         data: {
           email,
-          organizationId: input.organizationSlug,
+          organizationId: input.organizationId,
           role: input.role,
           invitedById: ctx.session.userId,
           meta: {
@@ -175,7 +175,7 @@ export const organizationRouter = createTRPCRouter({
     .input(
       z.object({
         userId: z.string(),
-        organizationSlug: z.string(),
+        organizationId: z.string(),
         access: z.array(z.string()),
       }),
     )
@@ -186,7 +186,7 @@ export const organizationRouter = createTRPCRouter({
 
       const access = await getOrganizationAccess({
         userId: ctx.session.userId,
-        organizationId: input.organizationSlug,
+        organizationId: input.organizationId,
       });
 
       if (access?.role !== 'org:admin') {
@@ -197,14 +197,13 @@ export const organizationRouter = createTRPCRouter({
         db.projectAccess.deleteMany({
           where: {
             userId: input.userId,
-            organizationId: input.organizationSlug,
+            organizationId: input.organizationId,
           },
         }),
         db.projectAccess.createMany({
           data: input.access.map((projectId) => ({
             userId: input.userId,
-            organizationSlug: input.organizationSlug,
-            organizationId: input.organizationSlug,
+            organizationId: input.organizationId,
             projectId: projectId,
             level: 'read',
           })),
diff --git a/packages/trpc/src/routers/project.ts b/packages/trpc/src/routers/project.ts
index 8be7d864..a0c3477c 100644
--- a/packages/trpc/src/routers/project.ts
+++ b/packages/trpc/src/routers/project.ts
@@ -4,7 +4,7 @@ import {
   db,
   getId,
   getProjectByIdCached,
-  getProjectsByOrganizationSlug,
+  getProjectsByOrganizationId,
 } from '@openpanel/db';
 
 import { getProjectAccess } from '../access';
@@ -15,12 +15,12 @@ export const projectRouter = createTRPCRouter({
   list: protectedProcedure
     .input(
       z.object({
-        organizationSlug: z.string().nullable(),
+        organizationId: z.string().nullable(),
       }),
     )
-    .query(async ({ input: { organizationSlug } }) => {
-      if (organizationSlug === null) return [];
-      return getProjectsByOrganizationSlug(organizationSlug);
+    .query(async ({ input: { organizationId } }) => {
+      if (organizationId === null) return [];
+      return getProjectsByOrganizationId(organizationId);
     }),
 
   update: protectedProcedure
@@ -54,15 +54,14 @@ export const projectRouter = createTRPCRouter({
     .input(
       z.object({
         name: z.string().min(1),
-        organizationSlug: z.string(),
+        organizationId: z.string(),
       }),
     )
-    .mutation(async ({ input: { name, organizationSlug } }) => {
+    .mutation(async ({ input: { name, organizationId } }) => {
       return db.project.create({
         data: {
           id: await getId('project', name),
-          organizationSlug: organizationSlug,
-          organizationId: organizationSlug,
+          organizationId,
           name: name,
         },
       });
diff --git a/packages/trpc/src/routers/share.ts b/packages/trpc/src/routers/share.ts
index 76fb7bb7..c339a256 100644
--- a/packages/trpc/src/routers/share.ts
+++ b/packages/trpc/src/routers/share.ts
@@ -17,8 +17,7 @@ export const shareRouter = createTRPCRouter({
         },
         create: {
           id: uid.rnd(),
-          organizationSlug: input.organizationSlug,
-          organizationId: input.organizationSlug,
+          organizationId: input.organizationId,
           projectId: input.projectId,
           public: input.public,
           password: input.password || null,
diff --git a/packages/trpc/src/trpc.ts b/packages/trpc/src/trpc.ts
index 3faf1cc3..44318c78 100644
--- a/packages/trpc/src/trpc.ts
+++ b/packages/trpc/src/trpc.ts
@@ -88,17 +88,6 @@ const enforceAccess = t.middleware(async ({ ctx, next, rawInput }) => {
     }
   }
 
-  if (has('organizationSlug', rawInput)) {
-    const access = await getOrganizationAccessCached({
-      userId: ctx.session.userId!,
-      organizationId: rawInput.organizationSlug as string,
-    });
-
-    if (!access) {
-      throw TRPCAccessError('You do not have access to this organization');
-    }
-  }
-
   return next();
 });
 
diff --git a/packages/validation/src/index.ts b/packages/validation/src/index.ts
index 63095944..406a550e 100644
--- a/packages/validation/src/index.ts
+++ b/packages/validation/src/index.ts
@@ -88,13 +88,13 @@ export const zReportInput = zChartInput.extend({
 
 export const zInviteUser = z.object({
   email: z.string().email(),
-  organizationSlug: z.string(),
+  organizationId: z.string(),
   role: z.enum(['org:admin', 'org:member']),
   access: z.array(z.string()),
 });
 
 export const zShareOverview = z.object({
-  organizationSlug: z.string(),
+  organizationId: z.string(),
   projectId: z.string(),
   password: z.string().nullable(),
   public: z.boolean(),
@@ -110,7 +110,7 @@ export const zCreateReference = z.object({
 export const zOnboardingProject = z
   .object({
     organization: z.string().optional(),
-    organizationSlug: z.string().optional(),
+    organizationId: z.string().optional(),
     project: z.string().min(3),
     domain: z.string().url().or(z.literal('').or(z.null())),
     website: z.boolean(),
@@ -118,7 +118,7 @@ export const zOnboardingProject = z
     backend: z.boolean(),
   })
   .superRefine((data, ctx) => {
-    if (!data.organization && !data.organizationSlug) {
+    if (!data.organization && !data.organizationId) {
       ctx.addIssue({
         code: 'custom',
         message: 'Organization is required',
@@ -127,7 +127,7 @@ export const zOnboardingProject = z
       ctx.addIssue({
         code: 'custom',
         message: 'Organization is required',
-        path: ['organizationSlug'],
+        path: ['organizationId'],
       });
     }
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7d82950f..b578b59a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1013,14 +1013,14 @@ importers:
         specifier: 1.0.1-local
         version: link:../web
       next:
-        specifier: ^12.0.0 || ^13.0.0 || ^14.0.0
-        version: 14.1.0(@opentelemetry/api@1.8.0)(react-dom@18.2.0)(react@18.2.0)
+        specifier: ^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0
+        version: 15.0.3(@opentelemetry/api@1.8.0)(react-dom@18.3.1)(react@18.3.1)
       react:
-        specifier: ^16.8.0 || ^17.0.0 || ^18.0.0
-        version: 18.2.0
+        specifier: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+        version: 18.3.1
       react-dom:
-        specifier: ^16.8.0 || ^17.0.0 || ^18.0.0
-        version: 18.2.0(react@18.2.0)
+        specifier: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+        version: 18.3.1(react@18.3.1)
     devDependencies:
       '@openpanel/tsconfig':
         specifier: workspace:*
@@ -3809,7 +3809,7 @@ packages:
       getenv: 1.0.0
       glob: 7.1.6
       resolve-from: 5.0.0
-      semver: 7.6.0
+      semver: 7.6.3
       slash: 3.0.0
       slugify: 1.6.6
       xcode: 3.0.1
@@ -4905,10 +4905,6 @@ packages:
     dev: false
     optional: true
 
-  /@next/env@14.1.0:
-    resolution: {integrity: sha512-Py8zIo+02ht82brwwhTg36iogzFqGLPXlRGKQw5s+qP/kMNc4MAyDeEwBKDijk6zTIbegEgu8Qy7C1LboslQAw==}
-    dev: false
-
   /@next/env@14.2.1:
     resolution: {integrity: sha512-qsHJle3GU3CmVx7pUoXcghX4sRN+vINkbLdH611T8ZlsP//grzqVW87BSUgOZeSAD4q7ZdZicdwNe/20U2janA==}
     dev: false
@@ -4923,15 +4919,6 @@ packages:
       glob: 7.1.7
     dev: false
 
-  /@next/swc-darwin-arm64@14.1.0:
-    resolution: {integrity: sha512-nUDn7TOGcIeyQni6lZHfzNoo9S0euXnu0jhsbMOmMJUBfgsnESdjN97kM7cBqQxZa8L/bM9om/S5/1dzCrW6wQ==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@next/swc-darwin-arm64@14.2.1:
     resolution: {integrity: sha512-kGjnjcIJehEcd3rT/3NAATJQndAEELk0J9GmGMXHSC75TMnvpOhONcjNHbjtcWE5HUQnIHy5JVkatrnYm1QhVw==}
     engines: {node: '>= 10'}
@@ -4950,15 +4937,6 @@ packages:
     dev: false
     optional: true
 
-  /@next/swc-darwin-x64@14.1.0:
-    resolution: {integrity: sha512-1jgudN5haWxiAl3O1ljUS2GfupPmcftu2RYJqZiMJmmbBT5M1XDffjUtRUzP4W3cBHsrvkfOFdQ71hAreNQP6g==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@next/swc-darwin-x64@14.2.1:
     resolution: {integrity: sha512-dAdWndgdQi7BK2WSXrx4lae7mYcOYjbHJUhvOUnJjMNYrmYhxbbvJ2xElZpxNxdfA6zkqagIB9He2tQk+l16ew==}
     engines: {node: '>= 10'}
@@ -4977,15 +4955,6 @@ packages:
     dev: false
     optional: true
 
-  /@next/swc-linux-arm64-gnu@14.1.0:
-    resolution: {integrity: sha512-RHo7Tcj+jllXUbK7xk2NyIDod3YcCPDZxj1WLIYxd709BQ7WuRYl3OWUNG+WUfqeQBds6kvZYlc42NJJTNi4tQ==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@next/swc-linux-arm64-gnu@14.2.1:
     resolution: {integrity: sha512-2ZctfnyFOGvTkoD6L+DtQtO3BfFz4CapoHnyLTXkOxbZkVRgg3TQBUjTD/xKrO1QWeydeo8AWfZRg8539qNKrg==}
     engines: {node: '>= 10'}
@@ -5004,15 +4973,6 @@ packages:
     dev: false
     optional: true
 
-  /@next/swc-linux-arm64-musl@14.1.0:
-    resolution: {integrity: sha512-v6kP8sHYxjO8RwHmWMJSq7VZP2nYCkRVQ0qolh2l6xroe9QjbgV8siTbduED4u0hlk0+tjS6/Tuy4n5XCp+l6g==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@next/swc-linux-arm64-musl@14.2.1:
     resolution: {integrity: sha512-jazZXctiaanemy4r+TPIpFP36t1mMwWCKMsmrTRVChRqE6putyAxZA4PDujx0SnfvZHosjdkx9xIq9BzBB5tWg==}
     engines: {node: '>= 10'}
@@ -5031,15 +4991,6 @@ packages:
     dev: false
     optional: true
 
-  /@next/swc-linux-x64-gnu@14.1.0:
-    resolution: {integrity: sha512-zJ2pnoFYB1F4vmEVlb/eSe+VH679zT1VdXlZKX+pE66grOgjmKJHKacf82g/sWE4MQ4Rk2FMBCRnX+l6/TVYzQ==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@next/swc-linux-x64-gnu@14.2.1:
     resolution: {integrity: sha512-VjCHWCjsAzQAAo8lkBOLEIkBZFdfW+Z18qcQ056kL4KpUYc8o59JhLDCBlhg+hINQRgzQ2UPGma2AURGOH0+Qg==}
     engines: {node: '>= 10'}
@@ -5058,15 +5009,6 @@ packages:
     dev: false
     optional: true
 
-  /@next/swc-linux-x64-musl@14.1.0:
-    resolution: {integrity: sha512-rbaIYFt2X9YZBSbH/CwGAjbBG2/MrACCVu2X0+kSykHzHnYH5FjHxwXLkcoJ10cX0aWCEynpu+rP76x0914atg==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@next/swc-linux-x64-musl@14.2.1:
     resolution: {integrity: sha512-7HZKYKvAp4nAHiHIbY04finRqjeYvkITOGOurP1aLMexIFG/1+oCnqhGogBdc4lao/lkMW1c+AkwWSzSlLasqw==}
     engines: {node: '>= 10'}
@@ -5085,15 +5027,6 @@ packages:
     dev: false
     optional: true
 
-  /@next/swc-win32-arm64-msvc@14.1.0:
-    resolution: {integrity: sha512-o1N5TsYc8f/HpGt39OUQpQ9AKIGApd3QLueu7hXk//2xq5Z9OxmV6sQfNp8C7qYmiOlHYODOGqNNa0e9jvchGQ==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@next/swc-win32-arm64-msvc@14.2.1:
     resolution: {integrity: sha512-YGHklaJ/Cj/F0Xd8jxgj2p8po4JTCi6H7Z3Yics3xJhm9CPIqtl8erlpK1CLv+HInDqEWfXilqatF8YsLxxA2Q==}
     engines: {node: '>= 10'}
@@ -5112,15 +5045,6 @@ packages:
     dev: false
     optional: true
 
-  /@next/swc-win32-ia32-msvc@14.1.0:
-    resolution: {integrity: sha512-XXIuB1DBRCFwNO6EEzCTMHT5pauwaSj4SWs7CYnME57eaReAKBXCnkUE80p/pAZcewm7hs+vGvNqDPacEXHVkw==}
-    engines: {node: '>= 10'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@next/swc-win32-ia32-msvc@14.2.1:
     resolution: {integrity: sha512-o+ISKOlvU/L43ZhtAAfCjwIfcwuZstiHVXq/BDsZwGqQE0h/81td95MPHliWCnFoikzWcYqh+hz54ZB2FIT8RA==}
     engines: {node: '>= 10'}
@@ -5130,15 +5054,6 @@ packages:
     dev: false
     optional: true
 
-  /@next/swc-win32-x64-msvc@14.1.0:
-    resolution: {integrity: sha512-9WEbVRRAqJ3YFVqEZIxUqkiO8l1nool1LmNxygr5HWF8AcSYsEpneUDhmjUVJEzO2A04+oPtZdombzzPPkTtgg==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@next/swc-win32-x64-msvc@14.2.1:
     resolution: {integrity: sha512-GmRoTiLcvCLifujlisknv4zu9/C4i9r0ktsA8E51EMqJL4bD4CpO7lDYr7SrUxCR0tS4RVcrqKmCak24T0ohaw==}
     engines: {node: '>= 10'}
@@ -8702,7 +8617,7 @@ packages:
       hermes-profile-transformer: 0.0.6
       node-stream-zip: 1.15.0
       ora: 5.4.1
-      semver: 7.6.0
+      semver: 7.6.3
       strip-ansi: 5.2.0
       wcwidth: 1.0.1
       yaml: 2.3.4
@@ -8780,7 +8695,7 @@ packages:
       node-fetch: 2.7.0
       open: 6.4.0
       ora: 5.4.1
-      semver: 7.6.0
+      semver: 7.6.3
       shell-quote: 1.8.1
       sudo-prompt: 9.2.1
     transitivePeerDependencies:
@@ -8815,7 +8730,7 @@ packages:
       fs-extra: 8.1.0
       graceful-fs: 4.2.11
       prompts: 2.4.2
-      semver: 7.6.0
+      semver: 7.6.3
     transitivePeerDependencies:
       - bufferutil
       - encoding
@@ -9430,12 +9345,6 @@ packages:
       tslib: 2.7.0
     dev: false
 
-  /@swc/helpers@0.5.2:
-    resolution: {integrity: sha512-E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw==}
-    dependencies:
-      tslib: 2.7.0
-    dev: false
-
   /@swc/helpers@0.5.5:
     resolution: {integrity: sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A==}
     dependencies:
@@ -17202,46 +17111,6 @@ packages:
       react-dom: 18.3.1(react@18.3.1)
     dev: false
 
-  /next@14.1.0(@opentelemetry/api@1.8.0)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-wlzrsbfeSU48YQBjZhDzOwhWhGsy+uQycR8bHAOt1LY1bn3zZEcDyHQOEoN3aWzQ8LHCAJ1nqrWCc9XF2+O45Q==}
-    engines: {node: '>=18.17.0'}
-    hasBin: true
-    peerDependencies:
-      '@opentelemetry/api': ^1.1.0
-      react: ^18.2.0
-      react-dom: ^18.2.0
-      sass: ^1.3.0
-    peerDependenciesMeta:
-      '@opentelemetry/api':
-        optional: true
-      sass:
-        optional: true
-    dependencies:
-      '@next/env': 14.1.0
-      '@opentelemetry/api': 1.8.0
-      '@swc/helpers': 0.5.2
-      busboy: 1.6.0
-      caniuse-lite: 1.0.30001596
-      graceful-fs: 4.2.11
-      postcss: 8.4.31
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
-      styled-jsx: 5.1.1(react@18.2.0)
-    optionalDependencies:
-      '@next/swc-darwin-arm64': 14.1.0
-      '@next/swc-darwin-x64': 14.1.0
-      '@next/swc-linux-arm64-gnu': 14.1.0
-      '@next/swc-linux-arm64-musl': 14.1.0
-      '@next/swc-linux-x64-gnu': 14.1.0
-      '@next/swc-linux-x64-musl': 14.1.0
-      '@next/swc-win32-arm64-msvc': 14.1.0
-      '@next/swc-win32-ia32-msvc': 14.1.0
-      '@next/swc-win32-x64-msvc': 14.1.0
-    transitivePeerDependencies:
-      - '@babel/core'
-      - babel-plugin-macros
-    dev: false
-
   /next@14.2.1(@opentelemetry/api@1.8.0)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-SF3TJnKdH43PMkCcErLPv+x/DY1YCklslk3ZmwaVoyUfDgHKexuKlf9sEfBQ69w+ue8jQ3msLb+hSj1T19hGag==}
     engines: {node: '>=18.17.0'}
@@ -20919,7 +20788,7 @@ packages:
       execa: 5.1.1
       globby: 11.1.0
       joycon: 3.1.1
-      postcss-load-config: 4.0.2(postcss@8.4.35)
+      postcss-load-config: 4.0.2(postcss@8.4.47)
       resolve-from: 5.0.0
       rollup: 4.12.0
       source-map: 0.8.0-beta.0
@@ -21254,7 +21123,7 @@ packages:
     dependencies:
       browserslist: 4.23.0
       escalade: 3.1.2
-      picocolors: 1.0.0
+      picocolors: 1.1.1
 
   /update-browserslist-db@1.1.1(browserslist@4.24.2):
     resolution: {integrity: sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==}