Просмотр исходного кода

Move from appcontainer to pagecontainer

ryohek 5 лет назад
Родитель
Сommit
2283d990e0

+ 10 - 3
src/client/js/components/Page/PageManagement.jsx

@@ -12,8 +12,15 @@ import RenameModal from '../RenameModal';
 
 const PageManagement = (props) => {
   const { t, appContainer, pageContainer } = props;
-  const { path, isDeletable, isAbleToDeleteCompletely } = pageContainer.state;
-  const { currentUser, openRenameModal, closeRenameModal } = appContainer;
+  const {
+    path,
+    isDeletable,
+    isAbleToDeleteCompletely,
+    openRenameModal,
+    closeRenameModal,
+  } = pageContainer.state;
+
+  const { currentUser } = appContainer;
   const isTopPagePath = isTopPage(path);
 
   const [isPageDeleteModalShown, setIsPageDeleteModalShown] = useState(false);
@@ -29,7 +36,7 @@ const PageManagement = (props) => {
   function renderDropdownItemForNotTopPage() {
     return (
       <>
-        <a className="dropdown-item" href="#" onClick={appContainer.openRenameModal}>
+        <a className="dropdown-item" href="#" onClick={pageContainer.openRenameModal}>
           <i className="icon-fw icon-action-redo"></i> { t('Move/Rename') }
         </a>
         <RenameModal

+ 1 - 1
src/client/js/components/RenameModal.jsx

@@ -51,7 +51,7 @@ const RenameModal = (props) => {
   }
 
   return (
-    <Modal isOpen={appContainer.state.isRenameModalShown} toggle={appContainer.closeRenameModal}>
+    <Modal isOpen={pageContainer.state.isRenameModalShown} toggle={pageContainer.closeRenameModal}>
       <ModalHeader tag="h4" toggle={appContainer.closeRenameModal} className="bg-primary text-light">
         { t('modal_rename.label.Move/Rename page') }
       </ModalHeader>

+ 0 - 10
src/client/js/services/AppContainer.js

@@ -100,8 +100,6 @@ export default class AppContainer extends Container {
 
     this.openPageCreateModal = this.openPageCreateModal.bind(this);
     this.closePageCreateModal = this.closePageCreateModal.bind(this);
-    this.openRenameModal = this.openRenameModal.bind(this);
-    this.closeRenameModal = this.closeRenameModal.bind(this);
   }
 
   /**
@@ -489,12 +487,4 @@ export default class AppContainer extends Container {
     this.setState({ isPageCreateModalShown: false });
   }
 
-  openRenameModal() {
-    this.setState({ isRenameModalShown: true });
-  }
-
-  closeRenameModal() {
-    this.setState({ isRenameModalShown: false });
-  }
-
 }

+ 10 - 0
src/client/js/services/PageContainer.js

@@ -114,6 +114,8 @@ export default class PageContainer extends Container {
     this.closePageDuplicateModal = this.closePageDuplicateModal.bind(this);
     this.openCreateTemplatePageModal = this.openCreateTemplatePageModal.bind(this);
     this.closeCreateTemplatePageModal = this.closeCreateTemplatePageModal.bind(this);
+    this.openRenameModal = this.openRenameModal.bind(this);
+    this.closeRenameModal = this.closeRenameModal.bind(this);
   }
 
   /**
@@ -448,4 +450,12 @@ export default class PageContainer extends Container {
     this.setState({ isCreateTemplatePageModalShown: false });
   }
 
+  openRenameModal() {
+    this.setState({ isRenameModalShown: true });
+  }
+
+  closeRenameModal() {
+    this.setState({ isRenameModalShown: false });
+  }
+
 }