Merge branch 'main' into sso-group-sync

apps/client/src/App.tsx

@@ -29,8 +29,12 @@ import { useRedirectToCloudSelect } from "@/ee/hooks/use-redirect-to-cloud-selec
 import SharedPage from "@/pages/share/shared-page.tsx";
 import Shares from "@/pages/settings/shares/shares.tsx";
 import ShareLayout from "@/features/share/components/share-layout.tsx";
-import ShareRedirect from '@/pages/share/share-redirect.tsx';
+import ShareRedirect from "@/pages/share/share-redirect.tsx";
 import { useTrackOrigin } from "@/hooks/use-track-origin";
+import SpacesPage from "@/pages/spaces/spaces.tsx";
+import { MfaChallengePage } from "@/ee/mfa/pages/mfa-challenge-page";
+import { MfaSetupRequiredPage } from "@/ee/mfa/pages/mfa-setup-required-page";
+import SpaceTrash from "@/pages/space/space-trash.tsx";
 
 export default function App() {
   const { t } = useTranslation();
@@ -45,6 +49,8 @@ export default function App() {
         <Route path={"/invites/:invitationId"} element={<InviteSignup />} />
         <Route path={"/forgot-password"} element={<ForgotPassword />} />
         <Route path={"/password-reset"} element={<PasswordReset />} />
+        <Route path={"/login/mfa"} element={<MfaChallengePage />} />
+        <Route path={"/login/mfa/setup"} element={<MfaSetupRequiredPage />} />
 
         {!isCloud() && (
           <Route path={"/setup/register"} element={<SetupWorkspace />} />
@@ -58,7 +64,10 @@ export default function App() {
         )}
 
         <Route element={<ShareLayout />}>
-          <Route path={"/share/:shareId/p/:pageSlug"} element={<SharedPage />} />
+          <Route
+            path={"/share/:shareId/p/:pageSlug"}
+            element={<SharedPage />}
+          />
           <Route path={"/share/p/:pageSlug"} element={<SharedPage />} />
         </Route>
 
@@ -67,7 +76,9 @@ export default function App() {
 
         <Route element={<Layout />}>
           <Route path={"/home"} element={<Home />} />
+          <Route path={"/spaces"} element={<SpacesPage />} />
           <Route path={"/s/:spaceSlug"} element={<SpaceHome />} />
+          <Route path={"/s/:spaceSlug/trash"} element={<SpaceTrash />} />
           <Route
             path={"/s/:spaceSlug/p/:pageSlug"}
             element={

apps/client/src/components/common/export-modal.tsx

@@ -29,19 +29,22 @@ export default function ExportModal({
 }: ExportModalProps) {
   const [format, setFormat] = useState<ExportFormat>(ExportFormat.Markdown);
   const [includeChildren, setIncludeChildren] = useState<boolean>(false);
-  const [includeAttachments, setIncludeAttachments] = useState<boolean>(true);
+  const [includeAttachments, setIncludeAttachments] = useState<boolean>(false);
   const { t } = useTranslation();
 
   const handleExport = async () => {
     try {
       if (type === "page") {
-        await exportPage({ pageId: id, format, includeChildren });
+        await exportPage({
+          pageId: id,
+          format,
+          includeChildren,
+          includeAttachments,
+        });
       }
       if (type === "space") {
         await exportSpace({ spaceId: id, format, includeAttachments });
       }
-      setIncludeChildren(false);
-      setIncludeAttachments(true);
       onClose();
     } catch (err) {
       notifications.show({
@@ -96,6 +99,18 @@ export default function ExportModal({
                   checked={includeChildren}
                 />
               </Group>
+
+              <Group justify="space-between" wrap="nowrap" mt="md">
+                <div>
+                  <Text size="md">{t("Include attachments")}</Text>
+                </div>
+                <Switch
+                  onChange={(event) =>
+                    setIncludeAttachments(event.currentTarget.checked)
+                  }
+                  checked={includeAttachments}
+                />
+              </Group>
             </>
           )}
 

apps/client/src/components/common/user-info.tsx

@@ -0,0 +1,24 @@
+import { Group, Text } from "@mantine/core";
+import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
+import React from "react";
+import { IUser } from '@/features/user/types/user.types.ts';
+
+interface UserInfoProps {
+  user: Partial<IUser>;
+  size?: string;
+}
+export function UserInfo({ user, size }: UserInfoProps) {
+  return (
+    <Group gap="sm" wrap="nowrap">
+      <CustomAvatar avatarUrl={user?.avatarUrl} name={user?.name} size={size} />
+      <div>
+        <Text fz="sm" fw={500} lineClamp={1}>
+          {user?.name}
+        </Text>
+        <Text fz="xs" c="dimmed">
+          {user?.email}
+        </Text>
+      </div>
+    </Group>
+  );
+}

apps/client/src/components/layouts/global/app-header.tsx

@@ -27,6 +27,8 @@ export function AppHeader() {
   const { isTrial, trialDaysLeft } = useTrial();
 
   const isHomeRoute = location.pathname.startsWith("/home");
+  const isSpacesRoute = location.pathname === "/spaces";
+  const hideSidebar = isHomeRoute || isSpacesRoute;
 
   const items = links.map((link) => (
     <Link key={link.label} to={link.link} className={classes.link}>
@@ -38,7 +40,7 @@ export function AppHeader() {
     <>
       <Group h="100%" px="md" justify="space-between" wrap={"nowrap"}>
         <Group wrap="nowrap">
-          {!isHomeRoute && (
+          {!hideSidebar && (
             <>
               <Tooltip label={t("Sidebar toggle")}>
                 <SidebarToggle

apps/client/src/components/layouts/global/aside.tsx

@@ -1,5 +1,5 @@
 import { Box, ScrollArea, Text } from "@mantine/core";
-import CommentList from "@/features/comment/components/comment-list.tsx";
+import CommentListWithTabs from "@/features/comment/components/comment-list-with-tabs.tsx";
 import { useAtom } from "jotai";
 import { asideStateAtom } from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
 import React, { ReactNode } from "react";
@@ -18,7 +18,7 @@ export default function Aside() {
 
   switch (tab) {
     case "comments":
-      component = <CommentList />;
+      component = <CommentListWithTabs />;
       title = "Comments";
       break;
     case "toc":
@@ -38,13 +38,17 @@ export default function Aside() {
             {t(title)}
           </Text>
 
-          <ScrollArea
-            style={{ height: "85vh" }}
-            scrollbarSize={5}
-            type="scroll"
-          >
-            <div style={{ paddingBottom: "200px" }}>{component}</div>
-          </ScrollArea>
+          {tab === "comments" ? (
+            <CommentListWithTabs />
+          ) : (
+            <ScrollArea
+              style={{ height: "85vh" }}
+              scrollbarSize={5}
+              type="scroll"
+            >
+              <div style={{ paddingBottom: "200px" }}>{component}</div>
+            </ScrollArea>
+          )}
         </>
       )}
     </Box>

apps/client/src/components/layouts/global/global-app-shell.tsx

@@ -73,13 +73,15 @@ export default function GlobalAppShell({
   const isSettingsRoute = location.pathname.startsWith("/settings");
   const isSpaceRoute = location.pathname.startsWith("/s/");
   const isHomeRoute = location.pathname.startsWith("/home");
+  const isSpacesRoute = location.pathname === "/spaces";
   const isPageRoute = location.pathname.includes("/p/");
+  const hideSidebar = isHomeRoute || isSpacesRoute;
 
   return (
     <AppShell
       header={{ height: 45 }}
       navbar={
-        !isHomeRoute && {
+        !hideSidebar && {
           width: isSpaceRoute ? sidebarWidth : 300,
           breakpoint: "sm",
           collapsed: {
@@ -100,7 +102,7 @@ export default function GlobalAppShell({
       <AppShell.Header px="md" className={classes.header}>
         <AppHeader />
       </AppShell.Header>
-      {!isHomeRoute && (
+      {!hideSidebar && (
         <AppShell.Navbar
           className={classes.navbar}
           withBorder={false}

apps/client/src/components/layouts/global/top-menu.tsx

@@ -1,9 +1,21 @@
-import { Group, Menu, UnstyledButton, Text } from "@mantine/core";
 import {
+  Group,
+  Menu,
+  UnstyledButton,
+  Text,
+  useMantineColorScheme,
+} from "@mantine/core";
+import {
+  IconBrightnessFilled,
   IconBrush,
+  IconCheck,
   IconChevronDown,
+  IconChevronRight,
+  IconDeviceDesktop,
   IconLogout,
+  IconMoon,
   IconSettings,
+  IconSun,
   IconUserCircle,
   IconUsers,
 } from "@tabler/icons-react";
@@ -19,6 +31,7 @@ export default function TopMenu() {
   const { t } = useTranslation();
   const [currentUser] = useAtom(currentUserAtom);
   const { logout } = useAuth();
+  const { colorScheme, setColorScheme } = useMantineColorScheme();
 
   const user = currentUser?.user;
   const workspace = currentUser?.workspace;
@@ -75,7 +88,7 @@ export default function TopMenu() {
               name={user.name}
             />
 
-            <div style={{width: 190}}>
+            <div style={{ width: 190 }}>
               <Text size="sm" fw={500} lineClamp={1}>
                 {user.name}
               </Text>
@@ -101,6 +114,44 @@ export default function TopMenu() {
           {t("My preferences")}
         </Menu.Item>
 
+        <Menu.Sub>
+          <Menu.Sub.Target>
+            <Menu.Sub.Item leftSection={<IconBrightnessFilled size={16} />}>
+              {t("Theme")}
+            </Menu.Sub.Item>
+          </Menu.Sub.Target>
+
+          <Menu.Sub.Dropdown>
+            <Menu.Item
+              onClick={() => setColorScheme("light")}
+              leftSection={<IconSun size={16} />}
+              rightSection={
+                colorScheme === "light" ? <IconCheck size={16} /> : null
+              }
+            >
+              {t("Light")}
+            </Menu.Item>
+            <Menu.Item
+              onClick={() => setColorScheme("dark")}
+              leftSection={<IconMoon size={16} />}
+              rightSection={
+                colorScheme === "dark" ? <IconCheck size={16} /> : null
+              }
+            >
+              {t("Dark")}
+            </Menu.Item>
+            <Menu.Item
+              onClick={() => setColorScheme("auto")}
+              leftSection={<IconDeviceDesktop size={16} />}
+              rightSection={
+                colorScheme === "auto" ? <IconCheck size={16} /> : null
+              }
+            >
+              {t("System settings")}
+            </Menu.Item>
+          </Menu.Sub.Dropdown>
+        </Menu.Sub>
+
         <Menu.Divider />
 
         <Menu.Item onClick={logout} leftSection={<IconLogout size={16} />}>

apps/client/src/components/settings/settings-sidebar.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react";
-import { Group, Text, ScrollArea, ActionIcon } from "@mantine/core";
+import { Group, Text, ScrollArea, ActionIcon, Tooltip } from "@mantine/core";
 import {
   IconUser,
   IconSettings,
@@ -42,6 +42,7 @@ interface DataItem {
   isEnterprise?: boolean;
   isAdmin?: boolean;
   isSelfhosted?: boolean;
+  showDisabledInNonEE?: boolean;
 }
 
 interface DataGroup {
@@ -84,6 +85,7 @@ const groupedData: DataGroup[] = [
         isCloud: true,
         isEnterprise: true,
         isAdmin: true,
+        showDisabledInNonEE: true,
       },
       { label: "Groups", icon: IconUsersGroup, path: "/settings/groups" },
       { label: "Spaces", icon: IconSpaces, path: "/settings/spaces" },
@@ -117,6 +119,11 @@ export default function SettingsSidebar() {
   }, [location.pathname]);
 
   const canShowItem = (item: DataItem) => {
+    if (item.showDisabledInNonEE && item.isEnterprise) {
+      // Check admin permission regardless of license
+      return item.isAdmin ? isAdmin : true;
+    }
+
     if (item.isCloud && item.isEnterprise) {
       if (!(isCloud() || workspace?.hasLicenseKey)) return false;
       return item.isAdmin ? isAdmin : true;
@@ -141,6 +148,13 @@ export default function SettingsSidebar() {
     return true;
   };
 
+  const isItemDisabled = (item: DataItem) => {
+    if (item.showDisabledInNonEE && item.isEnterprise) {
+      return !(isCloud() || workspace?.hasLicenseKey);
+    }
+    return false;
+  };
+
   const menuItems = groupedData.map((group) => {
     if (group.heading === "System" && (!isAdmin || isCloud())) {
       return null;
@@ -185,23 +199,48 @@ export default function SettingsSidebar() {
               break;
           }
 
-          return (
+          const isDisabled = isItemDisabled(item);
+          const linkElement = (
             <Link
-              onMouseEnter={prefetchHandler}
+              onMouseEnter={!isDisabled ? prefetchHandler : undefined}
               className={classes.link}
               data-active={active.startsWith(item.path) || undefined}
+              data-disabled={isDisabled || undefined}
               key={item.label}
-              to={item.path}
-              onClick={() => {
+              to={isDisabled ? "#" : item.path}
+              onClick={(e) => {
+                if (isDisabled) {
+                  e.preventDefault();
+                  return;
+                }
                 if (mobileSidebarOpened) {
                   toggleMobileSidebar();
                 }
               }}
+              style={{
+                opacity: isDisabled ? 0.5 : 1,
+                cursor: isDisabled ? "not-allowed" : "pointer",
+              }}
             >
               <item.icon className={classes.linkIcon} stroke={2} />
               <span>{t(item.label)}</span>
             </Link>
           );
+
+          if (isDisabled) {
+            return (
+              <Tooltip
+                key={item.label}
+                label={t("Available in enterprise edition")}
+                position="right"
+                withArrow
+              >
+                {linkElement}
+              </Tooltip>
+            );
+          }
+
+          return linkElement;
         })}
       </div>
     );

apps/client/src/ee/billing/components/billing-details.tsx

@@ -117,7 +117,8 @@ export default function BillingDetails() {
               {billing.billingScheme === "tiered" && (
                 <>
                   <Text fw={700} fz="lg">
-                    ${billing.amount / 100} {billing.currency.toUpperCase()}
+                    ${billing.amount / 100} {billing.currency.toUpperCase()} /{" "}
+                    {billing.interval}
                   </Text>
                   <Text c="dimmed" fz="sm">
                     per {billing.interval}
@@ -129,7 +130,7 @@ export default function BillingDetails() {
                 <>
                   <Text fw={700} fz="lg">
                     {(billing.amount / 100) * billing.quantity}{" "}
-                    {billing.currency.toUpperCase()}
+                    {billing.currency.toUpperCase()} / {billing.interval}
                   </Text>
                   <Text c="dimmed" fz="sm">
                     ${billing.amount / 100} /user/{billing.interval}

apps/client/src/ee/billing/components/billing-plans.tsx

@@ -12,14 +12,18 @@ import {
   Badge,
   Flex,
   Switch,
+  Alert,
 } from "@mantine/core";
 import { useState } from "react";
-import { IconCheck } from "@tabler/icons-react";
+import { IconCheck, IconInfoCircle } from "@tabler/icons-react";
 import { getCheckoutLink } from "@/ee/billing/services/billing-service.ts";
 import { useBillingPlans } from "@/ee/billing/queries/billing-query.ts";
+import { useAtomValue } from "jotai";
+import { workspaceAtom } from "@/features/user/atoms/current-user-atom";
 
 export default function BillingPlans() {
   const { data: plans } = useBillingPlans();
+  const workspace = useAtomValue(workspaceAtom);
   const [isAnnual, setIsAnnual] = useState(true);
   const [selectedTierValue, setSelectedTierValue] = useState<string | null>(
     null,
@@ -36,49 +40,76 @@ export default function BillingPlans() {
     }
   };
 
+  // TODO: remove by July 30.
+  // Check if workspace was created between June 28 and July 14, 2025
+  const showTieredPricingNotice = (() => {
+    if (!workspace?.createdAt) return false;
+    const createdDate = new Date(workspace.createdAt);
+    const startDate = new Date('2025-06-20');
+    const endDate = new Date('2025-07-14');
+    return createdDate >= startDate && createdDate <= endDate;
+  })();
+
   if (!plans || plans.length === 0) {
     return null;
   }
 
-  const firstPlan = plans[0];
+  // Check if any plan is tiered
+  const hasTieredPlans = plans.some(plan => plan.billingScheme === 'tiered' && plan.pricingTiers?.length > 0);
+  const firstTieredPlan = plans.find(plan => plan.billingScheme === 'tiered' && plan.pricingTiers?.length > 0);
 
-  // Set initial tier value if not set
-  if (!selectedTierValue && firstPlan.pricingTiers.length > 0) {
-    setSelectedTierValue(firstPlan.pricingTiers[0].upTo.toString());
+  // Set initial tier value if not set and we have tiered plans
+  if (hasTieredPlans && !selectedTierValue && firstTieredPlan) {
+    setSelectedTierValue(firstTieredPlan.pricingTiers[0].upTo.toString());
     return null;
   }
 
-  if (!selectedTierValue) {
+  // For tiered plans, ensure we have a selected tier
+  if (hasTieredPlans && !selectedTierValue) {
     return null;
   }
 
-  const selectData = firstPlan.pricingTiers
-    .filter((tier) => !tier.custom)
+  const selectData = firstTieredPlan?.pricingTiers
+    ?.filter((tier) => !tier.custom)
     .map((tier, index) => {
       const prevMaxUsers =
-        index > 0 ? firstPlan.pricingTiers[index - 1].upTo : 0;
+        index > 0 ? firstTieredPlan.pricingTiers[index - 1].upTo : 0;
       return {
         value: tier.upTo.toString(),
         label: `${prevMaxUsers + 1}-${tier.upTo} users`,
       };
-    });
+    }) || [];
 
   return (
     <Container size="xl" py="xl">
+      {/* Tiered pricing notice for eligible workspaces */}
+      {showTieredPricingNotice && !hasTieredPlans && (
+        <Alert
+          icon={<IconInfoCircle size={16} />} 
+          title="Want the old tiered pricing?" 
+          color="blue"
+          mb="lg"
+        >
+          Contact support to switch back to our tiered pricing model.
+        </Alert>
+      )}
+
       {/* Controls Section */}
       <Stack gap="xl" mb="md">
         {/* Team Size and Billing Controls */}
         <Group justify="center" align="center" gap="sm">
-          <Select
-            label="Team size"
-            description="Select the number of users"
-            value={selectedTierValue}
-            onChange={setSelectedTierValue}
-            data={selectData}
-            w={250}
-            size="md"
-            allowDeselect={false}
-          />
+          {hasTieredPlans && (
+            <Select
+              label="Team size"
+              description="Select the number of users"
+              value={selectedTierValue}
+              onChange={setSelectedTierValue}
+              data={selectData}
+              w={250}
+              size="md"
+              allowDeselect={false}
+            />
+          )}
 
           <Group justify="center" align="start">
             <Flex justify="center" gap="md" align="center">
@@ -102,17 +133,29 @@ export default function BillingPlans() {
       {/* Plans Grid */}
       <Group justify="center" gap="lg" align="stretch">
         {plans.map((plan, index) => {
-          const tieredPlan = plan;
-          const planSelectedTier =
-            tieredPlan.pricingTiers.find(
-              (tier) => tier.upTo.toString() === selectedTierValue,
-            ) || tieredPlan.pricingTiers[0];
-
-          const price = isAnnual
-            ? planSelectedTier.yearly
-            : planSelectedTier.monthly;
+          let price;
+          let displayPrice;
           const priceId = isAnnual ? plan.yearlyId : plan.monthlyId;
 
+          if (plan.billingScheme === 'tiered' && plan.pricingTiers?.length > 0) {
+            // Tiered billing logic
+            const planSelectedTier =
+              plan.pricingTiers.find(
+                (tier) => tier.upTo.toString() === selectedTierValue,
+              ) || plan.pricingTiers[0];
+
+            price = isAnnual
+              ? planSelectedTier.yearly
+              : planSelectedTier.monthly;
+            displayPrice = isAnnual ? (price / 12).toFixed(0) : price;
+          } else {
+            // Per-unit billing logic
+            const monthlyPrice = parseFloat(plan.price?.monthly || '0');
+            const yearlyPrice = parseFloat(plan.price?.yearly || '0');
+            price = isAnnual ? yearlyPrice : monthlyPrice;
+            displayPrice = isAnnual ? (yearlyPrice / 12).toFixed(0) : monthlyPrice;
+          }
+
           return (
             <Card
               key={plan.name}
@@ -143,25 +186,27 @@ export default function BillingPlans() {
                 <Stack gap="xs">
                   <Group align="baseline" gap="xs">
                     <Title order={1} size="h1">
-                      ${isAnnual ? (price / 12).toFixed(0) : price}
+                      ${displayPrice}
                     </Title>
                     <Text size="lg" c="dimmed">
-                      per {isAnnual ? "month" : "month"}
+                      {plan.billingScheme === 'per_unit' 
+                        ? `per user/month`
+                        : `per month`}
                     </Text>
                   </Group>
-                  {isAnnual && (
-                    <Text size="sm" c="dimmed">
-                      Billed annually
+                  <Text size="sm" c="dimmed">
+                    {isAnnual ? "Billed annually" : "Billed monthly"}
+                  </Text>
+                  {plan.billingScheme === 'tiered' && plan.pricingTiers && (
+                    <Text size="md" fw={500}>
+                      For {plan.pricingTiers.find(tier => tier.upTo.toString() === selectedTierValue)?.upTo || plan.pricingTiers[0].upTo} users
                     </Text>
                   )}
-                  <Text size="md" fw={500}>
-                    For {planSelectedTier.upTo} users
-                  </Text>
                 </Stack>
 
                 {/* CTA Button */}
                 <Button onClick={() => handleCheckout(priceId)} fullWidth>
-                  Upgrade
+                  Subscribe
                 </Button>
 
                 {/* Features */}

apps/client/src/ee/billing/types/billing.types.ts

@@ -53,7 +53,7 @@ export interface IBillingPlan {
   };
   features: string[];
   billingScheme: string | null;
-  pricingTiers: PricingTier[];
+  pricingTiers?: PricingTier[];
 }
 
 interface PricingTier {

apps/client/src/ee/comment/components/resolve-comment.tsx

@@ -0,0 +1,67 @@
+import { ActionIcon, Tooltip } from "@mantine/core";
+import { IconCircleCheck, IconCircleCheckFilled } from "@tabler/icons-react";
+import { useResolveCommentMutation } from "@/ee/comment/queries/comment-query";
+import { useTranslation } from "react-i18next";
+import { Editor } from "@tiptap/react";
+
+interface ResolveCommentProps {
+  editor: Editor;
+  commentId: string;
+  pageId: string;
+  resolvedAt?: Date;
+}
+
+function ResolveComment({
+  editor,
+  commentId,
+  pageId,
+  resolvedAt,
+}: ResolveCommentProps) {
+  const { t } = useTranslation();
+  const resolveCommentMutation = useResolveCommentMutation();
+
+  const isResolved = resolvedAt != null;
+  const iconColor = isResolved ? "green" : "gray";
+
+  const handleResolveToggle = async () => {
+    try {
+      await resolveCommentMutation.mutateAsync({
+        commentId,
+        pageId,
+        resolved: !isResolved,
+      });
+
+      if (editor) {
+        editor.commands.setCommentResolved(commentId, !isResolved);
+      }
+
+      //
+    } catch (error) {
+      console.error("Failed to toggle resolved state:", error);
+    }
+  };
+
+  return (
+    <Tooltip
+      label={isResolved ? t("Re-Open comment") : t("Resolve comment")}
+      position="top"
+    >
+      <ActionIcon
+        onClick={handleResolveToggle}
+        variant="subtle"
+        color={isResolved ? "green" : "gray"}
+        size="sm"
+        loading={resolveCommentMutation.isPending}
+        disabled={resolveCommentMutation.isPending}
+      >
+        {isResolved ? (
+          <IconCircleCheckFilled size={18} />
+        ) : (
+          <IconCircleCheck size={18} />
+        )}
+      </ActionIcon>
+    </Tooltip>
+  );
+}
+
+export default ResolveComment;

apps/client/src/ee/comment/queries/comment-query.ts

@@ -0,0 +1,87 @@
+import {
+  useMutation,
+  useQueryClient,
+} from "@tanstack/react-query";
+import { resolveComment } from "@/features/comment/services/comment-service";
+import {
+  IComment,
+  IResolveComment,
+} from "@/features/comment/types/comment.types";
+import { notifications } from "@mantine/notifications";
+import { IPagination } from "@/lib/types.ts";
+import { useTranslation } from "react-i18next";
+import { useQueryEmit } from "@/features/websocket/use-query-emit";
+import { RQ_KEY } from "@/features/comment/queries/comment-query";
+
+export function useResolveCommentMutation() {
+  const queryClient = useQueryClient();
+  const { t } = useTranslation();
+  const emit = useQueryEmit();
+
+  return useMutation({
+    mutationFn: (data: IResolveComment) => resolveComment(data),
+    onMutate: async (variables) => {
+      await queryClient.cancelQueries({ queryKey: RQ_KEY(variables.pageId) });
+      const previousComments = queryClient.getQueryData(RQ_KEY(variables.pageId));
+      queryClient.setQueryData(RQ_KEY(variables.pageId), (old: IPagination<IComment>) => {
+        if (!old || !old.items) return old;
+        const updatedItems = old.items.map((comment) =>
+          comment.id === variables.commentId
+            ? { 
+                ...comment, 
+                resolvedAt: variables.resolved ? new Date() : null, 
+                resolvedById: variables.resolved ? 'optimistic-user' : null,
+                resolvedBy: variables.resolved ? { id: 'optimistic-user', name: 'Resolving...', avatarUrl: null } : null
+              }
+            : comment,
+        );
+        return {
+          ...old,
+          items: updatedItems,
+        };
+      });
+      return { previousComments };
+    },
+    onError: (err, variables, context) => {
+      if (context?.previousComments) {
+        queryClient.setQueryData(RQ_KEY(variables.pageId), context.previousComments);
+      }
+      notifications.show({
+        message: t("Failed to resolve comment"),
+        color: "red",
+      });
+    },
+    onSuccess: (data: IComment, variables) => {
+      const pageId = data.pageId;
+      const currentComments = queryClient.getQueryData(
+        RQ_KEY(pageId),
+      ) as IPagination<IComment>;
+      if (currentComments && currentComments.items) {
+        const updatedComments = currentComments.items.map((comment) =>
+          comment.id === variables.commentId
+            ? { ...comment, resolvedAt: data.resolvedAt, resolvedById: data.resolvedById, resolvedBy: data.resolvedBy }
+            : comment,
+        );
+        queryClient.setQueryData(RQ_KEY(pageId), {
+          ...currentComments,
+          items: updatedComments,
+        });
+      }
+      emit({
+        operation: "resolveComment",
+        pageId: pageId,
+        commentId: variables.commentId,
+        resolved: variables.resolved,
+        resolvedAt: data.resolvedAt,
+        resolvedById: data.resolvedById,
+        resolvedBy: data.resolvedBy,
+      });
+      queryClient.invalidateQueries({ queryKey: RQ_KEY(pageId) });
+      notifications.show({ 
+        message: variables.resolved 
+          ? t("Comment resolved successfully") 
+          : t("Comment re-opened successfully") 
+      });
+    },
+  });
+} 

apps/client/src/ee/licence/components/oss-details.tsx

@@ -11,7 +11,7 @@ export default function OssDetails() {
         withTableBorder
       >
         <Table.Caption>
-          To unlock enterprise features like SSO, contact sales@docmost.com.
+          To unlock enterprise features like SSO, MFA, Resolve comments, contact sales@docmost.com.
         </Table.Caption>
         <Table.Tbody>
           <Table.Tr>

apps/client/src/ee/mfa/components/mfa-backup-code-input.tsx

@@ -0,0 +1,81 @@
+import React from "react";
+import {
+  TextInput,
+  Button,
+  Stack,
+  Text,
+  Alert,
+} from "@mantine/core";
+import { IconKey, IconAlertCircle } from "@tabler/icons-react";
+import { useTranslation } from "react-i18next";
+
+interface MfaBackupCodeInputProps {
+  value: string;
+  onChange: (value: string) => void;
+  error?: string;
+  onSubmit: () => void;
+  onCancel: () => void;
+  isLoading?: boolean;
+}
+
+export function MfaBackupCodeInput({
+  value,
+  onChange,
+  error,
+  onSubmit,
+  onCancel,
+  isLoading,
+}: MfaBackupCodeInputProps) {
+  const { t } = useTranslation();
+
+  return (
+    <Stack>
+      <Alert icon={<IconAlertCircle size={16} />} color="blue" variant="light">
+        <Text size="sm">
+          {t(
+            "Enter one of your backup codes. Each backup code can only be used once.",
+          )}
+        </Text>
+      </Alert>
+
+      <TextInput
+        label={t("Backup code")}
+        placeholder="XXXXXXXX"
+        value={value}
+        onChange={(e) => onChange(e.currentTarget.value.toUpperCase())}
+        error={error}
+        autoFocus
+        maxLength={8}
+        styles={{
+          input: {
+            fontFamily: "monospace",
+            letterSpacing: "0.1em",
+            fontSize: "1rem",
+          },
+        }}
+      />
+
+      <Stack>
+        <Button
+          fullWidth
+          size="md"
+          loading={isLoading}
+          onClick={onSubmit}
+          leftSection={<IconKey size={18} />}
+        >
+          {t("Verify backup code")}
+        </Button>
+
+        <Button
+          fullWidth
+          variant="subtle"
+          color="gray"
+          onClick={onCancel}
+          disabled={isLoading}
+        >
+          {t("Use authenticator app instead")}
+        </Button>
+      </Stack>
+    </Stack>
+  );
+}

apps/client/src/ee/mfa/components/mfa-backup-codes-modal.tsx

@@ -0,0 +1,193 @@
+import React, { useState } from "react";
+import {
+  Modal,
+  Stack,
+  Text,
+  Button,
+  Paper,
+  Group,
+  List,
+  Code,
+  CopyButton,
+  Alert,
+  PasswordInput,
+} from "@mantine/core";
+import {
+  IconRefresh,
+  IconCopy,
+  IconCheck,
+  IconAlertCircle,
+} from "@tabler/icons-react";
+import { useMutation } from "@tanstack/react-query";
+import { notifications } from "@mantine/notifications";
+import { useTranslation } from "react-i18next";
+import { regenerateBackupCodes } from "@/ee/mfa";
+import { useForm } from "@mantine/form";
+import { zodResolver } from "mantine-form-zod-resolver";
+import { z } from "zod";
+
+interface MfaBackupCodesModalProps {
+  opened: boolean;
+  onClose: () => void;
+}
+
+const formSchema = z.object({
+  confirmPassword: z.string().min(1, { message: "Password is required" }),
+});
+
+export function MfaBackupCodesModal({
+  opened,
+  onClose,
+}: MfaBackupCodesModalProps) {
+  const { t } = useTranslation();
+  const [backupCodes, setBackupCodes] = useState<string[]>([]);
+  const [showNewCodes, setShowNewCodes] = useState(false);
+
+  const form = useForm({
+    validate: zodResolver(formSchema),
+    initialValues: {
+      confirmPassword: "",
+    },
+  });
+
+  const regenerateMutation = useMutation({
+    mutationFn: (data: { confirmPassword: string }) =>
+      regenerateBackupCodes(data),
+    onSuccess: (data) => {
+      setBackupCodes(data.backupCodes);
+      setShowNewCodes(true);
+      form.reset();
+      notifications.show({
+        title: t("Success"),
+        message: t("New backup codes have been generated"),
+      });
+    },
+    onError: (error: any) => {
+      notifications.show({
+        title: t("Error"),
+        message:
+          error.response?.data?.message ||
+          t("Failed to regenerate backup codes"),
+        color: "red",
+      });
+    },
+  });
+
+  const handleRegenerate = (values: { confirmPassword: string }) => {
+    regenerateMutation.mutate(values);
+  };
+
+  const handleClose = () => {
+    setShowNewCodes(false);
+    setBackupCodes([]);
+    form.reset();
+    onClose();
+  };
+
+  return (
+    <Modal
+      opened={opened}
+      onClose={handleClose}
+      title={t("Backup codes")}
+      size="md"
+    >
+      <Stack gap="md">
+        {!showNewCodes ? (
+          <form onSubmit={form.onSubmit(handleRegenerate)}>
+            <Stack gap="md">
+              <Alert
+                icon={<IconAlertCircle size={20} />}
+                title={t("About backup codes")}
+                color="blue"
+                variant="light"
+              >
+                <Text size="sm">
+                  {t(
+                    "Backup codes can be used to access your account if you lose access to your authenticator app. Each code can only be used once.",
+                  )}
+                </Text>
+              </Alert>
+
+              <Text size="sm">
+                {t(
+                  "You can regenerate new backup codes at any time. This will invalidate all existing codes.",
+                )}
+              </Text>
+
+              <PasswordInput
+                label={t("Confirm password")}
+                placeholder={t("Enter your password")}
+                variant="filled"
+                {...form.getInputProps("confirmPassword")}
+              />
+
+              <Button
+                type="submit"
+                fullWidth
+                loading={regenerateMutation.isPending}
+                leftSection={<IconRefresh size={18} />}
+              >
+                {t("Generate new backup codes")}
+              </Button>
+            </Stack>
+          </form>
+        ) : (
+          <>
+            <Alert
+              icon={<IconAlertCircle size={20} />}
+              title={t("Save your new backup codes")}
+              color="yellow"
+            >
+              <Text size="sm">
+                {t(
+                  "Make sure to save these codes in a secure place. Your old backup codes are no longer valid.",
+                )}
+              </Text>
+            </Alert>
+
+            <Paper p="md" withBorder>
+              <Group justify="space-between" mb="sm">
+                <Text size="sm" fw={600}>
+                  {t("Your new backup codes")}
+                </Text>
+                <CopyButton value={backupCodes.join("\n")}>
+                  {({ copied, copy }) => (
+                    <Button
+                      size="xs"
+                      variant="subtle"
+                      onClick={copy}
+                      leftSection={
+                        copied ? (
+                          <IconCheck size={14} />
+                        ) : (
+                          <IconCopy size={14} />
+                        )
+                      }
+                    >
+                      {copied ? t("Copied") : t("Copy")}
+                    </Button>
+                  )}
+                </CopyButton>
+              </Group>
+              <List size="sm" spacing="xs">
+                {backupCodes.map((code, index) => (
+                  <List.Item key={index}>
+                    <Code>{code}</Code>
+                  </List.Item>
+                ))}
+              </List>
+            </Paper>
+
+            <Button
+              fullWidth
+              onClick={handleClose}
+              leftSection={<IconCheck size={18} />}
+            >
+              {t("I've saved my backup codes")}
+            </Button>
+          </>
+        )}
+      </Stack>
+    </Modal>
+  );
+}

apps/client/src/ee/mfa/components/mfa-challenge.module.css

@@ -0,0 +1,12 @@
+.container {
+  min-height: 100vh;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 1rem;
+}
+
+.paper {
+  width: 100%;
+  box-shadow: var(--mantine-shadow-lg);
+}

apps/client/src/ee/mfa/components/mfa-challenge.tsx

@@ -0,0 +1,160 @@
+import React, { useState } from "react";
+import {
+  Container,
+  Title,
+  Text,
+  PinInput,
+  Button,
+  Stack,
+  Anchor,
+  Paper,
+  Center,
+  ThemeIcon,
+} from "@mantine/core";
+import { useForm } from "@mantine/form";
+import { zodResolver } from "mantine-form-zod-resolver";
+import { IconDeviceMobile, IconLock } from "@tabler/icons-react";
+import { useNavigate } from "react-router-dom";
+import { notifications } from "@mantine/notifications";
+import classes from "./mfa-challenge.module.css";
+import { verifyMfa } from "@/ee/mfa";
+import APP_ROUTE from "@/lib/app-route";
+import { useTranslation } from "react-i18next";
+import * as z from "zod";
+import { MfaBackupCodeInput } from "./mfa-backup-code-input";
+
+const formSchema = z.object({
+  code: z
+    .string()
+    .refine(
+      (val) => (val.length === 6 && /^\d{6}$/.test(val)) || val.length === 8,
+      {
+        message: "Enter a 6-digit code or 8-character backup code",
+      },
+    ),
+});
+
+type MfaChallengeFormValues = z.infer<typeof formSchema>;
+
+export function MfaChallenge() {
+  const { t } = useTranslation();
+  const navigate = useNavigate();
+  const [isLoading, setIsLoading] = useState(false);
+  const [useBackupCode, setUseBackupCode] = useState(false);
+
+  const form = useForm<MfaChallengeFormValues>({
+    validate: zodResolver(formSchema),
+    initialValues: {
+      code: "",
+    },
+  });
+
+  const handleSubmit = async (values: MfaChallengeFormValues) => {
+    setIsLoading(true);
+    try {
+      await verifyMfa(values.code);
+      navigate(APP_ROUTE.HOME);
+    } catch (error: any) {
+      setIsLoading(false);
+      notifications.show({
+        message:
+          error.response?.data?.message || t("Invalid verification code"),
+        color: "red",
+      });
+      form.setFieldValue("code", "");
+    }
+  };
+
+  return (
+    <Container size={420} className={classes.container}>
+      <Paper radius="lg" p={40} className={classes.paper}>
+        <Stack align="center" gap="xl">
+          <Center>
+            <ThemeIcon size={80} radius="xl" variant="light" color="blue">
+              <IconDeviceMobile size={40} stroke={1.5} />
+            </ThemeIcon>
+          </Center>
+
+          <Stack align="center" gap="xs">
+            <Title order={2} ta="center" fw={600}>
+              {t("Two-factor authentication")}
+            </Title>
+            <Text size="sm" c="dimmed" ta="center">
+              {useBackupCode
+                ? t("Enter one of your backup codes")
+                : t("Enter the 6-digit code found in your authenticator app")}
+            </Text>
+          </Stack>
+
+          {!useBackupCode ? (
+            <form
+              onSubmit={form.onSubmit(handleSubmit)}
+              style={{ width: "100%" }}
+            >
+              <Stack gap="lg">
+                <Center>
+                  <PinInput
+                    length={6}
+                    type="number"
+                    autoFocus
+                    oneTimeCode
+                    {...form.getInputProps("code")}
+                    error={!!form.errors.code}
+                    styles={{
+                      input: {
+                        fontSize: "1.2rem",
+                        textAlign: "center",
+                      },
+                    }}
+                  />
+                </Center>
+                {form.errors.code && (
+                  <Text c="red" size="sm" ta="center">
+                    {form.errors.code}
+                  </Text>
+                )}
+
+                <Button
+                  type="submit"
+                  fullWidth
+                  size="md"
+                  loading={isLoading}
+                  leftSection={<IconLock size={18} />}
+                >
+                  {t("Verify")}
+                </Button>
+
+                <Anchor
+                  component="button"
+                  type="button"
+                  size="sm"
+                  c="dimmed"
+                  onClick={() => {
+                    setUseBackupCode(true);
+                    form.setFieldValue("code", "");
+                    form.clearErrors();
+                  }}
+                >
+                  {t("Use backup code")}
+                </Anchor>
+              </Stack>
+            </form>
+          ) : (
+            <MfaBackupCodeInput
+              value={form.values.code}
+              onChange={(value) => form.setFieldValue("code", value)}
+              error={form.errors.code?.toString()}
+              onSubmit={() => handleSubmit(form.values)}
+              onCancel={() => {
+                setUseBackupCode(false);
+                form.setFieldValue("code", "");
+                form.clearErrors();
+              }}
+              isLoading={isLoading}
+            />
+          )}
+        </Stack>
+      </Paper>
+    </Container>
+  );
+}

apps/client/src/ee/mfa/components/mfa-disable-modal.tsx

@@ -0,0 +1,124 @@
+import React from "react";
+import {
+  Modal,
+  Stack,
+  Text,
+  Button,
+  PasswordInput,
+  Alert,
+} from "@mantine/core";
+import { IconShieldOff, IconAlertTriangle } from "@tabler/icons-react";
+import { useForm } from "@mantine/form";
+import { zodResolver } from "mantine-form-zod-resolver";
+import { useMutation } from "@tanstack/react-query";
+import { notifications } from "@mantine/notifications";
+import { useTranslation } from "react-i18next";
+import { z } from "zod";
+import { disableMfa } from "@/ee/mfa";
+
+interface MfaDisableModalProps {
+  opened: boolean;
+  onClose: () => void;
+  onComplete: () => void;
+}
+
+const formSchema = z.object({
+  confirmPassword: z.string().min(1, { message: "Password is required" }),
+});
+
+export function MfaDisableModal({
+  opened,
+  onClose,
+  onComplete,
+}: MfaDisableModalProps) {
+  const { t } = useTranslation();
+
+  const form = useForm({
+    validate: zodResolver(formSchema),
+    initialValues: {
+      confirmPassword: "",
+    },
+  });
+
+  const disableMutation = useMutation({
+    mutationFn: disableMfa,
+    onSuccess: () => {
+      onComplete();
+    },
+    onError: (error: any) => {
+      notifications.show({
+        title: t("Error"),
+        message: error.response?.data?.message || t("Failed to disable MFA"),
+        color: "red",
+      });
+    },
+  });
+
+  const handleSubmit = async (values: { confirmPassword: string }) => {
+    await disableMutation.mutateAsync(values);
+  };
+
+  const handleClose = () => {
+    form.reset();
+    onClose();
+  };
+
+  return (
+    <Modal
+      opened={opened}
+      onClose={handleClose}
+      title={t("Disable two-factor authentication")}
+      size="md"
+    >
+      <form onSubmit={form.onSubmit(handleSubmit)}>
+        <Stack gap="md">
+          <Alert
+            icon={<IconAlertTriangle size={20} />}
+            title={t("Warning")}
+            color="red"
+            variant="light"
+          >
+            <Text size="sm">
+              {t(
+                "Disabling two-factor authentication will make your account less secure. You'll only need your password to sign in.",
+              )}
+            </Text>
+          </Alert>
+
+          <Text size="sm">
+            {t(
+              "Please enter your password to disable two-factor authentication:",
+            )}
+          </Text>
+
+          <PasswordInput
+            label={t("Password")}
+            placeholder={t("Enter your password")}
+            {...form.getInputProps("confirmPassword")}
+            autoFocus
+          />
+
+          <Stack gap="sm">
+            <Button
+              type="submit"
+              fullWidth
+              color="red"
+              loading={disableMutation.isPending}
+              leftSection={<IconShieldOff size={18} />}
+            >
+              {t("Disable two-factor authentication")}
+            </Button>
+            <Button
+              fullWidth
+              variant="default"
+              onClick={handleClose}
+              disabled={disableMutation.isPending}
+            >
+              {t("Cancel")}
+            </Button>
+          </Stack>
+        </Stack>
+      </form>
+    </Modal>
+  );
+}

apps/client/src/ee/mfa/components/mfa-settings.tsx

@@ -0,0 +1,123 @@
+import React, { useState } from "react";
+import { Group, Text, Button, Tooltip } from "@mantine/core";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
+import { notifications } from "@mantine/notifications";
+import { useTranslation } from "react-i18next";
+import { getMfaStatus } from "@/ee/mfa";
+import { MfaSetupModal } from "@/ee/mfa";
+import { MfaDisableModal } from "@/ee/mfa";
+import { MfaBackupCodesModal } from "@/ee/mfa";
+import { isCloud } from "@/lib/config.ts";
+import useLicense from "@/ee/hooks/use-license.tsx";
+
+export function MfaSettings() {
+  const { t } = useTranslation();
+  const queryClient = useQueryClient();
+  const [setupModalOpen, setSetupModalOpen] = useState(false);
+  const [disableModalOpen, setDisableModalOpen] = useState(false);
+  const [backupCodesModalOpen, setBackupCodesModalOpen] = useState(false);
+  const { hasLicenseKey } = useLicense();
+
+  const { data: mfaStatus, isLoading } = useQuery({
+    queryKey: ["mfa-status"],
+    queryFn: getMfaStatus,
+  });
+
+  if (isLoading || !mfaStatus) {
+    return null;
+  }
+
+  const canUseMfa = isCloud() || hasLicenseKey;
+
+  // Check if MFA is truly enabled
+  const isMfaEnabled = mfaStatus?.isEnabled === true;
+
+  const handleSetupComplete = () => {
+    setSetupModalOpen(false);
+    queryClient.invalidateQueries({ queryKey: ["mfa-status"] });
+    notifications.show({
+      title: t("Success"),
+      message: t("Two-factor authentication has been enabled"),
+    });
+  };
+
+  const handleDisableComplete = () => {
+    setDisableModalOpen(false);
+    queryClient.invalidateQueries({ queryKey: ["mfa-status"] });
+    notifications.show({
+      title: t("Success"),
+      message: t("Two-factor authentication has been disabled"),
+      color: "blue",
+    });
+  };
+
+  return (
+    <>
+      <Group justify="space-between" wrap="nowrap" gap="xl">
+        <div style={{ minWidth: 0, flex: 1 }}>
+          <Text size="md">{t("2-step verification")}</Text>
+          <Text size="sm" c="dimmed">
+            {!isMfaEnabled
+              ? t(
+                  "Protect your account with an additional verification layer when signing in.",
+                )
+              : t("Two-factor authentication is active on your account.")}
+          </Text>
+        </div>
+
+        {!isMfaEnabled ? (
+          <Tooltip
+            label={t("Available in enterprise edition")}
+            disabled={canUseMfa}
+          >
+            <Button
+              disabled={!canUseMfa}
+              variant="default"
+              onClick={() => setSetupModalOpen(true)}
+              style={{ whiteSpace: "nowrap" }}
+            >
+              {t("Add 2FA method")}
+            </Button>
+          </Tooltip>
+        ) : (
+          <Group gap="sm" wrap="nowrap">
+            <Button
+              variant="default"
+              size="sm"
+              onClick={() => setBackupCodesModalOpen(true)}
+              style={{ whiteSpace: "nowrap" }}
+            >
+              {t("Backup codes")} ({mfaStatus?.backupCodesCount || 0})
+            </Button>
+            <Button
+              variant="default"
+              size="sm"
+              color="red"
+              onClick={() => setDisableModalOpen(true)}
+              style={{ whiteSpace: "nowrap" }}
+            >
+              {t("Disable")}
+            </Button>
+          </Group>
+        )}
+      </Group>
+
+      <MfaSetupModal
+        opened={setupModalOpen}
+        onClose={() => setSetupModalOpen(false)}
+        onComplete={handleSetupComplete}
+      />
+
+      <MfaDisableModal
+        opened={disableModalOpen}
+        onClose={() => setDisableModalOpen(false)}
+        onComplete={handleDisableComplete}
+      />
+
+      <MfaBackupCodesModal
+        opened={backupCodesModalOpen}
+        onClose={() => setBackupCodesModalOpen(false)}
+      />
+    </>
+  );
+}

apps/client/src/ee/mfa/components/mfa-setup-modal.tsx

@@ -0,0 +1,347 @@
+import React, { useState } from "react";
+import {
+  Modal,
+  Stack,
+  Text,
+  Button,
+  Group,
+  Stepper,
+  Center,
+  Image,
+  PinInput,
+  Alert,
+  List,
+  CopyButton,
+  ActionIcon,
+  Tooltip,
+  Paper,
+  Code,
+  Loader,
+  Collapse,
+  UnstyledButton,
+} from "@mantine/core";
+import {
+  IconQrcode,
+  IconShieldCheck,
+  IconKey,
+  IconCopy,
+  IconCheck,
+  IconAlertCircle,
+  IconChevronDown,
+  IconChevronRight,
+  IconPrinter,
+} from "@tabler/icons-react";
+import { useForm } from "@mantine/form";
+import { useMutation } from "@tanstack/react-query";
+import { notifications } from "@mantine/notifications";
+import { useTranslation } from "react-i18next";
+import { setupMfa, enableMfa } from "@/ee/mfa";
+import { zodResolver } from "mantine-form-zod-resolver";
+import { z } from "zod";
+
+interface MfaSetupModalProps {
+  opened: boolean;
+  onClose?: () => void;
+  onComplete: () => void;
+  isRequired?: boolean;
+}
+
+interface SetupData {
+  secret: string;
+  qrCode: string;
+  manualKey: string;
+}
+
+const formSchema = z.object({
+  verificationCode: z
+    .string()
+    .length(6, { message: "Please enter a 6-digit code" }),
+});
+
+export function MfaSetupModal({
+  opened,
+  onClose,
+  onComplete,
+  isRequired = false,
+}: MfaSetupModalProps) {
+  const { t } = useTranslation();
+  const [active, setActive] = useState(0);
+  const [setupData, setSetupData] = useState<SetupData | null>(null);
+  const [backupCodes, setBackupCodes] = useState<string[]>([]);
+  const [manualEntryOpen, setManualEntryOpen] = useState(false);
+
+  const form = useForm({
+    validate: zodResolver(formSchema),
+    initialValues: {
+      verificationCode: "",
+    },
+  });
+
+  const setupMutation = useMutation({
+    mutationFn: () => setupMfa({ method: "totp" }),
+    onSuccess: (data) => {
+      setSetupData(data);
+    },
+    onError: (error: any) => {
+      notifications.show({
+        title: t("Error"),
+        message: error.response?.data?.message || t("Failed to setup MFA"),
+        color: "red",
+      });
+    },
+  });
+
+  // Generate QR code when modal opens
+  React.useEffect(() => {
+    if (opened && !setupData && !setupMutation.isPending) {
+      setupMutation.mutate();
+    }
+  }, [opened]);
+
+  const enableMutation = useMutation({
+    mutationFn: (verificationCode: string) =>
+      enableMfa({
+        secret: setupData!.secret,
+        verificationCode,
+      }),
+    onSuccess: (data) => {
+      setBackupCodes(data.backupCodes);
+      setActive(1); // Move to backup codes step
+    },
+    onError: (error: any) => {
+      notifications.show({
+        title: t("Error"),
+        message:
+          error.response?.data?.message || t("Invalid verification code"),
+        color: "red",
+      });
+      form.setFieldValue("verificationCode", "");
+    },
+  });
+
+  const handleClose = () => {
+    if (active === 1 && backupCodes.length > 0) {
+      onComplete();
+    }
+    onClose();
+    // Reset state
+    setTimeout(() => {
+      setActive(0);
+      setSetupData(null);
+      setBackupCodes([]);
+      setManualEntryOpen(false);
+      form.reset();
+    }, 200);
+  };
+
+  const handleVerify = async (values: { verificationCode: string }) => {
+    await enableMutation.mutateAsync(values.verificationCode);
+  };
+
+  const handlePrintBackupCodes = () => {
+    window.print();
+  };
+
+  return (
+    <Modal
+      opened={opened}
+      onClose={handleClose}
+      title={t("Set up two-factor authentication")}
+      size="md"
+    >
+      <Stepper active={active} size="sm">
+        <Stepper.Step
+          label={t("Setup & Verify")}
+          description={t("Add to authenticator")}
+          icon={<IconQrcode size={18} />}
+        >
+          <form onSubmit={form.onSubmit(handleVerify)}>
+            <Stack gap="md" mt="xl">
+              {setupMutation.isPending ? (
+                <Center py="xl">
+                  <Loader size="lg" />
+                </Center>
+              ) : setupData ? (
+                <>
+                  <Text size="sm">
+                    {t("1. Scan this QR code with your authenticator app")}
+                  </Text>
+
+                  <Center>
+                    <Paper p="md" withBorder>
+                      <Image
+                        src={setupData.qrCode}
+                        alt="MFA QR Code"
+                        width={200}
+                        height={200}
+                      />
+                    </Paper>
+                  </Center>
+
+                  <UnstyledButton
+                    onClick={() => setManualEntryOpen(!manualEntryOpen)}
+                  >
+                    <Group gap="xs">
+                      {manualEntryOpen ? (
+                        <IconChevronDown size={16} />
+                      ) : (
+                        <IconChevronRight size={16} />
+                      )}
+                      <Text size="sm" c="dimmed">
+                        {t("Can't scan the code?")}
+                      </Text>
+                    </Group>
+                  </UnstyledButton>
+
+                  <Collapse in={manualEntryOpen}>
+                    <Alert
+                      icon={<IconAlertCircle size={20} />}
+                      color="gray"
+                      variant="light"
+                    >
+                      <Text size="sm" mb="sm">
+                        {t(
+                          "Enter this code manually in your authenticator app:",
+                        )}
+                      </Text>
+                      <Group gap="xs">
+                        <Code block>{setupData.manualKey}</Code>
+                        <CopyButton value={setupData.manualKey}>
+                          {({ copied, copy }) => (
+                            <Tooltip label={copied ? t("Copied") : t("Copy")}>
+                              <ActionIcon
+                                color={copied ? "green" : "gray"}
+                                onClick={copy}
+                              >
+                                {copied ? (
+                                  <IconCheck size={16} />
+                                ) : (
+                                  <IconCopy size={16} />
+                                )}
+                              </ActionIcon>
+                            </Tooltip>
+                          )}
+                        </CopyButton>
+                      </Group>
+                    </Alert>
+                  </Collapse>
+
+                  <Text size="sm" mt="md">
+                    {t("2. Enter the 6-digit code from your authenticator")}
+                  </Text>
+
+                  <Stack align="center">
+                    <PinInput
+                      length={6}
+                      type="number"
+                      autoFocus
+                      oneTimeCode
+                      {...form.getInputProps("verificationCode")}
+                      styles={{
+                        input: {
+                          fontSize: "1.2rem",
+                          textAlign: "center",
+                        },
+                      }}
+                    />
+                    {form.errors.verificationCode && (
+                      <Text c="red" size="sm">
+                        {form.errors.verificationCode}
+                      </Text>
+                    )}
+                  </Stack>
+
+                  <Button
+                    type="submit"
+                    fullWidth
+                    loading={enableMutation.isPending}
+                    leftSection={<IconShieldCheck size={18} />}
+                  >
+                    {t("Verify and enable")}
+                  </Button>
+                </>
+              ) : (
+                <Center py="xl">
+                  <Text size="sm" c="dimmed">
+                    {t("Failed to generate QR code. Please try again.")}
+                  </Text>
+                </Center>
+              )}
+            </Stack>
+          </form>
+        </Stepper.Step>
+
+        <Stepper.Step
+          label={t("Backup")}
+          description={t("Save codes")}
+          icon={<IconKey size={18} />}
+        >
+          <Stack gap="md" mt="xl">
+            <Alert
+              icon={<IconAlertCircle size={20} />}
+              title={t("Save your backup codes")}
+              color="yellow"
+            >
+              <Text size="sm">
+                {t(
+                  "These codes can be used to access your account if you lose access to your authenticator app. Each code can only be used once.",
+                )}
+              </Text>
+            </Alert>
+
+            <Paper p="md" withBorder>
+              <Group justify="space-between" mb="sm">
+                <Text size="sm" fw={600}>
+                  {t("Backup codes")}
+                </Text>
+                <Group gap="xs" wrap="nowrap">
+                  <CopyButton value={backupCodes.join("\n")}>
+                    {({ copied, copy }) => (
+                      <Button
+                        size="xs"
+                        variant="subtle"
+                        onClick={copy}
+                        leftSection={
+                          copied ? (
+                            <IconCheck size={14} />
+                          ) : (
+                            <IconCopy size={14} />
+                          )
+                        }
+                      >
+                        {copied ? t("Copied") : t("Copy")}
+                      </Button>
+                    )}
+                  </CopyButton>
+                  <Button
+                    size="xs"
+                    variant="subtle"
+                    onClick={handlePrintBackupCodes}
+                    leftSection={<IconPrinter size={14} />}
+                  >
+                    {t("Print")}
+                  </Button>
+                </Group>
+              </Group>
+              <List size="sm" spacing="xs">
+                {backupCodes.map((code, index) => (
+                  <List.Item key={index}>
+                    <Code>{code}</Code>
+                  </List.Item>
+                ))}
+              </List>
+            </Paper>
+
+            <Button
+              fullWidth
+              onClick={handleClose}
+              leftSection={<IconCheck size={18} />}
+            >
+              {t("I've saved my backup codes")}
+            </Button>
+          </Stack>
+        </Stepper.Step>
+      </Stepper>
+    </Modal>
+  );
+}

apps/client/src/ee/mfa/components/mfa-setup-required.tsx

@@ -0,0 +1,48 @@
+import React from "react";
+import { Container, Paper, Title, Text, Alert, Stack } from "@mantine/core";
+import { IconAlertCircle } from "@tabler/icons-react";
+import { useTranslation } from "react-i18next";
+import { MfaSetupModal } from "@/ee/mfa";
+import APP_ROUTE from "@/lib/app-route.ts";
+import { useNavigate } from "react-router-dom";
+
+export default function MfaSetupRequired() {
+  const { t } = useTranslation();
+  const navigate = useNavigate();
+
+  const handleSetupComplete = () => {
+    navigate(APP_ROUTE.HOME);
+  };
+
+  return (
+    <Container size="sm" py="xl">
+      <Paper shadow="sm" p="xl" radius="md" withBorder>
+        <Stack>
+          <Title order={2} ta="center">
+            {t("Two-factor authentication required")}
+          </Title>
+
+          <Alert icon={<IconAlertCircle size="1rem" />} color="yellow">
+            <Text size="sm">
+              {t(
+                "Your workspace requires two-factor authentication. Please set it up to continue.",
+              )}
+            </Text>
+          </Alert>
+
+          <Text c="dimmed" size="sm" ta="center">
+            {t(
+              "This adds an extra layer of security to your account by requiring a verification code from your authenticator app.",
+            )}
+          </Text>
+
+          <MfaSetupModal
+            opened={true}
+            onComplete={handleSetupComplete}
+            isRequired={true}
+          />
+        </Stack>
+      </Paper>
+    </Container>
+  );
+}

apps/client/src/ee/mfa/components/mfa.module.css

@@ -0,0 +1,31 @@
+.qrCodeContainer {
+  background-color: white;
+  padding: 1rem;
+  border-radius: var(--mantine-radius-md);
+  display: inline-block;
+}
+
+.backupCodesList {
+  font-family: var(--mantine-font-family-monospace);
+  background-color: var(--mantine-color-gray-0);
+  padding: 1rem;
+  border-radius: var(--mantine-radius-md);
+  
+  @mixin dark {
+    background-color: var(--mantine-color-dark-7);
+  }
+}
+
+.codeItem {
+  padding: 0.25rem 0;
+  font-size: 0.875rem;
+}
+
+.setupStep {
+  min-height: 400px;
+}
+
+.verificationInput {
+  max-width: 320px;
+  margin: 0 auto;
+}

apps/client/src/ee/mfa/hooks/use-mfa-page-protection.ts

@@ -0,0 +1,51 @@
+import { useEffect, useState } from "react";
+import { useNavigate, useLocation } from "react-router-dom";
+import APP_ROUTE from "@/lib/app-route";
+import { validateMfaAccess } from "@/ee/mfa";
+
+export function useMfaPageProtection() {
+  const navigate = useNavigate();
+  const location = useLocation();
+  const [isValidating, setIsValidating] = useState(true);
+  const [isValid, setIsValid] = useState(false);
+
+  useEffect(() => {
+    const checkAccess = async () => {
+      const result = await validateMfaAccess();
+
+      if (!result.valid) {
+        navigate(APP_ROUTE.AUTH.LOGIN);
+        return;
+      }
+
+      // Check if user is on the correct page based on their MFA state
+      const isOnChallengePage =
+        location.pathname === APP_ROUTE.AUTH.MFA_CHALLENGE;
+      const isOnSetupPage =
+        location.pathname === APP_ROUTE.AUTH.MFA_SETUP_REQUIRED;
+
+      if (result.requiresMfaSetup && !isOnSetupPage) {
+        // User needs to set up MFA but is on challenge page
+        navigate(APP_ROUTE.AUTH.MFA_SETUP_REQUIRED);
+      } else if (
+        !result.requiresMfaSetup &&
+        result.userHasMfa &&
+        !isOnChallengePage
+      ) {
+        // User has MFA and should be on challenge page
+        navigate(APP_ROUTE.AUTH.MFA_CHALLENGE);
+      } else if (!result.isTransferToken) {
+        // User has a regular auth token, shouldn't be on MFA pages
+        navigate(APP_ROUTE.HOME);
+      } else {
+        setIsValid(true);
+      }
+
+      setIsValidating(false);
+    };
+
+    checkAccess();
+  }, [navigate, location.pathname]);
+
+  return { isValidating, isValid };
+}

apps/client/src/ee/mfa/index.ts

@@ -0,0 +1,19 @@
+// Components
+export { MfaChallenge } from "./components/mfa-challenge";
+export { MfaSettings } from "./components/mfa-settings";
+export { MfaSetupModal } from "./components/mfa-setup-modal";
+export { MfaDisableModal } from "./components/mfa-disable-modal";
+export { MfaBackupCodesModal } from "./components/mfa-backup-codes-modal";
+
+// Pages
+export { MfaChallengePage } from "./pages/mfa-challenge-page";
+export { MfaSetupRequiredPage } from "./pages/mfa-setup-required-page";
+
+// Services
+export * from "./services/mfa-service";
+
+// Types
+export * from "./types/mfa.types";
+
+// Hooks
+export { useMfaPageProtection } from "./hooks/use-mfa-page-protection.ts";

apps/client/src/ee/mfa/pages/mfa-challenge-page.tsx

@@ -0,0 +1,13 @@
+import React from "react";
+import { MfaChallenge } from "@/ee/mfa";
+import { useMfaPageProtection } from "@/ee/mfa";
+
+export function MfaChallengePage() {
+  const { isValid } = useMfaPageProtection();
+
+  if (!isValid) {
+    return null;
+  }
+
+  return <MfaChallenge />;
+}

apps/client/src/ee/mfa/pages/mfa-setup-required-page.tsx

@@ -0,0 +1,113 @@
+import React, { useState } from "react";
+import { useNavigate } from "react-router-dom";
+import {
+  Container,
+  Title,
+  Text,
+  Button,
+  Stack,
+  Paper,
+  Alert,
+  Center,
+  ThemeIcon,
+} from "@mantine/core";
+import { IconShieldCheck, IconAlertCircle } from "@tabler/icons-react";
+import { useTranslation } from "react-i18next";
+import APP_ROUTE from "@/lib/app-route";
+import { MfaSetupModal } from "@/ee/mfa";
+import classes from "@/features/auth/components/auth.module.css";
+import { notifications } from "@mantine/notifications";
+import { useMfaPageProtection } from "@/ee/mfa";
+
+export function MfaSetupRequiredPage() {
+  const { t } = useTranslation();
+  const navigate = useNavigate();
+  const [setupModalOpen, setSetupModalOpen] = useState(false);
+  const { isValid } = useMfaPageProtection();
+
+  const handleSetupComplete = async () => {
+    setSetupModalOpen(false);
+
+    notifications.show({
+      title: t("Success"),
+      message: t(
+        "Two-factor authentication has been set up. Please log in again.",
+      ),
+    });
+
+    navigate(APP_ROUTE.AUTH.LOGIN);
+  };
+
+  const handleLogout = () => {
+    navigate(APP_ROUTE.AUTH.LOGIN);
+  };
+
+  if (!isValid) {
+    return null;
+  }
+
+  return (
+    <Container size={480} className={classes.container}>
+      <Paper radius="lg" p={40}>
+        <Stack align="center" gap="xl">
+          <Center>
+            <ThemeIcon size={80} radius="xl" variant="light" color="blue">
+              <IconShieldCheck size={40} stroke={1.5} />
+            </ThemeIcon>
+          </Center>
+
+          <Stack align="center" gap="xs">
+            <Title order={2} ta="center" fw={600}>
+              {t("Two-factor authentication required")}
+            </Title>
+            <Text size="md" c="dimmed" ta="center">
+              {t(
+                "Your workspace requires two-factor authentication for all users",
+              )}
+            </Text>
+          </Stack>
+
+          <Alert
+            icon={<IconAlertCircle size={20} />}
+            color="blue"
+            variant="light"
+            w="100%"
+          >
+            <Text size="sm">
+              {t(
+                "To continue accessing your workspace, you must set up two-factor authentication. This adds an extra layer of security to your account.",
+              )}
+            </Text>
+          </Alert>
+
+          <Stack w="100%" gap="sm">
+            <Button
+              fullWidth
+              size="md"
+              onClick={() => setSetupModalOpen(true)}
+              leftSection={<IconShieldCheck size={18} />}
+            >
+              {t("Set up two-factor authentication")}
+            </Button>
+
+            <Button
+              fullWidth
+              variant="subtle"
+              color="gray"
+              onClick={handleLogout}
+            >
+              {t("Cancel and logout")}
+            </Button>
+          </Stack>
+        </Stack>
+      </Paper>
+
+      <MfaSetupModal
+        opened={setupModalOpen}
+        onClose={() => setSetupModalOpen(false)}
+        onComplete={handleSetupComplete}
+        isRequired={true}
+      />
+    </Container>
+  );
+}

apps/client/src/ee/mfa/services/mfa-service.ts

@@ -0,0 +1,61 @@
+import api from "@/lib/api-client";
+import {
+  MfaBackupCodesResponse,
+  MfaDisableRequest,
+  MfaEnableRequest,
+  MfaEnableResponse,
+  MfaSetupRequest,
+  MfaSetupResponse,
+  MfaStatusResponse,
+  MfaAccessValidationResponse,
+} from "@/ee/mfa";
+
+export async function getMfaStatus(): Promise<MfaStatusResponse> {
+  const req = await api.post("/mfa/status");
+  return req.data;
+}
+
+export async function setupMfa(
+  data: MfaSetupRequest,
+): Promise<MfaSetupResponse> {
+  const req = await api.post<MfaSetupResponse>("/mfa/setup", data);
+  return req.data;
+}
+
+export async function enableMfa(
+  data: MfaEnableRequest,
+): Promise<MfaEnableResponse> {
+  const req = await api.post<MfaEnableResponse>("/mfa/enable", data);
+  return req.data;
+}
+
+export async function disableMfa(
+  data: MfaDisableRequest,
+): Promise<{ success: boolean }> {
+  const req = await api.post<{ success: boolean }>("/mfa/disable", data);
+  return req.data;
+}
+
+export async function regenerateBackupCodes(data: {
+  confirmPassword: string;
+}): Promise<MfaBackupCodesResponse> {
+  const req = await api.post<MfaBackupCodesResponse>(
+    "/mfa/generate-backup-codes",
+    data,
+  );
+  return req.data;
+}
+
+export async function verifyMfa(code: string): Promise<any> {
+  const req = await api.post("/mfa/verify", { code });
+  return req.data;
+}
+
+export async function validateMfaAccess(): Promise<MfaAccessValidationResponse> {
+  try {
+    const res = await api.post("/mfa/validate-access");
+    return res.data;
+  } catch {
+    return { valid: false };
+  }
+}

apps/client/src/ee/mfa/types/mfa.types.ts

@@ -0,0 +1,62 @@
+export interface MfaMethod {
+  type: 'totp' | 'email';
+  isEnabled: boolean;
+}
+
+export interface MfaSettings {
+  isEnabled: boolean;
+  methods: MfaMethod[];
+  backupCodesCount: number;
+  lastUpdated?: string;
+}
+
+export interface MfaSetupState {
+  method: 'totp' | 'email';
+  secret?: string;
+  qrCode?: string;
+  manualEntry?: string;
+  backupCodes?: string[];
+}
+
+export interface MfaStatusResponse {
+  isEnabled?: boolean;
+  method?: string | null;
+  backupCodesCount?: number;
+}
+
+export interface MfaSetupRequest {
+  method: 'totp';
+}
+
+export interface MfaSetupResponse {
+  method: string;
+  qrCode: string;
+  secret: string;
+  manualKey: string;
+}
+
+export interface MfaEnableRequest {
+  secret: string;
+  verificationCode: string;
+}
+
+export interface MfaEnableResponse {
+  success: boolean;
+  backupCodes: string[];
+}
+
+export interface MfaDisableRequest {
+  confirmPassword: string;
+}
+
+export interface MfaBackupCodesResponse {
+  backupCodes: string[];
+}
+
+export interface MfaAccessValidationResponse {
+  valid: boolean;
+  isTransferToken?: boolean;
+  requiresMfaSetup?: boolean;
+  userHasMfa?: boolean;
+  isMfaEnforced?: boolean;
+}

apps/client/src/ee/security/components/enforce-mfa.tsx

@@ -0,0 +1,66 @@
+import { Group, Text, Switch, MantineSize, Title } from "@mantine/core";
+import { useAtom } from "jotai";
+import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { updateWorkspace } from "@/features/workspace/services/workspace-service.ts";
+import { notifications } from "@mantine/notifications";
+
+export default function EnforceMfa() {
+  const { t } = useTranslation();
+
+  return (
+    <>
+      <Title order={4} my="sm">
+        MFA
+      </Title>
+      <Group justify="space-between" wrap="nowrap" gap="xl">
+        <div>
+          <Text size="md">{t("Enforce two-factor authentication")}</Text>
+          <Text size="sm" c="dimmed">
+            {t(
+              "Once enforced, all members must enable two-factor authentication to access the workspace.",
+            )}
+          </Text>
+        </div>
+
+        <EnforceMfaToggle />
+      </Group>
+    </>
+  );
+}
+
+interface EnforceMfaToggleProps {
+  size?: MantineSize;
+  label?: string;
+}
+export function EnforceMfaToggle({ size, label }: EnforceMfaToggleProps) {
+  const { t } = useTranslation();
+  const [workspace, setWorkspace] = useAtom(workspaceAtom);
+  const [checked, setChecked] = useState(workspace?.enforceMfa);
+
+  const handleChange = async (event: React.ChangeEvent<HTMLInputElement>) => {
+    const value = event.currentTarget.checked;
+    try {
+      const updatedWorkspace = await updateWorkspace({ enforceMfa: value });
+      setChecked(value);
+      setWorkspace(updatedWorkspace);
+    } catch (err) {
+      notifications.show({
+        message: err?.response?.data?.message,
+        color: "red",
+      });
+    }
+  };
+
+  return (
+    <Switch
+      size={size}
+      label={label}
+      labelPosition="left"
+      defaultChecked={checked}
+      onChange={handleChange}
+      aria-label={t("Toggle MFA enforcement")}
+    />
+  );
+}

apps/client/src/ee/security/pages/security.tsx

@@ -11,6 +11,7 @@ import AllowedDomains from "@/ee/security/components/allowed-domains.tsx";
 import { useTranslation } from "react-i18next";
 import useLicense from "@/ee/hooks/use-license.tsx";
 import usePlan from "@/ee/hooks/use-plan.tsx";
+import EnforceMfa from "@/ee/security/components/enforce-mfa.tsx";
 
 export default function Security() {
   const { t } = useTranslation();
@@ -33,6 +34,10 @@ export default function Security() {
 
       <Divider my="lg" />
 
+      <EnforceMfa />
+
+      <Divider my="lg" />
+
       <Title order={4} my="lg">
         Single sign-on (SSO)
       </Title>

apps/client/src/features/auth/components/invite-sign-up-form.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as z from "zod";
 
-import { useForm, zodResolver } from "@mantine/form";
+import { useForm } from "@mantine/form";
 import {
   Container,
   Title,
@@ -11,6 +11,7 @@ import {
   Box,
   Stack,
 } from "@mantine/core";
+import { zodResolver } from "mantine-form-zod-resolver";
 import { useParams, useSearchParams } from "react-router-dom";
 import { IRegister } from "@/features/auth/types/auth.types";
 import useAuth from "@/features/auth/hooks/use-auth";

apps/client/src/features/auth/hooks/use-auth.ts

@@ -27,7 +27,7 @@ import APP_ROUTE from "@/lib/app-route.ts";
 import { RESET } from "jotai/utils";
 import { useTranslation } from "react-i18next";
 import { isCloud } from "@/lib/config.ts";
-import { exchangeTokenRedirectUrl, getHostnameUrl } from "@/ee/utils.ts";
+import { exchangeTokenRedirectUrl } from "@/ee/utils.ts";
 
 export default function useAuth() {
   const { t } = useTranslation();
@@ -39,9 +39,17 @@ export default function useAuth() {
     setIsLoading(true);
 
     try {
-      await login(data);
+      const response = await login(data);
       setIsLoading(false);
-      navigate(APP_ROUTE.HOME);
+
+      // Check if MFA is required
+      if (response?.userHasMfa) {
+        navigate(APP_ROUTE.AUTH.MFA_CHALLENGE);
+      } else if (response?.requiresMfaSetup) {
+        navigate(APP_ROUTE.AUTH.MFA_SETUP_REQUIRED);
+      } else {
+        navigate(APP_ROUTE.HOME);
+      }
     } catch (err) {
       setIsLoading(false);
       console.log(err);
@@ -56,9 +64,19 @@ export default function useAuth() {
     setIsLoading(true);
 
     try {
-      await acceptInvitation(data);
+      const response = await acceptInvitation(data);
       setIsLoading(false);
-      navigate(APP_ROUTE.HOME);
+
+      if (response?.requiresLogin) {
+        notifications.show({
+          message: t(
+            "Account created successfully. Please log in to set up two-factor authentication.",
+          ),
+        });
+        navigate(APP_ROUTE.AUTH.LOGIN);
+      } else {
+        navigate(APP_ROUTE.HOME);
+      }
     } catch (err) {
       setIsLoading(false);
       notifications.show({
@@ -100,12 +118,22 @@ export default function useAuth() {
     setIsLoading(true);
 
     try {
-      await passwordReset(data);
+      const response = await passwordReset(data);
       setIsLoading(false);
-      navigate(APP_ROUTE.HOME);
-      notifications.show({
-        message: t("Password reset was successful"),
-      });
+
+      if (response?.requiresLogin) {
+        notifications.show({
+          message: t(
+            "Password reset was successful. Please log in with your new password.",
+          ),
+        });
+        navigate(APP_ROUTE.AUTH.LOGIN);
+      } else {
+        navigate(APP_ROUTE.HOME);
+        notifications.show({
+          message: t("Password reset was successful"),
+        });
+      }
     } catch (err) {
       setIsLoading(false);
       notifications.show({

apps/client/src/features/auth/services/auth-service.ts

@@ -4,14 +4,16 @@ import {
   ICollabToken,
   IForgotPassword,
   ILogin,
+  ILoginResponse,
   IPasswordReset,
   ISetupWorkspace,
   IVerifyUserToken,
 } from "@/features/auth/types/auth.types";
 import { IWorkspace } from "@/features/workspace/types/workspace.types.ts";
 
-export async function login(data: ILogin): Promise<void> {
-  await api.post<void>("/auth/login", data);
+export async function login(data: ILogin): Promise<ILoginResponse> {
+  const response = await api.post<ILoginResponse>("/auth/login", data);
+  return response.data;
 }
 
 export async function logout(): Promise<void> {
@@ -36,8 +38,9 @@ export async function forgotPassword(data: IForgotPassword): Promise<void> {
   await api.post<void>("/auth/forgot-password", data);
 }
 
-export async function passwordReset(data: IPasswordReset): Promise<void> {
-  await api.post<void>("/auth/password-reset", data);
+export async function passwordReset(data: IPasswordReset): Promise<{ requiresLogin?: boolean; }> {
+  const req = await api.post("/auth/password-reset", data);
+  return req.data;
 }
 
 export async function verifyUserToken(data: IVerifyUserToken): Promise<any> {
@@ -47,4 +50,4 @@ export async function verifyUserToken(data: IVerifyUserToken): Promise<any> {
 export async function getCollabToken(): Promise<ICollabToken> {
   const req = await api.post<ICollabToken>("/auth/collab-token");
   return req.data;
-}
+}

apps/client/src/features/auth/types/auth.types.ts

@@ -38,3 +38,10 @@ export interface IVerifyUserToken {
 export interface ICollabToken {
   token?: string;
 }
+
+export interface ILoginResponse {
+  userHasMfa?: boolean;
+  requiresMfaSetup?: boolean;
+  mfaToken?: string;
+  isMfaEnforced?: boolean;
+}

apps/client/src/features/comment/components/comment-list-item.tsx

@@ -1,4 +1,4 @@
-import { Group, Text, Box } from "@mantine/core";
+import { Group, Text, Box, Badge } from "@mantine/core";
 import React, { useEffect, useState } from "react";
 import classes from "./comment.module.css";
 import { useAtom, useAtomValue } from "jotai";
@@ -7,22 +7,34 @@ import CommentEditor from "@/features/comment/components/comment-editor";
 import { pageEditorAtom } from "@/features/editor/atoms/editor-atoms";
 import CommentActions from "@/features/comment/components/comment-actions";
 import CommentMenu from "@/features/comment/components/comment-menu";
+import { useIsCloudEE } from "@/hooks/use-is-cloud-ee";
+import ResolveComment from "@/ee/comment/components/resolve-comment";
 import { useHover } from "@mantine/hooks";
 import {
   useDeleteCommentMutation,
   useUpdateCommentMutation,
 } from "@/features/comment/queries/comment-query";
+import { useResolveCommentMutation } from "@/ee/comment/queries/comment-query";
 import { IComment } from "@/features/comment/types/comment.types";
 import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
 import { currentUserAtom } from "@/features/user/atoms/current-user-atom.ts";
 import { useQueryEmit } from "@/features/websocket/use-query-emit";
+import { useTranslation } from "react-i18next";
 
 interface CommentListItemProps {
   comment: IComment;
   pageId: string;
+  canComment: boolean;
+  userSpaceRole?: string;
 }
 
-function CommentListItem({ comment, pageId }: CommentListItemProps) {
+function CommentListItem({
+  comment,
+  pageId,
+  canComment,
+  userSpaceRole,
+}: CommentListItemProps) {
+  const { t } = useTranslation();
   const { hovered, ref } = useHover();
   const [isEditing, setIsEditing] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
@@ -30,11 +42,13 @@ function CommentListItem({ comment, pageId }: CommentListItemProps) {
   const [content, setContent] = useState<string>(comment.content);
   const updateCommentMutation = useUpdateCommentMutation();
   const deleteCommentMutation = useDeleteCommentMutation(comment.pageId);
+  const resolveCommentMutation = useResolveCommentMutation();
   const [currentUser] = useAtom(currentUserAtom);
   const emit = useQueryEmit();
+  const isCloudEE = useIsCloudEE();
 
   useEffect(() => {
-    setContent(comment.content)
+    setContent(comment.content);
   }, [comment]);
 
   async function handleUpdateComment() {
@@ -72,8 +86,35 @@ function CommentListItem({ comment, pageId }: CommentListItemProps) {
     }
   }
 
+  async function handleResolveComment() {
+    if (!isCloudEE) return;
+    
+    try {
+      const isResolved = comment.resolvedAt != null;
+      
+      await resolveCommentMutation.mutateAsync({
+        commentId: comment.id,
+        pageId: comment.pageId,
+        resolved: !isResolved,
+      });
+
+      if (editor) {
+        editor.commands.setCommentResolved(comment.id, !isResolved);
+      }
+
+      emit({
+        operation: "invalidateComment",
+        pageId: pageId,
+      });
+    } catch (error) {
+      console.error("Failed to toggle resolved state:", error);
+    }
+  }
+
   function handleCommentClick(comment: IComment) {
-    const el = document.querySelector(`.comment-mark[data-comment-id="${comment.id}"]`);
+    const el = document.querySelector(
+      `.comment-mark[data-comment-id="${comment.id}"]`,
+    );
     if (el) {
       el.scrollIntoView({ behavior: "smooth", block: "center" });
       el.classList.add("comment-highlight");
@@ -106,28 +147,42 @@ function CommentListItem({ comment, pageId }: CommentListItemProps) {
             </Text>
 
             <div style={{ visibility: hovered ? "visible" : "hidden" }}>
-              {/*!comment.parentCommentId && (
-                <ResolveComment commentId={comment.id} pageId={comment.pageId} resolvedAt={comment.resolvedAt} />
-              )*/}
+              {!comment.parentCommentId && canComment && isCloudEE && (
+                <ResolveComment
+                  editor={editor}
+                  commentId={comment.id}
+                  pageId={comment.pageId}
+                  resolvedAt={comment.resolvedAt}
+                />
+              )}
 
-              {currentUser?.user?.id === comment.creatorId && (
+              {(currentUser?.user?.id === comment.creatorId || userSpaceRole === 'admin') && (
                 <CommentMenu
                   onEditComment={handleEditToggle}
                   onDeleteComment={handleDeleteComment}
+                  onResolveComment={handleResolveComment}
+                  canEdit={currentUser?.user?.id === comment.creatorId}
+                  isResolved={comment.resolvedAt != null}
+                  isParentComment={!comment.parentCommentId}
                 />
               )}
             </div>
           </Group>
 
-          <Text size="xs" fw={500} c="dimmed">
-            {timeAgo(comment.createdAt)}
-          </Text>
+          <Group gap="xs">
+            <Text size="xs" fw={500} c="dimmed">
+              {timeAgo(comment.createdAt)}
+            </Text>
+          </Group>
         </div>
       </Group>
 
       <div>
         {!comment.parentCommentId && comment?.selection && (
-          <Box className={classes.textSelection} onClick={() => handleCommentClick(comment)}>
+          <Box
+            className={classes.textSelection}
+            onClick={() => handleCommentClick(comment)}
+          >
             <Text size="sm">{comment?.selection}</Text>
           </Box>
         )}

apps/client/src/features/comment/components/comment-list-with-tabs.tsx

@@ -0,0 +1,330 @@
+import React, { useState, useRef, useCallback, memo, useMemo } from "react";
+import { useParams } from "react-router-dom";
+import { Divider, Paper, Tabs, Badge, Text, ScrollArea } from "@mantine/core";
+import CommentListItem from "@/features/comment/components/comment-list-item";
+import {
+  useCommentsQuery,
+  useCreateCommentMutation,
+} from "@/features/comment/queries/comment-query";
+import CommentEditor from "@/features/comment/components/comment-editor";
+import CommentActions from "@/features/comment/components/comment-actions";
+import { useFocusWithin } from "@mantine/hooks";
+import { IComment } from "@/features/comment/types/comment.types.ts";
+import { usePageQuery } from "@/features/page/queries/page-query.ts";
+import { IPagination } from "@/lib/types.ts";
+import { extractPageSlugId } from "@/lib";
+import { useTranslation } from "react-i18next";
+import { useQueryEmit } from "@/features/websocket/use-query-emit";
+import { useIsCloudEE } from "@/hooks/use-is-cloud-ee";
+import { useGetSpaceBySlugQuery } from "@/features/space/queries/space-query.ts";
+import { useSpaceAbility } from "@/features/space/permissions/use-space-ability.ts";
+import {
+  SpaceCaslAction,
+  SpaceCaslSubject,
+} from "@/features/space/permissions/permissions.type.ts";
+
+function CommentListWithTabs() {
+  const { t } = useTranslation();
+  const { pageSlug } = useParams();
+  const { data: page } = usePageQuery({ pageId: extractPageSlugId(pageSlug) });
+  const {
+    data: comments,
+    isLoading: isCommentsLoading,
+    isError,
+  } = useCommentsQuery({ pageId: page?.id, limit: 100 });
+  const createCommentMutation = useCreateCommentMutation();
+  const [isLoading, setIsLoading] = useState(false);
+  const emit = useQueryEmit();
+  const isCloudEE = useIsCloudEE();
+  const { data: space } = useGetSpaceBySlugQuery(page?.space?.slug);
+
+  const spaceRules = space?.membership?.permissions;
+  const spaceAbility = useSpaceAbility(spaceRules);
+
+
+  const canComment: boolean = spaceAbility.can(
+    SpaceCaslAction.Manage,
+    SpaceCaslSubject.Page
+  );
+
+  // Separate active and resolved comments
+  const { activeComments, resolvedComments } = useMemo(() => {
+    if (!comments?.items) {
+      return { activeComments: [], resolvedComments: [] };
+    }
+
+    const parentComments = comments.items.filter(
+      (comment: IComment) => comment.parentCommentId === null
+    );
+
+    const active = parentComments.filter(
+      (comment: IComment) => !comment.resolvedAt
+    );
+    const resolved = parentComments.filter(
+      (comment: IComment) => comment.resolvedAt
+    );
+
+    return { activeComments: active, resolvedComments: resolved };
+  }, [comments]);
+
+  const handleAddReply = useCallback(
+    async (commentId: string, content: string) => {
+      try {
+        setIsLoading(true);
+        const commentData = {
+          pageId: page?.id,
+          parentCommentId: commentId,
+          content: JSON.stringify(content),
+        };
+
+        await createCommentMutation.mutateAsync(commentData);
+
+        emit({
+          operation: "invalidateComment",
+          pageId: page?.id,
+        });
+      } catch (error) {
+        console.error("Failed to post comment:", error);
+      } finally {
+        setIsLoading(false);
+      }
+    },
+    [createCommentMutation, page?.id]
+  );
+
+  const renderComments = useCallback(
+    (comment: IComment) => (
+      <Paper
+        shadow="sm"
+        radius="md"
+        p="sm"
+        mb="sm"
+        withBorder
+        key={comment.id}
+        data-comment-id={comment.id}
+      >
+        <div>
+          <CommentListItem
+            comment={comment}
+            pageId={page?.id}
+            canComment={canComment}
+            userSpaceRole={space?.membership?.role}
+          />
+          <MemoizedChildComments
+            comments={comments}
+            parentId={comment.id}
+            pageId={page?.id}
+            canComment={canComment}
+            userSpaceRole={space?.membership?.role}
+          />
+        </div>
+
+        {!comment.resolvedAt && canComment && (
+          <>
+            <Divider my={4} />
+            <CommentEditorWithActions
+              commentId={comment.id}
+              onSave={handleAddReply}
+              isLoading={isLoading}
+            />
+          </>
+        )}
+      </Paper>
+    ),
+    [comments, handleAddReply, isLoading, space?.membership?.role]
+  );
+
+  if (isCommentsLoading) {
+    return <></>;
+  }
+
+  if (isError) {
+    return <div>{t("Error loading comments.")}</div>;
+  }
+
+  const totalComments = activeComments.length + resolvedComments.length;
+
+  // If not cloud/enterprise, show simple list without tabs
+  if (!isCloudEE) {
+    if (totalComments === 0) {
+      return <>{t("No comments yet.")}</>;
+    }
+
+    return (
+      <ScrollArea style={{ height: "85vh" }} scrollbarSize={5} type="scroll">
+        <div style={{ paddingBottom: "200px" }}>
+          {comments?.items
+            .filter((comment: IComment) => comment.parentCommentId === null)
+            .map((comment) => (
+              <Paper
+                shadow="sm"
+                radius="md"
+                p="sm"
+                mb="sm"
+                withBorder
+                key={comment.id}
+                data-comment-id={comment.id}
+              >
+                <div>
+                  <CommentListItem
+                    comment={comment}
+                    pageId={page?.id}
+                    canComment={canComment}
+                    userSpaceRole={space?.membership?.role}
+                  />
+                  <MemoizedChildComments
+                    comments={comments}
+                    parentId={comment.id}
+                    pageId={page?.id}
+                    canComment={canComment}
+                    userSpaceRole={space?.membership?.role}
+                  />
+                </div>
+
+                {canComment && (
+                  <>
+                    <Divider my={4} />
+                    <CommentEditorWithActions
+                      commentId={comment.id}
+                      onSave={handleAddReply}
+                      isLoading={isLoading}
+                    />
+                  </>
+                )}
+              </Paper>
+            ))}
+        </div>
+      </ScrollArea>
+    );
+  }
+
+  return (
+    <div style={{ height: "85vh", display: "flex", flexDirection: "column", marginTop: '-15px' }}>
+      <Tabs defaultValue="open" variant="default" style={{ flex: "0 0 auto" }}>
+        <Tabs.List justify="center">
+          <Tabs.Tab
+            value="open"
+            leftSection={
+              <Badge size="sm" variant="light" color="blue">
+                {activeComments.length}
+              </Badge>
+            }
+          >
+            {t("Open")}
+          </Tabs.Tab>
+          <Tabs.Tab
+            value="resolved"
+            leftSection={
+              <Badge size="sm" variant="light" color="green">
+                {resolvedComments.length}
+              </Badge>
+            }
+          >
+            {t("Resolved")}
+          </Tabs.Tab>
+        </Tabs.List>
+
+        <ScrollArea
+          style={{ flex: "1 1 auto", height: "calc(85vh - 60px)" }}
+          scrollbarSize={5}
+          type="scroll"
+        >
+          <div style={{ paddingBottom: "200px" }}>
+            <Tabs.Panel value="open" pt="xs">
+              {activeComments.length === 0 ? (
+                <Text size="sm" c="dimmed" ta="center" py="md">
+                  {t("No open comments.")}
+                </Text>
+              ) : (
+                activeComments.map(renderComments)
+              )}
+            </Tabs.Panel>
+
+            <Tabs.Panel value="resolved" pt="xs">
+              {resolvedComments.length === 0 ? (
+                <Text size="sm" c="dimmed" ta="center" py="md">
+                  {t("No resolved comments.")}
+                </Text>
+              ) : (
+                resolvedComments.map(renderComments)
+              )}
+            </Tabs.Panel>
+          </div>
+        </ScrollArea>
+      </Tabs>
+    </div>
+  );
+}
+
+interface ChildCommentsProps {
+  comments: IPagination<IComment>;
+  parentId: string;
+  pageId: string;
+  canComment: boolean;
+  userSpaceRole?: string;
+}
+const ChildComments = ({
+  comments,
+  parentId,
+  pageId,
+  canComment,
+  userSpaceRole,
+}: ChildCommentsProps) => {
+  const getChildComments = useCallback(
+    (parentId: string) =>
+      comments.items.filter(
+        (comment: IComment) => comment.parentCommentId === parentId
+      ),
+    [comments.items]
+  );
+
+  return (
+    <div>
+      {getChildComments(parentId).map((childComment) => (
+        <div key={childComment.id}>
+          <CommentListItem
+            comment={childComment}
+            pageId={pageId}
+            canComment={canComment}
+            userSpaceRole={userSpaceRole}
+          />
+          <MemoizedChildComments
+            comments={comments}
+            parentId={childComment.id}
+            pageId={pageId}
+            canComment={canComment}
+            userSpaceRole={userSpaceRole}
+          />
+        </div>
+      ))}
+    </div>
+  );
+};
+
+const MemoizedChildComments = memo(ChildComments);
+
+const CommentEditorWithActions = ({ commentId, onSave, isLoading }) => {
+  const [content, setContent] = useState("");
+  const { ref, focused } = useFocusWithin();
+  const commentEditorRef = useRef(null);
+
+  const handleSave = useCallback(() => {
+    onSave(commentId, content);
+    setContent("");
+    commentEditorRef.current?.clearContent();
+  }, [commentId, content, onSave]);
+
+  return (
+    <div ref={ref}>
+      <CommentEditor
+        ref={commentEditorRef}
+        onUpdate={setContent}
+        onSave={handleSave}
+        editable={true}
+      />
+      {focused && <CommentActions onSave={handleSave} isLoading={isLoading} />}
+    </div>
+  );
+};
+
+export default CommentListWithTabs;

apps/client/src/features/comment/components/comment-list.tsx

@@ -1,162 +0,0 @@
-import React, { useState, useRef, useCallback, memo } from "react";
-import { useParams } from "react-router-dom";
-import { Divider, Paper } from "@mantine/core";
-import CommentListItem from "@/features/comment/components/comment-list-item";
-import {
-  useCommentsQuery,
-  useCreateCommentMutation,
-} from "@/features/comment/queries/comment-query";
-import CommentEditor from "@/features/comment/components/comment-editor";
-import CommentActions from "@/features/comment/components/comment-actions";
-import { useFocusWithin } from "@mantine/hooks";
-import { IComment } from "@/features/comment/types/comment.types.ts";
-import { usePageQuery } from "@/features/page/queries/page-query.ts";
-import { IPagination } from "@/lib/types.ts";
-import { extractPageSlugId } from "@/lib";
-import { useTranslation } from "react-i18next";
-import { useQueryEmit } from "@/features/websocket/use-query-emit";
-
-function CommentList() {
-  const { t } = useTranslation();
-  const { pageSlug } = useParams();
-  const { data: page } = usePageQuery({ pageId: extractPageSlugId(pageSlug) });
-  const {
-    data: comments,
-    isLoading: isCommentsLoading,
-    isError,
-  } = useCommentsQuery({ pageId: page?.id, limit: 100 });
-  const createCommentMutation = useCreateCommentMutation();
-  const [isLoading, setIsLoading] = useState(false);
-  const emit = useQueryEmit();
-
-  const handleAddReply = useCallback(
-    async (commentId: string, content: string) => {
-      try {
-        setIsLoading(true);
-        const commentData = {
-          pageId: page?.id,
-          parentCommentId: commentId,
-          content: JSON.stringify(content),
-        };
-
-        await createCommentMutation.mutateAsync(commentData);
-
-        emit({
-          operation: "invalidateComment",
-          pageId: page?.id,
-        });
-      } catch (error) {
-        console.error("Failed to post comment:", error);
-      } finally {
-        setIsLoading(false);
-      }
-    },
-    [createCommentMutation, page?.id],
-  );
-
-  const renderComments = useCallback(
-    (comment: IComment) => (
-      <Paper
-        shadow="sm"
-        radius="md"
-        p="sm"
-        mb="sm"
-        withBorder
-        key={comment.id}
-        data-comment-id={comment.id}
-      >
-        <div>
-          <CommentListItem comment={comment} pageId={page?.id} />
-          <MemoizedChildComments comments={comments} parentId={comment.id} pageId={page?.id} />
-        </div>
-
-        <Divider my={4} />
-
-        <CommentEditorWithActions
-          commentId={comment.id}
-          onSave={handleAddReply}
-          isLoading={isLoading}
-        />
-      </Paper>
-    ),
-    [comments, handleAddReply, isLoading],
-  );
-
-  if (isCommentsLoading) {
-    return <></>;
-  }
-
-  if (isError) {
-    return <div>{t("Error loading comments.")}</div>;
-  }
-
-  if (!comments || comments.items.length === 0) {
-    return <>{t("No comments yet.")}</>;
-  }
-
-  return (
-    <>
-      {comments.items
-        .filter((comment) => comment.parentCommentId === null)
-        .map(renderComments)}
-    </>
-  );
-}
-
-interface ChildCommentsProps {
-  comments: IPagination<IComment>;
-  parentId: string;
-  pageId: string;
-}
-const ChildComments = ({ comments, parentId, pageId }: ChildCommentsProps) => {
-  const getChildComments = useCallback(
-    (parentId: string) =>
-      comments.items.filter(
-        (comment: IComment) => comment.parentCommentId === parentId,
-      ),
-    [comments.items],
-  );
-
-  return (
-    <div>
-      {getChildComments(parentId).map((childComment) => (
-        <div key={childComment.id}>
-          <CommentListItem comment={childComment} pageId={pageId} />
-          <MemoizedChildComments
-            comments={comments}
-            parentId={childComment.id}
-            pageId={pageId}
-          />
-        </div>
-      ))}
-    </div>
-  );
-};
-
-const MemoizedChildComments = memo(ChildComments);
-
-const CommentEditorWithActions = ({ commentId, onSave, isLoading }) => {
-  const [content, setContent] = useState("");
-  const { ref, focused } = useFocusWithin();
-  const commentEditorRef = useRef(null);
-
-  const handleSave = useCallback(() => {
-    onSave(commentId, content);
-    setContent("");
-    commentEditorRef.current?.clearContent();
-  }, [commentId, content, onSave]);
-
-  return (
-    <div ref={ref}>
-      <CommentEditor
-        ref={commentEditorRef}
-        onUpdate={setContent}
-        onSave={handleSave}
-        editable={true}
-      />
-      {focused && <CommentActions onSave={handleSave} isLoading={isLoading} />}
-    </div>
-  );
-};
-
-export default CommentList;

apps/client/src/features/comment/components/comment-menu.tsx

@@ -1,15 +1,28 @@
-import { ActionIcon, Menu } from "@mantine/core";
-import { IconDots, IconEdit, IconTrash } from "@tabler/icons-react";
+import { ActionIcon, Menu, Tooltip } from "@mantine/core";
+import { IconDots, IconEdit, IconTrash, IconCircleCheck, IconCircleCheckFilled } from "@tabler/icons-react";
 import { modals } from "@mantine/modals";
 import { useTranslation } from "react-i18next";
+import { useIsCloudEE } from "@/hooks/use-is-cloud-ee";
 
 type CommentMenuProps = {
   onEditComment: () => void;
   onDeleteComment: () => void;
+  onResolveComment?: () => void;
+  canEdit?: boolean;
+  isResolved?: boolean;
+  isParentComment?: boolean;
 };
 
-function CommentMenu({ onEditComment, onDeleteComment }: CommentMenuProps) {
+function CommentMenu({ 
+  onEditComment, 
+  onDeleteComment, 
+  onResolveComment,
+  canEdit = true,
+  isResolved = false,
+  isParentComment = false
+}: CommentMenuProps) {
   const { t } = useTranslation();
+  const isCloudEE = useIsCloudEE();
 
   //@ts-ignore
   const openDeleteModal = () =>
@@ -30,9 +43,34 @@ function CommentMenu({ onEditComment, onDeleteComment }: CommentMenuProps) {
       </Menu.Target>
 
       <Menu.Dropdown>
-        <Menu.Item onClick={onEditComment} leftSection={<IconEdit size={14} />}>
-          {t("Edit comment")}
-        </Menu.Item>
+        {canEdit && (
+          <Menu.Item onClick={onEditComment} leftSection={<IconEdit size={14} />}>
+            {t("Edit comment")}
+          </Menu.Item>
+        )}
+        {isParentComment && (
+          isCloudEE ? (
+            <Menu.Item 
+              onClick={onResolveComment} 
+              leftSection={
+                isResolved ? 
+                  <IconCircleCheckFilled size={14} /> : 
+                  <IconCircleCheck size={14} />
+              }
+            >
+              {isResolved ? t("Re-open comment") : t("Resolve comment")}
+            </Menu.Item>
+          ) : (
+            <Tooltip label={t("Available in enterprise edition")} position="left">
+              <Menu.Item 
+                disabled
+                leftSection={<IconCircleCheck size={14} />}
+              >
+                {t("Resolve comment")}
+              </Menu.Item>
+            </Tooltip>
+          )
+        )}
         <Menu.Item
           leftSection={<IconTrash size={14} />}
           onClick={openDeleteModal}

apps/client/src/features/comment/components/resolve-comment.tsx

@@ -1,47 +0,0 @@
-import { ActionIcon } from "@mantine/core";
-import { IconCircleCheck } from "@tabler/icons-react";
-import { modals } from "@mantine/modals";
-import { useResolveCommentMutation } from "@/features/comment/queries/comment-query";
-import { useTranslation } from "react-i18next";
-
-function ResolveComment({ commentId, pageId, resolvedAt }) {
-  const { t } = useTranslation();
-  const resolveCommentMutation = useResolveCommentMutation();
-
-  const isResolved = resolvedAt != null;
-  const iconColor = isResolved ? "green" : "gray";
-
-  //@ts-ignore
-  const openConfirmModal = () =>
-    modals.openConfirmModal({
-      title: t("Are you sure you want to resolve this comment thread?"),
-      centered: true,
-      labels: { confirm: t("Confirm"), cancel: t("Cancel") },
-      onConfirm: handleResolveToggle,
-    });
-
-  const handleResolveToggle = async () => {
-    try {
-      await resolveCommentMutation.mutateAsync({
-        commentId,
-        resolved: !isResolved,
-      });
-      //TODO: remove comment mark
-      // Remove comment thread from state on resolve
-    } catch (error) {
-      console.error("Failed to toggle resolved state:", error);
-    }
-  };
-
-  return (
-    <ActionIcon
-      onClick={openConfirmModal}
-      variant="default"
-      style={{ border: "none" }}
-    >
-      <IconCircleCheck size={20} stroke={2} color={iconColor} />
-    </ActionIcon>
-  );
-}
-
-export default ResolveComment;

apps/client/src/features/comment/queries/comment-query.ts

@@ -8,13 +8,11 @@ import {
   createComment,
   deleteComment,
   getPageComments,
-  resolveComment,
   updateComment,
 } from "@/features/comment/services/comment-service";
 import {
   ICommentParams,
   IComment,
-  IResolveComment,
 } from "@/features/comment/types/comment.types";
 import { notifications } from "@mantine/notifications";
 import { IPagination } from "@/lib/types.ts";
@@ -108,34 +106,4 @@ export function useDeleteCommentMutation(pageId?: string) {
   });
 }
 
-export function useResolveCommentMutation() {
-  const queryClient = useQueryClient();
-  const { t } = useTranslation();
-
-  return useMutation({
-    mutationFn: (data: IResolveComment) => resolveComment(data),
-    onSuccess: (data: IComment, variables) => {
-      const currentComments = queryClient.getQueryData(
-        RQ_KEY(data.pageId),
-      ) as IComment[];
-
-      /*
-      if (currentComments) {
-        const updatedComments = currentComments.map((comment) =>
-          comment.id === variables.commentId
-            ? { ...comment, ...data }
-            : comment,
-        );
-        queryClient.setQueryData(RQ_KEY(data.pageId), updatedComments);
-      }*/
-
-      notifications.show({ message: t("Comment resolved successfully") });
-    },
-    onError: (error) => {
-      notifications.show({
-        message: t("Failed to resolve comment"),
-        color: "red",
-      });
-    },
-  });
-}
+// EE: useResolveCommentMutation has been moved to @/ee/comment/queries/comment-query

apps/client/src/features/comment/types/comment.types.ts

@@ -16,6 +16,7 @@ export interface IComment {
   editedAt?: Date;
   deletedAt?: Date;
   creator: IUser;
+  resolvedBy?: IUser;
 }
 
 export interface ICommentData {
@@ -28,6 +29,7 @@ export interface ICommentData {
 
 export interface IResolveComment {
   commentId: string;
+  pageId: string;
   resolved: boolean;
 }
 

apps/client/src/features/editor/components/common/resizable-wrapper.module.css

@@ -0,0 +1,96 @@
+.wrapper {
+  position: relative;
+  width: 100%;
+  overflow: hidden;
+  border-radius: 8px;
+}
+
+.resizing {
+  user-select: none;
+  cursor: ns-resize;
+}
+
+.overlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 10;
+  background: transparent;
+}
+
+.resizeHandleBottom {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  height: 24px;
+  cursor: ns-resize;
+  opacity: 0;
+  transition: opacity 0.2s ease;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 2;
+  touch-action: none;
+  -webkit-user-select: none;
+  user-select: none;
+
+  @mixin light {
+    background: linear-gradient(to bottom, transparent, rgba(0, 0, 0, 0.05));
+  }
+
+  @mixin dark {
+    background: linear-gradient(
+      to bottom,
+      transparent,
+      rgba(255, 255, 255, 0.05)
+    );
+  }
+
+  &:hover {
+    @mixin light {
+      background: linear-gradient(to bottom, transparent, rgba(0, 0, 0, 0.1));
+    }
+
+    @mixin dark {
+      background: linear-gradient(
+        to bottom,
+        transparent,
+        rgba(255, 255, 255, 0.1)
+      );
+    }
+  }
+}
+
+.wrapper:hover .resizeHandleBottom,
+.resizing .resizeHandleBottom {
+  opacity: 1;
+}
+
+.resizeBar {
+  width: 50px;
+  height: 4px;
+  border-radius: 2px;
+  transition: background-color 0.2s ease;
+
+  @mixin light {
+    background-color: var(--mantine-color-gray-5);
+  }
+
+  @mixin dark {
+    background-color: var(--mantine-color-gray-6);
+  }
+}
+
+.resizeHandleBottom:hover .resizeBar,
+.resizing .resizeBar {
+  @mixin light {
+    background-color: var(--mantine-color-gray-7);
+  }
+
+  @mixin dark {
+    background-color: var(--mantine-color-gray-4);
+  }
+}

apps/client/src/features/editor/components/common/resizable-wrapper.tsx

@@ -0,0 +1,112 @@
+import React, { ReactNode, useCallback, useEffect, useRef, useState } from "react";
+import clsx from "clsx";
+import classes from "./resizable-wrapper.module.css";
+
+interface ResizableWrapperProps {
+  children: ReactNode;
+  initialHeight?: number;
+  minHeight?: number;
+  maxHeight?: number;
+  onResize?: (height: number) => void;
+  isEditable?: boolean;
+  className?: string;
+  showHandles?: "always" | "hover";
+  direction?: "vertical" | "horizontal" | "both";
+}
+
+export const ResizableWrapper: React.FC<ResizableWrapperProps> = ({
+  children,
+  initialHeight = 480,
+  minHeight = 200,
+  maxHeight = 1200,
+  onResize,
+  isEditable = true,
+  className,
+  showHandles = "hover",
+  direction = "vertical",
+}) => {
+  const [resizeParams, setResizeParams] = useState<{
+    initialSize: number;
+    initialClientY: number;
+    initialClientX: number;
+  } | null>(null);
+  const [currentHeight, setCurrentHeight] = useState(initialHeight);
+  const [isHovered, setIsHovered] = useState(false);
+  const wrapperRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    if (!resizeParams) return;
+
+    const handleMouseMove = (e: MouseEvent) => {
+      if (!wrapperRef.current) return;
+
+      if (direction === "vertical" || direction === "both") {
+        const deltaY = e.clientY - resizeParams.initialClientY;
+        const newHeight = Math.min(
+          Math.max(resizeParams.initialSize + deltaY, minHeight),
+          maxHeight
+        );
+        setCurrentHeight(newHeight);
+        wrapperRef.current.style.height = `${newHeight}px`;
+      }
+    };
+
+    const handleMouseUp = () => {
+      setResizeParams(null);
+      if (onResize && currentHeight !== initialHeight) {
+        onResize(currentHeight);
+      }
+      document.body.style.cursor = "";
+      document.body.style.userSelect = "";
+    };
+
+    document.addEventListener("mousemove", handleMouseMove);
+    document.addEventListener("mouseup", handleMouseUp);
+
+    return () => {
+      document.removeEventListener("mousemove", handleMouseMove);
+      document.removeEventListener("mouseup", handleMouseUp);
+    };
+  }, [resizeParams, currentHeight, initialHeight, onResize, minHeight, maxHeight, direction]);
+
+  const handleResizeStart = useCallback((e: React.MouseEvent) => {
+    e.preventDefault();
+    e.stopPropagation();
+
+    setResizeParams({
+      initialSize: currentHeight,
+      initialClientY: e.clientY,
+      initialClientX: e.clientX,
+    });
+
+    document.body.style.cursor = "ns-resize";
+    document.body.style.userSelect = "none";
+  }, [currentHeight]);
+
+  const shouldShowHandles = 
+    isEditable && 
+    (showHandles === "always" || (showHandles === "hover" && (isHovered || resizeParams)));
+
+  return (
+    <div
+      ref={wrapperRef}
+      className={clsx(classes.wrapper, className, {
+        [classes.resizing]: !!resizeParams,
+      })}
+      style={{ height: currentHeight }}
+      onMouseEnter={() => setIsHovered(true)}
+      onMouseLeave={() => setIsHovered(false)}
+    >
+      {children}
+      {!!resizeParams && <div className={classes.overlay} />}
+      {shouldShowHandles && direction === "vertical" && (
+        <div
+          className={classes.resizeHandleBottom}
+          onMouseDown={handleResizeStart}
+        >
+          <div className={classes.resizeBar} />
+        </div>
+      )}
+    </div>
+  );
+};

apps/client/src/features/editor/components/embed/embed-view.module.css

@@ -0,0 +1,16 @@
+.embedWrapper {
+  @mixin light {
+    background-color: var(--mantine-color-gray-0);
+  }
+
+  @mixin dark {
+    background-color: var(--mantine-color-dark-7);
+  }
+}
+
+.embedIframe {
+  width: 100%;
+  height: 100%;
+  border: none;
+  border-radius: 8px;
+}

apps/client/src/features/editor/components/embed/embed-view.tsx

@@ -1,9 +1,8 @@
 import { NodeViewProps, NodeViewWrapper } from "@tiptap/react";
-import { useMemo } from "react";
+import React, { useMemo, useCallback } from "react";
 import clsx from "clsx";
 import {
   ActionIcon,
-  AspectRatio,
   Button,
   Card,
   FocusTrap,
@@ -14,14 +13,18 @@ import {
 } from "@mantine/core";
 import { IconEdit } from "@tabler/icons-react";
 import { z } from "zod";
-import { useForm, zodResolver } from "@mantine/form";
+import { useForm } from "@mantine/form";
+import { zodResolver } from "mantine-form-zod-resolver";
 import { notifications } from "@mantine/notifications";
 import { useTranslation } from "react-i18next";
 import i18n from "i18next";
 import {
   getEmbedProviderById,
   getEmbedUrlAndProvider,
+  sanitizeUrl,
 } from "@docmost/editor-ext";
+import { ResizableWrapper } from "../common/resizable-wrapper";
+import classes from "./embed-view.module.css";
 
 const schema = z.object({
   url: z
@@ -33,7 +36,7 @@ const schema = z.object({
 export default function EmbedView(props: NodeViewProps) {
   const { t } = useTranslation();
   const { node, selected, updateAttributes, editor } = props;
-  const { src, provider } = node.attrs;
+  const { src, provider, height: nodeHeight } = node.attrs;
 
   const embedUrl = useMemo(() => {
     if (src) {
@@ -49,6 +52,13 @@ export default function EmbedView(props: NodeViewProps) {
     validate: zodResolver(schema),
   });
 
+  const handleResize = useCallback(
+    (newHeight: number) => {
+      updateAttributes({ height: newHeight });
+    },
+    [updateAttributes],
+  );
+
   async function onSubmit(data: { url: string }) {
     if (!editor.isEditable) {
       return;
@@ -57,11 +67,11 @@ export default function EmbedView(props: NodeViewProps) {
     if (provider) {
       const embedProvider = getEmbedProviderById(provider);
       if (embedProvider.id === "iframe") {
-        updateAttributes({ src: data.url });
+        updateAttributes({ src: sanitizeUrl(data.url) });
         return;
       }
       if (embedProvider.regex.test(data.url)) {
-        updateAttributes({ src: data.url });
+        updateAttributes({ src: sanitizeUrl(data.url) });
       } else {
         notifications.show({
           message: t("Invalid {{provider}} embed link", {
@@ -77,17 +87,25 @@ export default function EmbedView(props: NodeViewProps) {
   return (
     <NodeViewWrapper>
       {embedUrl ? (
-        <>
-          <AspectRatio ratio={16 / 9}>
-            <iframe
-              src={embedUrl}
-              allow="encrypted-media"
-              sandbox="allow-scripts allow-same-origin allow-forms allow-popups"
-              allowFullScreen
-              frameBorder="0"
-            ></iframe>
-          </AspectRatio>
-        </>
+        <ResizableWrapper
+          initialHeight={nodeHeight || 480}
+          minHeight={200}
+          maxHeight={1200}
+          onResize={handleResize}
+          isEditable={editor.isEditable}
+          className={clsx(classes.embedWrapper, {
+            "ProseMirror-selectednode": selected,
+          })}
+        >
+          <iframe
+            className={classes.embedIframe}
+            src={sanitizeUrl(embedUrl)}
+            allow="encrypted-media"
+            sandbox="allow-scripts allow-same-origin allow-forms allow-popups"
+            allowFullScreen
+            frameBorder="0"
+          />
+        </ResizableWrapper>
       ) : (
         <Popover
           width={300}

apps/client/src/features/editor/components/slash-menu/menu-items.ts

@@ -17,8 +17,10 @@ import {
   IconTable,
   IconTypography,
   IconMenu4,
-  IconCalendar, IconAppWindow,
-} from '@tabler/icons-react';
+  IconCalendar,
+  IconAppWindow,
+  IconSitemap,
+} from "@tabler/icons-react";
 import {
   CommandProps,
   SlashMenuGroupedItemsType,
@@ -357,6 +359,15 @@ const CommandGroups: SlashMenuGroupedItemsType = {
           .run();
       },
     },
+    {
+      title: "Subpages (Child pages)",
+      description: "List all subpages of the current page",
+      searchTerms: ["subpages", "child", "children", "nested", "hierarchy"],
+      icon: IconSitemap,
+      command: ({ editor, range }: CommandProps) => {
+        editor.chain().focus().deleteRange(range).insertSubpages().run();
+      },
+    },
     {
       title: "Iframe embed",
       description: "Embed any Iframe",

apps/client/src/features/editor/components/subpages/subpages-menu.tsx

@@ -0,0 +1,95 @@
+import {
+  BubbleMenu as BaseBubbleMenu,
+  posToDOMRect,
+  findParentNode,
+} from "@tiptap/react";
+import { Node as PMNode } from "@tiptap/pm/model";
+import React, { useCallback } from "react";
+import { ActionIcon, Tooltip } from "@mantine/core";
+import { IconTrash } from "@tabler/icons-react";
+import { useTranslation } from "react-i18next";
+import { Editor } from "@tiptap/core";
+import { sticky } from "tippy.js";
+
+interface SubpagesMenuProps {
+  editor: Editor;
+}
+
+interface ShouldShowProps {
+  state: any;
+  from?: number;
+  to?: number;
+}
+
+export const SubpagesMenu = React.memo(
+  ({ editor }: SubpagesMenuProps): JSX.Element => {
+    const { t } = useTranslation();
+
+    const shouldShow = useCallback(
+      ({ state }: ShouldShowProps) => {
+        if (!state) {
+          return false;
+        }
+
+        return editor.isActive("subpages");
+      },
+      [editor],
+    );
+
+    const getReferenceClientRect = useCallback(() => {
+      const { selection } = editor.state;
+      const predicate = (node: PMNode) => node.type.name === "subpages";
+      const parent = findParentNode(predicate)(selection);
+
+      if (parent) {
+        const dom = editor.view.nodeDOM(parent?.pos) as HTMLElement;
+        return dom.getBoundingClientRect();
+      }
+
+      return posToDOMRect(editor.view, selection.from, selection.to);
+    }, [editor]);
+
+    const deleteNode = useCallback(() => {
+      const { selection } = editor.state;
+      editor
+        .chain()
+        .focus()
+        .setNodeSelection(selection.from)
+        .deleteSelection()
+        .run();
+    }, [editor]);
+
+    return (
+      <BaseBubbleMenu
+        editor={editor}
+        pluginKey={`subpages-menu}`}
+        updateDelay={0}
+        tippyOptions={{
+          getReferenceClientRect,
+          offset: [0, 8],
+          zIndex: 99,
+          popperOptions: {
+            modifiers: [{ name: "flip", enabled: false }],
+          },
+          plugins: [sticky],
+          sticky: "popper",
+        }}
+        shouldShow={shouldShow}
+      >
+        <Tooltip position="top" label={t("Delete")}>
+          <ActionIcon
+            onClick={deleteNode}
+            variant="default"
+            size="lg"
+            color="red"
+            aria-label={t("Delete")}
+          >
+            <IconTrash size={18} />
+          </ActionIcon>
+        </Tooltip>
+      </BaseBubbleMenu>
+    );
+  },
+);
+
+export default SubpagesMenu;

apps/client/src/features/editor/components/subpages/subpages-view.tsx

@@ -0,0 +1,120 @@
+import { NodeViewProps, NodeViewWrapper } from "@tiptap/react";
+import { Stack, Text, Anchor, ActionIcon } from "@mantine/core";
+import { IconFileDescription } from "@tabler/icons-react";
+import { useGetSidebarPagesQuery } from "@/features/page/queries/page-query";
+import { useMemo } from "react";
+import { Link, useParams } from "react-router-dom";
+import classes from "./subpages.module.css";
+import styles from "../mention/mention.module.css";
+import {
+  buildPageUrl,
+  buildSharedPageUrl,
+} from "@/features/page/page.utils.ts";
+import { useTranslation } from "react-i18next";
+import { sortPositionKeys } from "@/features/page/tree/utils/utils";
+import { useSharedPageSubpages } from "@/features/share/hooks/use-shared-page-subpages";
+
+export default function SubpagesView(props: NodeViewProps) {
+  const { editor } = props;
+  const { spaceSlug, shareId } = useParams();
+  const { t } = useTranslation();
+
+  const currentPageId = editor.storage.pageId;
+
+  // Get subpages from shared tree if we're in a shared context
+  const sharedSubpages = useSharedPageSubpages(currentPageId);
+
+  const { data, isLoading, error } = useGetSidebarPagesQuery({
+    pageId: currentPageId,
+  });
+
+  const subpages = useMemo(() => {
+    // If we're in a shared context, use the shared subpages
+    if (shareId && sharedSubpages) {
+      return sharedSubpages.map((node) => ({
+        id: node.value,
+        slugId: node.slugId,
+        title: node.name,
+        icon: node.icon,
+        position: node.position,
+      }));
+    }
+
+    // Otherwise use the API data
+    if (!data?.pages) return [];
+    const allPages = data.pages.flatMap((page) => page.items);
+    return sortPositionKeys(allPages);
+  }, [data, shareId, sharedSubpages]);
+
+  if (isLoading && !shareId) {
+    return null;
+  }
+
+  if (error && !shareId) {
+    return (
+      <NodeViewWrapper>
+        <Text c="dimmed" size="md" py="md">
+          {t("Failed to load subpages")}
+        </Text>
+      </NodeViewWrapper>
+    );
+  }
+
+  if (subpages.length === 0) {
+    return (
+      <NodeViewWrapper>
+        <div className={classes.container}>
+          <Text c="dimmed" size="md" py="md">
+            {t("No subpages")}
+          </Text>
+        </div>
+      </NodeViewWrapper>
+    );
+  }
+
+  return (
+    <NodeViewWrapper>
+      <div className={classes.container}>
+        <Stack gap={5}>
+          {subpages.map((page) => (
+            <Anchor
+              key={page.id}
+              component={Link}
+              fw={500}
+              to={
+                shareId
+                  ? buildSharedPageUrl({
+                      shareId,
+                      pageSlugId: page.slugId,
+                      pageTitle: page.title,
+                    })
+                  : buildPageUrl(spaceSlug, page.slugId, page.title)
+              }
+              underline="never"
+              className={styles.pageMentionLink}
+              draggable={false}
+            >
+              {page?.icon ? (
+                <span style={{ marginRight: "4px" }}>{page.icon}</span>
+              ) : (
+                <ActionIcon
+                  variant="transparent"
+                  color="gray"
+                  component="span"
+                  size={18}
+                  style={{ verticalAlign: "text-bottom" }}
+                >
+                  <IconFileDescription size={18} />
+                </ActionIcon>
+              )}
+
+              <span className={styles.pageMentionText}>
+                {page?.title || t("untitled")}
+              </span>
+            </Anchor>
+          ))}
+        </Stack>
+      </div>
+    </NodeViewWrapper>
+  );
+}

apps/client/src/features/editor/components/subpages/subpages.module.css

@@ -0,0 +1,9 @@
+.container {
+  margin: 0;
+  padding-left: 4px;
+  user-select: none;
+
+  a {
+    border: none !important;
+  }
+}

apps/client/src/features/editor/components/table/table-background-color.tsx

@@ -0,0 +1,145 @@
+import React, { FC } from "react";
+import { IconCheck, IconPalette } from "@tabler/icons-react";
+import {
+  ActionIcon,
+  ColorSwatch,
+  Popover,
+  Stack,
+  Text,
+  Tooltip,
+  UnstyledButton,
+} from "@mantine/core";
+import { useEditor } from "@tiptap/react";
+import { useTranslation } from "react-i18next";
+
+export interface TableColorItem {
+  name: string;
+  color: string;
+}
+
+interface TableBackgroundColorProps {
+  editor: ReturnType<typeof useEditor>;
+}
+
+const TABLE_COLORS: TableColorItem[] = [
+  { name: "Default", color: "" },
+  { name: "Blue", color: "#b4d5ff" },
+  { name: "Green", color: "#acf5d2" },
+  { name: "Yellow", color: "#fef1b4" },
+  { name: "Red", color: "#ffbead" },
+  { name: "Pink", color: "#ffc7fe" },
+  { name: "Gray", color: "#eaecef" },
+  { name: "Purple", color: "#c1b7f2" },
+];
+
+export const TableBackgroundColor: FC<TableBackgroundColorProps> = ({
+  editor,
+}) => {
+  const { t } = useTranslation();
+  const [opened, setOpened] = React.useState(false);
+
+  const setTableCellBackground = (color: string, colorName: string) => {
+    editor
+      .chain()
+      .focus()
+      .updateAttributes("tableCell", { 
+        backgroundColor: color || null,
+        backgroundColorName: color ? colorName : null 
+      })
+      .updateAttributes("tableHeader", { 
+        backgroundColor: color || null,
+        backgroundColorName: color ? colorName : null 
+      })
+      .run();
+    setOpened(false);
+  };
+
+  // Get current cell's background color
+  const getCurrentColor = () => {
+    if (editor.isActive("tableCell")) {
+      const attrs = editor.getAttributes("tableCell");
+      return attrs.backgroundColor || "";
+    }
+    if (editor.isActive("tableHeader")) {
+      const attrs = editor.getAttributes("tableHeader");
+      return attrs.backgroundColor || "";
+    }
+    return "";
+  };
+
+  const currentColor = getCurrentColor();
+
+  return (
+    <Popover
+      width={200}
+      position="bottom"
+      opened={opened}
+      onChange={setOpened}
+      withArrow
+      transitionProps={{ transition: "pop" }}
+    >
+      <Popover.Target>
+        <Tooltip label={t("Background color")} withArrow>
+          <ActionIcon
+            variant="default"
+            size="lg"
+            aria-label={t("Background color")}
+            onClick={() => setOpened(!opened)}
+          >
+            <IconPalette size={18} />
+          </ActionIcon>
+        </Tooltip>
+      </Popover.Target>
+
+      <Popover.Dropdown>
+        <Stack gap="xs">
+          <Text size="sm" c="dimmed">
+            {t("Background color")}
+          </Text>
+
+          <div
+            style={{
+              display: "grid",
+              gridTemplateColumns: "repeat(4, 1fr)",
+              gap: "8px",
+            }}
+          >
+            {TABLE_COLORS.map((item, index) => (
+              <UnstyledButton
+                key={index}
+                onClick={() => setTableCellBackground(item.color, item.name)}
+                style={{
+                  position: "relative",
+                  width: "24px",
+                  height: "24px",
+                }}
+                title={t(item.name)}
+              >
+                <ColorSwatch
+                  color={item.color || "#ffffff"}
+                  size={24}
+                  style={{
+                    border: item.color === "" ? "1px solid #e5e7eb" : undefined,
+                    cursor: "pointer",
+                  }}
+                >
+                  {currentColor === item.color && (
+                    <IconCheck
+                      size={18}
+                      style={{
+                        color:
+                          item.color === "" || item.color.startsWith("#F")
+                            ? "#000000"
+                            : "#ffffff",
+                      }}
+                    />
+                  )}
+                </ColorSwatch>
+              </UnstyledButton>
+            ))}
+          </div>
+        </Stack>
+      </Popover.Dropdown>
+    </Popover>
+  );
+};

apps/client/src/features/editor/components/table/table-cell-menu.tsx

@@ -12,8 +12,11 @@ import {
   IconColumnRemove,
   IconRowRemove,
   IconSquareToggle,
+  IconTableRow,
 } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
+import { TableBackgroundColor } from "./table-background-color";
+import { TableTextAlignment } from "./table-text-alignment";
 
 export const TableCellMenu = React.memo(
   ({ editor, appendTo }: EditorMenuProps): JSX.Element => {
@@ -45,6 +48,10 @@ export const TableCellMenu = React.memo(
       editor.chain().focus().deleteRow().run();
     }, [editor]);
 
+    const toggleHeaderCell = useCallback(() => {
+      editor.chain().focus().toggleHeaderCell().run();
+    }, [editor]);
+
     return (
       <BaseBubbleMenu
         editor={editor}
@@ -60,6 +67,9 @@ export const TableCellMenu = React.memo(
         shouldShow={shouldShow}
       >
         <ActionIcon.Group>
+          <TableBackgroundColor editor={editor} />
+          <TableTextAlignment editor={editor} />
+          
           <Tooltip position="top" label={t("Merge cells")}>
             <ActionIcon
               onClick={mergeCells}
@@ -103,6 +113,17 @@ export const TableCellMenu = React.memo(
               <IconRowRemove size={18} />
             </ActionIcon>
           </Tooltip>
+
+          <Tooltip position="top" label={t("Toggle header cell")}>
+            <ActionIcon
+              onClick={toggleHeaderCell}
+              variant="default"
+              size="lg"
+              aria-label={t("Toggle header cell")}
+            >
+              <IconTableRow size={18} />
+            </ActionIcon>
+          </Tooltip>
         </ActionIcon.Group>
       </BaseBubbleMenu>
     );

apps/client/src/features/editor/components/table/table-text-alignment.tsx

@@ -0,0 +1,109 @@
+import React, { FC } from "react";
+import {
+  IconAlignCenter,
+  IconAlignLeft,
+  IconAlignRight,
+  IconCheck,
+} from "@tabler/icons-react";
+import {
+  ActionIcon,
+  Button,
+  Popover,
+  rem,
+  ScrollArea,
+  Tooltip,
+} from "@mantine/core";
+import { useEditor } from "@tiptap/react";
+import { useTranslation } from "react-i18next";
+
+interface TableTextAlignmentProps {
+  editor: ReturnType<typeof useEditor>;
+}
+
+interface AlignmentItem {
+  name: string;
+  icon: React.ElementType;
+  command: () => void;
+  isActive: () => boolean;
+  value: string;
+}
+
+export const TableTextAlignment: FC<TableTextAlignmentProps> = ({ editor }) => {
+  const { t } = useTranslation();
+  const [opened, setOpened] = React.useState(false);
+
+  const items: AlignmentItem[] = [
+    {
+      name: "Align left",
+      value: "left",
+      isActive: () => editor.isActive({ textAlign: "left" }),
+      command: () => editor.chain().focus().setTextAlign("left").run(),
+      icon: IconAlignLeft,
+    },
+    {
+      name: "Align center",
+      value: "center",
+      isActive: () => editor.isActive({ textAlign: "center" }),
+      command: () => editor.chain().focus().setTextAlign("center").run(),
+      icon: IconAlignCenter,
+    },
+    {
+      name: "Align right",
+      value: "right",
+      isActive: () => editor.isActive({ textAlign: "right" }),
+      command: () => editor.chain().focus().setTextAlign("right").run(),
+      icon: IconAlignRight,
+    },
+  ];
+
+  const activeItem = items.find((item) => item.isActive()) || items[0];
+
+  return (
+    <Popover
+      opened={opened}
+      onChange={setOpened}
+      position="bottom"
+      withArrow
+      transitionProps={{ transition: 'pop' }}
+    >
+      <Popover.Target>
+        <Tooltip label={t("Text alignment")} withArrow>
+          <ActionIcon
+            variant="default"
+            size="lg"
+            aria-label={t("Text alignment")}
+            onClick={() => setOpened(!opened)}
+          >
+            <activeItem.icon size={18} />
+          </ActionIcon>
+        </Tooltip>
+      </Popover.Target>
+
+      <Popover.Dropdown>
+        <ScrollArea.Autosize type="scroll" mah={300}>
+          <Button.Group orientation="vertical">
+            {items.map((item, index) => (
+              <Button
+                key={index}
+                variant="default"
+                leftSection={<item.icon size={16} />}
+                rightSection={
+                  item.isActive() && <IconCheck size={16} />
+                }
+                justify="left"
+                fullWidth
+                onClick={() => {
+                  item.command();
+                  setOpened(false);
+                }}
+                style={{ border: "none" }}
+              >
+                {t(item.name)}
+              </Button>
+            ))}
+          </Button.Group>
+        </ScrollArea.Autosize>
+      </Popover.Dropdown>
+    </Popover>
+  );
+};

apps/client/src/features/editor/extensions/extensions.ts

@@ -10,8 +10,6 @@ import { Highlight } from "@tiptap/extension-highlight";
 import { Typography } from "@tiptap/extension-typography";
 import { TextStyle } from "@tiptap/extension-text-style";
 import { Color } from "@tiptap/extension-color";
-import Table from "@tiptap/extension-table";
-import TableHeader from "@tiptap/extension-table-header";
 import SlashCommand from "@/features/editor/extensions/slash-command";
 import { Collaboration } from "@tiptap/extension-collaboration";
 import { CollaborationCursor } from "@tiptap/extension-collaboration-cursor";
@@ -25,6 +23,8 @@ import {
   MathInline,
   TableCell,
   TableRow,
+  TableHeader,
+  CustomTable,
   TrailingNode,
   TiptapImage,
   Callout,
@@ -38,6 +38,8 @@ import {
   Embed,
   SearchAndReplace,
   Mention,
+  Subpages,
+  TableDndExtension,
 } from "@docmost/editor-ext";
 import {
   randomElement,
@@ -57,6 +59,7 @@ import CodeBlockView from "@/features/editor/components/code-block/code-block-vi
 import DrawioView from "../components/drawio/drawio-view";
 import ExcalidrawView from "@/features/editor/components/excalidraw/excalidraw-view.tsx";
 import EmbedView from "@/features/editor/components/embed/embed-view.tsx";
+import SubpagesView from "@/features/editor/components/subpages/subpages-view.tsx";
 import plaintext from "highlight.js/lib/languages/plaintext";
 import powershell from "highlight.js/lib/languages/powershell";
 import abap from "highlightjs-sap-abap";
@@ -160,7 +163,7 @@ export const mainExtensions = [
       return ReactNodeViewRenderer(MentionView);
     },
   }),
-  Table.configure({
+  CustomTable.configure({
     resizable: true,
     lastColumnResizable: false,
     allowTableNodeSelection: true,
@@ -168,6 +171,7 @@ export const mainExtensions = [
   TableRow,
   TableCell,
   TableHeader,
+  TableDndExtension,
   MathInline.configure({
     view: MathInlineView,
   }),
@@ -212,6 +216,9 @@ export const mainExtensions = [
   Embed.configure({
     view: EmbedView,
   }),
+  Subpages.configure({
+    view: SubpagesView,
+  }),
   MarkdownClipboard.configure({
     transformPastedText: true,
   }),

apps/client/src/features/editor/page-editor.tsx

@@ -1,10 +1,5 @@
 import "@/features/editor/styles/index.css";
-import React, {
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from "react";
+import React, { useEffect, useMemo, useRef, useState } from "react";
 import { IndexeddbPersistence } from "y-indexeddb";
 import * as Y from "yjs";
 import {
@@ -36,6 +31,7 @@ import TableMenu from "@/features/editor/components/table/table-menu.tsx";
 import ImageMenu from "@/features/editor/components/image/image-menu.tsx";
 import CalloutMenu from "@/features/editor/components/callout/callout-menu.tsx";
 import VideoMenu from "@/features/editor/components/video/video-menu.tsx";
+import SubpagesMenu from "@/features/editor/components/subpages/subpages-menu.tsx";
 import {
   handleFileDrop,
   handlePaste,
@@ -80,7 +76,7 @@ export default function PageEditor({
   const [isLocalSynced, setLocalSynced] = useState(false);
   const [isRemoteSynced, setRemoteSynced] = useState(false);
   const [yjsConnectionStatus, setYjsConnectionStatus] = useAtom(
-    yjsConnectionStatusAtom,
+    yjsConnectionStatusAtom
   );
   const menuContainerRef = useRef(null);
   const documentName = `page.${pageId}`;
@@ -131,7 +127,15 @@ export default function PageEditor({
           const now = Date.now().valueOf() / 1000;
           const isTokenExpired = now >= payload.exp;
           if (isTokenExpired) {
-            refetchCollabToken();
+            refetchCollabToken().then((result) => {
+              if (result.data?.token) {
+                remote.disconnect();
+                setTimeout(() => {
+                  remote.configuration.token = result.data.token;
+                  remote.connect();
+                }, 100);
+              }
+            });
           }
         },
         onStatus: (status) => {
@@ -157,6 +161,21 @@ export default function PageEditor({
     };
   }, [pageId]);
 
+  /*
+  useEffect(() => {
+    // Handle token updates by reconnecting with new token
+    if (providersRef.current?.remote && collabQuery?.token) {
+      const currentToken = providersRef.current.remote.configuration.token;
+      if (currentToken !== collabQuery.token) {
+        // Token has changed, need to reconnect with new token
+        providersRef.current.remote.disconnect();
+        providersRef.current.remote.configuration.token = collabQuery.token;
+        providersRef.current.remote.connect();
+      }
+    }
+  }, [collabQuery?.token]);
+   */
+
   // Only connect/disconnect on tab/idle, not destroy
   useEffect(() => {
     if (!providersReady || !providersRef.current) return;
@@ -199,6 +218,10 @@ export default function PageEditor({
         scrollMargin: 80,
         handleDOMEvents: {
           keydown: (_view, event) => {
+            if ((event.ctrlKey || event.metaKey) && event.code === 'KeyS') {
+              event.preventDefault();
+              return true;
+            }
             if (["ArrowUp", "ArrowDown", "Enter"].includes(event.key)) {
               const slashCommand = document.querySelector("#slash-command");
               if (slashCommand) {
@@ -240,7 +263,7 @@ export default function PageEditor({
         debouncedUpdateContent(editorJson);
       },
     },
-    [pageId, editable, remoteProvider],
+    [pageId, editable, remoteProvider]
   );
 
   const debouncedUpdateContent = useDebouncedCallback((newContent: any) => {
@@ -256,7 +279,12 @@ export default function PageEditor({
   }, 3000);
 
   const handleActiveCommentEvent = (event) => {
-    const { commentId } = event.detail;
+    const { commentId, resolved } = event.detail;
+
+    if (resolved) {
+      return;
+    }
+
     setActiveCommentId(commentId);
     setAsideState({ tab: "comments", isAsideOpen: true });
 
@@ -273,7 +301,7 @@ export default function PageEditor({
     return () => {
       document.removeEventListener(
         "ACTIVE_COMMENT_EVENT",
-        handleActiveCommentEvent,
+        handleActiveCommentEvent
       );
     };
   }, []);
@@ -348,10 +376,13 @@ export default function PageEditor({
   }
 
   return (
-    <div style={{ position: "relative" }}>
+    <div className="editor-container" style={{ position: "relative" }}>
       <div ref={menuContainerRef}>
         <EditorContent editor={editor} />
-        <SearchAndReplaceDialog editor={editor} editable={editable} />
+
+        {editor && (
+          <SearchAndReplaceDialog editor={editor} editable={editable} />
+        )}
 
         {editor && editor.isEditable && (
           <div>
@@ -361,6 +392,7 @@ export default function PageEditor({
             <ImageMenu editor={editor} />
             <VideoMenu editor={editor} />
             <CalloutMenu editor={editor} />
+            <SubpagesMenu editor={editor} />
             <ExcalidrawMenu editor={editor} />
             <DrawioMenu editor={editor} />
             <LinkMenu editor={editor} appendTo={menuContainerRef} />

apps/client/src/features/editor/readonly-page-editor.tsx

@@ -6,21 +6,19 @@ import { Document } from "@tiptap/extension-document";
 import { Heading } from "@tiptap/extension-heading";
 import { Text } from "@tiptap/extension-text";
 import { Placeholder } from "@tiptap/extension-placeholder";
-import { useAtom } from "jotai/index";
-import {
-  pageEditorAtom,
-  readOnlyEditorAtom,
-} from "@/features/editor/atoms/editor-atoms.ts";
-import { Editor } from "@tiptap/core";
+import { useAtom } from "jotai";
+import { readOnlyEditorAtom } from "@/features/editor/atoms/editor-atoms.ts";
 
 interface PageEditorProps {
   title: string;
   content: any;
+  pageId?: string;
 }
 
 export default function ReadonlyPageEditor({
   title,
   content,
+  pageId,
 }: PageEditorProps) {
   const [, setReadOnlyEditor] = useAtom(readOnlyEditorAtom);
 
@@ -56,6 +54,9 @@ export default function ReadonlyPageEditor({
         content={content}
         onCreate={({ editor }) => {
           if (editor) {
+            if (pageId) {
+              editor.storage.pageId = pageId;
+            }
             // @ts-ignore
             setReadOnlyEditor(editor);
           }

apps/client/src/features/editor/styles/core.css

@@ -142,6 +142,11 @@
   .comment-mark {
     background: rgba(255, 215, 0, 0.14);
     border-bottom: 2px solid rgb(166, 158, 12);
+
+    &.resolved {
+      background: none;
+      border-bottom: none;
+    }
   }
 
   .comment-highlight {
@@ -187,7 +192,7 @@
   mask-size: 100% 100%;
   background-color: currentColor;
 
-  & -open {
+  &-open {
     --svg: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'%3E%3Cpath fill='%23000' d='M10 3v2H5v14h14v-5h2v6a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1zm7.586 2H13V3h8v8h-2V6.414l-7 7L10.586 12z'/%3E%3C/svg%3E");
   }
 

apps/client/src/features/editor/styles/drag-handle.css

@@ -45,6 +45,10 @@
     display: none;
     pointer-events: none;
   }
+
+  &[data-direction='horizontal'] {
+    rotate: 90deg;
+  }
 }
 
 .dark .drag-handle {

apps/client/src/features/editor/styles/index.css

@@ -11,3 +11,4 @@
 @import "./print.css";
 @import "./find.css";
 @import "./mention.css";
+@import "./ordered-list.css";

apps/client/src/features/editor/styles/ordered-list.css

@@ -0,0 +1,34 @@
+/* Ordered list type cycling based on nesting depth */
+ol,
+ol ol ol ol,
+ol ol ol ol ol ol ol,
+ol ol ol ol ol ol ol ol ol ol {
+  list-style-type: decimal;
+}
+
+ol ol,
+ol ol ol ol ol,
+ol ol ol ol ol ol ol ol,
+ol ol ol ol ol ol ol ol ol ol ol {
+  list-style-type: lower-alpha;
+}
+
+ol ol ol,
+ol ol ol ol ol ol,
+ol ol ol ol ol ol ol ol ol,
+ol ol ol ol ol ol ol ol ol ol ol ol {
+  list-style-type: lower-roman;
+}
+
+ol {
+  list-style-position: outside;
+  margin-left: 0.25rem;
+}
+
+/* Nested list spacing */
+ol ol,
+ol ul,
+ul ol {
+  margin-top: 0.1rem;
+  margin-bottom: 0.1rem;
+}

apps/client/src/features/editor/styles/table.css

@@ -4,9 +4,20 @@
   overflow-x: auto;
   & table {
     overflow-x: hidden;
+    min-width: 700px !important;
   }
 }
 
+.table-dnd-preview {
+  padding: 0;
+  background-color: rgba(255, 255, 255, 0.3);
+  backdrop-filter: blur(2px);
+}
+
+.table-dnd-drop-indicator {
+  background-color: #adf;
+}
+
 .ProseMirror {
   table {
     border-collapse: collapse;
@@ -38,8 +49,8 @@
 
     th {
       background-color: light-dark(
-              var(--mantine-color-gray-1),
-              var(--mantine-color-dark-5)
+        var(--mantine-color-gray-1),
+        var(--mantine-color-dark-5)
       );
       font-weight: bold;
       text-align: left;
@@ -66,8 +77,64 @@
       position: absolute;
       z-index: 2;
     }
-
   }
 }
 
+/* Table cell background colors with dark mode support */
+.ProseMirror {
+  table {
+    @mixin dark {
+      /* Blue */
+      td[data-background-color="#b4d5ff"],
+      th[data-background-color="#b4d5ff"] {
+        background-color: #1a3a5c !important;
+      }
 
+      /* Green */
+      td[data-background-color="#acf5d2"],
+      th[data-background-color="#acf5d2"] {
+        background-color: #1a4d3a !important;
+      }
+
+      /* Yellow */
+      td[data-background-color="#fef1b4"],
+      th[data-background-color="#fef1b4"] {
+        background-color: #7c5014 !important;
+      }
+
+      /* Red */
+      td[data-background-color="#ffbead"],
+      th[data-background-color="#ffbead"] {
+        background-color: #5c2a23 !important;
+      }
+
+      /* Pink */
+      td[data-background-color="#ffc7fe"],
+      th[data-background-color="#ffc7fe"] {
+        background-color: #4d2a4d !important;
+      }
+
+      /* Gray */
+      td[data-background-color="#eaecef"],
+      th[data-background-color="#eaecef"] {
+        background-color: #2a2e33 !important;
+      }
+
+      /* Purple */
+      td[data-background-color="#c1b7f2"],
+      th[data-background-color="#c1b7f2"] {
+        background-color: #3a2f5c !important;
+      }
+    }
+  }
+}
+
+.editor-container:has(.table-dnd-drop-indicator[data-dragging="true"]) {
+  .prosemirror-dropcursor-block {
+    display: none;
+  }
+
+  .prosemirror-dropcursor-inline {
+    display: none;
+  }
+}

apps/client/src/features/page/components/copy-page-modal.tsx

@@ -1,5 +1,5 @@
 import { Modal, Button, Group, Text } from "@mantine/core";
-import { copyPageToSpace } from "@/features/page/services/page-service.ts";
+import { duplicatePage } from "@/features/page/services/page-service.ts";
 import { useState } from "react";
 import { notifications } from "@mantine/notifications";
 import { useTranslation } from "react-i18next";
@@ -30,7 +30,7 @@ export default function CopyPageModal({
     if (!targetSpace) return;
 
     try {
-      const copiedPage = await copyPageToSpace({
+      const copiedPage = await duplicatePage({
         pageId,
         spaceId: targetSpace.id,
       });

apps/client/src/features/page/components/header/page-header-menu.tsx

@@ -231,7 +231,7 @@ function PageActionMenu({ readOnly }: PageActionMenuProps) {
                 leftSection={<IconTrash size={16} />}
                 onClick={handleDeletePage}
               >
-                {t("Delete")}
+                {t("Move to trash")}
               </Menu.Item>
             </>
           )}

apps/client/src/features/page/components/page-export-modal.tsx

@@ -1,105 +0,0 @@
-import { Modal, Button, Group, Text, Select, Switch } from "@mantine/core";
-import { exportPage } from "@/features/page/services/page-service.ts";
-import { useState } from "react";
-import * as React from "react";
-import { ExportFormat } from "@/features/page/types/page.types.ts";
-import { notifications } from "@mantine/notifications";
-import { useTranslation } from "react-i18next";
-
-interface PageExportModalProps {
-  pageId: string;
-  open: boolean;
-  onClose: () => void;
-}
-
-export default function PageExportModal({
-  pageId,
-  open,
-  onClose,
-}: PageExportModalProps) {
-  const { t } = useTranslation();
-  const [format, setFormat] = useState<ExportFormat>(ExportFormat.Markdown);
-
-  const handleExport = async () => {
-    try {
-      await exportPage({ pageId: pageId, format });
-      onClose();
-    } catch (err) {
-      notifications.show({
-        message: t("Export failed:") + err.response?.data.message,
-        color: "red",
-      });
-      console.error("export error", err);
-    }
-  };
-
-  const handleChange = (format: ExportFormat) => {
-    setFormat(format);
-  };
-
-  return (
-    <Modal.Root
-      opened={open}
-      onClose={onClose}
-      size={500}
-      padding="xl"
-      yOffset="10vh"
-      xOffset={0}
-      mah={400}
-    >
-      <Modal.Overlay />
-      <Modal.Content style={{ overflow: "hidden" }}>
-        <Modal.Header py={0}>
-          <Modal.Title fw={500}>{t("Export page")}</Modal.Title>
-          <Modal.CloseButton />
-        </Modal.Header>
-        <Modal.Body>
-          <Group justify="space-between" wrap="nowrap">
-            <div>
-              <Text size="md">{t("Format")}</Text>
-            </div>
-            <ExportFormatSelection format={format} onChange={handleChange} />
-          </Group>
-
-          <Group justify="space-between" wrap="nowrap" pt="md">
-            <div>
-              <Text size="md">{t("Include subpages")}</Text>
-            </div>
-            <Switch defaultChecked />
-          </Group>
-
-          <Group justify="center" mt="md">
-            <Button onClick={onClose} variant="default">
-              {t("Cancel")}
-            </Button>
-            <Button onClick={handleExport}>{t("Export")}</Button>
-          </Group>
-        </Modal.Body>
-      </Modal.Content>
-    </Modal.Root>
-  );
-}
-
-interface ExportFormatSelection {
-  format: ExportFormat;
-  onChange: (value: string) => void;
-}
-function ExportFormatSelection({ format, onChange }: ExportFormatSelection) {
-  const { t } = useTranslation();
-
-  return (
-    <Select
-      data={[
-        { value: "markdown", label: "Markdown" },
-        { value: "html", label: "HTML" },
-      ]}
-      defaultValue={format}
-      onChange={onChange}
-      styles={{ wrapper: { maxWidth: 120 } }}
-      comboboxProps={{ width: "120" }}
-      allowDeselect={false}
-      withCheckIcon={false}
-      aria-label={t("Select export format")}
-    />
-  );
-}

apps/client/src/features/page/components/page-import-modal.tsx

@@ -319,7 +319,7 @@ function ImportFormatSelection({ spaceId, onClose }: ImportFormatSelection) {
         >
           {(props) => (
             <Tooltip
-              label="Available in enterprise edition"
+              label={t("Available in enterprise edition")}
               disabled={canUseConfluence}
             >
               <Button

apps/client/src/features/page/hooks/use-delete-page-modal.tsx

@@ -4,26 +4,37 @@ import { useTranslation } from "react-i18next";
 
 type UseDeleteModalProps = {
   onConfirm: () => void;
+  isPermanent?: boolean;
 };
 
 export function useDeletePageModal() {
   const { t } = useTranslation();
-  const openDeleteModal = ({ onConfirm }: UseDeleteModalProps) => {
+  const openDeleteModal = ({
+    onConfirm,
+    isPermanent = false,
+  }: UseDeleteModalProps) => {
     modals.openConfirmModal({
-      title: t("Are you sure you want to delete this page?"),
+      title: isPermanent
+        ? t("Are you sure you want to delete this page?")
+        : t("Move this page to trash?"),
       children: (
         <Text size="sm">
-          {t(
-            "Are you sure you want to delete this page? This will delete its children and page history. This action is irreversible.",
-          )}
+          {isPermanent
+            ? t(
+                "Are you sure you want to delete this page? This will delete its children and page history. This action is irreversible.",
+              )
+            : t("Pages in trash will be permanently deleted after 30 days.")}
         </Text>
       ),
       centered: true,
-      labels: { confirm: t("Delete"), cancel: t("Cancel") },
+      labels: {
+        confirm: isPermanent ? t("Delete") : t("Move to trash"),
+        cancel: t("Cancel"),
+      },
       confirmProps: { color: "red" },
       onConfirm,
     });
   };
 
   return { openDeleteModal } as const;
-}
+}

apps/client/src/features/page/queries/page-query.ts

@@ -5,8 +5,8 @@ import {
   UseInfiniteQueryResult,
   useMutation,
   useQuery,
-  useQueryClient,
   UseQueryResult,
+  keepPreviousData,
 } from "@tanstack/react-query";
 import {
   createPage,
@@ -18,6 +18,8 @@ import {
   getPageBreadcrumbs,
   getRecentChanges,
   getAllSidebarPages,
+  getDeletedPages,
+  restorePage,
 } from "@/features/page/services/page-service";
 import {
   IMovePage,
@@ -26,12 +28,17 @@ import {
   SidebarPagesParams,
 } from "@/features/page/types/page.types";
 import { notifications } from "@mantine/notifications";
-import { IPagination } from "@/lib/types.ts";
+import { IPagination, QueryParams } from "@/lib/types.ts";
 import { queryClient } from "@/main.tsx";
 import { buildTree } from "@/features/page/tree/utils";
 import { useEffect } from "react";
 import { validate as isValidUuid } from "uuid";
 import { useTranslation } from "react-i18next";
+import { useAtom } from "jotai";
+import { treeDataAtom } from "@/features/page/tree/atoms/tree-data-atom";
+import { SimpleTree } from "react-arborist";
+import { SpaceTreeNode } from "@/features/page/tree/types";
+import { useQueryEmit } from "@/features/websocket/use-query-emit";
 
 export function usePageQuery(
   pageInput: Partial<IPageInput>,
@@ -70,10 +77,7 @@ export function useCreatePageMutation() {
 }
 
 export function updatePageData(data: IPage) {
-  const pageBySlug = queryClient.getQueryData<IPage>([
-    "pages",
-    data.slugId,
-  ]);
+  const pageBySlug = queryClient.getQueryData<IPage>(["pages", data.slugId]);
   const pageById = queryClient.getQueryData<IPage>(["pages", data.id]);
 
   if (pageBySlug) {
@@ -87,7 +91,13 @@ export function updatePageData(data: IPage) {
     queryClient.setQueryData(["pages", data.id], { ...pageById, ...data });
   }
 
-  invalidateOnUpdatePage(data.spaceId, data.parentPageId, data.id, data.title, data.icon);
+  invalidateOnUpdatePage(
+    data.spaceId,
+    data.parentPageId,
+    data.id,
+    data.title,
+    data.icon,
+  );
 }
 
 export function useUpdateTitlePageMutation() {
@@ -102,7 +112,30 @@ export function useUpdatePageMutation() {
     onSuccess: (data) => {
       updatePage(data);
 
-      invalidateOnUpdatePage(data.spaceId, data.parentPageId, data.id, data.title, data.icon);
+      invalidateOnUpdatePage(
+        data.spaceId,
+        data.parentPageId,
+        data.id,
+        data.title,
+        data.icon,
+      );
+    },
+  });
+}
+
+export function useRemovePageMutation() {
+  return useMutation({
+    mutationFn: (pageId: string) => deletePage(pageId, false),
+    onSuccess: (_, pageId) => {
+      notifications.show({ message: "Page moved to trash" });
+      invalidateOnDeletePage(pageId);
+      queryClient.invalidateQueries({
+        predicate: (item) =>
+          ["trash-list"].includes(item.queryKey[0] as string),
+      });
+    },
+    onError: (error) => {
+      notifications.show({ message: "Failed to delete page", color: "red" });
     },
   });
 }
@@ -110,10 +143,16 @@ export function useUpdatePageMutation() {
 export function useDeletePageMutation() {
   const { t } = useTranslation();
   return useMutation({
-    mutationFn: (pageId: string) => deletePage(pageId),
+    mutationFn: (pageId: string) => deletePage(pageId, true),
     onSuccess: (data, pageId) => {
       notifications.show({ message: t("Page deleted successfully") });
       invalidateOnDeletePage(pageId);
+
+      // Invalidate to refresh trash lists
+      queryClient.invalidateQueries({
+        predicate: (item) =>
+          ["trash-list"].includes(item.queryKey[0] as string),
+      });
     },
     onError: (error) => {
       notifications.show({ message: t("Failed to delete page"), color: "red" });
@@ -130,9 +169,90 @@ export function useMovePageMutation() {
   });
 }
 
-export function useGetSidebarPagesQuery(data: SidebarPagesParams|null): UseInfiniteQueryResult<InfiniteData<IPagination<IPage>, unknown>> {
+export function useRestorePageMutation() {
+  const [treeData, setTreeData] = useAtom(treeDataAtom);
+  const emit = useQueryEmit();
+
+  return useMutation({
+    mutationFn: (pageId: string) => restorePage(pageId),
+    onSuccess: async (restoredPage) => {
+      notifications.show({ message: "Page restored successfully" });
+
+      // Add the restored page back to the tree
+      const treeApi = new SimpleTree<SpaceTreeNode>(treeData);
+
+      // Check if the page already exists in the tree (it shouldn't)
+      if (!treeApi.find(restoredPage.id)) {
+        // Create the tree node data with hasChildren from backend
+        const nodeData: SpaceTreeNode = {
+          id: restoredPage.id,
+          slugId: restoredPage.slugId,
+          name: restoredPage.title || "Untitled",
+          icon: restoredPage.icon,
+          position: restoredPage.position,
+          spaceId: restoredPage.spaceId,
+          parentPageId: restoredPage.parentPageId,
+          hasChildren: restoredPage.hasChildren || false,
+          children: [],
+        };
+
+        // Determine the parent and index
+        const parentId = restoredPage.parentPageId || null;
+        let index = 0;
+
+        if (parentId) {
+          const parentNode = treeApi.find(parentId);
+          if (parentNode) {
+            index = parentNode.children?.length || 0;
+          }
+        } else {
+          // Root level page
+          index = treeApi.data.length;
+        }
+
+        // Add the node to the tree
+        treeApi.create({
+          parentId,
+          index,
+          data: nodeData,
+        });
+
+        // Update the tree data
+        setTreeData(treeApi.data);
+
+        // Emit websocket event to sync with other users
+        setTimeout(() => {
+          emit({
+            operation: "addTreeNode",
+            spaceId: restoredPage.spaceId,
+            payload: {
+              parentId,
+              index,
+              data: nodeData,
+            },
+          });
+        }, 50);
+      }
+
+      //  await queryClient.invalidateQueries({ queryKey: ["sidebar-pages", restoredPage.spaceId] });
+
+      // Also invalidate deleted pages query to refresh the trash list
+      await queryClient.invalidateQueries({
+        queryKey: ["trash-list", restoredPage.spaceId],
+      });
+    },
+    onError: (error) => {
+      notifications.show({ message: "Failed to restore page", color: "red" });
+    },
+  });
+}
+
+export function useGetSidebarPagesQuery(
+  data: SidebarPagesParams | null,
+): UseInfiniteQueryResult<InfiniteData<IPagination<IPage>, unknown>> {
   return useInfiniteQuery({
     queryKey: ["sidebar-pages", data],
+    enabled: !!data?.pageId || !!data?.spaceId,
     queryFn: ({ pageParam }) => getSidebarPages({ ...data, page: pageParam }),
     initialPageParam: 1,
     getPreviousPageParam: (firstPage) =>
@@ -188,6 +308,20 @@ export function useRecentChangesQuery(
   });
 }
 
+export function useDeletedPagesQuery(
+  spaceId: string,
+  params?: QueryParams,
+): UseQueryResult<IPagination<IPage>, Error> {
+  return useQuery({
+    queryKey: ["trash-list", spaceId, params],
+    queryFn: () => getDeletedPages(spaceId, params),
+    enabled: !!spaceId,
+    placeholderData: keepPreviousData,
+    refetchOnMount: true,
+    staleTime: 0,
+  });
+}
+
 export function invalidateOnCreatePage(data: Partial<IPage>) {
   const newPage: Partial<IPage> = {
     creatorId: data.creatorId,
@@ -202,34 +336,40 @@ export function invalidateOnCreatePage(data: Partial<IPage>) {
   };
 
   let queryKey: QueryKey = null;
-  if (data.parentPageId===null) {
-    queryKey = ['root-sidebar-pages', data.spaceId];
-  }else{
-    queryKey = ['sidebar-pages', {pageId: data.parentPageId, spaceId: data.spaceId}]
+  if (data.parentPageId === null) {
+    queryKey = ["root-sidebar-pages", data.spaceId];
+  } else {
+    queryKey = [
+      "sidebar-pages",
+      { pageId: data.parentPageId, spaceId: data.spaceId },
+    ];
   }
 
   //update all sidebar pages
-  queryClient.setQueryData<InfiniteData<IPagination<Partial<IPage>>>>(queryKey, (old) => {
-    if (!old) return old;
-    return {
-      ...old,
-      pages: old.pages.map((page,index) => {
-        if (index === old.pages.length - 1) {
-          return {
-            ...page,
-            items: [...page.items, newPage],
-          };
-        }
-        return page;
-      }),
-    };
-  });
+  queryClient.setQueryData<InfiniteData<IPagination<Partial<IPage>>>>(
+    queryKey,
+    (old) => {
+      if (!old) return old;
+      return {
+        ...old,
+        pages: old.pages.map((page, index) => {
+          if (index === old.pages.length - 1) {
+            return {
+              ...page,
+              items: [...page.items, newPage],
+            };
+          }
+          return page;
+        }),
+      };
+    },
+  );
 
   //update sidebar haschildren
-  if (data.parentPageId!==null){
+  if (data.parentPageId !== null) {
     //update sub sidebar pages haschildern
     const subSideBarMatches = queryClient.getQueriesData({
-      queryKey: ['sidebar-pages'],
+      queryKey: ["sidebar-pages"],
       exact: false,
     });
 
@@ -241,8 +381,10 @@ export function invalidateOnCreatePage(data: Partial<IPage>) {
           pages: old.pages.map((page) => ({
             ...page,
             items: page.items.map((sidebarPage: IPage) =>
-              sidebarPage.id === data.parentPageId ? { ...sidebarPage, hasChildren: true } : sidebarPage
-            )
+              sidebarPage.id === data.parentPageId
+                ? { ...sidebarPage, hasChildren: true }
+                : sidebarPage,
+            ),
           })),
         };
       });
@@ -250,7 +392,7 @@ export function invalidateOnCreatePage(data: Partial<IPage>) {
 
     //update root sidebar pages haschildern
     const rootSideBarMatches = queryClient.getQueriesData({
-      queryKey: ['root-sidebar-pages', data.spaceId],
+      queryKey: ["root-sidebar-pages", data.spaceId],
       exact: false,
     });
 
@@ -262,8 +404,10 @@ export function invalidateOnCreatePage(data: Partial<IPage>) {
           pages: old.pages.map((page) => ({
             ...page,
             items: page.items.map((sidebarPage: IPage) =>
-              sidebarPage.id === data.parentPageId ? { ...sidebarPage, hasChildren: true } : sidebarPage
-            )
+              sidebarPage.id === data.parentPageId
+                ? { ...sidebarPage, hasChildren: true }
+                : sidebarPage,
+            ),
           })),
         };
       });
@@ -276,27 +420,38 @@ export function invalidateOnCreatePage(data: Partial<IPage>) {
   });
 }
 
-export function invalidateOnUpdatePage(spaceId: string, parentPageId: string, id: string, title: string, icon: string) {
+export function invalidateOnUpdatePage(
+  spaceId: string,
+  parentPageId: string,
+  id: string,
+  title: string,
+  icon: string,
+) {
   let queryKey: QueryKey = null;
-  if(parentPageId===null){
-    queryKey = ['root-sidebar-pages', spaceId];
-  }else{
-    queryKey = ['sidebar-pages', {pageId: parentPageId, spaceId: spaceId}]
+  if (parentPageId === null) {
+    queryKey = ["root-sidebar-pages", spaceId];
+  } else {
+    queryKey = ["sidebar-pages", { pageId: parentPageId, spaceId: spaceId }];
   }
   //update all sidebar pages
-  queryClient.setQueryData<InfiniteData<IPagination<IPage>>>(queryKey, (old) => {
-    if (!old) return old;
-    return {
-      ...old,
-      pages: old.pages.map((page) => ({
-        ...page,
-        items: page.items.map((sidebarPage: IPage) =>
-          sidebarPage.id === id ? { ...sidebarPage, title: title, icon: icon } : sidebarPage
-        )
-      })),
-    };
-  });
-  
+  queryClient.setQueryData<InfiniteData<IPagination<IPage>>>(
+    queryKey,
+    (old) => {
+      if (!old) return old;
+      return {
+        ...old,
+        pages: old.pages.map((page) => ({
+          ...page,
+          items: page.items.map((sidebarPage: IPage) =>
+            sidebarPage.id === id
+              ? { ...sidebarPage, title: title, icon: icon }
+              : sidebarPage,
+          ),
+        })),
+      };
+    },
+  );
+
   //update recent changes
   queryClient.invalidateQueries({
     queryKey: ["recent-changes", spaceId],
@@ -311,7 +466,7 @@ export function invalidateOnMovePage() {
   });
   //invalidate all sub sidebar pages
   queryClient.invalidateQueries({
-    queryKey: ['sidebar-pages'],
+    queryKey: ["sidebar-pages"],
   });
   // ---
 }
@@ -320,7 +475,8 @@ export function invalidateOnDeletePage(pageId: string) {
   //update all sidebar pages
   const allSideBarMatches = queryClient.getQueriesData({
     predicate: (query) =>
-      query.queryKey[0] === 'root-sidebar-pages' || query.queryKey[0] === 'sidebar-pages',
+      query.queryKey[0] === "root-sidebar-pages" ||
+      query.queryKey[0] === "sidebar-pages",
   });
 
   allSideBarMatches.forEach(([key, d]) => {
@@ -330,14 +486,16 @@ export function invalidateOnDeletePage(pageId: string) {
         ...old,
         pages: old.pages.map((page) => ({
           ...page,
-          items: page.items.filter((sidebarPage: IPage) => sidebarPage.id !== pageId),
+          items: page.items.filter(
+            (sidebarPage: IPage) => sidebarPage.id !== pageId,
+          ),
         })),
       };
     });
   });
-  
+
   //update recent changes
   queryClient.invalidateQueries({
     queryKey: ["recent-changes"],
   });
-}
+}

apps/client/src/features/page/services/page-service.ts

@@ -8,6 +8,7 @@ import {
   IPageInput,
   SidebarPagesParams,
 } from '@/features/page/types/page.types';
+import { QueryParams } from "@/lib/types";
 import { IAttachment, IPagination } from "@/lib/types.ts";
 import { saveAs } from "file-saver";
 import { InfiniteData } from "@tanstack/react-query";
@@ -30,8 +31,21 @@ export async function updatePage(data: Partial<IPageInput>): Promise<IPage> {
   return req.data;
 }
 
-export async function deletePage(pageId: string): Promise<void> {
-  await api.post("/pages/delete", { pageId });
+export async function deletePage(pageId: string, permanentlyDelete = false): Promise<void> {
+  await api.post("/pages/delete", { pageId, permanentlyDelete });
+}
+
+export async function getDeletedPages(
+  spaceId: string,
+  params?: QueryParams,
+): Promise<IPagination<IPage>> {
+  const req = await api.post("/pages/trash", { spaceId, ...params });
+  return req.data;
+}
+
+export async function restorePage(pageId: string): Promise<IPage> {
+  const response = await api.post<IPage>("/pages/restore", { pageId });
+  return response.data;
 }
 
 export async function movePage(data: IMovePage): Promise<void> {
@@ -42,8 +56,8 @@ export async function movePageToSpace(data: IMovePageToSpace): Promise<void> {
   await api.post<void>("/pages/move-to-space", data);
 }
 
-export async function copyPageToSpace(data: ICopyPageToSpace): Promise<IPage> {
-  const req = await api.post<IPage>("/pages/copy-to-space", data);
+export async function duplicatePage(data: ICopyPageToSpace): Promise<IPage> {
+  const req = await api.post<IPage>("/pages/duplicate", data);
   return req.data;
 }
 

apps/client/src/features/page/trash/components/trash-page-content-modal.tsx

@@ -0,0 +1,41 @@
+import { Modal, Text, ScrollArea } from "@mantine/core";
+import { useTranslation } from "react-i18next";
+import ReadonlyPageEditor from "@/features/editor/readonly-page-editor.tsx";
+
+interface Props {
+  opened: boolean;
+  onClose: () => void;
+  pageTitle: string;
+  pageContent: any;
+}
+
+export default function TrashPageContentModal({
+  opened,
+  onClose,
+  pageTitle,
+  pageContent,
+}: Props) {
+  const { t } = useTranslation();
+  const title = pageTitle || t("Untitled");
+
+  return (
+    <Modal.Root size={1200} opened={opened} onClose={onClose}>
+      <Modal.Overlay />
+      <Modal.Content style={{ overflow: "hidden" }}>
+        <Modal.Header>
+          <Modal.Title>
+            <Text size="md" fw={500}>
+              {t("Preview")}
+            </Text>
+          </Modal.Title>
+          <Modal.CloseButton />
+        </Modal.Header>
+        <Modal.Body p={0}>
+          <ScrollArea h="650" w="100%" scrollbarSize={5}>
+            <ReadonlyPageEditor title={title} content={pageContent} />
+          </ScrollArea>
+        </Modal.Body>
+      </Modal.Content>
+    </Modal.Root>
+  );
+}

apps/client/src/features/page/trash/components/trash.tsx

@@ -0,0 +1,227 @@
+import { useParams } from "react-router-dom";
+import { useGetSpaceBySlugQuery } from "@/features/space/queries/space-query";
+import {
+  Container,
+  Title,
+  Table,
+  Group,
+  ActionIcon,
+  Text,
+  Alert,
+  Stack,
+  Menu,
+} from "@mantine/core";
+import {
+  IconInfoCircle,
+  IconDots,
+  IconRestore,
+  IconTrash,
+  IconFileDescription,
+} from "@tabler/icons-react";
+import {
+  useDeletedPagesQuery,
+  useRestorePageMutation,
+  useDeletePageMutation,
+} from "@/features/page/queries/page-query";
+import { modals } from "@mantine/modals";
+import { useTranslation } from "react-i18next";
+import { formattedDate } from "@/lib/time";
+import { useState } from "react";
+import TrashPageContentModal from "@/features/page/trash/components/trash-page-content-modal";
+import { UserInfo } from "@/components/common/user-info.tsx";
+import Paginate from "@/components/common/paginate.tsx";
+import { usePaginateAndSearch } from "@/hooks/use-paginate-and-search";
+
+export default function Trash() {
+  const { t } = useTranslation();
+  const { spaceSlug } = useParams();
+  const { page, setPage } = usePaginateAndSearch();
+  const { data: space } = useGetSpaceBySlugQuery(spaceSlug);
+  const { data: deletedPages, isLoading } = useDeletedPagesQuery(space?.id, {
+    page, limit: 50
+  });
+  const restorePageMutation = useRestorePageMutation();
+  const deletePageMutation = useDeletePageMutation();
+
+  const [selectedPage, setSelectedPage] = useState<{
+    title: string;
+    content: any;
+  } | null>(null);
+  const [modalOpened, setModalOpened] = useState(false);
+
+  const handleRestorePage = async (pageId: string) => {
+    await restorePageMutation.mutateAsync(pageId);
+  };
+
+  const handleDeletePage = async (pageId: string) => {
+    await deletePageMutation.mutateAsync(pageId);
+  };
+
+  const openDeleteModal = (pageId: string, pageTitle: string) => {
+    modals.openConfirmModal({
+      title: t("Are you sure you want to delete this page?"),
+      children: (
+        <Text size="sm">
+          {t(
+            "Are you sure you want to permanently delete '{{title}}'? This action cannot be undone.",
+            { title: pageTitle || "Untitled" },
+          )}
+        </Text>
+      ),
+      centered: true,
+      labels: { confirm: t("Delete"), cancel: t("Cancel") },
+      confirmProps: { color: "red" },
+      onConfirm: () => handleDeletePage(pageId),
+    });
+  };
+
+  const openRestoreModal = (pageId: string, pageTitle: string) => {
+    modals.openConfirmModal({
+      title: t("Restore page"),
+      children: (
+        <Text size="sm">
+          {t("Restore '{{title}}' and its sub-pages?", {
+            title: pageTitle || "Untitled",
+          })}
+        </Text>
+      ),
+      centered: true,
+      labels: { confirm: t("Restore"), cancel: t("Cancel") },
+      confirmProps: { color: "blue" },
+      onConfirm: () => handleRestorePage(pageId),
+    });
+  };
+
+  const hasPages = deletedPages && deletedPages.items.length > 0;
+
+  const handlePageClick = (page: any) => {
+    setSelectedPage({ title: page.title, content: page.content });
+    setModalOpened(true);
+  };
+
+  return (
+    <Container size="lg" py="lg">
+      <Stack gap="md">
+        <Group justify="space-between" mb="md">
+          <Title order={2}>{t("Trash")}</Title>
+        </Group>
+
+        <Alert icon={<IconInfoCircle size={16} />} variant="light" color="red">
+          <Text size="sm">
+            {t("Pages in trash will be permanently deleted after 30 days.")}
+          </Text>
+        </Alert>
+
+        {isLoading || !deletedPages ? (
+          <></>
+        ) : hasPages ? (
+          <Table.ScrollContainer minWidth={500}>
+            <Table highlightOnHover verticalSpacing="sm">
+              <Table.Thead>
+                <Table.Tr>
+                  <Table.Th>{t("Page")}</Table.Th>
+                  <Table.Th style={{ whiteSpace: "nowrap" }}>
+                    {t("Deleted by")}
+                  </Table.Th>
+                  <Table.Th style={{ whiteSpace: "nowrap" }}>
+                    {t("Deleted at")}
+                  </Table.Th>
+                  <Table.Th></Table.Th>
+                </Table.Tr>
+              </Table.Thead>
+              <Table.Tbody>
+                {deletedPages.items.map((page) => (
+                  <Table.Tr key={page.id}>
+                    <Table.Td>
+                      <Group
+                        wrap="nowrap"
+                        style={{ cursor: "pointer" }}
+                        onClick={() => handlePageClick(page)}
+                      >
+                        {page.icon || (
+                          <ActionIcon
+                            variant="transparent"
+                            color="gray"
+                            size={18}
+                          >
+                            <IconFileDescription size={18} />
+                          </ActionIcon>
+                        )}
+                        <div>
+                          <Text fw={500} size="sm" lineClamp={1}>
+                            {page.title || t("Untitled")}
+                          </Text>
+                        </div>
+                      </Group>
+                    </Table.Td>
+                    <Table.Td>
+                      <UserInfo user={page.deletedBy} size="sm" />
+                    </Table.Td>
+                    <Table.Td>
+                      <Text
+                        c="dimmed"
+                        style={{ whiteSpace: "nowrap" }}
+                        size="xs"
+                        fw={500}
+                      >
+                        {formattedDate(page.deletedAt)}
+                      </Text>
+                    </Table.Td>
+                    <Table.Td>
+                      <Menu>
+                        <Menu.Target>
+                          <ActionIcon variant="subtle" color="gray">
+                            <IconDots size={20} stroke={1.5} />
+                          </ActionIcon>
+                        </Menu.Target>
+                        <Menu.Dropdown>
+                          <Menu.Item
+                            leftSection={<IconRestore size={16} />}
+                            onClick={() =>
+                              openRestoreModal(page.id, page.title)
+                            }
+                          >
+                            {t("Restore")}
+                          </Menu.Item>
+                          <Menu.Item
+                            color="red"
+                            leftSection={<IconTrash size={16} />}
+                            onClick={() => openDeleteModal(page.id, page.title)}
+                          >
+                            {t("Delete")}
+                          </Menu.Item>
+                        </Menu.Dropdown>
+                      </Menu>
+                    </Table.Td>
+                  </Table.Tr>
+                ))}
+              </Table.Tbody>
+            </Table>
+          </Table.ScrollContainer>
+        ) : (
+          <Text ta="center" py="xl" c="dimmed">
+            {t("No pages in trash")}
+          </Text>
+        )}
+
+        {deletedPages && deletedPages.items.length > 0 && (
+          <Paginate
+            currentPage={page}
+            hasPrevPage={deletedPages.meta.hasPrevPage}
+            hasNextPage={deletedPages.meta.hasNextPage}
+            onPageChange={setPage}
+          />
+        )}
+      </Stack>
+
+      {selectedPage && (
+        <TrashPageContentModal
+          opened={modalOpened}
+          onClose={() => setModalOpened(false)}
+          pageTitle={selectedPage.title}
+          pageContent={selectedPage.content}
+        />
+      )}
+    </Container>
+  );
+}

apps/client/src/features/page/tree/components/space-tree.tsx

@@ -1,4 +1,10 @@
-import { NodeApi, NodeRendererProps, Tree, TreeApi } from "react-arborist";
+import {
+  NodeApi,
+  NodeRendererProps,
+  Tree,
+  TreeApi,
+  SimpleTree,
+} from "react-arborist";
 import { atom, useAtom } from "jotai";
 import { treeApiAtom } from "@/features/page/tree/atoms/tree-api-atom.ts";
 import {
@@ -66,6 +72,7 @@ import MovePageModal from "../../components/move-page-modal.tsx";
 import { mobileSidebarAtom } from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
 import { useToggleSidebar } from "@/components/layouts/global/hooks/hooks/use-toggle-sidebar.ts";
 import CopyPageModal from "../../components/copy-page-modal.tsx";
+import { duplicatePage } from "../../services/page-service.ts";
 
 interface SpaceTreeProps {
   spaceId: string;
@@ -90,8 +97,14 @@ export default function SpaceTree({ spaceId, readOnly }: SpaceTreeProps) {
   const treeApiRef = useRef<TreeApi<SpaceTreeNode>>();
   const [openTreeNodes, setOpenTreeNodes] = useAtom<OpenMap>(openTreeNodesAtom);
   const rootElement = useRef<HTMLDivElement>();
+  const [isRootReady, setIsRootReady] = useState(false);
   const { ref: sizeRef, width, height } = useElementSize();
-  const mergedRef = useMergedRef(rootElement, sizeRef);
+  const mergedRef = useMergedRef((element) => {
+    rootElement.current = element;
+    if (element && !isRootReady) {
+      setIsRootReady(true);
+    }
+  }, sizeRef);
   const [isDataLoaded, setIsDataLoaded] = useState(false);
   const { data: currentPage } = usePageQuery({
     pageId: extractPageSlugId(pageSlug),
@@ -199,16 +212,17 @@ export default function SpaceTree({ spaceId, readOnly }: SpaceTreeProps) {
     }
   }, [currentPage?.id]);
 
+  // Clean up tree API on unmount
   useEffect(() => {
-    if (treeApiRef.current) {
+    return () => {
       // @ts-ignore
-      setTreeApi(treeApiRef.current);
-    }
-  }, [treeApiRef.current]);
+      setTreeApi(null);
+    };
+  }, [setTreeApi]);
 
   return (
     <div ref={mergedRef} className={classes.treeContainer}>
-      {rootElement.current && (
+      {isRootReady && rootElement.current && (
         <Tree
           data={data.filter((node) => node?.spaceId === spaceId)}
           disableDrag={readOnly}
@@ -217,7 +231,13 @@ export default function SpaceTree({ spaceId, readOnly }: SpaceTreeProps) {
           {...controllers}
           width={width}
           height={rootElement.current.clientHeight}
-          ref={treeApiRef}
+          ref={(ref) => {
+            treeApiRef.current = ref;
+            if (ref) {
+              //@ts-ignore
+              setTreeApi(ref);
+            }
+          }}
           openByDefault={false}
           disableMultiSelection={true}
           className={classes.tree}
@@ -383,7 +403,7 @@ function Node({ node, style, dragHandle, tree }: NodeRendererProps<any>) {
         <span className={classes.text}>{node.data.name || t("untitled")}</span>
 
         <div className={classes.actions}>
-          <NodeMenu node={node} treeApi={tree} />
+          <NodeMenu node={node} treeApi={tree} spaceId={node.data.spaceId} />
 
           {!tree.props.disableEdit && (
             <CreateNode
@@ -436,13 +456,16 @@ function CreateNode({ node, treeApi, onExpandTree }: CreateNodeProps) {
 interface NodeMenuProps {
   node: NodeApi<SpaceTreeNode>;
   treeApi: TreeApi<SpaceTreeNode>;
+  spaceId: string;
 }
 
-function NodeMenu({ node, treeApi }: NodeMenuProps) {
+function NodeMenu({ node, treeApi, spaceId }: NodeMenuProps) {
   const { t } = useTranslation();
   const clipboard = useClipboard({ timeout: 500 });
   const { spaceSlug } = useParams();
   const { openDeleteModal } = useDeletePageModal();
+  const [data, setData] = useAtom(treeDataAtom);
+  const emit = useQueryEmit();
   const [exportOpened, { open: openExportModal, close: closeExportModal }] =
     useDisclosure(false);
   const [
@@ -461,6 +484,68 @@ function NodeMenu({ node, treeApi }: NodeMenuProps) {
     notifications.show({ message: t("Link copied") });
   };
 
+  const handleDuplicatePage = async () => {
+    try {
+      const duplicatedPage = await duplicatePage({
+        pageId: node.id,
+      });
+
+      // Find the index of the current node
+      const parentId =
+        node.parent?.id === "__REACT_ARBORIST_INTERNAL_ROOT__"
+          ? null
+          : node.parent?.id;
+      const siblings = parentId ? node.parent.children : treeApi?.props.data;
+      const currentIndex =
+        siblings?.findIndex((sibling) => sibling.id === node.id) || 0;
+      const newIndex = currentIndex + 1;
+
+      // Add the duplicated page to the tree
+      const treeNodeData: SpaceTreeNode = {
+        id: duplicatedPage.id,
+        slugId: duplicatedPage.slugId,
+        name: duplicatedPage.title,
+        position: duplicatedPage.position,
+        spaceId: duplicatedPage.spaceId,
+        parentPageId: duplicatedPage.parentPageId,
+        icon: duplicatedPage.icon,
+        hasChildren: duplicatedPage.hasChildren,
+        children: [],
+      };
+
+      // Update local tree
+      const simpleTree = new SimpleTree(data);
+      simpleTree.create({
+        parentId,
+        index: newIndex,
+        data: treeNodeData,
+      });
+      setData(simpleTree.data);
+
+      // Emit socket event
+      setTimeout(() => {
+        emit({
+          operation: "addTreeNode",
+          spaceId: spaceId,
+          payload: {
+            parentId,
+            index: newIndex,
+            data: treeNodeData,
+          },
+        });
+      }, 50);
+
+      notifications.show({
+        message: t("Page duplicated successfully"),
+      });
+    } catch (err) {
+      notifications.show({
+        message: err.response?.data.message || "An error occurred",
+        color: "red",
+      });
+    }
+  };
+
   return (
     <>
       <Menu shadow="md" width={200}>
@@ -505,6 +590,17 @@ function NodeMenu({ node, treeApi }: NodeMenuProps) {
 
           {!(treeApi.props.disableEdit as boolean) && (
             <>
+              <Menu.Item
+                leftSection={<IconCopy size={16} />}
+                onClick={(e) => {
+                  e.preventDefault();
+                  e.stopPropagation();
+                  handleDuplicatePage();
+                }}
+              >
+                {t("Duplicate")}
+              </Menu.Item>
+
               <Menu.Item
                 leftSection={<IconArrowRight size={16} />}
                 onClick={(e) => {
@@ -524,7 +620,7 @@ function NodeMenu({ node, treeApi }: NodeMenuProps) {
                   openCopyPageModal();
                 }}
               >
-                {t("Copy")}
+                {t("Copy to space")}
               </Menu.Item>
 
               <Menu.Divider />
@@ -537,7 +633,7 @@ function NodeMenu({ node, treeApi }: NodeMenuProps) {
                   openDeleteModal({ onConfirm: () => treeApi?.delete(node) });
                 }}
               >
-                {t("Delete")}
+                {t("Move to trash")}
               </Menu.Item>
             </>
           )}

apps/client/src/features/page/tree/hooks/use-tree-mutation.ts

@@ -13,7 +13,7 @@ import { IMovePage, IPage } from "@/features/page/types/page.types.ts";
 import { useNavigate, useParams } from "react-router-dom";
 import {
   useCreatePageMutation,
-  useDeletePageMutation,
+  useRemovePageMutation,
   useMovePageMutation,
   useUpdatePageMutation,
 } from "@/features/page/queries/page-query.ts";
@@ -28,7 +28,7 @@ export function useTreeMutation<T>(spaceId: string) {
   const tree = useMemo(() => new SimpleTree<SpaceTreeNode>(data), [data]);
   const createPageMutation = useCreatePageMutation();
   const updatePageMutation = useUpdatePageMutation();
-  const deletePageMutation = useDeletePageMutation();
+  const removePageMutation = useRemovePageMutation();
   const movePageMutation = useMovePageMutation();
   const navigate = useNavigate();
   const { spaceSlug } = useParams();
@@ -225,7 +225,7 @@ export function useTreeMutation<T>(spaceId: string) {
 
   const onDelete: DeleteHandler<T> = async (args: { ids: string[] }) => {
     try {
-      await deletePageMutation.mutateAsync(args.ids[0]);
+      await removePageMutation.mutateAsync(args.ids[0]);
 
       const node = tree.find(args.ids[0]);
       if (!node) {

apps/client/src/features/page/types/page.types.ts

@@ -20,6 +20,7 @@ export interface IPage {
   hasChildren: boolean;
   creator: ICreator;
   lastUpdatedBy: ILastUpdatedBy;
+  deletedBy: IDeletedBy;
   space: Partial<ISpace>;
 }
 
@@ -34,6 +35,12 @@ interface ILastUpdatedBy {
   avatarUrl: string;
 }
 
+interface IDeletedBy {
+  id: string;
+  name: string;
+  avatarUrl: string;
+}
+
 export interface IMovePage {
   pageId: string;
   position?: string;
@@ -49,11 +56,11 @@ export interface IMovePageToSpace {
 
 export interface ICopyPageToSpace {
   pageId: string;
-  spaceId: string;
+  spaceId?: string;
 }
 
 export interface SidebarPagesParams {
-  spaceId: string;
+  spaceId?: string;
   pageId?: string;
   page?: number; // pagination
 }
@@ -72,6 +79,7 @@ export interface IExportPageParams {
   pageId: string;
   format: ExportFormat;
   includeChildren?: boolean;
+  includeAttachments?: boolean;
 }
 
 export enum ExportFormat {

apps/client/src/features/share/atoms/shared-page-atom.ts

@@ -0,0 +1,6 @@
+import { atom } from "jotai";
+import { ISharedPageTree } from "@/features/share/types/share.types";
+import { SharedPageTreeNode } from "@/features/share/utils";
+
+export const sharedPageTreeAtom = atom<ISharedPageTree | null>(null);
+export const sharedTreeDataAtom = atom<SharedPageTreeNode[] | null>(null);

apps/client/src/features/share/components/share-shell.tsx

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useEffect, useMemo } from "react";
 import {
   ActionIcon,
   Affix,
@@ -14,8 +14,10 @@ import SharedTree from "@/features/share/components/shared-tree.tsx";
 import { TableOfContents } from "@/features/editor/components/table-of-contents/table-of-contents.tsx";
 import { readOnlyEditorAtom } from "@/features/editor/atoms/editor-atoms.ts";
 import { ThemeToggle } from "@/components/theme-toggle.tsx";
-import { useAtomValue } from "jotai";
+import { useAtomValue, useSetAtom } from "jotai";
 import { useAtom } from "jotai";
+import { sharedPageTreeAtom, sharedTreeDataAtom } from "@/features/share/atoms/shared-page-atom";
+import { buildSharedPageTree } from "@/features/share/utils";
 import {
   desktopSidebarAtom,
   mobileSidebarAtom,
@@ -59,6 +61,20 @@ export default function ShareShell({
   const { shareId } = useParams();
   const { data } = useGetSharedPageTreeQuery(shareId);
   const readOnlyEditor = useAtomValue(readOnlyEditorAtom);
+  
+  const setSharedPageTree = useSetAtom(sharedPageTreeAtom);
+  const setSharedTreeData = useSetAtom(sharedTreeDataAtom);
+  
+  // Build and set the tree data when it changes
+  const treeData = useMemo(() => {
+    if (!data?.pageTree) return null;
+    return buildSharedPageTree(data.pageTree);
+  }, [data?.pageTree]);
+  
+  useEffect(() => {
+    setSharedPageTree(data || null);
+    setSharedTreeData(treeData);
+  }, [data, treeData, setSharedPageTree, setSharedTreeData]);
 
   return (
     <AppShell

apps/client/src/features/share/hooks/use-shared-page-subpages.ts

@@ -0,0 +1,29 @@
+import { useMemo } from "react";
+import { useAtomValue } from "jotai";
+import { sharedTreeDataAtom } from "@/features/share/atoms/shared-page-atom";
+import { SharedPageTreeNode } from "@/features/share/utils";
+
+export function useSharedPageSubpages(pageId: string | undefined) {
+  const treeData = useAtomValue(sharedTreeDataAtom);
+
+  return useMemo(() => {
+    if (!treeData || !pageId) return [];
+
+    function findSubpages(nodes: SharedPageTreeNode[]): SharedPageTreeNode[] {
+      for (const node of nodes) {
+        if (node.value === pageId || node.slugId === pageId) {
+          return node.children || [];
+        }
+        if (node.children && node.children.length > 0) {
+          const subpages = findSubpages(node.children);
+          if (subpages.length > 0) {
+            return subpages;
+          }
+        }
+      }
+      return [];
+    }
+
+    return findSubpages(treeData);
+  }, [treeData, pageId]);
+}

apps/client/src/features/space/components/multi-member-select.tsx

@@ -26,6 +26,9 @@ const renderMultiSelectOption: MultiSelectProps["renderOption"] = ({
     {option["type"] === "group" && <IconGroupCircle />}
     <div>
       <Text size="sm" lineClamp={1}>{option.label}</Text>
+      {option["type"] === "user" && option["email"] && (
+        <Text size="xs" c="dimmed" lineClamp={1}>{option["email"]}</Text>
+      )}
     </div>
   </Group>
 );
@@ -47,6 +50,7 @@ export function MultiMemberSelect({ onChange }: MultiMemberSelectProps) {
       const userItems = suggestion?.users.map((user: IUser) => ({
         value: `user-${user.id}`,
         label: user.name,
+        email: user.email,
         avatarUrl: user.avatarUrl,
         type: "user",
       }));
@@ -57,47 +61,26 @@ export function MultiMemberSelect({ onChange }: MultiMemberSelectProps) {
         type: "group",
       }));
 
-      // Function to merge items into groups without duplicates
-      const mergeItemsIntoGroups = (existingGroups, newItems, groupName) => {
-        const existingValues = new Set(
-          existingGroups.flatMap((group) =>
-            group.items.map((item) => item.value),
-          ),
-        );
-        const newItemsFiltered = newItems.filter(
-          (item) => !existingValues.has(item.value),
-        );
-
-        const updatedGroups = existingGroups.map((group) => {
-          if (group.group === groupName) {
-            return { ...group, items: [...group.items, ...newItemsFiltered] };
-          }
-          return group;
+      // Create fresh data structure based on current search results
+      const newData = [];
+      
+      if (userItems && userItems.length > 0) {
+        newData.push({
+          group: t("Select a user"),
+          items: userItems,
         });
+      }
+      
+      if (groupItems && groupItems.length > 0) {
+        newData.push({
+          group: t("Select a group"),
+          items: groupItems,
+        });
+      }
 
-        // Use spread syntax to avoid mutation
-        return updatedGroups.some((group) => group.group === groupName)
-          ? updatedGroups
-          : [...updatedGroups, { group: groupName, items: newItemsFiltered }];
-      };
-
-      // Merge user items into groups
-      const updatedUserGroups = mergeItemsIntoGroups(
-        data,
-        userItems,
-        t("Select a user"),
-      );
-
-      // Merge group items into groups
-      const finalData = mergeItemsIntoGroups(
-        updatedUserGroups,
-        groupItems,
-        t("Select a group"),
-      );
-
-      setData(finalData);
+      setData(newData);
     }
-  }, [suggestion, data]);
+  }, [suggestion, t]);
 
   return (
     <MultiSelect
@@ -110,6 +93,7 @@ export function MultiMemberSelect({ onChange }: MultiMemberSelectProps) {
       searchable
       searchValue={searchValue}
       onSearchChange={setSearchValue}
+      filter={({ options }) => options}
       clearable
       variant="filled"
       onChange={onChange}

apps/client/src/features/space/components/sidebar/space-sidebar.tsx

@@ -14,6 +14,7 @@ import {
   IconPlus,
   IconSearch,
   IconSettings,
+  IconTrash,
 } from "@tabler/icons-react";
 import classes from "./space-sidebar.module.css";
 import React from "react";
@@ -206,6 +207,7 @@ interface SpaceMenuProps {
 }
 function SpaceMenu({ spaceId, onSpaceSettings }: SpaceMenuProps) {
   const { t } = useTranslation();
+  const { spaceSlug } = useParams();
   const [importOpened, { open: openImportModal, close: closeImportModal }] =
     useDisclosure(false);
   const [exportOpened, { open: openExportModal, close: closeExportModal }] =
@@ -253,6 +255,14 @@ function SpaceMenu({ spaceId, onSpaceSettings }: SpaceMenuProps) {
           >
             {t("Space settings")}
           </Menu.Item>
+
+          <Menu.Item
+            component={Link}
+            to={`/s/${spaceSlug}/trash`}
+            leftSection={<IconTrash size={16} />}
+          >
+            {t("Trash")}
+          </Menu.Item>
         </Menu.Dropdown>
       </Menu>
 

apps/client/src/features/space/components/space-grid.tsx

@@ -1,4 +1,4 @@
-import { Text, Avatar, SimpleGrid, Card, rem } from "@mantine/core";
+import { Text, Avatar, SimpleGrid, Card, rem, Group, Button } from "@mantine/core";
 import React, { useEffect } from 'react';
 import {
   prefetchSpace,
@@ -9,12 +9,13 @@ import { Link } from "react-router-dom";
 import classes from "./space-grid.module.css";
 import { formatMemberCount } from "@/lib";
 import { useTranslation } from "react-i18next";
+import { IconArrowRight } from "@tabler/icons-react";
 
 export default function SpaceGrid() {
   const { t } = useTranslation();
-  const { data, isLoading } = useGetSpacesQuery({ page: 1 });
+  const { data, isLoading } = useGetSpacesQuery({ page: 1, limit: 10 });
 
-  const cards = data?.items.map((space, index) => (
+  const cards = data?.items.slice(0, 9).map((space, index) => (
     <Card
       key={space.id}
       p="xs"
@@ -46,11 +47,27 @@ export default function SpaceGrid() {
 
   return (
     <>
-      <Text fz="sm" fw={500} mb={"md"}>
-        {t("Spaces you belong to")}
-      </Text>
+      <Group justify="space-between" align="center" mb="md">
+        <Text fz="sm" fw={500}>
+          {t("Spaces you belong to")}
+        </Text>
+      </Group>
 
       <SimpleGrid cols={{ base: 1, xs: 2, sm: 3 }}>{cards}</SimpleGrid>
+      
+      {data?.items && data.items.length > 9 && (
+        <Group justify="flex-end" mt="lg">
+          <Button
+            component={Link}
+            to="/spaces"
+            variant="subtle"
+            rightSection={<IconArrowRight size={16} />}
+            size="sm"
+          >
+            {t("View all spaces")}
+          </Button>
+        </Group>
+      )}
     </>
   );
 }

apps/client/src/features/space/components/spaces-page/all-spaces-list.module.css

@@ -0,0 +1,10 @@
+.spaceLink {
+  text-decoration: none;
+  color: inherit;
+  display: flex;
+  width: 100%;
+  
+  &:hover {
+    text-decoration: none;
+  }
+}

apps/client/src/features/space/components/spaces-page/all-spaces-list.tsx

@@ -0,0 +1,160 @@
+import {
+  Table,
+  Text,
+  Group,
+  ActionIcon,
+  Box,
+  Space,
+  Menu,
+  Avatar,
+  Anchor,
+} from "@mantine/core";
+import { IconDots, IconSettings } from "@tabler/icons-react";
+import { Link } from "react-router-dom";
+import { useTranslation } from "react-i18next";
+import { useState } from "react";
+import { useDisclosure } from "@mantine/hooks";
+import { formatMemberCount } from "@/lib";
+import { getSpaceUrl } from "@/lib/config";
+import { prefetchSpace } from "@/features/space/queries/space-query";
+import { SearchInput } from "@/components/common/search-input";
+import Paginate from "@/components/common/paginate";
+import NoTableResults from "@/components/common/no-table-results";
+import SpaceSettingsModal from "@/features/space/components/settings-modal";
+import classes from "./all-spaces-list.module.css";
+
+interface AllSpacesListProps {
+  spaces: any[];
+  onSearch: (query: string) => void;
+  page: number;
+  hasPrevPage?: boolean;
+  hasNextPage?: boolean;
+  onPageChange: (page: number) => void;
+}
+
+export default function AllSpacesList({
+  spaces,
+  onSearch,
+  page,
+  hasPrevPage,
+  hasNextPage,
+  onPageChange,
+}: AllSpacesListProps) {
+  const { t } = useTranslation();
+  const [settingsOpened, { open: openSettings, close: closeSettings }] =
+    useDisclosure(false);
+  const [selectedSpaceId, setSelectedSpaceId] = useState<string | null>(null);
+
+  const handleOpenSettings = (spaceId: string) => {
+    setSelectedSpaceId(spaceId);
+    openSettings();
+  };
+
+  return (
+    <Box>
+      <SearchInput onSearch={onSearch} />
+
+      <Space h="md" />
+
+      <Table.ScrollContainer minWidth={500}>
+        <Table highlightOnHover verticalSpacing="sm">
+          <Table.Thead>
+            <Table.Tr>
+              <Table.Th>{t("Space")}</Table.Th>
+              <Table.Th>{t("Members")}</Table.Th>
+              <Table.Th w={100}></Table.Th>
+            </Table.Tr>
+          </Table.Thead>
+
+          <Table.Tbody>
+            {spaces.length > 0 ? (
+              spaces.map((space) => (
+                <Table.Tr key={space.id}>
+                  <Table.Td>
+                    <Anchor
+                      size="sm"
+                      underline="never"
+                      style={{
+                        cursor: "pointer",
+                        color: "var(--mantine-color-text)",
+                      }}
+                      component={Link}
+                      to={getSpaceUrl(space.slug)}
+                    >
+                      <Group
+                        gap="sm"
+                        wrap="nowrap"
+                        className={classes.spaceLink}
+                        onMouseEnter={() => prefetchSpace(space.slug, space.id)}
+                      >
+                        <Avatar
+                          color="initials"
+                          variant="filled"
+                          name={space.name}
+                          size={40}
+                        />
+                        <div>
+                          <Text fz="sm" fw={500} lineClamp={1}>
+                            {space.name}
+                          </Text>
+                          {space.description && (
+                            <Text fz="xs" c="dimmed" lineClamp={2}>
+                              {space.description}
+                            </Text>
+                          )}
+                        </div>
+                      </Group>
+                    </Anchor>
+                  </Table.Td>
+                  <Table.Td>
+                    <Text size="sm" style={{ whiteSpace: "nowrap" }}>
+                      {formatMemberCount(space.memberCount, t)}
+                    </Text>
+                  </Table.Td>
+                  <Table.Td>
+                    <Group gap="xs" justify="flex-end">
+                      <Menu position="bottom-end">
+                        <Menu.Target>
+                          <ActionIcon variant="subtle" color="gray">
+                            <IconDots size={16} />
+                          </ActionIcon>
+                        </Menu.Target>
+                        <Menu.Dropdown>
+                          <Menu.Item
+                            leftSection={<IconSettings size={16} />}
+                            onClick={() => handleOpenSettings(space.id)}
+                          >
+                            {t("Space settings")}
+                          </Menu.Item>
+                        </Menu.Dropdown>
+                      </Menu>
+                    </Group>
+                  </Table.Td>
+                </Table.Tr>
+              ))
+            ) : (
+              <NoTableResults colSpan={3} />
+            )}
+          </Table.Tbody>
+        </Table>
+      </Table.ScrollContainer>
+
+      {spaces.length > 0 && (
+        <Paginate
+          currentPage={page}
+          hasPrevPage={hasPrevPage}
+          hasNextPage={hasNextPage}
+          onPageChange={onPageChange}
+        />
+      )}
+
+      {selectedSpaceId && (
+        <SpaceSettingsModal
+          spaceId={selectedSpaceId}
+          opened={settingsOpened}
+          onClose={closeSettings}
+        />
+      )}
+    </Box>
+  );
+}

apps/client/src/features/space/components/spaces-page/index.ts

@@ -0,0 +1 @@
+export { default as AllSpacesList } from "./all-spaces-list";

apps/client/src/features/user/components/account-mfa-section.tsx

@@ -0,0 +1,6 @@
+import React from "react";
+import { MfaSettings } from "@/ee/mfa";
+
+export function AccountMfaSection() {
+  return <MfaSettings />;
+}

apps/client/src/features/user/components/change-email.tsx

@@ -22,7 +22,7 @@ export default function ChangeEmail() {
 
   return (
     <Group justify="space-between" wrap="nowrap" gap="xl">
-      <div>
+      <div style={{ minWidth: 0, flex: 1 }}>
         <Text size="md">{t("Email")}</Text>
         <Text size="sm" c="dimmed">
           {currentUser?.user.email}
@@ -30,7 +30,7 @@ export default function ChangeEmail() {
       </div>
 
       {/*
-      <Button onClick={open} variant="default">
+      <Button onClick={open} variant="default" style={{ whiteSpace: "nowrap" }}>
         {t("Change email")}
       </Button>
       */}

apps/client/src/features/user/components/change-password.tsx

@@ -14,14 +14,14 @@ export default function ChangePassword() {
 
   return (
     <Group justify="space-between" wrap="nowrap" gap="xl">
-      <div>
+      <div style={{ minWidth: 0, flex: 1 }}>
         <Text size="md">{t("Password")}</Text>
         <Text size="sm" c="dimmed">
           {t("You can change your password here.")}
         </Text>
       </div>
 
-      <Button onClick={open} variant="default">
+      <Button onClick={open} variant="default" style={{ whiteSpace: "nowrap" }}>
         {t("Change password")}
       </Button>
 

apps/client/src/features/websocket/types/types.ts

@@ -63,6 +63,20 @@ export type RefetchRootTreeNodeEvent = {
   spaceId: string;
 };
 
+export type ResolveCommentEvent = {
+  operation: "resolveComment";
+  pageId: string;
+  commentId: string;
+  resolved: boolean;
+  resolvedAt?: Date;
+  resolvedById?: string;
+  resolvedBy?: {
+    id: string;
+    name: string;
+    avatarUrl?: string | null;
+  };
+};
+
 export type WebSocketEvent =
   | InvalidateEvent
   | InvalidateCommentsEvent
@@ -71,4 +85,5 @@ export type WebSocketEvent =
   | AddTreeNodeEvent
   | MoveTreeNodeEvent
   | DeleteTreeNodeEvent
-  | RefetchRootTreeNodeEvent;
+  | RefetchRootTreeNodeEvent
+  | ResolveCommentEvent;

apps/client/src/features/websocket/use-query-subscription.ts

@@ -13,6 +13,7 @@ import {
 } from "../page/queries/page-query";
 import { RQ_KEY } from "../comment/queries/comment-query";
 import { queryClient } from "@/main.tsx";
+import { IComment } from "@/features/comment/types/comment.types";
 
 export const useQuerySubscription = () => {
   const queryClient = useQueryClient();
@@ -96,6 +97,30 @@ export const useQuerySubscription = () => {
           });
           break;
         }
+        case "resolveComment": {
+          const currentComments = queryClient.getQueryData(
+            RQ_KEY(data.pageId),
+          ) as IPagination<IComment>;
+
+          if (currentComments && currentComments.items) {
+            const updatedComments = currentComments.items.map((comment) =>
+              comment.id === data.commentId
+                ? { 
+                    ...comment, 
+                    resolvedAt: data.resolvedAt, 
+                    resolvedById: data.resolvedById, 
+                    resolvedBy: data.resolvedBy 
+                  }
+                : comment,
+            );
+            
+            queryClient.setQueryData(RQ_KEY(data.pageId), {
+              ...currentComments,
+              items: updatedComments,
+            });
+          }
+          break;
+        }
       }
     });
   }, [queryClient, socket]);

apps/client/src/features/workspace/services/workspace-service.ts

@@ -66,8 +66,9 @@ export async function createInvitation(data: ICreateInvite) {
   return req.data;
 }
 
-export async function acceptInvitation(data: IAcceptInvite): Promise<void> {
-  await api.post<void>("/workspace/invites/accept", data);
+export async function acceptInvitation(data: IAcceptInvite): Promise<{ requiresLogin?: boolean; }> {
+  const req = await api.post("/workspace/invites/accept", data);
+  return req.data;
 }
 
 export async function getInviteLink(data: {

apps/client/src/features/workspace/types/workspace.types.ts

@@ -21,6 +21,7 @@ export interface IWorkspace {
   memberCount?: number;
   plan?: string;
   hasLicenseKey?: boolean;
+  enforceMfa?: boolean;
 }
 
 export interface ICreateInvite {

apps/client/src/hooks/use-is-cloud-ee.tsx

@@ -0,0 +1,7 @@
+import { isCloud } from "@/lib/config";
+import { useLicense } from "@/ee/hooks/use-license";
+
+export const useIsCloudEE = () => {
+  const { hasLicenseKey } = useLicense();
+  return isCloud() || !!hasLicenseKey;
+}; 

apps/client/src/lib/app-route.ts

@@ -1,5 +1,6 @@
 const APP_ROUTE = {
   HOME: "/home",
+  SPACES: "/spaces",
   AUTH: {
     LOGIN: "/login",
     SIGNUP: "/signup",
@@ -8,6 +9,8 @@ const APP_ROUTE = {
     PASSWORD_RESET: "/password-reset",
     CREATE_WORKSPACE: "/create",
     SELECT_WORKSPACE: "/select",
+    MFA_CHALLENGE: "/login/mfa",
+    MFA_SETUP_REQUIRED: "/login/mfa/setup",
   },
   SETTINGS: {
     ACCOUNT: {

apps/client/src/pages/settings/account/account-settings.tsx

@@ -4,18 +4,21 @@ import ChangePassword from "@/features/user/components/change-password";
 import { Divider } from "@mantine/core";
 import AccountAvatar from "@/features/user/components/account-avatar";
 import SettingsTitle from "@/components/settings/settings-title.tsx";
-import {getAppName} from "@/lib/config.ts";
-import {Helmet} from "react-helmet-async";
+import { getAppName } from "@/lib/config.ts";
+import { Helmet } from "react-helmet-async";
 import { useTranslation } from "react-i18next";
+import { AccountMfaSection } from "@/features/user/components/account-mfa-section";
 
 export default function AccountSettings() {
   const { t } = useTranslation();
 
   return (
     <>
-        <Helmet>
-            <title>{t("My Profile")} - {getAppName()}</title>
-        </Helmet>
+      <Helmet>
+        <title>
+          {t("My Profile")} - {getAppName()}
+        </title>
+      </Helmet>
       <SettingsTitle title={t("My Profile")} />
 
       <AccountAvatar />
@@ -29,6 +32,10 @@ export default function AccountSettings() {
       <Divider my="lg" />
 
       <ChangePassword />
+
+      <Divider my="lg" />
+
+      <AccountMfaSection />
     </>
   );
 }

apps/client/src/pages/share/shared-page.tsx

@@ -52,6 +52,7 @@ export default function SharedPage() {
           key={data.page.id}
           title={data.page.title}
           content={data.page.content}
+          pageId={data.page.id}
         />
       </Container>
 

apps/client/src/pages/space/space-trash.tsx

@@ -0,0 +1,27 @@
+import Trash from "@/features/page/trash/components/trash.tsx";
+import { useParams } from "react-router-dom";
+import { useGetSpaceBySlugQuery } from "@/features/space/queries/space-query.ts";
+import { useSpaceAbility } from "@/features/space/permissions/use-space-ability.ts";
+import React from "react";
+import {
+  SpaceCaslAction,
+  SpaceCaslSubject,
+} from "@/features/space/permissions/permissions.type.ts";
+
+export default function SpaceTrash() {
+  const { spaceSlug } = useParams();
+  const { data: space } = useGetSpaceBySlugQuery(spaceSlug);
+
+  const spaceRules = space?.membership?.permissions;
+  const spaceAbility = useSpaceAbility(spaceRules);
+
+  if (!space) {
+    return <></>;
+  }
+
+  if (spaceAbility.cannot(SpaceCaslAction.Manage, SpaceCaslSubject.Page)) {
+    return <></>;
+  }
+
+  return <Trash />;
+}

apps/client/src/pages/spaces/spaces.tsx

@@ -0,0 +1,53 @@
+import { Container, Title, Text, Group, Box } from "@mantine/core";
+import { useTranslation } from "react-i18next";
+import { Helmet } from "react-helmet-async";
+import { getAppName } from "@/lib/config";
+import { useGetSpacesQuery } from "@/features/space/queries/space-query";
+import CreateSpaceModal from "@/features/space/components/create-space-modal";
+import { AllSpacesList } from "@/features/space/components/spaces-page";
+import { usePaginateAndSearch } from "@/hooks/use-paginate-and-search";
+import useUserRole from "@/hooks/use-user-role";
+
+export default function Spaces() {
+  const { t } = useTranslation();
+  const { isAdmin } = useUserRole();
+  const { search, page, setPage, handleSearch } = usePaginateAndSearch();
+
+  const { data, isLoading } = useGetSpacesQuery({
+    page,
+    limit: 30,
+    query: search,
+  });
+
+  return (
+    <>
+      <Helmet>
+        <title>
+          {t("Spaces")} - {getAppName()}
+        </title>
+      </Helmet>
+
+      <Container size={"800"} pt="xl">
+        <Group justify="space-between" mb="xl">
+          <Title order={3}>{t("Spaces")}</Title>
+          {isAdmin && <CreateSpaceModal />}
+        </Group>
+
+        <Box>
+          <Text size="sm" c="dimmed" mb="md">
+            {t("Spaces you belong to")}
+          </Text>
+
+          <AllSpacesList
+            spaces={data?.items || []}
+            onSearch={handleSearch}
+            page={page}
+            hasPrevPage={data?.meta?.hasPrevPage}
+            hasNextPage={data?.meta?.hasNextPage}
+            onPageChange={setPage}
+          />
+        </Box>
+      </Container>
+    </>
+  );
+}