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

add totalCount to result and adjust tagList component

yusuketk 7 лет назад
Родитель
Сommit
05a629c5a4
2 измененных файлов с 7 добавлено и 7 удалено
  1. 4 5
      src/client/js/components/TagsList.jsx
  2. 3 2
      src/server/routes/tag.js

+ 4 - 5
src/client/js/components/TagsList.jsx

@@ -26,8 +26,8 @@ export default class TagsList extends React.Component {
     const offset = (selectPageNumber - 1) * limit;
     const res = await this.props.crowi.apiGet('/tags.list', { limit, offset });
 
-    const totalCount = res.result.pages.length;
-    const tagData = res.result.pages.tagData;
+    const totalCount = res.result.totalCount;
+    const tagData = res.result.tags;
     const activePage = selectPageNumber;
     const paginationNumbers = this.calculatePagination(limit, totalCount, activePage);
 
@@ -73,14 +73,13 @@ export default class TagsList extends React.Component {
   generateTagList(tagData) {
     return tagData.map((data) => {
       return (
-        <a key={data} href={`/_search?q=tag:${data}`} className="list-group-item">
-          <p className="float-left my-0">{data}</p>
+        <a key={data.name} href={`/_search?q=tag:${data.name}`} className="list-group-item">
+          <p className="float-left my-0">{data.name}</p>
         </a>
       );
     });
   }
 
-
   /**
    * generate Elements of Pagination First Prev
    * ex.  <<   <   1  2  3  >  >>

+ 3 - 2
src/server/routes/tag.js

@@ -37,9 +37,10 @@ module.exports = function(crowi, app) {
     const offset = +req.query.offset || 0;
     const sortOpt = { count: -1 };
     const queryOptions = { offset, limit, sortOpt };
-
+    const result = {};
     try {
-      const result = await Tag.findList(queryOptions);
+      result.tags = await Tag.findList(queryOptions);
+      result.totalCount = await Tag.count({});
       return res.json(ApiResponse.success({ result }));
     }
     catch (err) {