rename folder organizationId -> organizationSlug

apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/[dashboardId]/list-reports.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { StickyBelowHeader } from '@/app/(app)/[organizationId]/[projectId]/layout-sticky-below-header';
+import { StickyBelowHeader } from '@/app/(app)/[organizationSlug]/[projectId]/layout-sticky-below-header';
 import { useOverviewOptions } from '@/components/overview/useOverviewOptions';
 import { LazyChart } from '@/components/report/chart/LazyChart';
 import { Button } from '@/components/ui/button';

apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/[dashboardId]/page.tsx

@@ -1,4 +1,4 @@
-import PageLayout from '@/app/(app)/[organizationId]/[projectId]/page-layout';
+import PageLayout from '@/app/(app)/[organizationSlug]/[projectId]/page-layout';
 import { notFound } from 'next/navigation';
 
 import { getDashboardById, getReportsByDashboardId } from '@openpanel/db';
@@ -7,14 +7,14 @@ import { ListReports } from './list-reports';
 
 interface PageProps {
   params: {
-    organizationId: string;
+    organizationSlug: string;
     projectId: string;
     dashboardId: string;
   };
 }
 
 export default async function Page({
-  params: { organizationId: organizationSlug, projectId, dashboardId },
+  params: { organizationSlug, projectId, dashboardId },
 }: PageProps) {
   const [dashboard, reports] = await Promise.all([
     getDashboardById(dashboardId, projectId),

apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/page.tsx

@@ -1,4 +1,4 @@
-import PageLayout from '@/app/(app)/[organizationId]/[projectId]/page-layout';
+import PageLayout from '@/app/(app)/[organizationSlug]/[projectId]/page-layout';
 
 import { getDashboardsByProjectId } from '@openpanel/db';
 
@@ -8,12 +8,12 @@ import { ListDashboards } from './list-dashboards';
 interface PageProps {
   params: {
     projectId: string;
-    organizationId: string;
+    organizationSlug: string;
   };
 }
 
 export default async function Page({
-  params: { projectId, organizationId: organizationSlug },
+  params: { projectId, organizationSlug },
 }: PageProps) {
   const dashboards = await getDashboardsByProjectId(projectId);
 

apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/page.tsx

@@ -1,4 +1,4 @@
-import PageLayout from '@/app/(app)/[organizationId]/[projectId]/page-layout';
+import PageLayout from '@/app/(app)/[organizationSlug]/[projectId]/page-layout';
 import { OverviewFiltersButtons } from '@/components/overview/filters/overview-filters-buttons';
 import { OverviewFiltersDrawer } from '@/components/overview/filters/overview-filters-drawer';
 import {
@@ -17,7 +17,7 @@ import { EventList } from './event-list';
 interface PageProps {
   params: {
     projectId: string;
-    organizationId: string;
+    organizationSlug: string;
   };
   searchParams: {
     events?: string;
@@ -31,7 +31,7 @@ const nuqsOptions = {
 };
 
 export default async function Page({
-  params: { projectId, organizationId: organizationSlug },
+  params: { projectId, organizationSlug },
   searchParams,
 }: PageProps) {
   const filters =

apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout.tsx

@@ -11,14 +11,14 @@ import { LayoutSidebar } from './layout-sidebar';
 interface AppLayoutProps {
   children: React.ReactNode;
   params: {
-    organizationId: string;
+    organizationSlug: string;
     projectId: string;
   };
 }
 
 export default async function AppLayout({
   children,
-  params: { organizationId: organizationSlug, projectId },
+  params: { organizationSlug, projectId },
 }: AppLayoutProps) {
   const [organizations, projects, dashboards] = await Promise.all([
     getCurrentOrganizations(),

apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/page.tsx

@@ -1,4 +1,4 @@
-import PageLayout from '@/app/(app)/[organizationId]/[projectId]/page-layout';
+import PageLayout from '@/app/(app)/[organizationSlug]/[projectId]/page-layout';
 import { OverviewFiltersButtons } from '@/components/overview/filters/overview-filters-buttons';
 import { OverviewFiltersDrawer } from '@/components/overview/filters/overview-filters-drawer';
 import ServerLiveCounter from '@/components/overview/live-counter';
@@ -18,13 +18,13 @@ import { OverviewReportRange } from './overview-sticky-header';
 
 interface PageProps {
   params: {
-    organizationId: string;
+    organizationSlug: string;
     projectId: string;
   };
 }
 
 export default async function Page({
-  params: { organizationId: organizationSlug, projectId },
+  params: { organizationSlug, projectId },
 }: PageProps) {
   const share = await getShareByProjectId(projectId);
 

apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/[profileId]/page.tsx

@@ -1,4 +1,4 @@
-import PageLayout from '@/app/(app)/[organizationId]/[projectId]/page-layout';
+import PageLayout from '@/app/(app)/[organizationSlug]/[projectId]/page-layout';
 import { OverviewFiltersButtons } from '@/components/overview/filters/overview-filters-buttons';
 import { OverviewFiltersDrawer } from '@/components/overview/filters/overview-filters-drawer';
 import { ProfileAvatar } from '@/components/profiles/profile-avatar';
@@ -27,9 +27,9 @@ import { StickyBelowHeader } from '../../layout-sticky-below-header';
 
 interface PageProps {
   params: {
+    organizationSlug: string;
     projectId: string;
     profileId: string;
-    organizationId: string;
   };
   searchParams: {
     events?: string;
@@ -41,7 +41,7 @@ interface PageProps {
 }
 
 export default async function Page({
-  params: { projectId, profileId, organizationId: organizationSlug },
+  params: { projectId, profileId, organizationSlug },
   searchParams,
 }: PageProps) {
   const eventListOptions: GetEventListOptions = {

apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/page.tsx

@@ -1,4 +1,4 @@
-import PageLayout from '@/app/(app)/[organizationId]/[projectId]/page-layout';
+import PageLayout from '@/app/(app)/[organizationSlug]/[projectId]/page-layout';
 import { OverviewFiltersButtons } from '@/components/overview/filters/overview-filters-buttons';
 import { OverviewFiltersDrawer } from '@/components/overview/filters/overview-filters-drawer';
 import { eventQueryFiltersParser } from '@/hooks/useEventQueryFilters';
@@ -11,7 +11,7 @@ import ProfileTopServer from './profile-top';
 
 interface PageProps {
   params: {
-    organizationId: string;
+    organizationSlug: string;
     projectId: string;
   };
   searchParams: {
@@ -25,7 +25,7 @@ const nuqsOptions = {
 };
 
 export default function Page({
-  params: { organizationId: organizationSlug, projectId },
+  params: { organizationSlug, projectId },
   searchParams: { cursor, f },
 }: PageProps) {
   return (

apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/reports/[reportId]/page.tsx

@@ -1,4 +1,4 @@
-import PageLayout from '@/app/(app)/[organizationId]/[projectId]/page-layout';
+import PageLayout from '@/app/(app)/[organizationSlug]/[projectId]/page-layout';
 import { Pencil } from 'lucide-react';
 import { notFound } from 'next/navigation';
 
@@ -8,14 +8,14 @@ import ReportEditor from '../report-editor';
 
 interface PageProps {
   params: {
+    organizationSlug: string;
     projectId: string;
     reportId: string;
-    organizationId: string;
   };
 }
 
 export default async function Page({
-  params: { reportId, organizationId: organizationSlug },
+  params: { reportId, organizationSlug },
 }: PageProps) {
   const report = await getReportById(reportId);
 

apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/reports/page.tsx

@@ -1,18 +1,16 @@
-import PageLayout from '@/app/(app)/[organizationId]/[projectId]/page-layout';
+import PageLayout from '@/app/(app)/[organizationSlug]/[projectId]/page-layout';
 import { Pencil } from 'lucide-react';
 
 import ReportEditor from './report-editor';
 
 interface PageProps {
   params: {
-    organizationId: string;
+    organizationSlug: string;
     projectId: string;
   };
 }
 
-export default function Page({
+export default function Page({ params: { organizationSlug } }: PageProps) {
-  params: { organizationId: organizationSlug },
-}: PageProps) {
   return (
     <PageLayout
       organizationSlug={organizationSlug}

apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/reports/report-editor.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { useEffect } from 'react';
-import { StickyBelowHeader } from '@/app/(app)/[organizationId]/[projectId]/layout-sticky-below-header';
+import { StickyBelowHeader } from '@/app/(app)/[organizationSlug]/[projectId]/layout-sticky-below-header';
 import { ChartSwitch } from '@/components/report/chart';
 import { ReportChartType } from '@/components/report/ReportChartType';
 import { ReportInterval } from '@/components/report/ReportInterval';

apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/page.tsx

@@ -1,7 +1,7 @@
-import PageLayout from '@/app/(app)/[organizationId]/[projectId]/page-layout';
+import PageLayout from '@/app/(app)/[organizationSlug]/[projectId]/page-layout';
 import { notFound } from 'next/navigation';
 
-import { getInvites, getOrganizationBySlug } from '@openpanel/db';
+import { getOrganizationBySlug } from '@openpanel/db';
 
 import EditOrganization from './edit-organization';
 import InvitesServer from './invites';
@@ -9,12 +9,12 @@ import MembersServer from './members';
 
 interface PageProps {
   params: {
-    organizationId: string;
+    organizationSlug: string;
   };
 }
 
 export default async function Page({
-  params: { organizationId: organizationSlug },
+  params: { organizationSlug },
 }: PageProps) {
   const organization = await getOrganizationBySlug(organizationSlug);
 

apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/profile/page.tsx

@@ -1,4 +1,4 @@
-import PageLayout from '@/app/(app)/[organizationId]/[projectId]/page-layout';
+import PageLayout from '@/app/(app)/[organizationSlug]/[projectId]/page-layout';
 import { auth } from '@clerk/nextjs';
 
 import { getUserById } from '@openpanel/db';
@@ -8,11 +8,11 @@ import { Logout } from './logout';
 
 interface PageProps {
   params: {
-    organizationId: string;
+    organizationSlug: string;
   };
 }
 export default async function Page({
-  params: { organizationId: organizationSlug },
+  params: { organizationSlug },
 }: PageProps) {
   const { userId } = auth();
   const profile = await getUserById(userId!);

apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/projects/list-projects.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { StickyBelowHeader } from '@/app/(app)/[organizationId]/[projectId]/layout-sticky-below-header';
+import { StickyBelowHeader } from '@/app/(app)/[organizationSlug]/[projectId]/layout-sticky-below-header';
 import { ClientActions } from '@/components/clients/client-actions';
 import { ProjectActions } from '@/components/projects/project-actions';
 // import { columns } from '@/components/projects/table';

apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/projects/page.tsx

@@ -1,4 +1,4 @@
-import PageLayout from '@/app/(app)/[organizationId]/[projectId]/page-layout';
+import PageLayout from '@/app/(app)/[organizationSlug]/[projectId]/page-layout';
 
 import {
   getClientsByOrganizationSlug,
@@ -9,12 +9,12 @@ import ListProjects from './list-projects';
 
 interface PageProps {
   params: {
-    organizationId: string;
+    organizationSlug: string;
   };
 }
 
 export default async function Page({
-  params: { organizationId: organizationSlug },
+  params: { organizationSlug },
 }: PageProps) {
   const [projects, clients] = await Promise.all([
     getProjectsByOrganizationSlug(organizationSlug),

apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/references/list-references.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { StickyBelowHeader } from '@/app/(app)/[organizationId]/[projectId]/layout-sticky-below-header';
+import { StickyBelowHeader } from '@/app/(app)/[organizationSlug]/[projectId]/layout-sticky-below-header';
 import { DataTable } from '@/components/data-table';
 import { columns } from '@/components/references/table';
 import { Button } from '@/components/ui/button';

apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/references/page.tsx

@@ -1,4 +1,4 @@
-import PageLayout from '@/app/(app)/[organizationId]/[projectId]/page-layout';
+import PageLayout from '@/app/(app)/[organizationSlug]/[projectId]/page-layout';
 
 import { getReferences } from '@openpanel/db';
 
@@ -6,13 +6,13 @@ import ListReferences from './list-references';
 
 interface PageProps {
   params: {
-    organizationId: string;
+    organizationSlug: string;
     projectId: string;
   };
 }
 
 export default async function Page({
-  params: { organizationId: organizationSlug, projectId },
+  params: { organizationSlug, projectId },
 }: PageProps) {
   const references = await getReferences({
     where: {

apps/dashboard/src/app/(app)/[organizationSlug]/page.tsx

@@ -12,12 +12,12 @@ import { CreateProject } from './create-project';
 
 interface PageProps {
   params: {
-    organizationId: string;
+    organizationSlug: string;
   };
 }
 
 export default async function Page({
-  params: { organizationId: organizationSlug },
+  params: { organizationSlug },
 }: PageProps) {
   const [organization, projects] = await Promise.all([
     getOrganizationBySlug(organizationSlug),

apps/dashboard/src/app/(public)/share/overview/[id]/page.tsx

@@ -1,5 +1,5 @@
-import { StickyBelowHeader } from '@/app/(app)/[organizationId]/[projectId]/layout-sticky-below-header';
+import { StickyBelowHeader } from '@/app/(app)/[organizationSlug]/[projectId]/layout-sticky-below-header';
-import { OverviewReportRange } from '@/app/(app)/[organizationId]/[projectId]/overview-sticky-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';