Merge pull request #824 from M0rgan01/new_restore_checklist

New restore checklist
PrestaShop · Aug 2, 2024 · 5b780c9 · 5b780c9
2 parents 4c33fd4 + bc4b92e
commit 5b780c9
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 5 deletions.
diff --git a/js/upgrade.js b/js/upgrade.js
@@ -363,12 +363,8 @@ function afterRollback(res) {
 }
 
 function afterRollbackComplete(res) {
-  var params = res.nextParams;
   $("#pleaseWait").hide();
-  $("#upgradeResultCheck")
-    .html("<p>" + input.translation.restoreComplete + "</p>")
-    .show("slow");
-  updateInfoStep("<p class=\"alert alert-success\">" + input.translation.restoreComplete + "</p>");
+  $("#postRestoreChecklist").show();
   $(window).unbind();
 }
 
@@ -511,6 +507,10 @@ function doAjaxRequest(action, nextParams) {
  * @return void
  */
 function prepareNextButton(button_selector, nextParams) {
+  if (button_selector === "#rollback") {
+    $("#postUpdateChecklist").hide();
+  }
+
   $(button_selector)
     .unbind()
     .click(function(e) {

diff --git a/views/templates/block/postRestoreChecklistBlock.html.twig b/views/templates/block/postRestoreChecklistBlock.html.twig
@@ -0,0 +1,38 @@
+<div id="postRestoreChecklist" style="display: none; margin-top: 10px;">
+    <div class="alert alert-success">
+        <div style="display: flex;">
+            <div>
+                <div style="font-weight: bold;">
+                    {{ 'Your restoration is complete'|trans({}) }}
+                </div>
+                {{ 'Before continuing with your tasks, please review the following checklist to ensure smooth operation after recent recovery.'|trans({}) }}
+            </div>
+            <div style="margin-left: auto">
+                <a class="btn btn-primary" target="_blank" href="https://devdocs.prestashop-project.org/8/basics/keeping-up-to-date/upgrade-module/post-restore-checklist/">
+                    <i class="material-icons" style="font-size: 18px; margin-right: 4px;">
+                        launch
+                    </i>
+                    {{ 'Open developer documentation'|trans({}) }}
+                </a>
+            </div>
+        </div>
+    </div>
+
+    <div class="panel">
+        <div class="panel-heading">
+            {{ 'Next steps'|trans({}) }}
+        </div>
+        <ul>
+            <li>{{ 'Disable the maintenance mode in General settings > Maintenance.'|trans({}) }}</li>
+        </ul>
+    </div>
+
+    <div class="panel">
+        <div class="panel-heading">
+            {{ 'Troubleshooting'|trans({}) }}
+        </div>
+        <ul>
+            <li>{{ 'If you can\'t access your back office, try emptying the cache.'|trans({}) }}</li>
+        </ul>
+    </div>
+</div>
diff --git a/views/templates/main.html.twig b/views/templates/main.html.twig
@@ -30,6 +30,7 @@
 
 {% include '@ModuleAutoUpgrade/block/versionComparison.html.twig' %}
 {% include '@ModuleAutoUpgrade/block/postUpdateChecklistBlock.html.twig' %}
+{% include '@ModuleAutoUpgrade/block/postRestoreChecklistBlock.html.twig' %}
 {% include '@ModuleAutoUpgrade/block/activityLog.html.twig' %}
 
 {% include '@ModuleAutoUpgrade/block/rollbackForm.html.twig' %}