Quellcode durchsuchen

add pagingLimitS in PageHistory

zahmis vor 5 Jahren
Ursprung
Commit
bb5174c4fa

+ 4 - 4
src/client/js/components/PageHistory.jsx

@@ -16,6 +16,7 @@ const logger = loggerFactory('growi:PageHistory');
 
 
 function PageHistory(props) {
 function PageHistory(props) {
   const { pageHistoryContainer } = props;
   const { pageHistoryContainer } = props;
+  const { activePage, totalPages, pagingLimit } = pageHistoryContainer.state;
 
 
   const handlePage = useCallback(async(selectedPage) => {
   const handlePage = useCallback(async(selectedPage) => {
     try {
     try {
@@ -48,15 +49,14 @@ function PageHistory(props) {
       }
       }
     });
     });
   }
   }
-  console.log(pageHistoryContainer.state.pagingLimit);
 
 
   function pager() {
   function pager() {
     return (
     return (
       <PaginationWrapper
       <PaginationWrapper
-        activePage={pageHistoryContainer.state.activePage}
+        activePage={activePage}
         changePage={handlePage}
         changePage={handlePage}
-        totalItemsCount={pageHistoryContainer.state.totalPages}
-        pagingLimit={pageHistoryContainer.state.pagingLimit}
+        totalItemsCount={totalPages}
+        pagingLimit={pagingLimit}
         align="center"
         align="center"
       />
       />
     );
     );

+ 7 - 2
src/client/js/services/PageHistoryContainer.js

@@ -32,7 +32,6 @@ export default class PageHistoryContainer extends Container {
       activePage: 1,
       activePage: 1,
       pagingLimit: this.appContainer.getConfig().pageLimitationS,
       pagingLimit: this.appContainer.getConfig().pageLimitationS,
     };
     };
-    console.log(this.state.pagingLimit);
 
 
     this.retrieveRevisions = this.retrieveRevisions.bind(this);
     this.retrieveRevisions = this.retrieveRevisions.bind(this);
     this.onDiffOpenClicked = this.onDiffOpenClicked.bind(this);
     this.onDiffOpenClicked = this.onDiffOpenClicked.bind(this);
@@ -54,11 +53,17 @@ export default class PageHistoryContainer extends Container {
    */
    */
   async retrieveRevisions(selectedPage) {
   async retrieveRevisions(selectedPage) {
     const { pageId, shareLinkId } = this.pageContainer.state;
     const { pageId, shareLinkId } = this.pageContainer.state;
+    const { pagingLimit } = this.state;
+
+    console.log(pagingLimit);
+
     if (!pageId) {
     if (!pageId) {
       return;
       return;
     }
     }
 
 
-    const res = await this.appContainer.apiv3Get('/revisions/list', { pageId, shareLinkId, selectedPage });
+    const res = await this.appContainer.apiv3Get('/revisions/list', {
+      pageId, shareLinkId, selectedPage, pagingLimit,
+    });
     const rev = res.data.docs;
     const rev = res.data.docs;
 
 
     // set Pagination state
     // set Pagination state

+ 2 - 1
src/server/routes/apiv3/revisions.js

@@ -9,7 +9,6 @@ const ErrorV3 = require('../../models/vo/error-apiv3');
 
 
 const router = express.Router();
 const router = express.Router();
 
 
-
 /**
 /**
  * @swagger
  * @swagger
  *  tags:
  *  tags:
@@ -98,6 +97,7 @@ module.exports = (crowi) => {
    */
    */
   router.get('/list', certifySharedPage, accessTokenParser, loginRequired, validator.retrieveRevisions, apiV3FormValidator, async(req, res) => {
   router.get('/list', certifySharedPage, accessTokenParser, loginRequired, validator.retrieveRevisions, apiV3FormValidator, async(req, res) => {
     const pageId = req.query.pageId;
     const pageId = req.query.pageId;
+    const pagingLimit = req.query.pagingLimit;
     const { isSharedPage } = req;
     const { isSharedPage } = req;
 
 
     const selectedPage = parseInt(req.query.selectedPage) || 1;
     const selectedPage = parseInt(req.query.selectedPage) || 1;
@@ -114,6 +114,7 @@ module.exports = (crowi) => {
         { path: page.path },
         { path: page.path },
         {
         {
           page: selectedPage,
           page: selectedPage,
+          limit: pagingLimit,
           sort: { createdAt: -1 },
           sort: { createdAt: -1 },
           populate: {
           populate: {
             path: 'author',
             path: 'author',