wip

packages/app/src/server/routes/search.js

@@ -163,6 +163,16 @@ module.exports = function(crowi, app) {
         return page;
       });
 
+      findResult.pages.map((page) => {
+        const data = esResult.data.find((data) => {
+          return page.id === data._id;
+        });
+
+        page.bookmarkCount = data._source.bookmark_count || 0;
+        page.elasticSearchResult = data.elasticSearchResult;
+        return page;
+      });
+      console.log('findResult', findResult);
       result.meta = esResult.meta;
       result.totalCount = findResult.totalCount;
       result.data = findResult.pages
@@ -180,7 +190,7 @@ module.exports = function(crowi, app) {
     catch (err) {
       return res.json(ApiResponse.error(err));
     }
-
+    console.log('result', result);
     return res.json(ApiResponse.success(result));
   };
 

packages/ui/src/components/PagePath/PageListMeta.jsx

@@ -38,8 +38,8 @@ export class PageListMeta extends React.Component {
     }
 
     let bookmarkCount;
-    if (page.bookmarkCount > 0) {
-      bookmarkCount = <span><i className="icon-star" />{page.bookmarkCount}</span>;
+    if (this.props.bookmarkCount > 0) {
+      bookmarkCount = <span><i className="icon-star" />{this.props.bookmarkCount}</span>;
     }
 
 
@@ -59,6 +59,7 @@ export class PageListMeta extends React.Component {
 
 PageListMeta.propTypes = {
   page: PropTypes.object.isRequired,
+  bookmarkCount: PropTypes.number,
 };
 
 PageListMeta.defaultProps = {