Merge pull request #2890 from weseek/imprv/show-trash-page-list-new

Imprv/show trash page list new

src/client/js/app.jsx

@@ -15,7 +15,7 @@ import PageComments from './components/PageComments';
 import PageTimeline from './components/PageTimeline';
 import CommentEditorLazyRenderer from './components/PageComment/CommentEditorLazyRenderer';
 import PageManagement from './components/Page/PageManagement';
-import TrashPage from './components/TrashPage';
+import TrashPageList from './components/TrashPageList';
 import TrashPageAlert from './components/Page/TrashPageAlert';
 import NotFoundPage from './components/NotFoundPage';
 import NotFoundAlert from './components/Page/NotFoundAlert';
@@ -76,7 +76,7 @@ Object.assign(componentMappings, {
 
   'trash-page-alert': <TrashPageAlert />,
 
-  'trash-page': <TrashPage />,
+  'trash-page-list': <TrashPageList />,
 
   'not-found-page': <NotFoundPage />,
 

src/client/js/components/CustomNavigation.jsx

@@ -63,7 +63,7 @@ const CustomNavigation = (props) => {
         })}
       </Nav>
       <hr className="my-0 grw-nav-slide-hr border-none" style={{ width: `${sliderWidth}%`, marginLeft: `${sliderMarginLeft}%` }} />
-      <TabContent activeTab={activeTab} className="p-5">
+      <TabContent activeTab={activeTab} className="p-4">
         {Object.entries(props.navTabMapping).map(([key, value]) => {
           return (
             <TabPane key={key} tabId={key}>

src/client/js/components/MyDraftList/MyDraftList.jsx

@@ -134,7 +134,7 @@ class MyDraftList extends React.Component {
     const totalCount = this.state.totalDrafts;
 
     return (
-      <div className="page-list-container-create">
+      <div>
 
         { totalCount === 0
           && <span>No drafts yet.</span>

src/client/js/components/PageList.jsx

@@ -67,8 +67,8 @@ const PageList = (props) => {
   }
 
   return (
-    <div className="page-list-container-create">
-      <ul className="page-list-ul page-list-ul-flat ml-n4">
+    <div className="page-list">
+      <ul className="page-list-ul page-list-ul-flat">
         {pageList}
       </ul>
       <PaginationWrapper

src/client/js/components/RecentCreated/RecentCreated.jsx

@@ -69,7 +69,7 @@ class RecentCreated extends React.Component {
     const pageList = this.generatePageList(this.state.pages);
 
     return (
-      <div className="page-list-container-create">
+      <div>
         <ul className="page-list-ul page-list-ul-flat mb-3">
           {pageList}
         </ul>

src/client/js/components/TrashPage.jsx → src/client/js/components/TrashPageList.jsx

@@ -3,17 +3,17 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 import PageListIcon from './Icons/PageListIcon';
 import CustomNavigation from './CustomNavigation';
+import PageList from './PageList';
 
 
-const TrashPage = (props) => {
+const TrashPageList = (props) => {
   const { t } = props;
 
   const navTabMapping = {
     pagelist: {
       icon: <PageListIcon />,
       i18n: t('page_list'),
-      // [TODO: show trash page list by gw4064]
-      tabContent: t('Trash page list'),
+      tabContent: <PageList />,
       index: 0,
     },
   };
@@ -25,8 +25,8 @@ const TrashPage = (props) => {
   );
 };
 
-TrashPage.propTypes = {
+TrashPageList.propTypes = {
   t: PropTypes.func.isRequired, //  i18next
 };
 
-export default withTranslation()(TrashPage);
+export default withTranslation()(TrashPageList);

src/server/routes/apiv3/pages.js

@@ -88,7 +88,19 @@ module.exports = (crowi) => {
     const { path } = req.query;
     const limit = +req.query.limit || 30;
     const offset = +req.query.offset || 0;
-    const queryOptions = { offset, limit };
+    const { isTrashPage } = require('@commons/util/path-utils');
+
+    let includeTrashed = false;
+
+    if (isTrashPage(path)) {
+      includeTrashed = true;
+    }
+
+    const queryOptions = {
+      offset,
+      limit,
+      includeTrashed,
+    };
 
     try {
       const result = await Page.findListWithDescendants(path, req.user, queryOptions);

src/server/views/layout-growi/page_list.html

@@ -26,7 +26,9 @@
 
 
 {% block content_main_after %}
-  <div id="trash-page"></div>
+  {% if isTrashPage() %}
+    <div id="trash-page-list"></div>
+  {% endif %}
   {% if page %}
     {% include '../widget/page_attachments.html' %}
   {% endif %}