clean code

packages/app/src/components/Comments.tsx

@@ -3,33 +3,35 @@ import React from 'react';
 import { PageComment } from '~/components/PageComment';
 import { useCommentPreviewOptions } from '~/stores/renderer';
 
+import { useIsTrashPage } from '../stores/context';
+
 import { CommentEditorLazyRenderer } from './PageComment/CommentEditorLazyRenderer';
 
 type CommentsProps = {
   pageId?: string,
-  isDeleted: boolean,
 }
 
 export const Comments = (props: CommentsProps): JSX.Element => {
 
-  const { pageId, isDeleted } = props;
+  const { pageId } = props;
 
   const { data: rendererOptions } = useCommentPreviewOptions();
+  const { data: isDeleted } = useIsTrashPage();
 
-  // TODO: Implement Skelton
-  if (rendererOptions == null) {
+  // TODO: Implement or refactor Skelton if server-side rendering
+  if (rendererOptions == null || isDeleted == null) {
     return <></>;
   }
 
   return (
-    // TODO: Check CSS import
+    // TODO: Check and refactor CSS import
     <div className="page-comments-row mt-5 py-4 d-edit-none d-print-none">
       <div className="container-lg">
         <div className="page-comments">
           <div id="page-comments-list" className="page-comments-list">
             <PageComment pageId={pageId} isReadOnly={false} titleAlign="left" />
           </div>
-          { isDeleted && (
+          { !isDeleted && (
             <div id="page-comment-write">
               <CommentEditorLazyRenderer pageId={pageId} rendererOptions={rendererOptions} />
             </div>

packages/app/src/pages/[[...path]].page.tsx

@@ -74,7 +74,7 @@ import {
 const logger = loggerFactory('growi:pages:all');
 
 const {
-  isPermalink: _isPermalink, isUsersHomePage, isTrashPage: _isTrashPage, isUserPage, isCreatablePage, isTrashPage,
+  isPermalink: _isPermalink, isUsersHomePage, isTrashPage: _isTrashPage, isUserPage, isCreatablePage,
 } = pagePathUtils;
 const { removeHeadingSlash } = pathUtils;
 
@@ -333,9 +333,9 @@ const GrowiPage: NextPage<Props> = (props: Props) => {
         <footer className="footer d-edit-none">
           {/* TODO: Enable page_list.html */}
           {/* TODO: Enable isIdenticalPathPage or useIdenticalPath */}
-          { !props.isIdenticalPathPage && (
-            <Comments pageId={pageId} isDeleted={isTrashPage(pageWithMeta?.data.path)}/>
-          )}
+          {/* { !props.isIdenticalPathPage && ( */}
+          <Comments pageId={pageId} />
+          {/* )} */}
           {/* TODO: Create UsersHomePageFooter conponent */}
           { isUsersHomePage(pageWithMeta?.data.path) && (
             <div className="container-lg user-page-footer py-5">