Merge pull request #3682 from weseek/master

release v4.2.17

CHANGES.md

@@ -1,5 +1,11 @@
 # CHANGES
 
+## v4.2.17-RC
+
+* Improvement: Invoke garbage collection when reindex all pages by elasticsearch
+* Improvement: Hide Sidebar at shared pages
+* Fix: No unsaved alert is displayed without difference the latest markdown and editor value
+
 ## v4.2.16-RC
 
 * Fix: "Only inside the group" causes an error
@@ -102,6 +108,7 @@
 ## v4.2.5
 
 * Improvement: Invoke garbage collection when reindex all pages by elasticsearch
+    * Turned out not working -- 2021.05.01
 * Fix: MathJax rendering does not work
 
 ## v4.2.4

package.json

@@ -1,6 +1,6 @@
 {
   "name": "growi",
-  "version": "4.2.16-RC",
+  "version": "4.2.17-RC",
   "description": "Team collaboration software using markdown",
   "tags": [
     "wiki",
@@ -63,7 +63,7 @@
     "server:nolazy": "env-cmd -f config/env.dev.js node-dev --nolazy --inspect src/server/app.js",
     "server:dev": "env-cmd -f config/env.dev.js node-dev --expose_gc --inspect src/server/app.js",
     "server:prod:ci": "npm run server:prod -- --ci",
-    "server:prod": "env-cmd -f config/env.prod.js node src/server/app.js",
+    "server:prod": "env-cmd -f config/env.prod.js node --expose_gc src/server/app.js",
     "server": "npm run server:dev",
     "start": "npm run server:prod",
     "test": "jest --config=config/jest.config.js --passWithNoTests -- ",

src/client/js/components/PageEditor.jsx

@@ -101,13 +101,23 @@ class PageEditor extends React.Component {
    * @param {string} value
    */
   onMarkdownChanged(value) {
-    const { pageContainer, editorContainer } = this.props;
+    const { pageContainer } = this.props;
     this.setMarkdownStateWithDebounce(value);
     // only when the first time to edit
     if (!pageContainer.state.revisionId) {
       this.saveDraftWithDebounce();
     }
-    editorContainer.enableUnsavedWarning();
+  }
+
+  // Displays an alert if there is a difference with pageContainer's markdown
+  componentDidUpdate(prevProps, prevState) {
+    const { pageContainer, editorContainer } = this.props;
+
+    if (this.state.markdown !== prevState.markdown) {
+      if (pageContainer.state.markdown !== this.state.markdown) {
+        editorContainer.enableUnsavedWarning();
+      }
+    }
   }
 
   /**

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

@@ -17,6 +17,8 @@
 {% endblock %}
 {% block head_warn_alert_siteurl_undefined %}
 {% endblock %}
+{% block sidebar %}
+{% endblock %}
 
 {% block content_main %}
   <div class="container-lg">
@@ -29,7 +31,7 @@
       <div id="share-link-alert"></div>
 
       {% include '../widget/page_content.html' %}
-      
+
     </div>
 
   </div>

src/server/views/layout/layout.html

@@ -77,8 +77,9 @@
   {% block head_warn_breaking_changes %}{% include '../widget/alert_breaking_changes.html' %}{% endblock %}
 
   <div id="page-wrapper" class="page-wrapper d-flex d-print-block">
-    {# Sidebar #}
+    {% block sidebar %}
     <div id="grw-sidebar-wrapper"></div>
+    {% endblock %}
 
     <div class="flex-fill mw-0">
       {% block head_warn_alert_siteurl_undefined %}{% include '../widget/alert_siteurl_undefined.html' %}{% endblock %}