Merge branch 'master' into fix/122554-your-bookmarks-are-displayed-no-other-users-home-pages

apps/app/src/components/Bookmarks/BookmarkFolderMenu.tsx

@@ -88,9 +88,6 @@ export const BookmarkFolderMenu: React.FC<{children?: React.ReactNode}> = ({ chi
     setSelectedItem(itemId);
 
     try {
-      if (isBookmarked) {
-        await toggleBookmarkHandler();
-      }
       if (currentPage != null) {
         await addBookmarkToFolder(currentPage._id, itemId === 'root' ? null : itemId);
       }
@@ -101,7 +98,7 @@ export const BookmarkFolderMenu: React.FC<{children?: React.ReactNode}> = ({ chi
     catch (err) {
       toastError(err);
     }
-  }, [mutateBookmarkFolders, isBookmarked, currentPage, mutateBookmarkInfo, mutateUserBookmarks, toggleBookmarkHandler]);
+  }, [mutateBookmarkFolders, currentPage, mutateBookmarkInfo, mutateUserBookmarks]);
 
   const renderBookmarkMenuItem = () => {
     return (

apps/app/src/server/models/bookmark-folder.ts

@@ -215,7 +215,7 @@ bookmarkFolderSchema.statics.updateBookmark = async function(pageId: Types.Objec
 Promise<BookmarkFolderDocument | null> {
   // If isBookmarked
   if (status) {
-    const bookmarkedPage = await Bookmark.findOne({ page: pageId });
+    const bookmarkedPage = await Bookmark.findOne({ page: pageId, user: userId });
     const bookmarkFolder = await this.findOne({ owner: userId, bookmarks: { $in: [bookmarkedPage?._id] } });
     if (bookmarkFolder != null) {
       await this.updateOne({ owner: userId, _id: bookmarkFolder._id }, { $pull: { bookmarks:  bookmarkedPage?._id } });