fb fix

packages/app/src/components/Common/Dropdown/PageItemControl.tsx

@@ -69,6 +69,8 @@ const PageItemControlDropdownMenu = React.memo((props: DropdownMenuProps): JSX.E
       logger.warn('This page could not be deleted.');
       return;
     }
+    console.log('pageInfo', pageInfo);
+    console.log('pageId', pageId);
     await onClickDeleteMenuItem(pageId);
   }, [onClickDeleteMenuItem, pageId, pageInfo]);
 

packages/app/src/components/Sidebar/PageTree.tsx

@@ -3,12 +3,11 @@ import { useTranslation } from 'react-i18next';
 
 import { useSWRxV5MigrationStatus } from '~/stores/page-listing';
 import {
-  useCurrentPagePath, useCurrentPageId, useRevisionId, useTargetAndAncestors, useIsGuestUser, useNotFoundTargetPathOrId,
+  useCurrentPagePath, useCurrentPageId, useTargetAndAncestors, useIsGuestUser, useNotFoundTargetPathOrId,
 } from '~/stores/context';
 
 import ItemsTree from './PageTree/ItemsTree';
 import PrivateLegacyPages from './PageTree/PrivateLegacyPages';
-import { IPageForPageDeleteModal } from '~/stores/ui';
 
 const PageTree: FC = memo(() => {
   const { t } = useTranslation();
@@ -16,7 +15,6 @@ const PageTree: FC = memo(() => {
   const { data: isGuestUser } = useIsGuestUser();
   const { data: currentPath } = useCurrentPagePath();
   const { data: targetId } = useCurrentPageId();
-  const { data: revisionId } = useRevisionId();
   const { data: targetAndAncestorsData } = useTargetAndAncestors();
   const { data: notFoundTargetPathOrIdData } = useNotFoundTargetPathOrId();
   const { data: migrationStatus } = useSWRxV5MigrationStatus();
@@ -61,14 +59,6 @@ const PageTree: FC = memo(() => {
 
   const path = currentPath || '/';
 
-  const pageId = targetId != null ? targetId : '';
-
-  const pageToDelete: IPageForPageDeleteModal = {
-    pageId,
-    path,
-    revisionId,
-  };
-
   return (
     <>
       <div className="grw-sidebar-content-header p-3">
@@ -81,7 +71,6 @@ const PageTree: FC = memo(() => {
           targetPath={path}
           targetPathOrId={targetPathOrId}
           targetAndAncestorsData={targetAndAncestorsData}
-          pageToDelete={pageToDelete}
         />
       </div>
 

packages/app/src/components/Sidebar/PageTree/Item.tsx

@@ -22,7 +22,7 @@ interface ItemProps {
   itemNode: ItemNode
   targetPathOrId?: string
   isOpen?: boolean
-  onClickDeleteByPage?(): void
+  onClickDeleteByPage?(pageToDelete: IPageForPageDeleteModal | null): void
 }
 
 // Utility to mark target
@@ -139,7 +139,7 @@ const Item: FC<ItemProps> = (props: ItemProps) => {
       path,
     };
 
-    onClickDeleteByPage();
+    onClickDeleteByPage(pageToDelete);
   }, [page, onClickDeleteByPage]);
 
 

packages/app/src/components/Sidebar/PageTree/ItemsTree.tsx

@@ -52,10 +52,9 @@ type ItemsTreeProps = {
   targetPath: string
   targetPathOrId?: string
   targetAndAncestorsData?: TargetAndAncestors
-  pageToDelete: IPageForPageDeleteModal
 }
 
-const renderByInitialNode = (initialNode: ItemNode, isEnableActions: boolean, targetPathOrId?: string, onClickDeleteByPage?: () => void): JSX.Element => {
+const renderByInitialNode = (initialNode: ItemNode, isEnableActions: boolean, targetPathOrId?: string, onClickDeleteByPage?: (pageToDelete: IPageForPageDeleteModal | null) => void): JSX.Element => {
   return (
     <ul className="grw-pagetree list-group p-3">
       <Item
@@ -76,14 +75,14 @@ const renderByInitialNode = (initialNode: ItemNode, isEnableActions: boolean, ta
  */
 const ItemsTree: FC<ItemsTreeProps> = (props: ItemsTreeProps) => {
   const {
-    targetPath, targetPathOrId, targetAndAncestorsData, pageToDelete, isEnableActions,
+    targetPath, targetPathOrId, targetAndAncestorsData, isEnableActions,
   } = props;
 
   const { data: ancestorsChildrenData, error: error1 } = useSWRxPageAncestorsChildren(targetPath);
   const { data: rootPageData, error: error2 } = useSWRxRootPage();
   const { open: openDeleteModal } = usePageDeleteModalStatus();
 
-  const onClickDeleteByPage = () => {
+  const onClickDeleteByPage = (pageToDelete: IPageForPageDeleteModal) => {
     openDeleteModal([pageToDelete]);
   };