Skip to content

OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.

rename folder organizationId -> organizationSlug

Carl-Gerhard Lindesvärdd922c31455af
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/[dashboardId]/list-reports.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/[dashboardId]/list-reports.tsx
similarity index 97%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/[dashboardId]/list-reports.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/[dashboardId]/list-reports.tsx
index 21b87099a..a259c9064 100644
--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/[dashboardId]/list-reports.tsx
+++ b/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';
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/[dashboardId]/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/[dashboardId]/page.tsx
similarity index 78%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/[dashboardId]/page.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/[dashboardId]/page.tsx
index 40912c64b..86b3cb5ab 100644
--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/[dashboardId]/page.tsx
+++ b/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),
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/header-dashboards.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/header-dashboards.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/header-dashboards.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/header-dashboards.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/list-dashboards.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/list-dashboards.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/list-dashboards.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/list-dashboards.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/page.tsx
similarity index 77%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/page.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/page.tsx
index e0b0f670b..5058afb1d 100644
--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/page.tsx
+++ b/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);
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/charts/events-per-day-chart.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/charts/events-per-day-chart.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/charts/events-per-day-chart.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/charts/events-per-day-chart.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-conversions-list/event-conversions-list.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-conversions-list/event-conversions-list.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-conversions-list/event-conversions-list.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-conversions-list/event-conversions-list.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-conversions-list/index.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-conversions-list/index.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-conversions-list/index.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-conversions-list/index.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-details.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-details.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-details.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-details.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-edit.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-edit.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-edit.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-edit.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-icon.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-icon.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-icon.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-icon.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-list-item.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-list-item.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-list-item.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-list-item.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-list.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-list.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-list.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-list.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-listener.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-listener.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-listener.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-listener.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/page.tsx
similarity index 93%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/page.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/page.tsx
index 271c286a8..d3e57f5b3 100644
--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/page.tsx
+++ b/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 =
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-menu.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-menu.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-menu.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-menu.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-organization-selector.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-organization-selector.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-organization-selector.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-organization-selector.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-project-selector.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-project-selector.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-project-selector.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-project-selector.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-sidebar.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-sidebar.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-sidebar.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-sidebar.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-sticky-below-header.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-sticky-below-header.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-sticky-below-header.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-sticky-below-header.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout.tsx
similarity index 94%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout.tsx
index 152a3f19e..79b6e68aa 100644
--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout.tsx
+++ b/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(),
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/overview-sticky-header.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/overview-sticky-header.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/overview-sticky-header.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/overview-sticky-header.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/page-layout.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/page-layout.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/page-layout.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/page-layout.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/page.tsx
similarity index 93%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/page.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/page.tsx
index a71f5ffb0..55f2b36c2 100644
--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/page.tsx
+++ b/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);
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/[profileId]/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/[profileId]/page.tsx
similarity index 97%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/[profileId]/page.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/[profileId]/page.tsx
index 2775862b5..a30223fd1 100644
--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/[profileId]/page.tsx
+++ b/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 = {
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/page.tsx
similarity index 91%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/page.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/page.tsx
index 8ca653b17..e3c711153 100644
--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/page.tsx
+++ b/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 (
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/profile-last-seen/index.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/profile-last-seen/index.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/profile-last-seen/index.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/profile-last-seen/index.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/profile-list/index.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/profile-list/index.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/profile-list/index.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/profile-list/index.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/profile-list/profile-list.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/profile-list/profile-list.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/profile-list/profile-list.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/profile-list/profile-list.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/profile-top/index.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/profile-top/index.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/profile-top/index.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/profile-top/index.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/[reportId]/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/reports/[reportId]/page.tsx
similarity index 81%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/[reportId]/page.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/reports/[reportId]/page.tsx
index 5218a8d6c..394870bb4 100644
--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/[reportId]/page.tsx
+++ b/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);
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/reports/page.tsx
similarity index 68%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/page.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/reports/page.tsx
index 1711a3acc..537909b22 100644
--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/page.tsx
+++ b/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({
- params: { organizationId: organizationSlug },
-}: PageProps) {
+export default function Page({ params: { organizationSlug } }: PageProps) {
return (
<PageLayout
organizationSlug={organizationSlug}
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/report-editor.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/reports/report-editor.tsx
similarity index 97%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/report-editor.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/reports/report-editor.tsx
index 10debee6d..eaea10ada 100644
--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/report-editor.tsx
+++ b/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';
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/edit-organization.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/edit-organization.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/edit-organization.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/edit-organization.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invites/create-invite.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/invites/create-invite.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invites/create-invite.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/invites/create-invite.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invites/index.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/invites/index.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invites/index.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/invites/index.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invites/invites.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/invites/invites.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invites/invites.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/invites/invites.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/members/index.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/members/index.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/members/index.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/members/index.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/members/members.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/members/members.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/members/members.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/members/members.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/page.tsx
similarity index 79%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/page.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/page.tsx
index ec7679053..fdb4ef200 100644
--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/page.tsx
+++ b/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);
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/page.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/page.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/page.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/profile/edit-profile.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/profile/edit-profile.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/profile/edit-profile.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/profile/edit-profile.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/profile/logout.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/profile/logout.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/profile/logout.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/profile/logout.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/profile/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/profile/page.tsx
similarity index 78%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/profile/page.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/profile/page.tsx
index 9793d135e..9033caea6 100644
--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/profile/page.tsx
+++ b/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!);
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/projects/list-projects.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/projects/list-projects.tsx
similarity index 97%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/projects/list-projects.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/projects/list-projects.tsx
index 6b67f1488..6786f9738 100644
--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/projects/list-projects.tsx
+++ b/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';
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/projects/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/projects/page.tsx
similarity index 78%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/projects/page.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/projects/page.tsx
index bb8241795..5f7c02d54 100644
--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/projects/page.tsx
+++ b/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),
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/references/list-references.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/references/list-references.tsx
similarity index 89%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/references/list-references.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/references/list-references.tsx
index 0040cc796..854567712 100644
--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/references/list-references.tsx
+++ b/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';
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/references/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/references/page.tsx
similarity index 74%
rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/references/page.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/references/page.tsx
index ee6b723f7..f008741d3 100644
--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/references/page.tsx
+++ b/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: {
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/create-project.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/create-project.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/[organizationId]/create-project.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/create-project.tsx
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/page.tsx
similarity index 96%
rename from apps/dashboard/src/app/(app)/[organizationId]/page.tsx
rename to apps/dashboard/src/app/(app)/[organizationSlug]/page.tsx
index 83e73c10e..2ed6f5fb9 100644
--- a/apps/dashboard/src/app/(app)/[organizationId]/page.tsx
+++ b/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),
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 50afad8e9..c9ea643d3 100644
--- a/apps/dashboard/src/app/(public)/share/overview/[id]/page.tsx
+++ b/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 { OverviewReportRange } from '@/app/(app)/[organizationId]/[projectId]/overview-sticky-header';
+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';