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

update PageContentFooter Props

jam411 3 лет назад
Родитель
Сommit
b31939531e

+ 5 - 12
packages/app/src/components/PageContentFooter.tsx

@@ -1,10 +1,8 @@
 import React, { memo } from 'react';
 
-import { IUser, Ref } from '@growi/core';
+import { IPage } from '@growi/core';
 import dynamic from 'next/dynamic';
 
-import { IUserHasId } from '~/interfaces/user';
-
 import { Skelton } from './Skelton';
 
 import styles from './PageContentFooter.module.scss';
@@ -13,23 +11,18 @@ const AuthorInfo = dynamic(() => import('./Navbar/AuthorInfo'),
   { ssr: false, loading: () => <Skelton additionalClass={`${styles['page-content-footer-skelton']} mb-3`} /> });
 
 export type PageContentFooterProps = {
-  createdAt: Date,
-  updatedAt: Date,
-  creator: IUserHasId,
-  revisionAuthor: Ref<IUser>,
+  page: IPage,
 }
 
 export const PageContentFooter = memo((props: PageContentFooterProps): JSX.Element => {
-  const {
-    createdAt, updatedAt, creator, revisionAuthor,
-  } = props;
+  const { page } = props;
 
   return (
     <div className={`${styles['page-content-footer']} page-content-footer py-4 d-edit-none d-print-none}`}>
       <div className="grw-container-convertible">
         <div className="page-meta">
-          <AuthorInfo user={creator} date={createdAt} mode="create" locate="footer" />
-          <AuthorInfo user={revisionAuthor} date={updatedAt} mode="update" locate="footer" />
+          <AuthorInfo user={page.creator} date={page.createdAt} mode="create" locate="footer" />
+          <AuthorInfo user={page.lastUpdateUser} date={page.updatedAt} mode="update" locate="footer" />
         </div>
       </div>
     </div>

+ 1 - 4
packages/app/src/components/SearchPage/SearchResultContent.tsx

@@ -224,10 +224,7 @@ export const SearchResultContent: FC<Props> = (props: Props) => {
           hideIfEmpty
         />
         <PageContentFooter
-          createdAt={new Date(page.createdAt)}
-          updatedAt={new Date(page.updatedAt)}
-          creator={page.creator}
-          revisionAuthor={page.lastUpdateUser}
+          page={page}
         />
       </div>
     </div>

+ 2 - 11
packages/app/src/pages/[[...path]].page.tsx

@@ -327,20 +327,11 @@ const GrowiPage: NextPage<Props> = (props: Props) => {
           </div>
           { !props.isIdenticalPathPage && !props.isNotFound && (
             <footer className="footer d-edit-none">
-              { !isTopPagePath && (
-                <Comments
-                  pageId={pageId}
-                />
-              ) }
+              { !isTopPagePath && (<Comments pageId={pageId} />) }
               { (pageWithMeta != null && isUsersHomePage(pageWithMeta.data.path)) && (
                 <UsersHomePageFooter creatorId={pageWithMeta.data.creator._id}/>
               ) }
-              <PageContentFooter
-                createdAt={new Date(pageWithMeta?.data.createdAt)}
-                updatedAt={new Date(pageWithMeta?.data.updatedAt)}
-                creator={pageWithMeta?.data.creator}
-                revisionAuthor={pageWithMeta?.data.lastUpdateUser}
-              />
+              <PageContentFooter page={pageWithMeta?.data} />
             </footer>
           )}