fix interval

apps/client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "client",
   "private": true,
-  "version": "0.25.3",
+  "version": "0.25.2",
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",
@@ -25,7 +25,7 @@
     "@tabler/icons-react": "^3.36.1",
     "@tanstack/react-query": "^5.90.17",
     "alfaaz": "^1.1.0",
-    "axios": "^1.13.5",
+    "axios": "^1.13.2",
     "clsx": "^2.1.1",
     "emoji-mart": "^5.6.0",
     "file-saver": "^2.0.5",

apps/client/src/components/common/copy-button.tsx

@@ -1,33 +0,0 @@
-// Source: https://github.com/mantinedev/mantine/blob/master/packages/@mantine/core/src/components/CopyButton/CopyButton.tsx - MIT
-// modified to use the polyfilled clipboard api
-import React from "react";
-import { useClipboard } from "@/hooks/use-clipboard";
-import { useProps } from "@mantine/core";
-
-interface CopyButtonProps {
-  /** Children callback, provides current status and copy function as an argument */
-  children: (payload: { copied: boolean; copy: () => void }) => React.ReactNode;
-
-  /** Value that is copied to the clipboard when the button is clicked */
-  value: string;
-
-  /** Copied status timeout in ms @default `1000` */
-  timeout?: number;
-}
-
-const defaultProps = {
-  timeout: 1000,
-} satisfies Partial<CopyButtonProps>;
-
-export function CopyButton(props: CopyButtonProps) {
-  const { children, timeout, value, ...others } = useProps(
-    "CopyButton",
-    defaultProps,
-    props,
-  );
-  const clipboard = useClipboard({ timeout });
-  const copy = () => clipboard.copy(value);
-  return <>{children({ copy, copied: clipboard.copied, ...others })}</>;
-}
-
-CopyButton.displayName = "@mantine/core/CopyButton";

apps/client/src/components/common/copy.tsx

@@ -1,5 +1,4 @@
-import { ActionIcon, Tooltip } from "@mantine/core";
+import { ActionIcon, CopyButton, Tooltip } from "@mantine/core";
-import { CopyButton } from "@/components/common/copy-button";
 import { IconCheck, IconCopy } from "@tabler/icons-react";
 import React from "react";
 import { useTranslation } from "react-i18next";

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

@@ -8,10 +8,10 @@ import {
   Group,
   List,
   Code,
+  CopyButton,
   Alert,
   PasswordInput,
 } from "@mantine/core";
