Mudana-Grune 2 лет назад
Родитель
Сommit
9914df8cd9

+ 7 - 7
apps/app/src/components/Bookmarks/BookmarkFolderItem.tsx

@@ -40,7 +40,7 @@ export const BookmarkFolderItem: FC<BookmarkFolderItemProps> = (props: BookmarkF
   const acceptedTypes: DragItemType[] = [DRAG_ITEM_TYPE.FOLDER, DRAG_ITEM_TYPE.BOOKMARK];
   const {
     isReadOnlyUser, bookmarkFolder, isOpen: _isOpen = false, isOperable, level, root, isUserHomePage,
-    onClickDeleteBookmarkHandler, bookmarkFolderTreeMutation, onPagePutBacked
+    onClickDeleteBookmarkHandler, bookmarkFolderTreeMutation, onPagePutBacked,
   } = props;
 
   const {
@@ -58,13 +58,13 @@ export const BookmarkFolderItem: FC<BookmarkFolderItemProps> = (props: BookmarkF
 
   const paddingLeft = BASE_FOLDER_PADDING * level;
 
-  const loadChildFolder = useCallback(async () => {
+  const loadChildFolder = useCallback(async() => {
     setIsOpen(!isOpen);
     setTargetFolder(folderId);
   }, [folderId, isOpen]);
 
   // Rename for bookmark folder handler
-  const onPressEnterHandlerForRename = useCallback(async (folderName: string) => {
+  const onPressEnterHandlerForRename = useCallback(async(folderName: string) => {
     try {
       // TODO: do not use any type
       await updateBookmarkFolder(folderId, folderName, parent as any, children);
@@ -77,7 +77,7 @@ export const BookmarkFolderItem: FC<BookmarkFolderItemProps> = (props: BookmarkF
   }, [bookmarkFolderTreeMutation, children, folderId, parent]);
 
   // Create new folder / subfolder handler
-  const onPressEnterHandlerForCreate = useCallback(async (folderName: string) => {
+  const onPressEnterHandlerForCreate = useCallback(async(folderName: string) => {
     try {
       await addNewFolder(folderName, targetFolder);
       setIsOpen(true);
@@ -89,7 +89,7 @@ export const BookmarkFolderItem: FC<BookmarkFolderItemProps> = (props: BookmarkF
     }
   }, [bookmarkFolderTreeMutation, targetFolder]);
 
-  const onClickPlusButton = useCallback(async (e) => {
+  const onClickPlusButton = useCallback(async(e) => {
     e.stopPropagation();
     if (!isOpen && childrenExists) {
       setIsOpen(true);
@@ -97,7 +97,7 @@ export const BookmarkFolderItem: FC<BookmarkFolderItemProps> = (props: BookmarkF
     setIsCreateAction(true);
   }, [childrenExists, isOpen]);
 
-  const itemDropHandler = async (item: DragItemDataType, dragItemType: string | symbol | null) => {
+  const itemDropHandler = async(item: DragItemDataType, dragItemType: string | symbol | null) => {
     if (dragItemType === DRAG_ITEM_TYPE.FOLDER) {
       try {
         if (item.bookmarkFolder != null) {
@@ -203,7 +203,7 @@ export const BookmarkFolderItem: FC<BookmarkFolderItemProps> = (props: BookmarkF
     openDeleteBookmarkFolderModal(bookmarkFolder, { onDeleted: bookmarkFolderDeleteHandler });
   }, [bookmarkFolder, bookmarkFolderTreeMutation, openDeleteBookmarkFolderModal]);
 
-  const onClickMoveToRootHandlerForBookmarkFolderItemControl = useCallback(async () => {
+  const onClickMoveToRootHandlerForBookmarkFolderItemControl = useCallback(async() => {
     try {
       await updateBookmarkFolder(bookmarkFolder._id, bookmarkFolder.name, null, bookmarkFolder.children);
       bookmarkFolderTreeMutation();

+ 1 - 1
apps/app/src/components/Bookmarks/BookmarkFolderMenu.tsx

@@ -135,7 +135,7 @@ export const BookmarkFolderMenu: React.FC<{children?: React.ReactNode}> = ({ chi
               </div>
             </div>
             {bookmarkFolders?.map(folder => (
-               <React.Fragment key={`bookmark-folders-${folder._id}`}>
+              <React.Fragment key={`bookmark-folders-${folder._id}`}>
                 <div key={folder._id}>
                   <div
                     className="dropdown-item grw-bookmark-folder-menu-item list-group-item list-group-item-action border-0 py-0"

+ 5 - 6
apps/app/src/components/Bookmarks/BookmarkFolderTree.tsx

@@ -10,14 +10,13 @@ import { useSWRxUserBookmarks, useSWRBookmarkInfo } from '~/stores/bookmark';
 import { useSWRxBookmarkFolderAndChild } from '~/stores/bookmark-folder';
 import { useIsReadOnlyUser } from '~/stores/context';
 import { usePageDeleteModal, usePutBackPageModal } from '~/stores/modal';
-import { useSWRxCurrentPage } from '~/stores/page';
+import { useSWRxCurrentPage, mutateAllPageInfo } from '~/stores/page';
 
 import { BookmarkFolderItem } from './BookmarkFolderItem';
 import { BookmarkItem } from './BookmarkItem';
 
 import styles from './BookmarkFolderTree.module.scss';
 import { unlink } from '~/client/services/page-operation';
-import { mutateAllPageInfo } from '~/stores/page';
 import { useRouter } from 'next/router';
 
 // type DragItemDataType = {
@@ -59,7 +58,7 @@ export const BookmarkFolderTree: React.FC<Props> = (props: Props) => {
       toastSuccess(isCompletely ? t('deleted_pages_completely', { path: pathOrPathsToDelete }) : t('deleted_pages', { path: pathOrPathsToDelete }));
       bookmarkFolderTreeMutation();
       mutateAllPageInfo();
-      if(pageToDelete.data._id === currentPage?._id && _isRecursively){
+      if (pageToDelete.data._id === currentPage?._id && _isRecursively) {
         router.push(`/trash${currentPage.path}`);
       }
     };
@@ -101,15 +100,15 @@ export const BookmarkFolderTree: React.FC<Props> = (props: Props) => {
   // };
   const putBackClickHandler = useCallback(async(pagePath: string) => {
     const bookmarkedPage = userBookmarks?.filter(userBookmark => userBookmark._id === pagePath)[0];
-    if(bookmarkedPage != null){
-      const { _id: pageId, path } = bookmarkedPage
+    if (bookmarkedPage != null) {
+      const { _id: pageId, path } = bookmarkedPage;
       const putBackedHandler = async() => {
         try {
           await unlink(path);
           mutateAllPageInfo();
           bookmarkFolderTreeMutation();
           // Redirect to original page if current page id equal to bookmarked page
-          if(bookmarkedPage._id === currentPage?._id){
+          if (bookmarkedPage._id === currentPage?._id) {
             router.push(`/${pageId}`);
           }
           toastSuccess(t('page_has_been_reverted', { path }));

+ 10 - 10
apps/app/src/components/Bookmarks/BookmarkItem.tsx

@@ -45,7 +45,7 @@ export const BookmarkItem = (props: Props): JSX.Element => {
 
   const {
     isReadOnlyUser, isOperable, bookmarkedPage, onClickDeleteBookmarkHandler,
-    parentFolder, level, canMoveToRoot, bookmarkFolderTreeMutation, onPagePutBacked
+    parentFolder, level, canMoveToRoot, bookmarkFolderTreeMutation, onPagePutBacked,
   } = props;
   const { open: openPutBackPageModal } = usePutBackPageModal();
   const [isRenameInputShown, setRenameInputShown] = useState(false);
@@ -61,7 +61,7 @@ export const BookmarkItem = (props: Props): JSX.Element => {
     ...bookmarkedPage, parentFolder,
   };
 
-  const onClickMoveToRootHandler = useCallback(async () => {
+  const onClickMoveToRootHandler = useCallback(async() => {
     try {
       await addBookmarkToFolder(bookmarkedPage._id, null);
       bookmarkFolderTreeMutation();
@@ -71,7 +71,7 @@ export const BookmarkItem = (props: Props): JSX.Element => {
     }
   }, [bookmarkFolderTreeMutation, bookmarkedPage._id]);
 
-  const bookmarkMenuItemClickHandler = useCallback(async () => {
+  const bookmarkMenuItemClickHandler = useCallback(async() => {
     await unbookmark(bookmarkedPage._id);
     bookmarkFolderTreeMutation();
   }, [bookmarkedPage._id, bookmarkFolderTreeMutation]);
@@ -80,7 +80,7 @@ export const BookmarkItem = (props: Props): JSX.Element => {
     setRenameInputShown(true);
   }, []);
 
-  const pressEnterForRenameHandler = useCallback(async (inputText: string) => {
+  const pressEnterForRenameHandler = useCallback(async(inputText: string) => {
     const parentPath = pathUtils.addTrailingSlash(nodePath.dirname(bookmarkedPage.path ?? ''));
     const newPagePath = nodePath.resolve(parentPath, inputText);
     if (newPagePath === bookmarkedPage.path) {
@@ -99,7 +99,7 @@ export const BookmarkItem = (props: Props): JSX.Element => {
     }
   }, [bookmarkedPage, bookmarkFolderTreeMutation]);
 
-  const deleteMenuItemClickHandler = useCallback(async (_pageId: string, pageInfo: IPageInfoAll | undefined): Promise<void> => {
+  const deleteMenuItemClickHandler = useCallback(async(_pageId: string, pageInfo: IPageInfoAll | undefined): Promise<void> => {
     if (bookmarkedPage._id == null || bookmarkedPage.path == null) {
       throw Error('_id and path must not be null.');
     }
@@ -116,9 +116,9 @@ export const BookmarkItem = (props: Props): JSX.Element => {
     onClickDeleteBookmarkHandler(pageToDelete);
   }, [bookmarkedPage._id, bookmarkedPage.path, bookmarkedPage.revision, onClickDeleteBookmarkHandler]);
 
-  const putBackClickHandler = useCallback(async () => {
-    const { _id: pageId, path } = bookmarkedPage
-    const putBackedHandler = async () => {
+  const putBackClickHandler = useCallback(async() => {
+    const { _id: pageId, path } = bookmarkedPage;
+    const putBackedHandler = async() => {
       try {
         await unlink(path);
         mutateAllPageInfo();
@@ -126,13 +126,13 @@ export const BookmarkItem = (props: Props): JSX.Element => {
         if (pageId === currentPage?._id) {
           router.push(`/${pageId}`);
         }
-        toastSuccess(t('page_has_been_reverted', { path }))
+        toastSuccess(t('page_has_been_reverted', { path }));
       }
       catch (err) {
         toastError(err);
       }
       if (onPagePutBacked != null) {
-        onPagePutBacked(path)
+        onPagePutBacked(path);
       }
     };
     openPutBackPageModal({ pageId, path }, { onPutBacked: putBackedHandler });

+ 1 - 1
apps/app/src/components/Navbar/GrowiContextualSubNavigation.tsx

@@ -235,7 +235,7 @@ const GrowiContextualSubNavigation = (props: GrowiContextualSubNavigationProps):
   const { open: openRenameModal } = usePageRenameModal();
   const { open: openDeleteModal } = usePageDeleteModal();
   const { data: templateTagData } = useTemplateTagData();
-  const {mutate: mutatePageInfo} = useSWRxPageInfo(pageId)
+  const { mutate: mutatePageInfo } = useSWRxPageInfo(pageId);
 
   const updateStateAfterSave = useUpdateStateAfterSave(pageId);
 

+ 1 - 1
apps/app/src/components/PageList/PageListItemL.tsx

@@ -91,7 +91,7 @@ const PageListItemLSubstance: ForwardRefRenderFunction<ISelectable, Props> = (pr
   const { open: openDeleteModal } = usePageDeleteModal();
   const { open: openPutBackPageModal } = usePutBackPageModal();
 
-  const {data: currentUser } = useCurrentUser();
+  const { data: currentUser } = useCurrentUser();
   const shouldFetch = isSelected && (pageData != null || pageMeta != null);
   const { data: pageInfo } = useSWRxPageInfo(shouldFetch ? pageData?._id : null);
   const { mutate: mutateUserBookmark } = useSWRxUserBookmarks(currentUser?._id);