kaori 4 лет назад
Родитель
Сommit
e6e10e8531

+ 2 - 1
packages/app/resource/locales/en_US/translation.json

@@ -155,7 +155,8 @@
   "Sign out": "Logout",
   "Sign out": "Logout",
   "Disassociate": "Disassociate",
   "Disassociate": "Disassociate",
   "No bookmarks yet": "No bookmarks yet",
   "No bookmarks yet": "No bookmarks yet",
-  "Add to bookmark": "Add to bookmark",
+  "add_bookmark": "Add a bookmark",
+  "delete_bookmark": "Delete a bookmark",
   "Recent Created": "Recent Created",
   "Recent Created": "Recent Created",
   "Recent Changes": "Recent Changes",
   "Recent Changes": "Recent Changes",
   "Page Tree": "Page Tree",
   "Page Tree": "Page Tree",

+ 1 - 1
packages/app/resource/locales/ja_JP/translation.json

@@ -157,7 +157,7 @@
   "Sidebar mode": "サイドバーモード",
   "Sidebar mode": "サイドバーモード",
   "Sidebar mode on Editor": "サイドバーモード(編集時)",
   "Sidebar mode on Editor": "サイドバーモード(編集時)",
   "No bookmarks yet": "No bookmarks yet",
   "No bookmarks yet": "No bookmarks yet",
-  "Add to bookmark": "ブックマークに追加",
+  "add_bookmark": "ブックマークに追加",
   "Recent Created": "最新の作成",
   "Recent Created": "最新の作成",
   "Recent Changes": "最新の変更",
   "Recent Changes": "最新の変更",
   "Page Tree": "ページツリー",
   "Page Tree": "ページツリー",

+ 1 - 1
packages/app/resource/locales/zh_CN/translation.json

@@ -163,7 +163,7 @@
 	"Sign out": "退出",
 	"Sign out": "退出",
   "Disassociate": "解除关联",
   "Disassociate": "解除关联",
   "No bookmarks yet": "暂无书签",
   "No bookmarks yet": "暂无书签",
-  "Add to bookmark": "添加到书签",
+  "add_bookmark": "添加到书签",
 	"Recent Created": "最新创建",
 	"Recent Created": "最新创建",
   "Recent Changes": "最新修改",
   "Recent Changes": "最新修改",
   "Page Tree": "页面树",
   "Page Tree": "页面树",

+ 6 - 3
packages/app/src/components/Common/Dropdown/PageItemControl.tsx

@@ -37,7 +37,7 @@ const PageItemControl: FC<PageItemControlProps> = (props: PageItemControlProps)
   const addBookmarkClickHandler = (async() => {
   const addBookmarkClickHandler = (async() => {
     try {
     try {
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      await apiv3Put('/bookmarks', { pageId: page._id, bool: true });
+      await apiv3Put('/bookmarks', { pageId: page._id, bool: !bookmarkInfo!.isBookmarked });
       mutateBookmarkInfo();
       mutateBookmarkInfo();
     }
     }
     catch (err) {
     catch (err) {
@@ -45,6 +45,10 @@ const PageItemControl: FC<PageItemControlProps> = (props: PageItemControlProps)
     }
     }
   });
   });
 
 
+  if (bookmarkInfoError != null || bookmarkInfo == null) {
+    return <></>;
+  }
+
 
 
   return (
   return (
     <UncontrolledDropdown>
     <UncontrolledDropdown>
@@ -82,9 +86,8 @@ const PageItemControl: FC<PageItemControlProps> = (props: PageItemControlProps)
         )}
         )}
         {isEnableActions && (
         {isEnableActions && (
           <DropdownItem onClick={addBookmarkClickHandler}>
           <DropdownItem onClick={addBookmarkClickHandler}>
-            {/* <DropdownItem onClick={() => { console.log('hogehoge') }}> */}
             <i className="fa fa-fw fa-bookmark-o"></i>
             <i className="fa fa-fw fa-bookmark-o"></i>
-            {t('Add to bookmark')}
+            { bookmarkInfo.isBookmarked ? t('delete_bookmark') : t('add_bookmark') }
           </DropdownItem>
           </DropdownItem>
         )}
         )}
         {isEnableActions && (
         {isEnableActions && (