stevenfukase 4 سال پیش
والد
کامیت
fa6c2959fc
2فایلهای تغییر یافته به همراه13 افزوده شده و 13 حذف شده
  1. 1 1
      packages/app/src/components/SearchPage/SearchResultListItem.tsx
  2. 12 12
      packages/ui/src/components/PagePath/PageListMeta.jsx

+ 1 - 1
packages/app/src/components/SearchPage/SearchResultListItem.tsx

@@ -115,7 +115,7 @@ const SearchResultListItem: FC<Props> = (props:Props) => {
               </h3>
               </h3>
               {/* page meta */}
               {/* page meta */}
               <div className="d-flex mx-2">
               <div className="d-flex mx-2">
-                <PageListMeta pageData={pageData} pageMeta={pageMeta} />
+                <PageListMeta page={pageData} bookmarkCount={pageMeta.bookmarkCount} />
               </div>
               </div>
               {/* doropdown icon includes page control buttons */}
               {/* doropdown icon includes page control buttons */}
               <div className="ml-auto">
               <div className="ml-auto">

+ 12 - 12
packages/ui/src/components/PagePath/PageListMeta.jsx

@@ -8,38 +8,38 @@ const { checkTemplatePath } = templateChecker;
 export class PageListMeta extends React.Component {
 export class PageListMeta extends React.Component {
 
 
   render() {
   render() {
-    const { pageData, pageMeta } = this.props;
+    const { page } = this.props;
 
 
     // top check
     // top check
     let topLabel;
     let topLabel;
-    if (isTopPage(pageData.path)) {
+    if (isTopPage(page.path)) {
       topLabel = <span className="badge badge-info">TOP</span>;
       topLabel = <span className="badge badge-info">TOP</span>;
     }
     }
 
 
     // template check
     // template check
     let templateLabel;
     let templateLabel;
-    if (checkTemplatePath(pageData.path)) {
+    if (checkTemplatePath(page.path)) {
       templateLabel = <span className="badge badge-info">TMPL</span>;
       templateLabel = <span className="badge badge-info">TMPL</span>;
     }
     }
 
 
     let commentCount;
     let commentCount;
-    if (pageData.commentCount > 0) {
-      commentCount = <span><i className="icon-bubble" />{pageData.commentCount}</span>;
+    if (page.commentCount > 0) {
+      commentCount = <span><i className="icon-bubble" />{page.commentCount}</span>;
     }
     }
 
 
     let likerCount;
     let likerCount;
-    if (pageData.liker.length > 0) {
-      likerCount = <span><i className="icon-like" />{pageData.liker.length}</span>;
+    if (page.liker.length > 0) {
+      likerCount = <span><i className="icon-like" />{page.liker.length}</span>;
     }
     }
 
 
     let locked;
     let locked;
-    if (pageData.grant !== 1) {
+    if (page.grant !== 1) {
       locked = <span><i className="icon-lock" /></span>;
       locked = <span><i className="icon-lock" /></span>;
     }
     }
 
 
     let bookmarkCount;
     let bookmarkCount;
-    if (pageMeta.bookmarkCount > 0) {
-      bookmarkCount = <span><i className="icon-star" />{pageMeta.bookmarkCount}</span>;
+    if (this.props.bookmarkCount > 0) {
+      bookmarkCount = <span><i className="icon-star" />{this.props.bookmarkCount}</span>;
     }
     }
 
 
 
 
@@ -58,8 +58,8 @@ export class PageListMeta extends React.Component {
 }
 }
 
 
 PageListMeta.propTypes = {
 PageListMeta.propTypes = {
-  pageData: PropTypes.object.isRequired,
-  pageMeta: PropTypes.object.isRequired,
+  page: PropTypes.object.isRequired,
+  bookmarkCount: PropTypes.number,
 };
 };
 
 
 PageListMeta.defaultProps = {
 PageListMeta.defaultProps = {