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

create SearchResultPage and remove nested a tag

yusuketk 5 лет назад
Родитель
Сommit
812fb910e6

+ 2 - 2
src/client/js/components/SearchPage/SearchResult.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import * as toastr from 'toastr';
 
-import Page from '../PageList/Page';
+import SearchResultPage from './SearchResultPage';
 import SearchResultList from './SearchResultList';
 import DeletePageListModal from './DeletePageListModal';
 import AppContainer from '../../services/AppContainer';
@@ -177,7 +177,7 @@ class SearchResult extends React.Component {
       return (
         <li key={page._id} className="nav-item page-list-li w-100">
           <a className="nav-link page-list-link d-flex align-items-center" href={pageId}>
-            <Page page={page} noLink />
+            <SearchResultPage page={page} noLink />
             <div className="ml-auto d-flex">
               { this.state.deletionMode
                 && (

+ 33 - 0
src/client/js/components/SearchPage/SearchResultPage.jsx

@@ -0,0 +1,33 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import UserPicture from '../User/UserPicture';
+import PageListMeta from '../PageList/PageListMeta';
+import PagePathLabel from '../PageList/PagePathLabel';
+
+export default class SearchResultPage extends React.Component {
+
+  render() {
+    const {
+      page, noLink,
+    } = this.props;
+
+    return (
+      <>
+        <UserPicture user={page.lastUpdateUser} noLink={noLink} />
+        <PagePathLabel page={page} />
+        <PageListMeta page={page} />
+      </>
+    );
+  }
+
+}
+
+SearchResultPage.propTypes = {
+  page: PropTypes.object.isRequired,
+  noLink: PropTypes.bool,
+};
+
+SearchResultPage.defaultProps = {
+  noLink: false,
+};