v0.22.1

apps/client/package.json

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

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

@@ -1,10 +1,10 @@
 import { Group, Text } from "@mantine/core";
 import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
 import React from "react";
-import { User } from "server/dist/database/types/entity.types";
+import { IUser } from '@/features/user/types/user.types.ts';
 
 interface UserInfoProps {
-  user: User;
+  user: Partial<IUser>;
   size?: string;
 }
 export function UserInfo({ user, size }: UserInfoProps) {

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

@@ -41,11 +41,16 @@ function CommentListWithTabs() {
   const spaceRules = space?.membership?.permissions;
   const spaceAbility = useSpaceAbility(spaceRules);
 
+
   const canComment: boolean = spaceAbility.can(
     SpaceCaslAction.Manage,
     SpaceCaslSubject.Page
   );
 
+  console.log(spaceAbility)
+
+  console.log('can comment', canComment);
+
   // Separate active and resolved comments
   const { activeComments, resolvedComments } = useMemo(() => {
     if (!comments?.items) {
@@ -179,6 +184,17 @@ function CommentListWithTabs() {
                     userSpaceRole={space?.membership?.role}
                   />
                 </div>
+
+                {canComment && (
+                  <>
+                    <Divider my={4} />
+                    <CommentEditorWithActions
+                      commentId={comment.id}
+                      onSave={handleAddReply}
+                      isLoading={isLoading}
+                    />
+                  </>
+                )}
               </Paper>
             ))}
         </div>

apps/server/package.json

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

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

@@ -261,35 +261,7 @@ export class PageService {
 
     if (isDuplicateInSameSpace) {
       // For duplicate in same space, position right after the original page
-      let siblingQuery = this.db
+      nextPosition = generateJitteredKeyBetween(rootPage.position, null);
-        .selectFrom('pages')
-        .select(['position'])
-        .where('spaceId', '=', rootPage.spaceId)
-        .where('position', '>', rootPage.position);
-
-      if (rootPage.parentPageId) {
-        siblingQuery = siblingQuery.where(
-          'parentPageId',
-          '=',
-          rootPage.parentPageId,
-        );
-      } else {
-        siblingQuery = siblingQuery.where('parentPageId', 'is', null);
-      }
-
-      const nextSibling = await siblingQuery
-        .orderBy('position', 'asc')
-        .limit(1)
-        .executeTakeFirst();
-
-      if (nextSibling) {
-        nextPosition = generateJitteredKeyBetween(
-          rootPage.position,
-          nextSibling.position,
-        );
-      } else {
-        nextPosition = generateJitteredKeyBetween(rootPage.position, null);
-      }
     } else {
       // For copy to different space, position at the end
       nextPosition = await this.nextPagePosition(spaceId);
@@ -434,25 +406,35 @@ export class PageService {
             attachment.id,
             newAttachmentId,
           );
-          await this.storageService.copy(attachment.filePath, newPathFile);
+
-          await this.db
+          try {
-            .insertInto('attachments')
+            await this.storageService.copy(attachment.filePath, newPathFile);
-            .values({
+
-              id: newAttachmentId,
+            await this.db
-              type: attachment.type,
+              .insertInto('attachments')
-              filePath: newPathFile,
+              .values({
-              fileName: attachment.fileName,
+                id: newAttachmentId,
-              fileSize: attachment.fileSize,
+                type: attachment.type,
-              mimeType: attachment.mimeType,
+                filePath: newPathFile,
-              fileExt: attachment.fileExt,
+                fileName: attachment.fileName,
-              creatorId: attachment.creatorId,
+                fileSize: attachment.fileSize,
-              workspaceId: attachment.workspaceId,
+                mimeType: attachment.mimeType,
-              pageId: newPageId,
+                fileExt: attachment.fileExt,
-              spaceId: spaceId,
+                creatorId: attachment.creatorId,
-            })
+                workspaceId: attachment.workspaceId,
-            .execute();
+                pageId: newPageId,
+                spaceId: spaceId,
+              })
+              .execute();
+          } catch (err) {
+            this.logger.error(
+              `Duplicate page: failed to copy attachment ${attachment.id}`,
+              err,
+            );
+            // Continue with other attachments even if one fails
+          }
         } catch (err) {
-          this.logger.log(err);
+          this.logger.error(err);
         }
       }
     }

apps/server/src/core/page/services/trash-cleanup.service.ts

@@ -19,7 +19,7 @@ export class TrashCleanupService {
   @Interval('trash-cleanup', 24 * 60 * 60 * 1000) // every 24 hours
   async cleanupOldTrash() {
     try {
-      this.logger.log('Starting trash cleanup job');
+      this.logger.debug('Starting trash cleanup job');
 
       const retentionDate = new Date();
       retentionDate.setDate(retentionDate.getDate() - this.RETENTION_DAYS);

package.json

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