add flag

src/client/js/components/PageDeleteModal.jsx

@@ -50,8 +50,9 @@ const PageDeleteModal = (props) => {
     setErrorMessage(null);
 
     try {
-      await pageContainer.deletePage(isDeleteRecursively, isDeleteCompletely);
-      window.location.href = encodeURI(path);
+      const response = await pageContainer.deletePage(isDeleteRecursively, isDeleteCompletely);
+      const trashPagePath = response.page.path;
+      window.location.href = encodeURI(trashPagePath);
     }
     catch (err) {
       setErrorCode(err.code);
@@ -138,7 +139,6 @@ PageDeleteModal.propTypes = {
 
   isOpen: PropTypes.bool.isRequired,
   toggle: PropTypes.func.isRequired,
-  onClickSubmit: PropTypes.func.isRequired,
 
   path: PropTypes.string.isRequired,
   isDeleteCompletelyModal: PropTypes.bool,

src/client/js/services/PageContainer.js

@@ -301,11 +301,15 @@ export default class PageContainer extends Container {
     return { page: res.page, tags: res.tags };
   }
 
-  async deletePage(recursively, completely) {
+  deletePage(isRecursively, isCompletely) {
     const websocketContainer = this.appContainer.getContainer('WebsocketContainer');
 
+    // control flag
+    const completely = isCompletely ? true : null;
+    const recursively = isRecursively ? true : null;
+
     try {
-      await this.appContainer.apiPost('/pages.remove', {
+      return this.appContainer.apiPost('/pages.remove', {
         recursively,
         completely,
         page_id: this.state.pageId,