-import { CopyButton } from "@/components/common/copy-button";
 import {
   IconRefresh,
   IconCopy,

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

@@ -11,6 +11,7 @@ import {
   PinInput,
   Alert,
   List,
+  CopyButton,
   ActionIcon,
   Tooltip,
   Paper,
@@ -19,7 +20,6 @@ import {
   Collapse,
   UnstyledButton,
 } from "@mantine/core";
-import { CopyButton } from "@/components/common/copy-button";
 import {
   IconQrcode,
   IconShieldCheck,

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

@@ -84,14 +84,9 @@ const CommentEditor = forwardRef(
       autofocus: (autofocus && "end") || false,
     });
 
-    // Sync content from props for read-only editors (e.g. when updated via
-    // websocket on another browser). Skip for editable editors to avoid
-    // resetting the cursor position on every keystroke.
     useEffect(() => {
-      if (!editable && commentEditor && defaultContent) {
+      commentEditor.commands.setContent(defaultContent);
-        commentEditor.commands.setContent(defaultContent);
+    }, [defaultContent]);
-      }
-    }, [defaultContent, editable, commentEditor]);
 
     useEffect(() => {
       setTimeout(() => {

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

@@ -1,5 +1,5 @@
 import { Group, Text, Box, Badge } from "@mantine/core";
-import React, { useEffect, useRef, useState } from "react";
+import React, { useEffect, useState } from "react";
 import classes from "./comment.module.css";
 import { useAtom, useAtomValue } from "jotai";
 import { timeAgo } from "@/lib/time";
@@ -40,7 +40,6 @@ function CommentListItem({
   const [isLoading, setIsLoading] = useState(false);
   const editor = useAtomValue(pageEditorAtom);
   const [content, setContent] = useState<string>(comment.content);
-  const editContentRef = useRef<any>(null);
   const updateCommentMutation = useUpdateCommentMutation();
   const deleteCommentMutation = useDeleteCommentMutation(comment.pageId);
   const resolveCommentMutation = useResolveCommentMutation();
@@ -57,13 +56,9 @@ function CommentListItem({
       setIsLoading(true);
       const commentToUpdate = {
         commentId: comment.id,
-        content: JSON.stringify(editContentRef.current ?? content),
+        content: JSON.stringify(content),
       };
       await updateCommentMutation.mutateAsync(commentToUpdate);
-      if (editContentRef.current) {
-        setContent(editContentRef.current);
-        editContentRef.current = null;
-      }
       setIsEditing(false);
 
       emit({
@@ -133,7 +128,6 @@ function CommentListItem({
     setIsEditing(true);
   }
   function cancelEdit() {
-    editContentRef.current = null;
     setIsEditing(false);
   }
 
@@ -200,7 +194,7 @@ function CommentListItem({
             <CommentEditor
               defaultContent={content}
               editable={true}
-              onUpdate={(newContent: any) => { editContentRef.current = newContent; }}
+              onUpdate={(newContent: any) => setContent(newContent)}
               onSave={handleUpdateComment}
               autofocus={true}
             />

apps/client/src/features/editor/components/code-block/code-block-view.tsx

@@ -1,6 +1,5 @@
 import { NodeViewContent, NodeViewProps, NodeViewWrapper } from "@tiptap/react";
-import { ActionIcon, Group, Select, Tooltip } from "@mantine/core";
+import { ActionIcon, CopyButton, Group, Select, Tooltip } from "@mantine/core";
-import { CopyButton } from "@/components/common/copy-button";
 import { useEffect, useState } from "react";
 import { IconCheck, IconCopy } from "@tabler/icons-react";
 import classes from "./code-block.module.css";

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

@@ -17,8 +17,7 @@ import React, { useEffect, useRef, useState } from "react";
 import useToggleAside from "@/hooks/use-toggle-aside.tsx";
 import { useAtom, useAtomValue } from "jotai";
 import { historyAtoms } from "@/features/page-history/atoms/history-atoms.ts";
-import { useDisclosure, useHotkeys } from "@mantine/hooks";
+import { useClipboard, useDisclosure, useHotkeys } from "@mantine/hooks";
-import { useClipboard } from "@/hooks/use-clipboard";
 import { useParams } from "react-router-dom";
 import { usePageQuery } from "@/features/page/queries/page-query.ts";
 import { buildPageUrl } from "@/features/page/page.utils.ts";

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

@@ -54,11 +54,11 @@ import { IPage, SidebarPagesParams } from "@/features/page/types/page.types.ts";
 import { queryClient } from "@/main.tsx";
 import { OpenMap } from "react-arborist/dist/main/state/open-slice";
 import {
+  useClipboard,
   useDisclosure,
   useElementSize,
   useMergedRef,
 } from "@mantine/hooks";
-import { useClipboard } from "@/hooks/use-clipboard";
 import { dfs } from "react-arborist/dist/module/utils";
 import { useQueryEmit } from "@/features/websocket/use-query-emit.ts";
 import { buildPageUrl } from "@/features/page/page.utils.ts";

apps/client/src/features/share/components/share-action-menu.tsx

@@ -13,7 +13,7 @@ import {
   buildPageUrl,
   buildSharedPageUrl,
 } from "@/features/page/page.utils.ts";
-import { useClipboard } from "@/hooks/use-clipboard";
+import { useClipboard } from "@mantine/hooks";
 import { notifications } from "@mantine/notifications";
 import { useNavigate } from "react-router-dom";
 import { useDeleteShareMutation } from "@/features/share/queries/share-query.ts";

apps/client/src/features/workspace/components/members/components/invite-action-menu.tsx

@@ -8,7 +8,7 @@ import {
 } from "@/features/workspace/queries/workspace-query.ts";
 import { useTranslation } from "react-i18next";
 import { notifications } from "@mantine/notifications";
-import { useClipboard } from "@/hooks/use-clipboard";
+import { useClipboard } from "@mantine/hooks";
 import { getInviteLink } from "@/features/workspace/services/workspace-service.ts";
 import useUserRole from "@/hooks/use-user-role.tsx";
 import { isCloud } from "@/lib/config.ts";

apps/client/src/features/workspace/components/members/components/workspace-invite-section.tsx

@@ -1,8 +1,7 @@
 import { useAtom } from "jotai";
 import { currentUserAtom } from "@/features/user/atoms/current-user-atom.ts";
 import { useEffect, useState } from "react";
-import { Button, Group, Text, TextInput } from "@mantine/core";
+import { Button, CopyButton, Group, Text, TextInput } from "@mantine/core";
-import { CopyButton } from "@/components/common/copy-button";
 import { useTranslation } from "react-i18next";
 
 export default function WorkspaceInviteSection() {

apps/client/src/hooks/use-clipboard.ts

@@ -1,60 +0,0 @@
-// Source: https://github.com/mantinedev/mantine/blob/master/packages/@mantine/hooks/src/use-clipboard/use-clipboard.ts
-// polyfilled to support execCommand fallback
-import { useState } from "react";
-import { execCommandCopy } from "@docmost/editor-ext";
-
-export type UseClipboardOptions = {
-  timeout?: number;
-};
-
-export type UseClipboardReturnValue = {
-  copy: (value: string) => void;
-  reset: () => void;
-  error: Error | null;
-  copied: boolean;
-};
-
-export function useClipboard(
-  options: UseClipboardOptions = { timeout: 2000 },
-): UseClipboardReturnValue {
-  const [error, setError] = useState<Error | null>(null);
-  const [copied, setCopied] = useState(false);
-  const [copyTimeout, setCopyTimeout] = useState<number | null>(null);
-
-  const handleCopyResult = (value: boolean) => {
-    window.clearTimeout(copyTimeout!);
-    setCopyTimeout(window.setTimeout(() => setCopied(false), options.timeout));
-    setCopied(value);
-  };
-
-  const copy = (value: string) => {
-    if ("clipboard" in navigator) {
-      navigator.clipboard
-        .writeText(value)
-        .then(() => handleCopyResult(true))
-        .catch(() => {
-          try {
-            execCommandCopy(value);
-            handleCopyResult(true);
-          } catch (err) {
-            setError(err instanceof Error ? err : new Error("Failed to copy"));
-          }
-        });
-    } else {
-      try {
-        execCommandCopy(value);
-        handleCopyResult(true);
-      } catch (err) {
-        setError(err instanceof Error ? err : new Error("Failed to copy"));
-      }
-    }
-  };
-
-  const reset = () => {
-    setCopied(false);
-    setError(null);
-    window.clearTimeout(copyTimeout!);
-  };
-
-  return { copy, reset, error, copied };
-}

apps/server/package.json

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

apps/server/src/collaboration/server/collab-app.module.ts

@@ -9,8 +9,6 @@ import { EventEmitterModule } from '@nestjs/event-emitter';
 import { HealthModule } from '../../integrations/health/health.module';
 import { CollaborationController } from './collaboration.controller';
 import { LoggerModule } from '../../common/logger/logger.module';
-import { RedisModule } from '@nestjs-labs/nestjs-ioredis';
-import { RedisConfigService } from '../../integrations/redis/redis-config.service';
 
 @Module({
   imports: [
@@ -21,9 +19,6 @@ import { RedisConfigService } from '../../integrations/redis/redis-config.servic
     QueueModule,
     HealthModule,
     EventEmitterModule.forRoot(),
-    RedisModule.forRootAsync({
-      useClass: RedisConfigService,
-    }),
   ],
   controllers: [
     AppController,

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

@@ -464,8 +464,7 @@ export class AttachmentController {
       'Cache-Control': `${cacheScope}, max-age=3600`,
     });
 
-    const isSvg = attachment.fileExt === '.svg';
+    if (fileSize) {
-    if (fileSize && !isSvg) {
       res.header('Content-Length', fileSize);
     }
 

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

@@ -99,7 +99,6 @@ export class AttachmentService {
       if (isUpdate) {
         attachment = await this.attachmentRepo.updateAttachment(
           {
-            fileSize: preparedFile.fileSize,
             updatedAt: new Date(),
           },
           attachmentId,

package.json

@@ -1,7 +1,7 @@
 {
   "name": "docmost",
   "homepage": "https://docmost.com",
-  "version": "0.25.3",
+  "version": "0.25.2",
   "private": true,
   "scripts": {
     "build": "nx run-many -t build",
@@ -78,12 +78,12 @@
     "yjs": "^13.6.29"
   },
   "devDependencies": {
-    "@nx/js": "22.5.0",
+    "@nx/js": "20.4.5",
     "@types/bytes": "^3.1.5",
     "@types/turndown": "^5.0.6",
     "@types/uuid": "^10.0.0",
     "concurrently": "^9.1.2",
-    "nx": "22.5.0",
+    "nx": "20.4.5",
     "tsx": "^4.19.3"
   },
   "workspaces": {

packages/editor-ext/src/lib/heading/heading.ts

@@ -4,7 +4,6 @@ import TiptapHeading, {
 import { mergeAttributes } from "@tiptap/react";
 import { Decoration, DecorationSet } from "prosemirror-view";
 import { Plugin } from "prosemirror-state";
-import { copyToClipboard } from "../utils";
 
 const copyIcon = `<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24"><!-- Icon from Material Symbols Light by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M10.616 16.077H7.077q-1.692 0-2.884-1.192T3 12t1.193-2.885t2.884-1.193h3.539v1H7.077q-1.27 0-2.173.904Q4 10.731 4 12t.904 2.173t2.173.904h3.539zM8.5 12.5v-1h7v1zm4.885 3.577v-1h3.538q1.27 0 2.173-.904Q20 13.269 20 12t-.904-2.173t-2.173-.904h-3.538v-1h3.538q1.692 0 2.885 1.192T21 12t-1.193 2.885t-2.884 1.193z"/></svg>`;
 const successIcon = `<svg xmlns="http://www.w3.org/2000/svg" style="color: forestgreen;" width="18" height="18" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="m10.6 16.6l7.05-7.05l-1.4-1.4l-5.65 5.65l-2.85-2.85l-1.4 1.4zM12 22q-2.075 0-3.9-.788t-3.175-2.137T2.788 15.9T2 12t.788-3.9t2.137-3.175T8.1 2.788T12 2t3.9.788t3.175 2.137T21.213 8.1T22 12t-.788 3.9t-2.137 3.175t-3.175 2.138T12 22"/></svg>`;
@@ -42,7 +41,7 @@ export const Heading = TiptapHeading.extend<TiptapHeadingOptions>({
                       const id = node.attrs.id;
                       const baseUrl = window.location.href.split('#')[0];
                       const url = `${baseUrl}#${id}`;
-                      copyToClipboard(url);
+                      navigator.clipboard.writeText(url);
                       linkBtnContent.innerHTML = successIcon;
                       setTimeout(
                         () => (linkBtnContent.innerHTML = copyIcon),

packages/editor-ext/src/lib/utils.ts

@@ -384,25 +384,3 @@ export function sanitizeUrl(url: string | undefined): string {
 
 const alphabet = "abcdefghijklmnopqrstuvwxyz";
 export const generateNodeId = customAlphabet(alphabet, 12);
-
-export function copyToClipboard(text: string): void {
-  if ("clipboard" in navigator) {
-    navigator.clipboard.writeText(text).catch(() => {
-      execCommandCopy(text);
-    });
-  } else {
-    execCommandCopy(text);
-  }
-}
-
-export function execCommandCopy(text: string): void {
-  const textarea = document.createElement("textarea");
-  textarea.value = text;
-  textarea.style.position = "fixed";
-  textarea.style.left = "-9999px";
-  textarea.style.top = "-9999px";
-  document.body.appendChild(textarea);
-  textarea.select();
-  document.execCommand("copy");
-  document.body.removeChild(textarea);
-}