refs #80335: Detach page control from page container

- Revert changes which uses "deletePage" method with arguments pageId and revisionId

packages/app/src/client/services/PageContainer.js

@@ -529,7 +529,9 @@ export default class PageContainer extends Container {
     return res;
   }
 
-  deletePage(pageId, revisionId, isRecursively, isCompletely) {
+  // If you want to delete a specific page, give the pageId as an argument.
+  // Otherwise, the current page will be deleted
+  deletePage(isRecursively, isCompletely, pageId = this.state.pageId, revisionId = this.state.revisionId) {
     const socketIoContainer = this.appContainer.getContainer('SocketIoContainer');
 
     // control flag

packages/app/src/components/Page/PageManagement.jsx

@@ -22,7 +22,7 @@ const PageManagement = (props) => {
   const {
     t, appContainer, pageContainer, isCompactMode,
   } = props;
-  const { path, pageId, revisionId, isDeletable, isAbleToDeleteCompletely } = pageContainer.state;
+  const { path, isDeletable, isAbleToDeleteCompletely } = pageContainer.state;
 
   const { currentUser } = appContainer;
   const isTopPagePath = isTopPage(path);
@@ -179,8 +179,6 @@ const PageManagement = (props) => {
           isOpen={isPageDeleteModalShown}
           onClose={closePageDeleteModalHandler}
           path={path}
-          pageId={pageId}
-          revisionId={revisionId}
           isAbleToDeleteCompletely={isAbleToDeleteCompletely}
         />
         <PagePresentationModal

packages/app/src/components/Page/TrashPageAlert.jsx

@@ -15,7 +15,7 @@ import PageDeleteModal from '../PageDeleteModal';
 const TrashPageAlert = (props) => {
   const { t, pageContainer } = props;
   const {
-    pageId, revisionId, path, isDeleted, lastUpdateUsername, updatedAt, deletedUserName, deletedAt, isAbleToDeleteCompletely,
+    path, isDeleted, lastUpdateUsername, updatedAt, deletedUserName, deletedAt, isAbleToDeleteCompletely,
   } = pageContainer.state;
   const [isEmptyTrashModalShown, setIsEmptyTrashModalShown] = useState(false);
   const [isPutbackPageModalShown, setIsPutbackPageModalShown] = useState(false);
@@ -98,8 +98,6 @@ const TrashPageAlert = (props) => {
           isOpen={isPageDeleteModalShown}
           onClose={opclosePageDeleteModalHandler}
           path={path}
-          pageId={pageId}
-          revisionId={revisionId}
           isDeleteCompletelyModal
           isAbleToDeleteCompletely={isAbleToDeleteCompletely}
         />

packages/app/src/components/PageDeleteModal.jsx

@@ -50,7 +50,7 @@ const PageDeleteModal = (props) => {
     setErrs(null);
 
     try {
-      const response = await pageContainer.deletePage(pageId, revisionId, isDeleteRecursively, isDeleteCompletely);
+      const response = await pageContainer.deletePage(isDeleteRecursively, isDeleteCompletely);
       const trashPagePath = response.page.path;
       window.location.href = encodeURI(trashPagePath);
     }