add candelete completly

src/client/js/components/Page/TrashPageAlert.jsx

@@ -2,9 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import { withTranslation } from 'react-i18next';
-import { format } from 'date-fns';
 
-import { isTopPage, isUserPage } from '@commons/util/path-utils';
 import { createSubscribedElement } from '../UnstatedUtils';
 import AppContainer from '../../services/AppContainer';
 import PageContainer from '../../services/PageContainer';
@@ -14,14 +12,43 @@ import UserPicture from '../User/UserPicture';
 const TrashPageAlert = (props) => {
   const { t, appContainer, pageContainer } = props;
   const {
-    path, isDeleted, revisionAuthor, updatedAt, childrenPages,
+    path, isDeleted, revisionAuthor, updatedAt, childrenPages, isAbleToDeleteCompletely,
   } = pageContainer.state;
-  console.log(pageContainer.state);
   const { currentUser } = appContainer;
 
-  const isTopPagePath = isTopPage(path);
-  const isUserPagePath = isUserPage(path);
-  // const now = format(updatedAt, 'Y-m-d H:i:s');
+  function renderEmptyButton() {
+    return (
+      <div>
+        <button href="#" type="button" className="btn btn-danger rounded-pill btn-sm" data-target="#emptyTrash" data-toggle="modal">
+          <i className="icon-trash" aria-hidden="true"></i>{ t('modal_empty.empty_the_trash') }
+        </button>
+      </div>
+    );
+  }
+
+  function renderTrashManagementButton() {
+    return (
+      <div>
+        <button
+          type="button"
+          className="btn btn-outline-secondary rounded-pill btn-sm mr-2"
+          data-target="#putBackPage"
+          data-toggle="modal"
+        >
+          <i className="icon-action-undo" aria-hidden="true"></i> { t('Put Back') }
+        </button>
+        <button
+          type="button"
+          className="btn btn-danger rounded-pill btn-sm mr-2"
+          disabled={!isAbleToDeleteCompletely}
+          data-target="#deletePage"
+          data-toggle="modal"
+        >
+          <i className="icon-fire" aria-hidden="true"></i> { t('Delete Completely') }
+        </button>
+      </div>
+    );
+  }
 
   return (
     <div className="alert alert-warning py-3 px-4 d-flex align-items-center justify-content-between">
@@ -29,20 +56,8 @@ const TrashPageAlert = (props) => {
       This page is in the trash <i className="icon-trash" aria-hidden="true"></i>.
         {isDeleted && <span><br /><UserPicture user={revisionAuthor} /> Deleted by {revisionAuthor.name} at {updatedAt}</span>}
       </div>
-      {currentUser.admin && path === '/trash' && childrenPages.length > 0 && (
-      <div>
-        <button href="#" type="button" className="btn btn-danger rounded-pill btn-sm" data-target="#emptyTrash" data-toggle="modal">
-          <i className="icon-trash" aria-hidden="true"></i>{ t('modal_empty.empty_the_trash') }
-        </button>
-      </div>
-      )}
-      {/*
-    {% if page.isDeleted() and user %}
-    <div>
-      <button href="#" class="btn btn-outline-secondary rounded-pill btn-sm mr-2" data-target="#putBackPage" data-toggle="modal"><i class="icon-action-undo" aria-hidden="true"></i> {{ t('Put Back') }}</button>
-      <button href="#" class="btn btn-danger rounded-pill btn-sm mr-2" {% if !user.canDeleteCompletely(page.creator._id) %} disabled="disabled" {% endif %} data-target="#deletePage" data-toggle="modal"><i class="icon-fire" aria-hidden="true"></i> {{ t('Delete Completely') }}</button>
-    </div>
-    {% endif %} */}
+      {(currentUser.admin && path === '/trash' && childrenPages.length > 0) && renderEmptyButton()}
+      {(isDeleted && currentUser != null) && renderTrashManagementButton()}
     </div>
   );
 };

src/client/js/services/PageContainer.js

@@ -48,6 +48,7 @@ export default class PageContainer extends Container {
       creator: JSON.parse(mainContent.getAttribute('data-page-creator')),
       updatedAt: mainContent.getAttribute('data-page-updated-at'),
       isDeleted:  JSON.parse(mainContent.getAttribute('data-page-is-deleted')),
+      isAbleToDeleteCompletely:  JSON.parse(mainContent.getAttribute('data-page-is-able-to-delete-completely')),
       tags: [],
       childrenPages: JSON.parse(mainContent.getAttribute('data-children-pages')),
       templateTagData: mainContent.getAttribute('data-template-tags') || null,

src/server/views/widget/page_content.html

@@ -12,6 +12,7 @@
   data-page-is-liked="{% if page.isLiked(user) %}true{% else %}false{% endif %}"
   data-page-is-seen="{% if page and page.isSeenUser(user) %}1{% else %}0{% endif %}"
   data-page-is-deleted="{% if page.isDeleted() %}true{% else %}false{% endif %}"
+  data-page-is-able-to-delete-completely="{% if user.canDeleteCompletely(page.creator._id) %}true{% else %}false{% endif %}"
   data-slack-channels="{{ slack|default('') }}"
   data-page-created-at="{% if page %}{{ page.createdAt|datetz('Y/m/d H:i:s') }}{% endif %}"
   data-page-creator="{% if page %}{{ page.creator|json }}{% endif %}"