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

+ 1 - 0
packages/app/src/components/Page/TrashPageAlert.jsx

@@ -97,6 +97,7 @@ const TrashPageAlert = (props) => {
           pageId={pageId}
           path={path}
         />
+        {/* TODO: show PageDeleteModal with usePageDeleteModalStatus by 87567  */}
         <PageDeleteModal
           isOpen={isPageDeleteModalShown}
           onClose={opclosePageDeleteModalHandler}

+ 3 - 6
packages/app/src/components/PageDeleteModal.tsx

@@ -31,7 +31,6 @@ const deleteIconAndKey = {
 
 type Props = {
   isOpen: boolean,
-  // pages: IPageForPageDeleteModal[],
   isDeleteCompletelyModal: boolean,
   isAbleToDeleteCompletely: boolean,
   onClose?: () => void,
@@ -40,15 +39,13 @@ type Props = {
 const PageDeleteModal: FC<Props> = (props: Props) => {
   const { t } = useTranslation('');
   const {
-    /* isOpen, onClose, */ isDeleteCompletelyModal, /* pages , */ isAbleToDeleteCompletely,
+    isDeleteCompletelyModal, isAbleToDeleteCompletely,
   } = props;
 
 
   const { data: closeDeleteModalData, close: closeDeleteModal } = usePageDeleteModalStatus();
   const { data: isOpened } = useDeleteModalOpened();
 
-  console.log('closeDeleteModalData', closeDeleteModalData);
-
   const [isDeleteRecursively, setIsDeleteRecursively] = useState(true);
   const [isDeleteCompletely, setIsDeleteCompletely] = useState(isDeleteCompletelyModal && isAbleToDeleteCompletely);
   const deleteMode = isDeleteCompletely ? 'completely' : 'temporary';
@@ -151,7 +148,7 @@ const PageDeleteModal: FC<Props> = (props: Props) => {
     );
   }
 
-  const renderHoge = () => {
+  const renderPagePathsToDelete = () => {
     if (closeDeleteModalData != null && closeDeleteModalData.pages != null) {
       const { pages } = closeDeleteModalData;
       return pages.pages.map(page => <div key={page.pageId}><code>{ page.path }</code></div>);
@@ -173,7 +170,7 @@ const PageDeleteModal: FC<Props> = (props: Props) => {
           {/* {closeDeleteModalData?.pages.pages.map((page) => {
             return <div key={page.pageId}><code>{ page.path }</code></div>;
           })} */}
-          {renderHoge()}
+          {renderPagePathsToDelete()}
         </div>
         {renderDeleteRecursivelyForm()}
         {!isDeleteCompletelyModal && renderDeleteCompletelyForm()}

+ 1 - 0
packages/app/src/components/SearchPage.jsx

@@ -371,6 +371,7 @@ class SearchPage extends React.Component {
           activePage={this.state.activePage}
         >
         </SearchPageLayout>
+        {/* TODO: show PageDeleteModal with usePageDeleteModalStatus by 87569  */}
         <PageDeleteModal
           isOpen={this.state.isDeleteConfirmModalShown}
           onClose={this.closeDeleteConfirmModalHandler}

+ 2 - 1
packages/app/src/components/Sidebar/PageTree/ItemsTree.tsx

@@ -94,10 +94,11 @@ const ItemsTree: FC<ItemsTreeProps> = (props: ItemsTreeProps) => {
   const { data: ancestorsChildrenData, error: error1 } = useSWRxPageAncestorsChildren(targetPath);
   const { data: rootPageData, error: error2 } = useSWRxRootPage();
 
+  // TODO: show PageDeleteModal with usePageDeleteModalStatus by 87568
   const DeleteModal = (
     <PageDeleteModal
       isOpen={isDeleteModalOpen}
-      pages={pagesToDelete}
+      // pages={pagesToDelete}
       isAbleToDeleteCompletely={isAbleToDeleteCompletely}
       isDeleteCompletelyModal={isDeleteCompletelyModal}
       onClose={onCloseDelete}