Update translation and isDroppable condition

packages/app/public/static/locales/en_US/commons.json

@@ -16,7 +16,8 @@
     "update_failed": "Failed to update {{target}}",
     "delete_succeeded": "Succeeded to delete {{target}}",
     "remove_share_link_success": "Succeeded to remove {{shareLinkId}}",
-    "remove_share_link": "Succeeded to remove {{count}} share links"
+    "remove_share_link": "Succeeded to remove {{count}} share links",
+    "add_succeeded": "Succeeded to add {{target}}"
   },
   "alert": {
     "siteUrl_is_not_set": "'Site URL' is NOT set. Set it from the {{link}}",

packages/app/public/static/locales/en_US/translation.json

@@ -815,6 +815,7 @@
   },
   "bookmark_folder":{
     "bookmark_folder": "bookmark folder",
+    "bookmark": "bookmark",
     "delete_modal": {
       "modal_header_label": "Delete Bookmark Folder",
       "modal_body_description": "Delete this bookmark folder and its contents",

packages/app/public/static/locales/ja_JP/commons.json

@@ -16,7 +16,8 @@
     "update_failed": "{{target}}の更新に失敗しました",
     "delete_succeeded": "{{target}} の削除に成功しました",
     "remove_share_link_success": "{{shareLinkId}}を削除しました",
-    "remove_share_link": "共有リンクを{{count}}件削除しました"
+    "remove_share_link": "共有リンクを{{count}}件削除しました",
+    "add_succeeded": "新しい{{target}}が追加されました"
   },
   "alert": {
     "siteUrl_is_not_set": "'サイトURL' が設定されていません。{{link}} から設定してください。",

packages/app/public/static/locales/ja_JP/translation.json

@@ -815,6 +815,7 @@
   },
   "bookmark_folder":{
     "bookmark_folder": "ブックマークフォルダ",
+    "bookmark": "ブックマーク",
     "delete_modal": {
       "modal_header_label": "ブックマークフォルダを削除",
       "modal_body_description": "このブックマーク フォルダとその内容を削除する",

packages/app/public/static/locales/zh_CN/commons.json

@@ -16,7 +16,8 @@
     "update_failed": "Failed to update {{target}}",
     "delete_succeeded": "Succeeded to delete {{target}}",
     "remove_share_link_success": "Succeeded to remove {{shareLinkId}}",
-    "remove_share_link": "Succeeded to remove {{count}} share links"
+    "remove_share_link": "Succeeded to remove {{count}} share links",
+    "add_succeeded": "Succeeded to add {{target}}"
   },
   "alert": {
     "siteUrl_is_not_set": "主页URL未设置，通过 {{link}} 设置",

packages/app/public/static/locales/zh_CN/translation.json

@@ -818,6 +818,7 @@
   },
   "bookmark_folder":{
     "bookmark_folder": "书签文件夹",
+    "bookmark": "书签",
     "delete_modal": {
       "modal_header_label": "删除书签文件夹",
       "modal_body_description": "删除此书签文件夹及其内容",

packages/app/src/components/Bookmarks/BookmarkFolderItem.tsx

@@ -187,7 +187,7 @@ const BookmarkFolderItem: FC<BookmarkFolderItemProps> = (props: BookmarkFolderIt
     try {
       await apiv3Put('/bookmark-folder', { bookmarkFolderId: item.bookmarkFolder._id, name: item.bookmarkFolder.name, parent: bookmarkFolder._id });
       await mutateChildBookmarkData();
-      toastSuccess(t('toaster.update_successed', { target: t('bookmark_folder.bookmark_folder') }));
+      toastSuccess(t('toaster.update_successed', { target: t('bookmark_folder.bookmark_folder'), ns: 'commons' }));
     }
     catch (err) {
       toastError(err);
@@ -198,25 +198,20 @@ const BookmarkFolderItem: FC<BookmarkFolderItemProps> = (props: BookmarkFolderIt
     try {
       await apiv3Post('/bookmark-folder/add-boookmark-to-folder', { pageId: item._id, folderId: bookmarkFolder._id });
       mutateParentBookmarkFolder();
-      toastSuccess('Bookmark added to bookmark folder successfully');
+      toastSuccess(t('toaster.add_successed', { target: t('bookmark_folder.bookmark'), ns: 'commons' }));
     }
     catch (err) {
       toastError(err);
     }
 
-  }, [bookmarkFolder._id, mutateParentBookmarkFolder]);
+  }, [bookmarkFolder._id, mutateParentBookmarkFolder, t]);
 
 
   const isDroppable = (item: BookmarkFolderItemProps, targetRoot: string, targetLevel: number): boolean => {
     if (item.bookmarkFolder.parent === bookmarkFolder._id || item.bookmarkFolder._id === bookmarkFolder._id) {
       return false;
     }
-    if (item.root === targetRoot) {
-      if (item.level < targetLevel) {
-        return false;
-      }
-    }
-    return true;
+    return item.root !== targetRoot || item.level >= targetLevel;
   };
 
   const [, bookmarkFolderDropRef] = useDrop(() => ({

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

@@ -60,7 +60,7 @@ const BookmarkFolderMenu = (props: Props): JSX.Element => {
       await apiv3Post('/bookmark-folder', { name: folderName, parent: null });
       await mutateBookmarkFolderData();
       setIsCreateAction(false);
-      toastSuccess(t('toaster.create_succeeded', { target: t('bookmark_folder.bookmark_folder') }));
+      toastSuccess(t('toaster.create_succeeded', { target: t('bookmark_folder.bookmark_folder'), ns: 'commons' }));
     }
     catch (err) {
       toastError(err);
@@ -73,7 +73,7 @@ const BookmarkFolderMenu = (props: Props): JSX.Element => {
       await apiv3Post('/bookmark-folder/add-boookmark-to-folder', { pageId: currentPage?._id, folderId: itemId });
 
       mutateBookmarkInfo();
-      toastSuccess('Bookmark added to bookmark folder successfully');
+      toastSuccess(t('toaster.add_succeeded', { target: t('bookmark_folder.bookmark'), ns: 'commons' }));
     }
     catch (err) {
       toastError(err);
@@ -81,7 +81,7 @@ const BookmarkFolderMenu = (props: Props): JSX.Element => {
 
     mutateBookmarkFolderData();
     setSelectedItem(itemId);
-  }, [currentPage?._id, mutateBookmarkFolderData, mutateBookmarkInfo]);
+  }, [currentPage?._id, mutateBookmarkFolderData, mutateBookmarkInfo, t]);
 
   const renderBookmarkMenuItem = useCallback(() => {
     return (

packages/app/src/components/Bookmarks/BookmarkFolderMenuItem.tsx

@@ -43,7 +43,7 @@ const BookmarkFolderMenuItem = (props: Props):JSX.Element => {
       await apiv3Post('/bookmark-folder', { name: folderName, parent: item._id });
       await mutateChildFolders();
       setIsCreateAction(false);
-      toastSuccess(t('toaster.create_succeeded', { target: t('bookmark_folder.bookmark_folder') }));
+      toastSuccess(t('toaster.create_succeeded', { target: t('bookmark_folder.bookmark_folder'), ns: 'commons' }));
     }
     catch (err) {
       toastError(err);
@@ -91,7 +91,7 @@ const BookmarkFolderMenuItem = (props: Props):JSX.Element => {
     onSelectedChild();
     try {
       await apiv3Post('/bookmark-folder/add-boookmark-to-folder', { pageId: currentPage?._id, folderId: item._id });
-      toastSuccess('Bookmark added to bookmark folder successfully');
+      toastSuccess(t('toaster.add_succeeded', { target: t('bookmark_folder.bookmark'), ns: 'commons' }));
       mutateParentFolders();
       mutateChildFolders();
       setSelectedItem(item._id);
@@ -101,7 +101,7 @@ const BookmarkFolderMenuItem = (props: Props):JSX.Element => {
     }
 
 
-  }, [mutateBookmarkInfo, onSelectedChild, currentPage?._id, mutateParentFolders, mutateChildFolders]);
+  }, [mutateBookmarkInfo, onSelectedChild, currentPage?._id, mutateParentFolders, mutateChildFolders, t]);
 
   const renderBookmarkSubMenuItem = useCallback(() => {
     return (