Преглед изворни кода

delete PageAttachmet in app.jsx

zahmis пре 5 година
родитељ
комит
14df29376f
3 измењених фајлова са 9 додато и 18 уклоњено
  1. 0 3
      src/client/js/app.jsx
  2. 9 13
      src/client/js/components/PageTimeline.jsx
  3. 0 2
      src/server/routes/apiv3/pages.js

+ 0 - 3
src/client/js/app.jsx

@@ -19,7 +19,6 @@ import PageTimeline from './components/PageTimeline';
 import CommentEditorLazyRenderer from './components/PageComment/CommentEditorLazyRenderer';
 import CommentEditorLazyRenderer from './components/PageComment/CommentEditorLazyRenderer';
 import PageManagement from './components/Page/PageManagement';
 import PageManagement from './components/Page/PageManagement';
 import TrashPageAlert from './components/Page/TrashPageAlert';
 import TrashPageAlert from './components/Page/TrashPageAlert';
-import PageAttachment from './components/PageAttachment';
 import PageStatusAlert from './components/PageStatusAlert';
 import PageStatusAlert from './components/PageStatusAlert';
 import RecentCreated from './components/RecentCreated/RecentCreated';
 import RecentCreated from './components/RecentCreated/RecentCreated';
 import MyDraftList from './components/MyDraftList/MyDraftList';
 import MyDraftList from './components/MyDraftList/MyDraftList';
@@ -86,9 +85,7 @@ if (pageContainer.state.pageId != null) {
   Object.assign(componentMappings, {
   Object.assign(componentMappings, {
     'page-comments-list': <PageComments />,
     'page-comments-list': <PageComments />,
     'page-comment-write': <CommentEditorLazyRenderer />,
     'page-comment-write': <CommentEditorLazyRenderer />,
-    'page-attachment': <PageAttachment />,
     'page-management': <PageManagement />,
     'page-management': <PageManagement />,
-
     'revision-toc': <TableOfContents />,
     'revision-toc': <TableOfContents />,
     'seen-user-list': <SeenUserList />,
     'seen-user-list': <SeenUserList />,
     'liker-list': <LikerList />,
     'liker-list': <LikerList />,

+ 9 - 13
src/client/js/components/PageTimeline.jsx

@@ -35,8 +35,6 @@ class PageTimeline extends React.Component {
     const { path } = pageContainer.state;
     const { path } = pageContainer.state;
     const { limit } = this.state;
     const { limit } = this.state;
     const offset = (selectedPage - 1) * limit;
     const offset = (selectedPage - 1) * limit;
-
-    // if (!path) { return null }
     const activePage = selectedPage;
     const activePage = selectedPage;
 
 
     const res = await appContainer.apiv3Get('/pages/list', { path, limit, offset });
     const res = await appContainer.apiv3Get('/pages/list', { path, limit, offset });
@@ -47,20 +45,18 @@ class PageTimeline extends React.Component {
       totalPageItems,
       totalPageItems,
       pages,
       pages,
     });
     });
-    console.log(activePage);
+  }
+
+  async componentDidMount() {
+    await this.handlePage(1);
   }
   }
 
 
   componentWillMount() {
   componentWillMount() {
     const { appContainer } = this.props;
     const { appContainer } = this.props;
-
     // initialize GrowiRenderer
     // initialize GrowiRenderer
     this.growiRenderer = appContainer.getRenderer('timeline');
     this.growiRenderer = appContainer.getRenderer('timeline');
   }
   }
 
 
-  async componentDidMount() {
-    await this.handlePage(1);
-  }
-
   render() {
   render() {
     const { pages } = this.state;
     const { pages } = this.state;
 
 
@@ -100,6 +96,11 @@ class PageTimeline extends React.Component {
 
 
 }
 }
 
 
+/**
+ * Wrapper component for using unstated
+ */
+const PageTimelineWrapper = withUnstatedContainers(PageTimeline, [AppContainer, PageContainer]);
+
 PageTimeline.propTypes = {
 PageTimeline.propTypes = {
   t: PropTypes.func.isRequired, // i18next
   t: PropTypes.func.isRequired, // i18next
   appContainer: PropTypes.instanceOf(AppContainer).isRequired,
   appContainer: PropTypes.instanceOf(AppContainer).isRequired,
@@ -107,9 +108,4 @@ PageTimeline.propTypes = {
   pages: PropTypes.arrayOf(PropTypes.object),
   pages: PropTypes.arrayOf(PropTypes.object),
 };
 };
 
 
-/**
- * Wrapper component for using unstated
- */
-const PageTimelineWrapper = withUnstatedContainers(PageTimeline, [AppContainer, PageContainer]);
-
 export default withTranslation()(PageTimelineWrapper);
 export default withTranslation()(PageTimelineWrapper);

+ 0 - 2
src/server/routes/apiv3/pages.js

@@ -90,8 +90,6 @@ module.exports = (crowi) => {
     const offset = +req.query.offset || 0;
     const offset = +req.query.offset || 0;
     const queryOptions = { offset, limit };
     const queryOptions = { offset, limit };
 
 
-    console.log(limit);
-
     try {
     try {
       const result = await Page.findListWithDescendants(path, req.user, queryOptions);
       const result = await Page.findListWithDescendants(path, req.user, queryOptions);
       console.log(result);
       console.log(result);