fix page export

apps/client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "client",
   "private": true,
-  "version": "0.20.4",
+  "version": "0.20.2",
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",

apps/client/public/locales/en-US/translation.json

@@ -383,8 +383,5 @@
   "Publicly shared pages from spaces you are a member of will appear here": "Publicly shared pages from spaces you are a member of will appear here",
   "Share deleted successfully": "Share deleted successfully",
   "Share not found": "Share not found",
-  "Failed to share page": "Failed to share page",
+  "Failed to share page": "Failed to share page"
-  "Copy page":  "Copy page",
-  "Copy page to a different space.": "Copy page to a different space.",
-  "Page copied successfully": "Page copied successfully"
 }

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

@@ -1,6 +1,5 @@
 export enum BillingPlan {
   STANDARD = "standard",
-  BUSINESS = "business",
 }
 
 export interface IBilling {

apps/client/src/ee/hooks/use-plan.tsx

@@ -2,18 +2,14 @@ import { useAtom } from "jotai";
 import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
 import { BillingPlan } from "@/ee/billing/types/billing.types.ts";
 
-const usePlan = () => {
+export const usePlan = () => {
   const [workspace] = useAtom(workspaceAtom);
 
   const isStandard =
     typeof workspace?.plan === "string" &&
     workspace?.plan.toLowerCase() === BillingPlan.STANDARD.toLowerCase();
 
-  const isBusiness =
+  return { isStandard };
-    typeof workspace?.plan === "string" &&
-    workspace?.plan.toLowerCase() === BillingPlan.BUSINESS.toLowerCase();
-
-  return { isStandard, isBusiness };
 };
 
 export default usePlan;

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

@@ -15,7 +15,7 @@ export default function EnforceSso() {
         <Text size="md">{t("Enforce SSO")}</Text>
         <Text size="sm" c="dimmed">
           {t(
-            "Once enforced, members will not be able to login with email and password.",
+            "Once enforced, members will not able able to login with email and password.",
           )}
         </Text>
       </div>

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

@@ -10,13 +10,11 @@ import EnforceSso from "@/ee/security/components/enforce-sso.tsx";
 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";
 
 export default function Security() {
   const { t } = useTranslation();
   const { isAdmin } = useUserRole();
   const { hasLicenseKey } = useLicense();
-  const { isBusiness } = usePlan();
 
   if (!isAdmin) {
     return null;
@@ -37,7 +35,8 @@ export default function Security() {
         Single sign-on (SSO)
       </Title>
 
-      {(isCloud() && isBusiness) || (!isCloud() && hasLicenseKey) ? (
+      {/*TODO: revisit when we add a second plan */}
+      {!isCloud() && hasLicenseKey ? (
         <>
           <EnforceSso />
           <Divider my="lg" />

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

@@ -1,4 +1,4 @@
-import { Button, Group, Tooltip } from "@mantine/core";
+import { Button, Group } from "@mantine/core";
 import { useTranslation } from "react-i18next";
 
 type CommentActionsProps = {

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

@@ -15,7 +15,6 @@ import { asideStateAtom } from "@/components/layouts/global/hooks/atoms/sidebar-
 import { useEditor } from "@tiptap/react";
 import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
 import { useTranslation } from "react-i18next";
-import { useQueryEmit } from "@/features/websocket/use-query-emit";
 
 interface CommentDialogProps {
   editor: ReturnType<typeof useEditor>;
@@ -36,8 +35,6 @@ function CommentDialog({ editor, pageId }: CommentDialogProps) {
   const createCommentMutation = useCreateCommentMutation();
   const { isPending } = createCommentMutation;
 
-  const emit = useQueryEmit();
-
   const handleDialogClose = () => {
     setShowCommentPopup(false);
     editor.chain().focus().unsetCommentDecoration().run();
@@ -66,23 +63,11 @@ function CommentDialog({ editor, pageId }: CommentDialogProps) {
         .run();
       setActiveCommentId(createdComment.id);
 
-      //unselect text to close bubble menu
-      editor.commands.setTextSelection({ from: editor.view.state.selection.from, to: editor.view.state.selection.from });
-
       setAsideState({ tab: "comments", isAsideOpen: true });
       setTimeout(() => {
         const selector = `div[data-comment-id="${createdComment.id}"]`;
         const commentElement = document.querySelector(selector);
-        commentElement?.scrollIntoView({ behavior: "smooth", block: "center" });
+        commentElement?.scrollIntoView();
-
-        editor.view.dispatch(
-          editor.state.tr.scrollIntoView()
-        );
-      }, 400);
-
-      emit({
-        operation: "invalidateComment",
-        pageId: pageId,
       });
     } finally {
       setShowCommentPopup(false);
@@ -124,7 +109,6 @@ function CommentDialog({ editor, pageId }: CommentDialogProps) {
 
         <CommentEditor
           onUpdate={handleCommentEditorChange}
-          onSave={handleAddComment}
           placeholder={t("Write a comment")}
           editable={true}
           autofocus={true}

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

@@ -8,12 +8,10 @@ import { useFocusWithin } from "@mantine/hooks";
 import clsx from "clsx";
 import { forwardRef, useEffect, useImperativeHandle } from "react";
 import { useTranslation } from "react-i18next";
-import EmojiCommand from "@/features/editor/extensions/emoji-command";
 
 interface CommentEditorProps {
   defaultContent?: any;
   onUpdate?: any;
-  onSave?: any;
   editable: boolean;
   placeholder?: string;
   autofocus?: boolean;
@@ -24,7 +22,6 @@ const CommentEditor = forwardRef(
     {
       defaultContent,
       onUpdate,
-      onSave,
       editable,
       placeholder,
       autofocus,
@@ -45,35 +42,7 @@ const CommentEditor = forwardRef(
         }),
         Underline,
         Link,
-        EmojiCommand,
       ],
-      editorProps: {
-        handleDOMEvents: {
-          keydown: (_view, event) => {
-            if (
-              [
-                "ArrowUp",
-                "ArrowDown",
-                "ArrowLeft",
-                "ArrowRight",
-                "Enter",
-              ].includes(event.key)
-            ) {
-              const emojiCommand = document.querySelector("#emoji-command");
-              if (emojiCommand) {
-                return true;
-              }
-            }
-
-            if ((event.ctrlKey || event.metaKey) && event.key === "Enter") {
-              event.preventDefault();
-              if (onSave) onSave();
-
-              return true;
-            }
-          },
-        },
-      },
       onUpdate({ editor }) {
         if (onUpdate) onUpdate(editor.getJSON());
       },
@@ -84,10 +53,6 @@ const CommentEditor = forwardRef(
       autofocus: (autofocus && "end") || false,
     });
 
-    useEffect(() => {
-      commentEditor.commands.setContent(defaultContent);
-    }, [defaultContent]);
-
     useEffect(() => {
       setTimeout(() => {
         if (autofocus) {

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

@@ -1,5 +1,5 @@
 import { Group, Text, Box } from "@mantine/core";
-import React, { useEffect, useState } from "react";
+import React, { useState } from "react";
 import classes from "./comment.module.css";
 import { useAtom, useAtomValue } from "jotai";
 import { timeAgo } from "@/lib/time";
@@ -15,14 +15,12 @@ import {
 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";
 
 interface CommentListItemProps {
   comment: IComment;
-  pageId: string;
 }
 
-function CommentListItem({ comment, pageId }: CommentListItemProps) {
+function CommentListItem({ comment }: CommentListItemProps) {
   const { hovered, ref } = useHover();
   const [isEditing, setIsEditing] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
@@ -31,11 +29,6 @@ function CommentListItem({ comment, pageId }: CommentListItemProps) {
   const updateCommentMutation = useUpdateCommentMutation();
   const deleteCommentMutation = useDeleteCommentMutation(comment.pageId);
   const [currentUser] = useAtom(currentUserAtom);
-  const emit = useQueryEmit();
-
-  useEffect(() => {
-    setContent(comment.content)
-  }, [comment]);
 
   async function handleUpdateComment() {
     try {
@@ -46,11 +39,6 @@ function CommentListItem({ comment, pageId }: CommentListItemProps) {
       };
       await updateCommentMutation.mutateAsync(commentToUpdate);
       setIsEditing(false);
-
-      emit({
-        operation: "invalidateComment",
-        pageId: pageId,
-      });
     } catch (error) {
       console.error("Failed to update comment:", error);
     } finally {
@@ -62,27 +50,11 @@ function CommentListItem({ comment, pageId }: CommentListItemProps) {
     try {
       await deleteCommentMutation.mutateAsync(comment.id);
       editor?.commands.unsetComment(comment.id);
-
-      emit({
-        operation: "invalidateComment",
-        pageId: pageId,
-      });
     } catch (error) {
       console.error("Failed to delete comment:", error);
     }
   }
 
-  function handleCommentClick(comment: IComment) {
-    const el = document.querySelector(`.comment-mark[data-comment-id="${comment.id}"]`);
-    if (el) {
-      el.scrollIntoView({ behavior: "smooth", block: "center" });
-      el.classList.add("comment-highlight");
-      setTimeout(() => {
-        el.classList.remove("comment-highlight");
-      }, 3000);
-    }
-  }
-
   function handleEditToggle() {
     setIsEditing(true);
   }
@@ -127,7 +99,7 @@ function CommentListItem({ comment, pageId }: CommentListItemProps) {
 
       <div>
         {!comment.parentCommentId && comment?.selection && (
-          <Box className={classes.textSelection} onClick={() => handleCommentClick(comment)}>
+          <Box className={classes.textSelection}>
             <Text size="sm">{comment?.selection}</Text>
           </Box>
         )}
@@ -140,7 +112,6 @@ function CommentListItem({ comment, pageId }: CommentListItemProps) {
               defaultContent={content}
               editable={true}
               onUpdate={(newContent: any) => setContent(newContent)}
-              onSave={handleUpdateComment}
               autofocus={true}
             />
 

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

@@ -14,7 +14,6 @@ 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();
@@ -27,7 +26,6 @@ function CommentList() {
   } = 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) => {
@@ -40,11 +38,6 @@ function CommentList() {
         };
 
         await createCommentMutation.mutateAsync(commentData);
-
-        emit({
-          operation: "invalidateComment",
-          pageId: page?.id,
-        });
       } catch (error) {
         console.error("Failed to post comment:", error);
       } finally {
@@ -66,8 +59,8 @@ function CommentList() {
         data-comment-id={comment.id}
       >
         <div>
-          <CommentListItem comment={comment} pageId={page?.id} />
+          <CommentListItem comment={comment} />
-          <MemoizedChildComments comments={comments} parentId={comment.id} pageId={page?.id} />
+          <MemoizedChildComments comments={comments} parentId={comment.id} />
         </div>
 
         <Divider my={4} />
@@ -106,9 +99,8 @@ function CommentList() {
 interface ChildCommentsProps {
   comments: IPagination<IComment>;
   parentId: string;
-  pageId: string;
 }
-const ChildComments = ({ comments, parentId, pageId }: ChildCommentsProps) => {
+const ChildComments = ({ comments, parentId }: ChildCommentsProps) => {
   const getChildComments = useCallback(
     (parentId: string) =>
       comments.items.filter(
@@ -121,11 +113,10 @@ const ChildComments = ({ comments, parentId, pageId }: ChildCommentsProps) => {
     <div>
       {getChildComments(parentId).map((childComment) => (
         <div key={childComment.id}>
-          <CommentListItem comment={childComment} pageId={pageId} />
+          <CommentListItem comment={childComment} />
           <MemoizedChildComments
             comments={comments}
             parentId={childComment.id}
-            pageId={pageId}
           />
         </div>
       ))}
@@ -151,7 +142,6 @@ const CommentEditorWithActions = ({ commentId, onSave, isLoading }) => {
       <CommentEditor
         ref={commentEditorRef}
         onUpdate={setContent}
-        onSave={handleSave}
         editable={true}
       />
       {focused && <CommentActions onSave={handleSave} isLoading={isLoading} />}

apps/client/src/features/comment/components/comment.module.css

@@ -11,25 +11,22 @@
     border-left: 2px solid var(--mantine-color-gray-6);
     padding: 8px;
     background: var(--mantine-color-gray-light);
-    cursor: pointer;
 }
 
 .commentEditor {
 
     .focused {
-        border-radius: var(--mantine-radius-sm);
         box-shadow: 0 0 0 2px var(--mantine-color-blue-3);
     }
 
     .ProseMirror :global(.ProseMirror){
-        border-radius: var(--mantine-radius-sm);
         max-width: 100%;
         white-space: pre-wrap;
         word-break: break-word;
         max-height: 20vh;
         padding-left: 6px;
         padding-right: 6px;
-        margin-top: 10px;
+        margin-top: 2px;
         margin-bottom: 2px;
         overflow: hidden auto;
     }

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

@@ -33,7 +33,7 @@ const renderEmojiItems = () => {
         showOnCreate: true,
         interactive: true,
         trigger: "manual",
-        placement: "bottom",
+        placement: "bottom-start",
       });
     },
     onStart: (props: {

apps/client/src/features/editor/components/mention/mention-list.tsx

@@ -3,7 +3,6 @@ import React, {
   useCallback,
   useEffect,
   useImperativeHandle,
-  useMemo,
   useRef,
   useState,
 } from "react";
@@ -19,7 +18,7 @@ import {
 import clsx from "clsx";
 import classes from "./mention.module.css";
 import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
-import { IconFileDescription, IconPlus } from "@tabler/icons-react";
+import { IconFileDescription } from "@tabler/icons-react";
 import { useSpaceQuery } from "@/features/space/queries/space-query.ts";
 import { useParams } from "react-router-dom";
 import { v7 as uuid7 } from "uuid";
@@ -29,28 +28,14 @@ import {
   MentionListProps,
   MentionSuggestionItem,
 } from "@/features/editor/components/mention/mention.type.ts";
-import { IPage } from "@/features/page/types/page.types";
-import { useCreatePageMutation, usePageQuery } from "@/features/page/queries/page-query";
-import { treeDataAtom } from "@/features/page/tree/atoms/tree-data-atom";
-import { SimpleTree } from "react-arborist";
-import { SpaceTreeNode } from "@/features/page/tree/types";
-import { useTranslation } from "react-i18next";
-import { useQueryEmit } from "@/features/websocket/use-query-emit";
-import { extractPageSlugId } from "@/lib";
 
 const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
   const [selectedIndex, setSelectedIndex] = useState(1);
   const viewportRef = useRef<HTMLDivElement>(null);
-  const { pageSlug, spaceSlug } = useParams();
+  const { spaceSlug } = useParams();
-  const { data: page } = usePageQuery({ pageId: extractPageSlugId(pageSlug) });
   const { data: space } = useSpaceQuery(spaceSlug);
   const [currentUser] = useAtom(currentUserAtom);
   const [renderItems, setRenderItems] = useState<MentionSuggestionItem[]>([]);
-  const { t } = useTranslation();
-  const [data, setData] = useAtom(treeDataAtom);
-  const tree = useMemo(() => new SimpleTree<SpaceTreeNode>(data), [data]);
-  const createPageMutation = useCreatePageMutation();
-  const emit = useQueryEmit();
 
   const { data: suggestion, isLoading } = useSearchSuggestionsQuery({
     query: props.query,
@@ -60,23 +45,12 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
     limit: 10,
   });
 
-  const createPageItem = (label: string) : MentionSuggestionItem => {
-    return {
-      id: null,
-      label: label,
-      entityType: "page",
-      entityId: null,
-      slugId: null,
-      icon: null,
-    }
-  }
-
   useEffect(() => {
     if (suggestion && !isLoading) {
       let items: MentionSuggestionItem[] = [];
 
       if (suggestion?.users?.length > 0) {
-        items.push({ entityType: "header", label: t("Users") });
+        items.push({ entityType: "header", label: "Users" });
 
         items = items.concat(
           suggestion.users.map((user) => ({
@@ -90,7 +64,7 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
       }
 
       if (suggestion?.pages?.length > 0) {
-        items.push({ entityType: "header", label: t("Pages") });
+        items.push({ entityType: "header", label: "Pages" });
         items = items.concat(
           suggestion.pages.map((page) => ({
             id: uuid7(),
@@ -102,7 +76,6 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
           })),
         );
       }
-      items.push(createPageItem(props.query));
 
       setRenderItems(items);
       // update editor storage
@@ -123,7 +96,7 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
             creatorId: currentUser?.user.id,
           });
         }
-        if (item.entityType === "page" && item.id!==null) {
+        if (item.entityType === "page") {
           props.command({
             id: item.id,
             label: item.label || "Untitled",
@@ -133,9 +106,6 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
             creatorId: currentUser?.user.id,
           });
         }
-        if (item.entityType === "page" && item.id===null) {
-          createPage(item.label);
-        }
       }
     },
     [renderItems],
@@ -197,58 +167,6 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
     },
   }));
 
-  const createPage = async (title: string) => {
-    const payload: { spaceId: string; parentPageId?: string; title: string } = {
-      spaceId: space.id,
-      parentPageId: page.id || null,
-      title: title
-    };
-    
-    let createdPage: IPage;
-    try {
-      createdPage = await createPageMutation.mutateAsync(payload);
-      const parentId = page.id || null;
-      const data = {
-        id: createdPage.id,
-        slugId: createdPage.slugId,
-        name: createdPage.title,
-        position: createdPage.position,
-        spaceId: createdPage.spaceId,
-        parentPageId: createdPage.parentPageId,
-        children: [],
-      } as any;
-
-      const lastIndex = tree.data.length;
-
-      tree.create({ parentId, index: lastIndex, data });
-      setData(tree.data);
-
-      props.command({
-        id: uuid7(),
-        label:  createdPage.title || "Untitled",
-        entityType: "page",
-        entityId: createdPage.id,
-        slugId: createdPage.slugId,
-        creatorId: currentUser?.user.id,
-      });
-
-      setTimeout(() => {
-      emit({
-        operation: "addTreeNode",
-        spaceId: space.id,
-        payload: {
-          parentId,
-          index: lastIndex,
-          data,
-        },
-      });
-    }, 50);
-
-    } catch (err) {
-      throw new Error("Failed to create page");
-    }
-  }
-
   // if no results and enter what to do?
 
   useEffect(() => {
@@ -260,7 +178,7 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
   if (renderItems.length === 0) {
     return (
       <Paper shadow="md" p="xs" withBorder>
-        { t("No results") }
+        No results
       </Paper>
     );
   }
@@ -330,14 +248,14 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
                         color="gray"
                         size={18}
                       >
-                        { (item.id) ? <IconFileDescription size={18} /> : <IconPlus size={18} /> }
+                        <IconFileDescription size={18} />
                       </ActionIcon>
                     )}
                   </ActionIcon>
 
                   <div style={{ flex: 1 }}>
                     <Text size="sm" fw={500}>
-                      { (item.id) ? item.label : t("Create page") + ': ' + item.label }
+                      {item.label}
                     </Text>
                   </div>
                 </Group>

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

@@ -219,12 +219,9 @@ export default function PageEditor({
     setActiveCommentId(commentId);
     setAsideState({ tab: "comments", isAsideOpen: true });
 
-    //wait if aside is closed
-    setTimeout(() => {
     const selector = `div[data-comment-id="${commentId}"]`;
     const commentElement = document.querySelector(selector);
-      commentElement?.scrollIntoView({ behavior: "smooth", block: "center" });
+    commentElement?.scrollIntoView();
-    }, 400);
   };
 
   useEffect(() => {

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

@@ -144,19 +144,6 @@
     border-bottom: 2px solid rgb(166, 158, 12);
   }
 
-  .comment-highlight {
-    animation: flash-highlight 3s ease-out;
-  }
-
-  @keyframes flash-highlight {
-    0% {
-      background-color: #ff4d4d;
-    }
-    100% {
-      background-color: rgba(255, 215, 0, 0.14);
-    }
-  }
-
   .resize-cursor {
     cursor: ew-resize;
     cursor: col-resize;

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

@@ -47,7 +47,7 @@
 
     .column-resize-handle {
       background-color: #adf;
-      bottom: -1px;
+      bottom: -2px;
       position: absolute;
       right: -2px;
       pointer-events: none;

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

@@ -10,7 +10,7 @@ import {
   pageEditorAtom,
   titleEditorAtom,
 } from "@/features/editor/atoms/editor-atoms";
-import { updatePageData, useUpdateTitlePageMutation } from "@/features/page/queries/page-query";
+import { useUpdatePageMutation } from "@/features/page/queries/page-query";
 import { useDebouncedCallback } from "@mantine/hooks";
 import { useAtom } from "jotai";
 import { useQueryEmit } from "@/features/websocket/use-query-emit.ts";
@@ -38,7 +38,7 @@ export function TitleEditor({
   editable,
 }: TitleEditorProps) {
   const { t } = useTranslation();
-  const { mutateAsync: updateTitlePageMutationAsync } = useUpdateTitlePageMutation();
+  const { mutateAsync: updatePageMutationAsync } = useUpdatePageMutation();
   const pageEditor = useAtomValue(pageEditorAtom);
   const [, setTitleEditor] = useAtom(titleEditorAtom);
   const emit = useQueryEmit();
@@ -94,7 +94,7 @@ export function TitleEditor({
       return;
     }
 
-    updateTitlePageMutationAsync({
+    updatePageMutationAsync({
       pageId: pageId,
       title: titleEditor.getText(),
     }).then((page) => {
@@ -106,10 +106,6 @@ export function TitleEditor({
         payload: { title: page.title, slugId: page.slugId },
       };
 
-      if (page.title !== titleEditor.getText()) return;
-
-      updatePageData(page);
-
       localEmitter.emit("message", event);
       emit(event);
     });

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

@@ -1,105 +0,0 @@
-import { Modal, Button, Group, Text } from "@mantine/core";
-import { copyPageToSpace } from "@/features/page/services/page-service.ts";
-import { useState } from "react";
-import { notifications } from "@mantine/notifications";
-import { useTranslation } from "react-i18next";
-import { ISpace } from "@/features/space/types/space.types.ts";
-import { queryClient } from "@/main.tsx";
-import { SpaceSelect } from "@/features/space/components/sidebar/space-select.tsx";
-import { useNavigate } from "react-router-dom";
-import { buildPageUrl } from "@/features/page/page.utils.ts";
-
-interface CopyPageModalProps {
-  pageId: string;
-  currentSpaceSlug: string;
-  open: boolean;
-  onClose: () => void;
-}
-
-export default function CopyPageModal({
-  pageId,
-  currentSpaceSlug,
-  open,
-  onClose,
-}: CopyPageModalProps) {
-  const { t } = useTranslation();
-  const [targetSpace, setTargetSpace] = useState<ISpace>(null);
-  const navigate = useNavigate();
-
-  const handleCopy = async () => {
-    if (!targetSpace) return;
-
-    try {
-      const copiedPage = await copyPageToSpace({
-        pageId,
-        spaceId: targetSpace.id,
-      });
-      queryClient.removeQueries({
-        predicate: (item) =>
-          ["pages", "sidebar-pages", "root-sidebar-pages"].includes(
-            item.queryKey[0] as string,
-          ),
-      });
-
-      const pageUrl = buildPageUrl(
-        copiedPage.space.slug,
-        copiedPage.slugId,
-        copiedPage.title,
-      );
-      navigate(pageUrl);
-      notifications.show({
-        message: t("Page copied successfully"),
-      });
-      onClose();
-      setTargetSpace(null);
-    } catch (err) {
-      notifications.show({
-        message: err.response?.data.message || "An error occurred",
-        color: "red",
-      });
-      console.log(err);
-    }
-  };
-
-  const handleChange = (space: ISpace) => {
-    setTargetSpace(space);
-  };
-
-  return (
-    <Modal.Root
-      opened={open}
-      onClose={onClose}
-      size={500}
-      padding="xl"
-      yOffset="10vh"
-      xOffset={0}
-      mah={400}
-      onClick={(e) => e.stopPropagation()}
-    >
-      <Modal.Overlay />
-      <Modal.Content style={{ overflow: "hidden" }}>
-        <Modal.Header py={0}>
-          <Modal.Title fw={500}>{t("Copy page")}</Modal.Title>
-          <Modal.CloseButton />
-        </Modal.Header>
-        <Modal.Body>
-          <Text mb="xs" c="dimmed" size="sm">
-            {t("Copy page to a different space.")}
-          </Text>
-
-          <SpaceSelect
-            value={currentSpaceSlug}
-            clearable={false}
-            onChange={handleChange}
-          />
-          <Group justify="end" mt="md">
-            <Button onClick={onClose} variant="default">
-              {t("Cancel")}
-            </Button>
-            <Button onClick={handleCopy}>{t("Copy")}</Button>
-          </Group>
-        </Modal.Body>
-      </Modal.Content>
-    </Modal.Root>
-  );
-}

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

@@ -12,7 +12,7 @@ import {
   IconTrash,
   IconWifiOff,
 } from "@tabler/icons-react";
-import React from "react";
+import React, { useEffect } from "react";
 import useToggleAside from "@/hooks/use-toggle-aside.tsx";
 import { useAtom } from "jotai";
 import { historyAtoms } from "@/features/page-history/atoms/history-atoms.ts";
@@ -35,7 +35,7 @@ import {
 import { formattedDate, timeAgo } from "@/lib/time.ts";
 import MovePageModal from "@/features/page/components/move-page-modal.tsx";
 import { useTimeAgo } from "@/hooks/use-time-ago.tsx";
-import ShareModal from "@/features/share/components/share-modal.tsx";
+import ShareModal from '@/features/share/components/share-modal.tsx';
 
 interface PageHeaderMenuProps {
   readOnly?: boolean;
@@ -106,7 +106,7 @@ function PageActionMenu({ readOnly }: PageActionMenuProps) {
     { open: openMovePageModal, close: closeMoveSpaceModal },
   ] = useDisclosure(false);
   const [pageEditor] = useAtom(pageEditorAtom);
-  const pageUpdatedAt = useTimeAgo(page?.updatedAt);
+  const pageUpdatedAt = useTimeAgo(page.updatedAt);
 
   const handleCopyLink = () => {
     const pageUrl =

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

@@ -46,7 +46,6 @@ export default function MovePageModal({
         message: t("Page moved successfully"),
       });
       onClose();
-      setTargetSpace(null);
     } catch (err) {
       notifications.show({
         message: err.response?.data.message || "An error occurred",
@@ -54,6 +53,7 @@ export default function MovePageModal({
       });
       console.log(err);
     }
+    setTargetSpace(null);
   };
 
   const handleChange = (space: ISpace) => {
@@ -69,7 +69,7 @@ export default function MovePageModal({
       yOffset="10vh"
       xOffset={0}
       mah={400}
-      onClick={(e) => e.stopPropagation()}
+      onClick={e => e.stopPropagation()}
     >
       <Modal.Overlay />
       <Modal.Content style={{ overflow: "hidden" }}>
@@ -78,9 +78,7 @@ export default function MovePageModal({
           <Modal.CloseButton />
         </Modal.Header>
         <Modal.Body>
-          <Text mb="xs" c="dimmed" size="sm">
+          <Text mb="xs" c="dimmed" size="sm">{t("Move page to a different space.")}</Text>
-            {t("Move page to a different space.")}
-          </Text>
 
           <SpaceSelect
             value={currentSpaceSlug}

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

@@ -63,7 +63,12 @@ export function useCreatePageMutation() {
   });
 }
 
-export function updatePageData(data: IPage) {
+export function useUpdatePageMutation() {
+  const queryClient = useQueryClient();
+
+  return useMutation<IPage, Error, Partial<IPageInput>>({
+    mutationFn: (data) => updatePage(data),
+    onSuccess: (data) => {
       const pageBySlug = queryClient.getQueryData<IPage>([
         "pages",
         data.slugId,
@@ -80,19 +85,6 @@ export function updatePageData(data: IPage) {
       if (pageById) {
         queryClient.setQueryData(["pages", data.id], { ...pageById, ...data });
       }
-}
-
-export function useUpdateTitlePageMutation() {
-  return useMutation<IPage, Error, Partial<IPageInput>>({
-    mutationFn: (data) => updatePage(data),
-  });
-}
-
-export function useUpdatePageMutation() {
-  return useMutation<IPage, Error, Partial<IPageInput>>({
-    mutationFn: (data) => updatePage(data),
-    onSuccess: (data) => {
-      updatePage(data);
     },
   });
 }

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

@@ -1,6 +1,5 @@
 import api from "@/lib/api-client";
 import {
-  ICopyPageToSpace,
   IExportPageParams,
   IMovePage,
   IMovePageToSpace,
@@ -40,11 +39,6 @@ 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);
-  return req.data;
-}
-
 export async function getSidebarPages(
   params: SidebarPagesParams,
 ): Promise<IPagination<IPage>> {

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

@@ -15,7 +15,6 @@ import {
   IconArrowRight,
   IconChevronDown,
   IconChevronRight,
-  IconCopy,
   IconDotsVertical,
   IconFileDescription,
   IconFileExport,
@@ -61,7 +60,6 @@ import ExportModal from "@/components/common/export-modal";
 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";
 
 interface SpaceTreeProps {
   spaceId: string;
@@ -450,10 +448,6 @@ function NodeMenu({ node, treeApi }: NodeMenuProps) {
     movePageModalOpened,
     { open: openMovePageModal, close: closeMoveSpaceModal },
   ] = useDisclosure(false);
-  const [
-    copyPageModalOpened,
-    { open: openCopyPageModal, close: closeCopySpaceModal },
-  ] = useDisclosure(false);
 
   const handleCopyLink = () => {
     const pageUrl =
@@ -517,17 +511,6 @@ function NodeMenu({ node, treeApi }: NodeMenuProps) {
                 {t("Move")}
               </Menu.Item>
 
-              <Menu.Item
-                leftSection={<IconCopy size={16} />}
-                onClick={(e) => {
-                  e.preventDefault();
-                  e.stopPropagation();
-                  openCopyPageModal();
-                }}
-              >
-                {t("Copy")}
-              </Menu.Item>
-
               <Menu.Divider />
               <Menu.Item
                 c="red"
@@ -553,13 +536,6 @@ function NodeMenu({ node, treeApi }: NodeMenuProps) {
         open={movePageModalOpened}
       />
 
-      <CopyPageModal
-        pageId={node.id}
-        currentSpaceSlug={spaceSlug}
-        onClose={closeCopySpaceModal}
-        open={copyPageModalOpened}
-      />
-
       <ExportModal
         type="page"
         id={node.id}

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

@@ -12,7 +12,7 @@ export interface IPage {
   spaceId: string;
   workspaceId: string;
   isLocked: boolean;
-  lastUpdatedById: string;
+  lastUpdatedById: Date;
   createdAt: Date;
   updatedAt: Date;
   deletedAt: Date;
@@ -47,11 +47,6 @@ export interface IMovePageToSpace {
   spaceId: string;
 }
 
-export interface ICopyPageToSpace {
-  pageId: string;
-  spaceId: string;
-}
-
 export interface SidebarPagesParams {
   spaceId: string;
   pageId?: string;

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

@@ -81,7 +81,7 @@ export function SpaceSelect({
       nothingFoundMessage={t("No space found")}
       limit={50}
       checkIconPosition="right"
-      comboboxProps={{ width, withinPortal: true, position: "bottom" }}
+      comboboxProps={{ width, withinPortal: false }}
       dropdownOpened={opened}
     />
   );

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

@@ -7,11 +7,6 @@ export type InvalidateEvent = {
   id?: string;
 };
 
-export type InvalidateCommentsEvent = {
-  operation: "invalidateComment";
-  pageId: string;
-};
-
 export type UpdateEvent = {
   operation: "updateOne";
   spaceId: string;
@@ -57,4 +52,4 @@ export type DeleteTreeNodeEvent = {
   }
 };
 
-export type WebSocketEvent = InvalidateEvent | InvalidateCommentsEvent | UpdateEvent | DeleteEvent | AddTreeNodeEvent | MoveTreeNodeEvent | DeleteTreeNodeEvent;
+export type WebSocketEvent = InvalidateEvent | UpdateEvent | DeleteEvent | AddTreeNodeEvent | MoveTreeNodeEvent | DeleteTreeNodeEvent;

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

@@ -3,7 +3,6 @@ import { socketAtom } from "@/features/websocket/atoms/socket-atom.ts";
 import { useAtom } from "jotai";
 import { useQueryClient } from "@tanstack/react-query";
 import { WebSocketEvent } from "@/features/websocket/types";
-import { RQ_KEY } from "../comment/queries/comment-query";
 
 export const useQuerySubscription = () => {
   const queryClient = useQueryClient();
@@ -22,11 +21,6 @@ export const useQuerySubscription = () => {
             queryKey: [...data.entity, data.id].filter(Boolean),
           });
           break;
-        case "invalidateComment":
-          queryClient.invalidateQueries({
-            queryKey: RQ_KEY(data.pageId),
-          });
-          break;
         case "updateOne":
           entity = data.entity[0];
           if (entity === "pages") {

apps/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "server",
-  "version": "0.20.4",
+  "version": "0.20.2",
   "description": "",
   "author": "",
   "private": true,

apps/server/src/collaboration/collaboration.module.ts

@@ -1,4 +1,4 @@
-import { Logger, Module, OnModuleDestroy, OnModuleInit } from '@nestjs/common';
+import { Module, OnModuleDestroy, OnModuleInit } from '@nestjs/common';
 import { AuthenticationExtension } from './extensions/authentication.extension';
 import { PersistenceExtension } from './extensions/persistence.extension';
 import { CollaborationGateway } from './collaboration.gateway';
@@ -22,7 +22,6 @@ import { LoggerExtension } from './extensions/logger.extension';
   imports: [TokenModule],
 })
 export class CollaborationModule implements OnModuleInit, OnModuleDestroy {
-  private readonly logger = new Logger(CollaborationModule.name);
   private collabWsAdapter: CollabWsAdapter;
   private path = '/collab';
 
@@ -39,15 +38,7 @@ export class CollaborationModule implements OnModuleInit, OnModuleDestroy {
 
     wss.on('connection', (client: WebSocket, request: IncomingMessage) => {
       this.collaborationGateway.handleConnection(client, request);
-
-      client.on('error', (error) => {
-        this.logger.error('WebSocket client error:', error);
     });
-    });
-
-    wss.on('error', (error) =>
-      this.logger.log('WebSocket server error:', error),
-    );
   }
 
   async onModuleDestroy(): Promise<void> {

apps/server/src/collaboration/collaboration.util.ts

@@ -46,7 +46,7 @@ export const tiptapExtensions = [
     codeBlock: false,
   }),
   Comment,
-  TextAlign.configure({ types: ["heading", "paragraph"] }),
+  TextAlign,
   TaskList,
   TaskItem,
   Underline,

apps/server/src/collaboration/extensions/persistence.extension.ts

@@ -130,7 +130,7 @@ export class PersistenceExtension implements Extension {
           );
           this.contributors.delete(documentName);
         } catch (err) {
-          this.logger.debug('Contributors error:' + err?.['message']);
+          this.logger.log('Contributors error:' + err?.['message']);
         }
 
         await this.pageRepo.updatePage(

apps/server/src/common/helpers/prosemirror/utils.ts

@@ -1,12 +1,7 @@
 import { Node } from '@tiptap/pm/model';
-import {
+import { jsonToNode } from '../../../collaboration/collaboration.util';
-  jsonToNode,
-  tiptapExtensions,
-} from '../../../collaboration/collaboration.util';
 import { validate as isValidUUID } from 'uuid';
 import { Transform } from '@tiptap/pm/transform';
-import { TiptapTransformer } from '@hocuspocus/transformer';
-import * as Y from 'yjs';
 
 export interface MentionNode {
   id: string;
@@ -64,6 +59,7 @@ export function extractPageMentions(mentionList: MentionNode[]): MentionNode[] {
   return pageMentionList as MentionNode[];
 }
 
+
 export function getProsemirrorContent(content: any) {
   return (
     content ?? {
@@ -112,18 +108,3 @@ export function removeMarkTypeFromDoc(doc: Node, markName: string): Node {
   const tr = new Transform(doc).removeMark(0, doc.content.size, markType);
   return tr.doc;
 }
-
-export function createYdocFromJson(prosemirrorJson: any): Buffer | null {
-  if (prosemirrorJson) {
-    const ydoc = TiptapTransformer.toYdoc(
-      prosemirrorJson,
-      'default',
-      tiptapExtensions,
-    );
-
-    Y.encodeStateAsUpdate(ydoc);
-
-    return Buffer.from(Y.encodeStateAsUpdate(ydoc));
-  }
-  return null;
-}

apps/server/src/core/page/dto/copy-page.dto.ts

@@ -1,24 +0,0 @@
-import { IsString, IsNotEmpty } from 'class-validator';
-
-export class CopyPageToSpaceDto {
-  @IsNotEmpty()
-  @IsString()
-  pageId: string;
-
-  @IsNotEmpty()
-  @IsString()
-  spaceId: string;
-}
-
-export type CopyPageMapEntry = {
-  newPageId: string;
-  newSlugId: string;
-  oldSlugId: string;
-};
-
-export type ICopyPageAttachment = {
-  newPageId: string,
-  oldPageId: string,
-  oldAttachmentId: string,
-  newAttachmentId: string,
-};

apps/server/src/core/page/dto/move-page.dto.ts

@@ -1,10 +1,4 @@
-import {
+import { IsString, IsOptional, MinLength, MaxLength } from 'class-validator';
-  IsString,
-  IsOptional,
-  MinLength,
-  MaxLength,
-  IsNotEmpty,
-} from 'class-validator';
 
 export class MovePageDto {
   @IsString()
@@ -21,11 +15,9 @@ export class MovePageDto {
 }
 
 export class MovePageToSpaceDto {
-  @IsNotEmpty()
   @IsString()
   pageId: string;
 
-  @IsNotEmpty()
   @IsString()
   spaceId: string;
 }

apps/server/src/core/page/page.controller.ts

@@ -28,7 +28,6 @@ import {
 import SpaceAbilityFactory from '../casl/abilities/space-ability.factory';
 import { PageRepo } from '@docmost/db/repos/page/page.repo';
 import { RecentPageDto } from './dto/recent-page.dto';
-import { CopyPageToSpaceDto } from './dto/copy-page.dto';
 
 @UseGuards(JwtAuthGuard)
 @Controller('pages')
@@ -238,36 +237,6 @@ export class PageController {
     return this.pageService.movePageToSpace(movedPage, dto.spaceId);
   }
 
-  @HttpCode(HttpStatus.OK)
-  @Post('copy-to-space')
-  async copyPageToSpace(
-    @Body() dto: CopyPageToSpaceDto,
-    @AuthUser() user: User,
-  ) {
-    const copiedPage = await this.pageRepo.findById(dto.pageId);
-    if (!copiedPage) {
-      throw new NotFoundException('Page to copy not found');
-    }
-    if (copiedPage.spaceId === dto.spaceId) {
-      throw new BadRequestException('Page is already in this space');
-    }
-
-    const abilities = await Promise.all([
-      this.spaceAbility.createForUser(user, copiedPage.spaceId),
-      this.spaceAbility.createForUser(user, dto.spaceId),
-    ]);
-
-    if (
-      abilities.some((ability) =>
-        ability.cannot(SpaceCaslAction.Edit, SpaceCaslSubject.Page),
-      )
-    ) {
-      throw new ForbiddenException();
-    }
-
-    return this.pageService.copyPageToSpace(copiedPage, dto.spaceId, user);
-  }
-
   @HttpCode(HttpStatus.OK)
   @Post('move')
   async movePage(@Body() dto: MovePageDto, @AuthUser() user: User) {

apps/server/src/core/page/page.module.ts

@@ -2,12 +2,10 @@ import { Module } from '@nestjs/common';
 import { PageService } from './services/page.service';
 import { PageController } from './page.controller';
 import { PageHistoryService } from './services/page-history.service';
-import { StorageModule } from '../../integrations/storage/storage.module';
 
 @Module({
   controllers: [PageController],
   providers: [PageService, PageHistoryService],
   exports: [PageService, PageHistoryService],
-  imports: [StorageModule]
 })
 export class PageModule {}

apps/server/src/core/page/services/page.service.ts

@@ -1,13 +1,12 @@
 import {
   BadRequestException,
   Injectable,
-  Logger,
   NotFoundException,
 } from '@nestjs/common';
 import { CreatePageDto } from '../dto/create-page.dto';
 import { UpdatePageDto } from '../dto/update-page.dto';
 import { PageRepo } from '@docmost/db/repos/page/page.repo';
-import { InsertablePage, Page, User } from '@docmost/db/types/entity.types';
+import { Page } from '@docmost/db/types/entity.types';
 import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
 import {
   executeWithPagination,
@@ -22,28 +21,13 @@ import { DB } from '@docmost/db/types/db';
 import { generateSlugId } from '../../../common/helpers';
 import { executeTx } from '@docmost/db/utils';
 import { AttachmentRepo } from '@docmost/db/repos/attachment/attachment.repo';
-import { v7 as uuid7 } from 'uuid';
-import {
-  createYdocFromJson,
-  getAttachmentIds,
-  getProsemirrorContent,
-  isAttachmentNode,
-  removeMarkTypeFromDoc,
-} from '../../../common/helpers/prosemirror/utils';
-import { jsonToNode, jsonToText } from 'src/collaboration/collaboration.util';
-import { CopyPageMapEntry, ICopyPageAttachment } from '../dto/copy-page.dto';
-import { Node as PMNode } from '@tiptap/pm/model';
-import { StorageService } from '../../../integrations/storage/storage.service';
 
 @Injectable()
 export class PageService {
-  private readonly logger = new Logger(PageService.name);
-
   constructor(
     private pageRepo: PageRepo,
     private attachmentRepo: AttachmentRepo,
     @InjectKysely() private readonly db: KyselyDB,
-    private readonly storageService: StorageService,
   ) {}
 
   async findById(
@@ -258,154 +242,6 @@ export class PageService {
     });
   }
 
-  async copyPageToSpace(rootPage: Page, spaceId: string, authUser: User) {
-    //TODO:
-    // i. maintain internal links within copied pages
-
-    const nextPosition = await this.nextPagePosition(spaceId);
-
-    const pages = await this.pageRepo.getPageAndDescendants(rootPage.id, {
-      includeContent: true,
-    });
-
-    const pageMap = new Map<string, CopyPageMapEntry>();
-    pages.forEach((page) => {
-      pageMap.set(page.id, {
-        newPageId: uuid7(),
-        newSlugId: generateSlugId(),
-        oldSlugId: page.slugId,
-      });
-    });
-
-    const attachmentMap = new Map<string, ICopyPageAttachment>();
-
-    const insertablePages: InsertablePage[] = await Promise.all(
-      pages.map(async (page) => {
-        const pageContent = getProsemirrorContent(page.content);
-        const pageFromMap = pageMap.get(page.id);
-
-        const doc = jsonToNode(pageContent);
-        const prosemirrorDoc = removeMarkTypeFromDoc(doc, 'comment');
-
-        const attachmentIds = getAttachmentIds(prosemirrorDoc.toJSON());
-
-        if (attachmentIds.length > 0) {
-          attachmentIds.forEach((attachmentId: string) => {
-            const newPageId = pageFromMap.newPageId;
-            const newAttachmentId = uuid7();
-            attachmentMap.set(attachmentId, {
-              newPageId: newPageId,
-              oldPageId: page.id,
-              oldAttachmentId: attachmentId,
-              newAttachmentId: newAttachmentId,
-            });
-
-            prosemirrorDoc.descendants((node: PMNode) => {
-              if (isAttachmentNode(node.type.name)) {
-                if (node.attrs.attachmentId === attachmentId) {
-                  //@ts-ignore
-                  node.attrs.attachmentId = newAttachmentId;
-
-                  if (node.attrs.src) {
-                    //@ts-ignore
-                    node.attrs.src = node.attrs.src.replace(
-                      attachmentId,
-                      newAttachmentId,
-                    );
-                  }
-                  if (node.attrs.src) {
-                    //@ts-ignore
-                    node.attrs.src = node.attrs.src.replace(
-                      attachmentId,
-                      newAttachmentId,
-                    );
-                  }
-                }
-              }
-            });
-          });
-        }
-
-        const prosemirrorJson = prosemirrorDoc.toJSON();
-
-        return {
-          id: pageFromMap.newPageId,
-          slugId: pageFromMap.newSlugId,
-          title: page.title,
-          icon: page.icon,
-          content: prosemirrorJson,
-          textContent: jsonToText(prosemirrorJson),
-          ydoc: createYdocFromJson(prosemirrorJson),
-          position: page.id === rootPage.id ? nextPosition : page.position,
-          spaceId: spaceId,
-          workspaceId: page.workspaceId,
-          creatorId: authUser.id,
-          lastUpdatedById: authUser.id,
-          parentPageId: page.parentPageId
-            ? pageMap.get(page.parentPageId)?.newPageId
-            : null,
-        };
-      }),
-    );
-
-    await this.db.insertInto('pages').values(insertablePages).execute();
-
-    //TODO: best to handle this in a queue
-    const attachmentsIds = Array.from(attachmentMap.keys());
-    if (attachmentsIds.length > 0) {
-      const attachments = await this.db
-        .selectFrom('attachments')
-        .selectAll()
-        .where('id', 'in', attachmentsIds)
-        .where('workspaceId', '=', rootPage.workspaceId)
-        .execute();
-
-      for (const attachment of attachments) {
-        try {
-          const pageAttachment = attachmentMap.get(attachment.id);
-
-          // make sure the copied attachment belongs to the page it was copied from
-          if (attachment.pageId !== pageAttachment.oldPageId) {
-            continue;
-          }
-
-          const newAttachmentId = pageAttachment.newAttachmentId;
-
-          const newPageId = pageAttachment.newPageId;
-
-          const newPathFile = attachment.filePath.replace(
-            attachment.id,
-            newAttachmentId,
-          );
-          await this.storageService.copy(attachment.filePath, newPathFile);
-          await this.db
-            .insertInto('attachments')
-            .values({
-              id: newAttachmentId,
-              type: attachment.type,
-              filePath: newPathFile,
-              fileName: attachment.fileName,
-              fileSize: attachment.fileSize,
-              mimeType: attachment.mimeType,
-              fileExt: attachment.fileExt,
-              creatorId: attachment.creatorId,
-              workspaceId: attachment.workspaceId,
-              pageId: newPageId,
-              spaceId: spaceId,
-            })
-            .execute();
-        } catch (err) {
-          this.logger.log(err);
-        }
-      }
-    }
-
-    const newPageId = pageMap.get(rootPage.id).newPageId;
-    return await this.pageRepo.findById(newPageId, {
-      includeSpace: true,
-    });
-  }
-
   async movePage(dto: MovePageDto, movedPage: Page) {
     // validate position value by attempting to generate a key
     try {

apps/server/src/core/workspace/services/workspace.service.ts

@@ -387,14 +387,14 @@ export class WorkspaceService {
       .replace(/[^a-z0-9]/g, '')
       .substring(0, 20);
     // Ensure we leave room for a random suffix.
-    const maxSuffixLength = 6;
+    const maxSuffixLength = 3;
 
     if (subdomain.length < 4) {
       subdomain = `${subdomain}-${generateRandomSuffix(maxSuffixLength)}`;
     }
 
     if (DISALLOWED_HOSTNAMES.includes(subdomain)) {
-      subdomain = `workspace-${generateRandomSuffix(maxSuffixLength)}`;
+      subdomain = `myworkspace-${generateRandomSuffix(maxSuffixLength)}`;
     }
 
     let uniqueHostname = subdomain;

apps/server/src/database/repos/user-token/user-token.repo.ts

@@ -70,7 +70,7 @@ export class UserTokenRepo {
       .where('userId', '=', userId)
       .where('workspaceId', '=', workspaceId)
       .where('type', '=', tokenType)
-      .orderBy('expiresAt', 'desc')
+      .orderBy('expiresAt desc')
       .execute();
   }
 

apps/server/src/database/repos/workspace/workspace.repo.ts

@@ -70,7 +70,7 @@ export class WorkspaceRepo {
     return await this.db
       .selectFrom('workspaces')
       .selectAll()
-      .orderBy('createdAt', 'asc')
+      .orderBy('createdAt asc')
       .limit(1)
       .executeTakeFirst();
   }

apps/server/src/integrations/storage/drivers/local.driver.ts

@@ -25,16 +25,6 @@ export class LocalDriver implements StorageDriver {
     }
   }
 
-  async copy(fromFilePath: string, toFilePath: string): Promise<void> {
-    try {
-      if (await this.exists(fromFilePath)) {
-        await fs.copy(fromFilePath, toFilePath);
-      }
-    } catch (err) {
-      throw new Error(`Failed to copy file: ${(err as Error).message}`);
-    }
-  }
-
   async read(filePath: string): Promise<Buffer> {
     try {
       return await fs.readFile(this._fullPath(filePath));

apps/server/src/integrations/storage/drivers/s3.driver.ts

@@ -1,6 +1,5 @@
 import { S3StorageConfig, StorageDriver, StorageOption } from '../interfaces';
 import {
-  CopyObjectCommand,
   DeleteObjectCommand,
   GetObjectCommand,
   HeadObjectCommand,
@@ -40,22 +39,6 @@ export class S3Driver implements StorageDriver {
     }
   }
 
-  async copy(fromFilePath: string, toFilePath: string): Promise<void> {
-    try {
-      if (await this.exists(fromFilePath)) {
-        await this.s3Client.send(
-          new CopyObjectCommand({
-            Bucket: this.config.bucket,
-            CopySource: `${this.config.bucket}/${fromFilePath}`,
-            Key: toFilePath,
-          }),
-        );
-      }
-    } catch (err) {
-      throw new Error(`Failed to copy file: ${(err as Error).message}`);
-    }
-  }
-
   async read(filePath: string): Promise<Buffer> {
     try {
       const command = new GetObjectCommand({

apps/server/src/integrations/storage/interfaces/storage-driver.interface.ts

@@ -1,8 +1,6 @@
 export interface StorageDriver {
   upload(filePath: string, file: Buffer): Promise<void>;
 
-  copy(fromFilePath: string, toFilePath: string): Promise<void>;
-
   read(filePath: string): Promise<Buffer>;
 
   exists(filePath: string): Promise<boolean>;

apps/server/src/integrations/storage/storage.service.ts

@@ -14,11 +14,6 @@ export class StorageService {
     this.logger.debug(`File uploaded successfully. Path: ${filePath}`);
   }
 
-  async copy(fromFilePath: string, toFilePath: string) {
-    await this.storageDriver.copy(fromFilePath, toFilePath);
-    this.logger.debug(`File copied successfully. Path: ${toFilePath}`);
-  }
-
   async read(filePath: string): Promise<Buffer> {
     return this.storageDriver.read(filePath);
   }

apps/server/src/main.ts

@@ -4,7 +4,12 @@ import {
   FastifyAdapter,
   NestFastifyApplication,
 } from '@nestjs/platform-fastify';
-import { Logger, NotFoundException, ValidationPipe } from '@nestjs/common';
+import {
+  Logger,
+  NotFoundException,
+  RequestMethod,
+  ValidationPipe,
+} from '@nestjs/common';
 import { TransformHttpResponseInterceptor } from './common/interceptors/http-response.interceptor';
 import { WsRedisIoAdapter } from './ws/adapter/ws-redis.adapter';
 import { InternalLogFilter } from './common/logger/internal-log-filter';
@@ -87,14 +92,6 @@ async function bootstrap() {
 
   const logger = new Logger('NestApplication');
 
-  process.on('unhandledRejection', (reason, promise) => {
-    logger.error(`UnhandledRejection: ${promise}, reason: ${reason}`);
-  });
-
-  process.on('uncaughtException', (error) => {
-    logger.error('UncaughtException:', error);
-  });
-
   const port = process.env.PORT || 3000;
   await app.listen(port, '0.0.0.0', () => {
     logger.log(

package.json

@@ -1,7 +1,7 @@
 {
   "name": "docmost",
   "homepage": "https://docmost.com",
-  "version": "0.20.4",
+  "version": "0.20.2",
   "private": true,
   "scripts": {
     "build": "nx run-many -t build",