fix changes

src/client/js/components/BookmarkButton.jsx

@@ -8,7 +8,6 @@ import { withUnstatedContainers } from './UnstatedUtils';
 import { toastError } from '../util/apiNotification';
 import PageContainer from '../services/PageContainer';
 import AppContainer from '../services/AppContainer';
-import NavigationContainer from '../services/NavigationContainer';
 
 class BookmarkButton extends React.Component {
 
@@ -36,32 +35,23 @@ class BookmarkButton extends React.Component {
 
 
   render() {
-    const {
-      appContainer, pageContainer, navigationContainer, t,
-    } = this.props;
+    const { appContainer, pageContainer, t } = this.props;
     const { isGuestUser } = appContainer;
 
-    const { editorMode } = navigationContainer.state;
-
-    const isViewMode = editorMode === 'view';
-
     return (
       <div>
-        {isViewMode
-        && (
-          <button
-            type="button"
-            id="bookmark-button"
-            onClick={this.handleClick}
-            className={`btn btn-bookmark border-0
-            ${`btn-${this.props.size}`} ${pageContainer.state.isBookmarked ? 'active' : ''} ${isGuestUser ? 'disabled' : ''}`}
-          >
-            <i className="icon-star mr-3"></i>
-            <span className="total-bookmarks">
-              {pageContainer.state.sumOfBookmarks}
-            </span>
-          </button>
-        )}
+        <button
+          type="button"
+          id="bookmark-button"
+          onClick={this.handleClick}
+          className={`btn btn-bookmark border-0
+          ${`btn-${this.props.size}`} ${pageContainer.state.isBookmarked ? 'active' : ''} ${isGuestUser ? 'disabled' : ''}`}
+        >
+          <i className="icon-star mr-3"></i>
+          <span className="total-bookmarks">
+            {pageContainer.state.sumOfBookmarks}
+          </span>
+        </button>
 
         {isGuestUser && (
         <UncontrolledTooltip placement="top" target="bookmark-button" fade={false}>
@@ -77,12 +67,12 @@ class BookmarkButton extends React.Component {
 /**
  * Wrapper component for using unstated
  */
-const BookmarkButtonWrapper = withUnstatedContainers(BookmarkButton, [AppContainer, NavigationContainer, PageContainer]);
+const BookmarkButtonWrapper = withUnstatedContainers(BookmarkButton, [AppContainer, PageContainer]);
 
 BookmarkButton.propTypes = {
   appContainer: PropTypes.instanceOf(AppContainer).isRequired,
-  navigationContainer: PropTypes.instanceOf(NavigationContainer).isRequired,
   pageContainer: PropTypes.instanceOf(PageContainer).isRequired,
+
   pageId: PropTypes.string,
   t: PropTypes.func.isRequired,
   size: PropTypes.string,

src/client/js/components/LikeButton.jsx

@@ -8,8 +8,6 @@ import { withUnstatedContainers } from './UnstatedUtils';
 import { toastError } from '../util/apiNotification';
 import AppContainer from '../services/AppContainer';
 import PageContainer from '../services/PageContainer';
-import NavigationContainer from '../services/NavigationContainer';
-
 
 class LikeButton extends React.Component {
 
@@ -35,33 +33,25 @@ class LikeButton extends React.Component {
     }
   }
 
+
   render() {
-    const {
-      appContainer, navigationContainer, pageContainer, t,
-    } = this.props;
+    const { appContainer, pageContainer, t } = this.props;
     const { isGuestUser } = appContainer;
-    const { editorMode } = navigationContainer.state;
-
-    const isViewMode = editorMode === 'view';
 
     return (
       <div>
-        {isViewMode
-          && (
-          <button
-            type="button"
-            id="like-button"
-            onClick={this.handleClick}
-            className={`btn btn-like border-0
-            ${pageContainer.state.isLiked ? 'active' : ''} ${isGuestUser ? 'disabled' : ''}`}
-          >
-            <i className="icon-like mr-3"></i>
-            <span className="total-likes">
-              {pageContainer.state.sumOfLikers}
-            </span>
-          </button>
-          )
-        }
+        <button
+          type="button"
+          id="like-button"
+          onClick={this.handleClick}
+          className={`btn btn-like border-0
+          ${pageContainer.state.isLiked ? 'active' : ''} ${isGuestUser ? 'disabled' : ''}`}
+        >
+          <i className="icon-like mr-3"></i>
+          <span className="total-likes">
+            {pageContainer.state.sumOfLikers}
+          </span>
+        </button>
 
         {isGuestUser && (
         <UncontrolledTooltip placement="top" target="like-button" fade={false}>
@@ -77,12 +67,12 @@ class LikeButton extends React.Component {
 /**
  * Wrapper component for using unstated
  */
-const LikeButtonWrapper = withUnstatedContainers(LikeButton, [AppContainer, NavigationContainer, PageContainer]);
+const LikeButtonWrapper = withUnstatedContainers(LikeButton, [AppContainer, PageContainer]);
 
 LikeButton.propTypes = {
   appContainer: PropTypes.instanceOf(AppContainer).isRequired,
-  navigationContainer: PropTypes.instanceOf(NavigationContainer).isRequired,
   pageContainer: PropTypes.instanceOf(PageContainer).isRequired,
+
   t: PropTypes.func.isRequired,
   size: PropTypes.string,
 };

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

@@ -7,7 +7,6 @@ import urljoin from 'url-join';
 import { isTopPage } from '@commons/util/path-utils';
 import { withUnstatedContainers } from '../UnstatedUtils';
 import AppContainer from '../../services/AppContainer';
-import NavigationContainer from '../../services/NavigationContainer';
 import PageContainer from '../../services/PageContainer';
 import PageDeleteModal from '../PageDeleteModal';
 import PageRenameModal from '../PageRenameModal';
@@ -19,16 +18,13 @@ import PresentationIcon from '../Icons/PresentationIcon';
 
 const PageManagement = (props) => {
   const {
-    t, appContainer, navigationContainer, pageContainer, isCompactMode,
+    t, appContainer, pageContainer, isCompactMode,
   } = props;
   const { path, isDeletable, isAbleToDeleteCompletely } = pageContainer.state;
 
   const { currentUser } = appContainer;
   const isTopPagePath = isTopPage(path);
 
-  const { editorMode } = navigationContainer.state;
-  const isViewMode = editorMode === 'view';
-
   const [isPageRenameModalShown, setIsPageRenameModalShown] = useState(false);
   const [isPageDuplicateModalShown, setIsPageDuplicateModalShown] = useState(false);
   const [isPageTemplateModalShown, setIsPageTempleteModalShown] = useState(false);
@@ -228,9 +224,7 @@ const PageManagement = (props) => {
 
   return (
     <>
-      {isViewMode && (
-        currentUser == null ? renderDotsIconForGuestUser() : renderDotsIconForCurrentUser()
-      )}
+      {currentUser == null ? renderDotsIconForGuestUser() : renderDotsIconForCurrentUser()}
       <div className="dropdown-menu dropdown-menu-right">
         {isTopPagePath ? renderDropdownItemForTopPage() : renderDropdownItemForNotTopPage()}
         <button className="dropdown-item" type="button" onClick={openPageTemplateModalHandler}>
@@ -246,13 +240,12 @@ const PageManagement = (props) => {
 /**
  * Wrapper component for using unstated
  */
-const PageManagementWrapper = withUnstatedContainers(PageManagement, [AppContainer, NavigationContainer, PageContainer]);
+const PageManagementWrapper = withUnstatedContainers(PageManagement, [AppContainer, PageContainer]);
 
 
 PageManagement.propTypes = {
   t: PropTypes.func.isRequired, // i18next
   appContainer: PropTypes.instanceOf(AppContainer).isRequired,
-  navigationContainer: PropTypes.instanceOf(NavigationContainer).isRequired,
   pageContainer: PropTypes.instanceOf(PageContainer).isRequired,
 
   isCompactMode: PropTypes.bool,