Jelajahi Sumber

fix limit:null and recentcreated bug

zahmis 5 tahun lalu
induk
melakukan
a0f048644d

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

@@ -23,7 +23,7 @@ class MyBookmarkList extends React.Component {
       pages: [],
       activePage: 1,
       totalPages: 0,
-      pagingLimit: 30,
+      pagingLimit: null,
     };
 
     this.handlePage = this.handlePage.bind(this);

+ 0 - 1
src/client/js/components/PageAttachment.jsx

@@ -111,7 +111,6 @@ class PageAttachment extends React.Component {
 
 
   render() {
-    console.log(this.state.limit);
     const { t } = this.props;
     if (this.state.attachments.length === 0) {
       return t('No_attachments_yet');

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

@@ -18,7 +18,7 @@ const PageList = (props) => {
 
   const [activePage, setActivePage] = useState(1);
   const [totalPages, setTotalPages] = useState(0);
-  const [limit, setLimit] = useState(10);
+  const [limit, setLimit] = useState(null);
 
   function setPageNumber(selectedPageNumber) {
     setActivePage(selectedPageNumber);

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

@@ -19,7 +19,7 @@ class PageTimeline extends React.Component {
     this.state = {
       activePage: 1,
       totalPageItems: 0,
-      limit:  10,
+      limit: null,
 
       // TODO: remove after when timeline is implemented with React and inject data with props
       pages: this.props.pages,

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

@@ -14,8 +14,8 @@ class PaginationWrapper extends React.Component {
     super(props);
 
     this.state = {
-      totalItemsCount: 0,
       activePage: 1,
+      totalItemsCount: 0,
       paginationNumbers: {},
       limit: this.props.pagingLimit || Infinity,
     };

+ 9 - 5
src/client/js/components/RecentCreated/RecentCreated.jsx

@@ -17,7 +17,7 @@ class RecentCreated extends React.Component {
       pages: [],
       activePage: 1,
       totalPages: 0,
-      pagingLimit: 30,
+      pagingLimit: null,
     };
 
     this.handlePage = this.handlePage.bind(this);
@@ -32,18 +32,18 @@ class RecentCreated extends React.Component {
     await this.getRecentCreatedList(selectedPage);
   }
 
-  async getRecentCreatedList(selectPageNumber) {
+  async getRecentCreatedList(selectedPage) {
     const { appContainer, userId } = this.props;
-    const page = { selectPageNumber };
+    const page = selectedPage;
     // const userId = appContainer.currentUserId;
 
     // pagesList get and pagination calculate
-    const res = await appContainer.apiv3Get(`/users/${userId}/recent`, page);
+    const res = await appContainer.apiv3Get(`/users/${userId}/recent`, { page });
     const { totalCount, pages, limit } = res.data;
 
     this.setState({
       pages,
-      activePage: selectPageNumber,
+      activePage: selectedPage,
       totalPages: totalCount,
       pagingLimit: limit,
     });
@@ -67,6 +67,10 @@ class RecentCreated extends React.Component {
   render() {
     const pageList = this.generatePageList(this.state.pages);
 
+    console.log(this.state.activePage);
+    console.log(this.state.totalPages);
+    console.log(this.state.pagingLimit);
+
     return (
       <div className="page-list-container-create">
         <ul className="page-list-ul page-list-ul-flat mb-3">

+ 1 - 1
src/client/js/services/PageHistoryContainer.js

@@ -28,7 +28,7 @@ export default class PageHistoryContainer extends Container {
 
       totalPages: 0,
       activePage: 1,
-      pagingLimit: 10,
+      pagingLimit: null,
     };
 
     this.retrieveRevisions = this.retrieveRevisions.bind(this);