takeru0001 5 лет назад
Родитель
Сommit
e585c3bc7a
2 измененных файлов с 10 добавлено и 17 удалено
  1. 6 5
      src/client/js/components/PageList.jsx
  2. 4 12
      src/server/routes/apiv3/pages.js

+ 6 - 5
src/client/js/components/PageList.jsx

@@ -18,15 +18,18 @@ const PageList = (props) => {
 
 
   const [totalItemsCount, setTotalItemsCount] = useState(0);
   const [totalItemsCount, setTotalItemsCount] = useState(0);
   const [activePage, setActivePage] = useState(1);
   const [activePage, setActivePage] = useState(1);
+  const [totalPages, setTotalPages] = useState(0);
   const [paginationNumbers, setPaginationNumbers] = useState({});
   const [paginationNumbers, setPaginationNumbers] = useState({});
   const [limit, setLimit] = useState(Infinity);
   const [limit, setLimit] = useState(Infinity);
 
 
   const getPageList = useCallback(async() => {
   const getPageList = useCallback(async() => {
-    const res = await appContainer.apiv3Get('/pages/list', { path });
+    const res = await appContainer.apiv3Get('/pages/list', { path, limit });
 
 
     setPages(res.data.pages);
     setPages(res.data.pages);
     setIsLoading(true);
     setIsLoading(true);
-  }, [appContainer, path]);
+    setLimit(limit);
+    setTotalPages(res.totalCount);
+  }, [appContainer, path, limit]);
 
 
   useEffect(() => {
   useEffect(() => {
     getPageList();
     getPageList();
@@ -50,8 +53,6 @@ const PageList = (props) => {
   ));
   ));
 
 
   const handlePage = 'handlePage';
   const handlePage = 'handlePage';
-  const totalPages = 'totalPages';
-  const pagingLimit = 'pagingLimit';
 
 
   return (
   return (
     <div className="page-list-container-create">
     <div className="page-list-container-create">
@@ -62,7 +63,7 @@ const PageList = (props) => {
         activePage={activePage}
         activePage={activePage}
         changePage={handlePage}
         changePage={handlePage}
         totalItemsCount={totalPages}
         totalItemsCount={totalPages}
-        pagingLimit={pagingLimit}
+        pagingLimit={limit}
       />
       />
     </div>
     </div>
   );
   );

+ 4 - 12
src/server/routes/apiv3/pages.js

@@ -89,18 +89,10 @@ module.exports = (crowi) => {
   router.get('/list', accessTokenParser, loginRequired, async(req, res) => {
   router.get('/list', accessTokenParser, loginRequired, async(req, res) => {
     const { path } = req.query;
     const { path } = req.query;
     try {
     try {
-      const result = await Page.findListWithDescendants(path, req.user);
-
-      const paginateResult = await Page.paginate(
-        {},
-        {
-          page: result,
-          limit: PAGE_ITEMS,
-          sort: { createdAt: -1 },
-        },
-      );
-      console.log(paginateResult);
-      return res.apiv3(paginateResult);
+      const result = await Page.findListWithDescendants(path, req.user, { limit: 8, offset: 0 });
+      console.log(result);
+
+      return res.apiv3(result);
     }
     }
     catch (err) {
     catch (err) {
       logger.error('Failed to get Descendants Pages', err);
       logger.error('Failed to get Descendants Pages', err);