Fix settings for personal workspace

Author: arjunkomath

app/(dashboard)/[tenant]/projects/[projectId]/settings/page.tsx

@@ -7,6 +7,7 @@ import { PageLoading } from "@/components/core/loaders";
 import PermissionsManagement from "@/components/core/permissions-management";
 import PageSection from "@/components/core/section";
 import PageTitle from "@/components/layout/page-title";
+import { isPersonalTenant } from "@/lib/utils/useOwner";
 import { useTRPC } from "@/trpc/client";
 
 export default function ProjectSettings() {
@@ -21,7 +22,7 @@ export default function ProjectSettings() {
 		}),
 	);
 
-	const isOrgAdmin = tenant === "me";
+	const isOrgAdmin = isPersonalTenant(tenant);
 
 	if (isLoading || !project) return <PageLoading />;
 

app/(dashboard)/[tenant]/settings/page.tsx

@@ -5,9 +5,17 @@ import { ProfileSettings } from "@/components/settings/profile-settings";
 import { TeamSettings } from "@/components/settings/team-settings";
 import { WorkspaceSettings } from "@/components/settings/workspace-settings";
 import { bytesToMegabytes } from "@/lib/blobStore";
+import { isPersonalTenant } from "@/lib/utils/useOwner";
 import { caller } from "@/trpc/server";
 
-export default async function Settings() {
+export default async function Settings({
+	params,
+}: {
+	params: Promise<{ tenant: string }>;
+}) {
+	const { tenant } = await params;
+	const isPersonal = isPersonalTenant(tenant);
+
 	const [storage, timezone, projectsData] = await Promise.all([
 		caller.settings.getStorageUsage(),
 		caller.settings.getTimezone(),
@@ -20,21 +28,25 @@ export default async function Settings() {
 		<>
 			<PageTitle title="Settings" />
 
-			<PageSection
-				title="Workspace"
-				titleIcon={<Building2 className="w-5 h-5" />}
-				bottomMargin
-			>
-				<WorkspaceSettings />
-			</PageSection>
+			{!isPersonal && (
+				<PageSection
+					title="Workspace"
+					titleIcon={<Building2 className="w-5 h-5" />}
+					bottomMargin
+				>
+					<WorkspaceSettings />
+				</PageSection>
+			)}
 
-			<PageSection
-				title="Team"
-				titleIcon={<Users className="w-5 h-5" />}
-				bottomMargin
-			>
-				<TeamSettings />
-			</PageSection>
+			{!isPersonal && (
+				<PageSection
+					title="Team"
+					titleIcon={<Users className="w-5 h-5" />}
+					bottomMargin
+				>
+					<TeamSettings />
+				</PageSection>
+			)}
 
 			<PageSection
 				title="Usage"

app/(dashboard)/[tenant]/today/page.tsx

@@ -27,6 +27,7 @@ import { Card } from "@/components/ui/card";
 import { toDateStringWithDay } from "@/lib/utils/date";
 import { displayMutationError } from "@/lib/utils/error";
 import { eventToHumanReadableString } from "@/lib/utils/useEvents";
+import { isPersonalTenant } from "@/lib/utils/useOwner";
 import { useTRPC } from "@/trpc/client";
 
 export default function Today() {
@@ -52,7 +53,7 @@ export default function Today() {
 		});
 
 	const projects = projectsData?.projects;
-	const isOrgAdmin = projectsData?.isOrgAdmin ?? tenant === "me";
+	const isOrgAdmin = projectsData?.isOrgAdmin ?? isPersonalTenant(tenant);
 
 	const { dueToday = [], overDue = [], events = [] } = todayData ?? {};
 

lib/utils/useOwner.ts

@@ -24,7 +24,7 @@ export async function getOwner(): Promise<Result> {
 
 	const activeOrgId = session.session.activeOrganizationId;
 
-	let orgSlug = "me";
+	let orgSlug = PERSONAL_TENANT;
 	if (activeOrgId) {
 		const db = database();
 		const org = await db
@@ -45,6 +45,12 @@ export async function getOwner(): Promise<Result> {
 	};
 }
 
+export const PERSONAL_TENANT = "me";
+
+export function isPersonalTenant(tenant: string) {
+	return tenant === PERSONAL_TENANT;
+}
+
 export async function getTimezone() {
 	const cookieStore = await cookies();
 	return (