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

clean codes avoid ts error and rename PageCommentsThread

yuto-oweseek 4 лет назад
Родитель
Сommit
6f3281fc7d

+ 2 - 2
packages/app/src/client/app.jsx

@@ -123,8 +123,8 @@ if (pageContainer.state.pageId != null) {
     'page-comments-list': <PageComments />,
     'page-comment-write': <CommentEditorLazyRenderer appContainer={appContainer} />,
     'page-content-footer': <PageContentFooter
-      createdAt={pageContainer.state.createdAt}
-      updatedAt={pageContainer.state.updatedAt}
+      createdAt={new Date(pageContainer.state.createdAt)}
+      updatedAt={new Date(pageContainer.state.updatedAt)}
       creator={pageContainer.state.creator}
       revisionAuthor={pageContainer.state.revisionAuthor}
     />,

+ 2 - 2
packages/app/src/components/PageCommentsThread.tsx → packages/app/src/components/PageCommentList.tsx

@@ -16,7 +16,7 @@ type Props = {
 
 }
 
-const PageCommentsThread:FC<Props> = memo((props:Props):JSX.Element => {
+const PageCommentList:FC<Props> = memo((props:Props):JSX.Element => {
 
   const { appContainer, pageId } = props;
 
@@ -103,4 +103,4 @@ const PageCommentsThread:FC<Props> = memo((props:Props):JSX.Element => {
 });
 
 
-export default PageCommentsThread;
+export default PageCommentList;

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

@@ -16,7 +16,7 @@ import { exportAsMarkdown } from '~/client/services/page-operation';
 import { toastSuccess } from '~/client/util/apiNotification';
 
 import PageContentFooter from '../PageContentFooter';
-import PageCommentsThread from '../PageCommentsThread';
+import PageCommentList from '../PageCommentList';
 
 import RevisionLoader from '../Page/RevisionLoader';
 import AppContainer from '../../client/services/AppContainer';
@@ -219,10 +219,10 @@ export const SearchResultContent: FC<Props> = (props: Props) => {
           highlightKeywords={highlightKeywords}
           isRenderable
         />
-        <PageCommentsThread appContainer={appContainer} pageId={page._id} />
+        <PageCommentList appContainer={appContainer} pageId={page._id} />
         <PageContentFooter
-          createdAt={pageWithMeta.data.createdAt}
-          updatedAt={pageWithMeta.data.updatedAt}
+          createdAt={new Date(pageWithMeta.data.createdAt)}
+          updatedAt={new Date(pageWithMeta.data.updatedAt)}
           creator={pageWithMeta.data.creator}
           revisionAuthor={pageWithMeta.data.lastUpdateUser}
         />

+ 0 - 3
packages/app/src/server/service/search.ts

@@ -427,9 +427,6 @@ class SearchService implements SearchQueryParser, SearchResolver {
         bookmarkCount: data._source.bookmark_count || 0,
         elasticSearchResult,
       };
-      console.log('pageData:', pageData);
-      console.log('pageMEta:', pageMeta);
-
 
       return { data: pageData, meta: pageMeta };
     });

+ 1 - 1
packages/app/src/stores/comment.tsx

@@ -7,7 +7,7 @@ import { Nullable } from '../interfaces/common';
 
 type IResponseComment = {
   comments: ICommentHasIdList,
-  ok: string,
+  ok: boolean,
 }
 
 export const useSWRxPageComment = (pageId: Nullable<string>): SWRResponse<ICommentHasIdList, Error> => {