Email for professionals and teams
Let users manage their own mailboxes from Settings (#133)
Can K.3429e183855c
diff --git a/src/app/(admin)/accounts/[id]/mailboxes/page.tsx b/src/app/(admin)/accounts/[id]/mailboxes/page.tsxindex d66c669..1f7f0cd 100644--- a/src/app/(admin)/accounts/[id]/mailboxes/page.tsx+++ b/src/app/(admin)/accounts/[id]/mailboxes/page.tsx@@ -1,6 +1,7 @@"use client";import { useEffect, useState } from "react";+import Link from "next/link";import { useParams } from "next/navigation";import { Plus, Trash2 } from "lucide-react";import { useLanguage } from "@/components/language-provider";@@ -102,6 +103,12 @@ export default function AccountMailboxesPage() {{mailbox.localPart}@{mailbox.hostname}</span></span>+ <span className="flex shrink-0 items-center gap-1">+ <Button asChild variant="ghost" size="sm">+ <Link href={`/mailboxes/${mailbox.id}`} aria-label={`${t("mailbox.title")}: ${mailbox.localPart}@${mailbox.hostname}`}>+ {t("mailbox.title")}+ </Link>+ </Button><Buttontype="button"variant="ghost"@@ -111,6 +118,7 @@ export default function AccountMailboxesPage() {><Trash2 className="h-4 w-4 text-red-600" /></Button>+ </span></div>))}{account && mailboxes.length === 0 && (diff --git a/src/app/(admin)/mailboxes/[id]/page.tsx b/src/app/(admin)/mailboxes/[id]/page.tsxindex 4c94895..68bc765 100644--- a/src/app/(admin)/mailboxes/[id]/page.tsx+++ b/src/app/(admin)/mailboxes/[id]/page.tsx@@ -2,7 +2,7 @@import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";import { AtSign, Save, Trash2, UserPlus } from "lucide-react";-import { useParams, useRouter } from "next/navigation";+import { useParams, usePathname, useRouter } from "next/navigation";import { useEffect, useState } from "react";import { useLanguage } from "@/components/language-provider";import { Badge } from "@/components/ui/badge";@@ -31,6 +31,7 @@ import {revokeSharedInboxAccess,updateMailboxSettings,} from "./utils";+import { getMailboxesBase } from "../utils";import MailboxAvatarForm from "./MailboxAvatarForm";export default function MailboxSettingsPage() {@@ -67,11 +68,12 @@ export default function MailboxSettingsPage() {});const router = useRouter();+ const base = getMailboxesBase(usePathname());const removeMailbox = useMutation({mutationFn: () => deleteMailbox(mailboxId),onSuccess: async () => {await qc.invalidateQueries({ queryKey: ["mailboxes"] });- router.push("/mailboxes");+ router.push(base);},});diff --git a/src/app/(admin)/mailboxes/page.tsx b/src/app/(admin)/mailboxes/page.tsxindex 05b7033..9f4420b 100644--- a/src/app/(admin)/mailboxes/page.tsx+++ b/src/app/(admin)/mailboxes/page.tsx@@ -3,7 +3,7 @@import { mobilePrimaryActionClass } from "@/components/page-header-utils";import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";import Link from "next/link";-import { useRouter } from "next/navigation";+import { usePathname, useRouter } from "next/navigation";import { useEffect, useState } from "react";import { Plus, UsersRound } from "lucide-react";import { useLanguage } from "@/components/language-provider";@@ -25,12 +25,13 @@ import { clearMailboxesCache } from "@/components/mailbox-provider-utils";import { ProgressiveAvatarImage } from "@/components/progressive-avatar-image";import { authFetch } from "@/lib/auth/client";import type { CurrentAccountResponse, Domain, MailboxOwner, MailboxesResponse } from "./types";-import { getMailboxAddress, getMailboxName } from "./utils";+import { getMailboxAddress, getMailboxesBase, getMailboxName } from "./utils";export default function MailboxesPage() {const { t } = useLanguage();const qc = useQueryClient();const router = useRouter();+ const base = getMailboxesBase(usePathname());const [displayName, setDisplayName] = useState("");const [localPart, setLocalPart] = useState("");const [domainId, setDomainId] = useState("");@@ -103,7 +104,7 @@ export default function MailboxesPage() {clearMailboxesCache();setCreateOpen(false);qc.invalidateQueries({ queryKey: ["mailboxes"] });- if (mailboxType === "shared" && mailboxId) router.push(`/mailboxes/${mailboxId}`);+ if (mailboxType === "shared" && mailboxId) router.push(`${base}/${mailboxId}`);setMailboxType("personal");},});@@ -249,7 +250,7 @@ export default function MailboxesPage() {return (<ListRow key={mailbox.id} asChild><Link- href={`/mailboxes/${mailbox.id}`}+ href={`${base}/${mailbox.id}`}className="group px-5 py-4 transition-colors hover:bg-blue-50/40"><span className="relative flex h-10 w-10 shrink-0 items-center justify-center overflow-hidden rounded-full bg-blue-100 text-sm font-semibold text-blue-700">diff --git a/src/app/(admin)/mailboxes/utils.ts b/src/app/(admin)/mailboxes/utils.tsindex 1c7ddfb..a4baae5 100644--- a/src/app/(admin)/mailboxes/utils.ts+++ b/src/app/(admin)/mailboxes/utils.ts@@ -7,3 +7,7 @@ export function getMailboxAddress(mailbox: Pick<Mailbox, "localPart" | "hostnameexport function getMailboxName(mailbox: Pick<Mailbox, "displayName" | "localPart">): string {return mailbox.displayName?.trim() || mailbox.localPart;}++export function getMailboxesBase(pathname: string) {+ return pathname.startsWith("/settings") ? "/settings/mailboxes" : "/mailboxes";+}diff --git a/src/app/(settings)/settings/mailboxes/[id]/page.tsx b/src/app/(settings)/settings/mailboxes/[id]/page.tsxnew file mode 100644index 0000000..e66a55e--- /dev/null+++ b/src/app/(settings)/settings/mailboxes/[id]/page.tsx@@ -0,0 +1 @@+export { default } from "@/app/(admin)/mailboxes/[id]/page";diff --git a/src/app/(settings)/settings/mailboxes/page.tsx b/src/app/(settings)/settings/mailboxes/page.tsxnew file mode 100644index 0000000..472ed12--- /dev/null+++ b/src/app/(settings)/settings/mailboxes/page.tsx@@ -0,0 +1 @@+export { default } from "@/app/(admin)/mailboxes/page";diff --git a/src/components/settings/settings-nav-types.d.ts b/src/components/settings/settings-nav-types.d.tsindex f865d8c..72a2f3e 100644--- a/src/components/settings/settings-nav-types.d.ts+++ b/src/components/settings/settings-nav-types.d.ts@@ -3,6 +3,7 @@ import type { TranslationKey } from "@/lib/i18n/types";export type SettingsNavItem = {href: string;labelKey: TranslationKey;+ requiresMailboxAccess?: boolean;};export type SettingsNavSection = {diff --git a/src/components/settings/settings-nav-utils.ts b/src/components/settings/settings-nav-utils.tsindex 789e54e..8348327 100644--- a/src/components/settings/settings-nav-utils.ts+++ b/src/components/settings/settings-nav-utils.ts@@ -33,6 +33,11 @@ export const settingsNavSections: SettingsNavSection[] = [{labelKey: "settings.nav.mailbox",items: [+ {+ href: "/settings/mailboxes",+ labelKey: "admin.nav.mailboxes",+ requiresMailboxAccess: true,+ },{href: "/settings/import",labelKey: "settings.nav.import",diff --git a/src/components/settings/settings-nav.tsx b/src/components/settings/settings-nav.tsxindex 44c9c62..5869e5a 100644--- a/src/components/settings/settings-nav.tsx+++ b/src/components/settings/settings-nav.tsx@@ -3,6 +3,7 @@import Link from "next/link";import { usePathname } from "next/navigation";import { useLanguage } from "@/components/language-provider";+import { useCurrentUser } from "@/hooks/use-current-user";import { cn } from "@/lib/utils";import { SectionNavSheet } from "../section-nav-sheet";import { isActiveSettingsPath, settingsNavSections } from "./settings-nav-utils";@@ -10,13 +11,19 @@ import { isActiveSettingsPath, settingsNavSections } from "./settings-nav-utils"export function SettingsNav() {const { t } = useLanguage();const pathname = usePathname();- const currentItem = settingsNavSections.flatMap((section) => section.items).find((item) => isActiveSettingsPath(pathname, item.href));+ const user = useCurrentUser();+ const canManageMailboxes = user?.canManageMailboxes === true;+ const sections = settingsNavSections.map((section) => ({+ ...section,+ items: section.items.filter((item) => !item.requiresMailboxAccess || canManageMailboxes),+ }));+ const currentItem = sections.flatMap((section) => section.items).find((item) => isActiveSettingsPath(pathname, item.href));const currentLabel = t(currentItem?.labelKey ?? "settings.nav.settings");return (<SectionNavSheet title={t("settings.nav.menu")} label={currentLabel} className="w-full px-4 py-4 md:min-h-full md:w-64 md:border-r md:border-blue-100/70 md:py-10"><div className="sticky top-6 space-y-7">- {settingsNavSections.map((section) => (+ {sections.map((section) => (<div key={section.labelKey} className="space-y-3"><h2 className="px-4 text-xs font-semibold uppercase tracking-wide text-neutral-500">{t(section.labelKey)}