fix: dialog

PrestaShop · Jan 9, 2025 · 95a9bdf · 95a9bdf
1 parent f4add9e
commit 95a9bdf
Show file tree

Hide file tree

Showing 11 changed files with 112 additions and 110 deletions.
diff --git a/storybook/stories/components/DialogBackupDelete.stories.js b/storybook/stories/components/DialogBackupDelete.stories.js
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  */
 
-import DialogBackupDelete from "../../../views/templates/dialogs/dialog-backup-delete.html.twig";
+import DialogBackupDelete from "../../../views/templates/dialogs/dialog-delete-backup.html.twig";
 
 export default {
   title: "Components/Dialog",
@@ -34,7 +34,12 @@ export const BackupDelete = {
   args: {
     backup_name: "autoupgrade_save_8.1.6",
     backup_date: "15/07/2024 8:00",
-    is_only_backup: true,
+    only_backup: true,
+    form_name: "delete-backup",
+    form_route_to_confirm_delete: "/",
+    form_fields: {
+      BACKUP_NAME: "backup_name",
+    },
   },
   play: async () => {
     const dialog = document.querySelector('.dialog');

diff --git a/storybook/stories/components/DialogRestoreFromBackup.stories.js b/storybook/stories/components/DialogRestoreFromBackup.stories.js
@@ -0,0 +1,48 @@
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License 3.0 (AFL-3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <[email protected]>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
+ */
+
+import DialogRestoreFromBackup from "../../../views/templates/dialogs/dialog-restore-from-backup.html.twig";
+
+export default {
+  title: "Components/Dialog",
+  component: DialogRestoreFromBackup,
+  args: {
+    backup_version: "1.7.8.1",
+    backup_name: "backup-name",
+    backup_date: "2024-01-01",
+    form_name: "backup_to_restore",
+    form_route_to_confirm_restore: "/",
+    form_fields: {
+      BACKUP_NAME: "backup_name",
+    },
+  },
+};
+
+export const RestoreFromBackup = {
+  play: async () => {
+    const dialog = document.querySelector('.dialog');
+    dialog.showModal();
+  },
+};
diff --git a/storybook/stories/pages/BackupSelection.stories.js b/storybook/stories/pages/BackupSelection.stories.js
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  */
 
-import BackupSelectionPage from "../../../views/templates/pages/rollback.html.twig";
+import BackupSelectionPage from "../../../views/templates/pages/restore.html.twig";
 import { Default as BackupSelectionComponent } from "../components/BackupSelection.stories";
 import { BackupSelection as Stepper } from "../components/Stepper.stories";
 

diff --git a/storybook/stories/pages/PostRestore.stories.js b/storybook/stories/pages/PostRestore.stories.js
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  */
 
-import PostRestorePage from "../../../views/templates/pages/rollback.html.twig";
+import PostRestorePage from "../../../views/templates/pages/restore.html.twig";
 import { PostRestore as Stepper } from "../components/Stepper.stories";
 
 export default {

diff --git a/storybook/stories/pages/Restore.stories.js b/storybook/stories/pages/Restore.stories.js
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  */
 
-import RestorePage from "../../../views/templates/pages/rollback.html.twig";
+import RestorePage from "../../../views/templates/pages/restore.html.twig";
 import { RestoreLogsProgress as LogsProgress } from "../components/LogsProgress.stories";
 import { RestoreLogsViewer as LogsViewer } from "../components/LogsViewer.stories";
 import { Restore as Stepper } from "../components/Stepper.stories";

diff --git a/views/templates/dialogs/dialog-backup-delete.html.twig b/views/templates/dialogs/dialog-backup-delete.html.twig
diff --git a/views/templates/dialogs/dialog-backup.html.twig b/views/templates/dialogs/dialog-backup.html.twig
@@ -10,17 +10,13 @@
 
 {% block dialog_extra_content %}{% endblock %}
 
-{% block dialog_footer %}
-  <div class="dialog__footer">
-    {% block dialog_footer_inner %}
-      <button type="button" class="btn btn-link" data-dismiss="dialog">
-        {{ 'Cancel'|trans({}) }}
-      </button>
+{% block dialog_footer_inner %}
+  <button type="button" class="btn btn-link" data-dismiss="dialog">
+    {{ 'Cancel'|trans({}) }}
+  </button>
 
-      <button type="button" class="btn btn-primary">
-        <i class="material-icons">settings_backup_restore</i>
-        {{ 'Start backup'|trans({}) }}
-      </button>
-    {% endblock %}
-  </div>
+  <button type="button" class="btn btn-primary">
+    <i class="material-icons">settings_backup_restore</i>
+    {{ 'Start backup'|trans({}) }}
+  </button>
 {% endblock %}
diff --git a/views/templates/dialogs/dialog-delete-backup.html.twig b/views/templates/dialogs/dialog-delete-backup.html.twig
@@ -13,19 +13,15 @@
 
 {% block dialog_extra_content %}{% endblock %}
 
-{% block dialog_footer %}
-  <div class="dialog__footer">
-    {% block dialog_footer_inner %}
-      <button type="button" class="btn btn-link" data-dismiss="dialog">
-        {{ 'Cancel'|trans({}) }}
-      </button>
+{% block dialog_footer_inner %}
+  <button type="button" class="btn btn-link" data-dismiss="dialog">
+    {{ 'Cancel'|trans({}) }}
+  </button>
 
-      <form id="{{ form_name }}" name="{{ form_name }}" data-route-to-confirm-delete="{{ form_route_to_confirm_delete }}">
-        <input type="hidden" name="{{ form_fields.BACKUP_NAME }}" value="{{ backup_name }}">
-        <button type="submit" class="btn btn-danger">
-          {{ 'Delete '|trans({}) }}
-        </button>
-      </form>
-    {% endblock %}
-  </div>
+  <form id="{{ form_name }}" name="{{ form_name }}" data-route-to-confirm-delete="{{ form_route_to_confirm_delete }}">
+    <input type="hidden" name="{{ form_fields.BACKUP_NAME }}" value="{{ backup_name }}">
+    <button type="submit" class="btn btn-danger">
+      {{ 'Delete'|trans({}) }}
+    </button>
+  </form>
 {% endblock %}
diff --git a/views/templates/dialogs/dialog-error-report.html.twig b/views/templates/dialogs/dialog-error-report.html.twig
@@ -50,17 +50,13 @@
   </form>
 {% endblock %}
 
-{% block dialog_footer %}
-  <div class="dialog__footer">
-    {% block dialog_footer_inner %}
-      <button type="button" class="btn btn-link" data-dismiss="dialog">
-        {{ 'Cancel'|trans({}) }}
-      </button>
+{% block dialog_footer_inner %}
+  <button type="button" class="btn btn-link" data-dismiss="dialog">
+    {{ 'Cancel'|trans({}) }}
+  </button>
 
-      <button type="submit" form="form-error-feedback" class="btn btn-primary">
-        <i class="material-icons">send</i>
-        {{ 'Send error report'|trans({}) }}
-      </button>
-    {% endblock %}
-  </div>
+  <button type="submit" form="form-error-feedback" class="btn btn-primary">
+    <i class="material-icons">send</i>
+    {{ 'Send error report'|trans({}) }}
+  </button>
 {% endblock %}
diff --git a/views/templates/dialogs/dialog-restore-from-backup.html.twig b/views/templates/dialogs/dialog-restore-from-backup.html.twig
@@ -10,19 +10,15 @@
 
 {% block dialog_extra_content %}{% endblock %}
 
-{% block dialog_footer %}
-  <div class="dialog__footer">
-    {% block dialog_footer_inner %}
-      <button type="button" class="btn btn-link" data-dismiss="dialog">
-        {{ 'Cancel'|trans({}) }}
-      </button>
+{% block dialog_footer_inner %}
+  <button type="button" class="btn btn-link" data-dismiss="dialog">
+    {{ 'Cancel'|trans({}) }}
+  </button>
 
-      <form id="{{ form_name }}" name="{{ form_name }}" data-route-to-confirm-restore="{{ form_route_to_confirm_restore }}">
-        <input type="hidden" name="{{ form_fields.BACKUP_NAME }}" value="{{ backup_name }}" />
-        <button type="submit" class="btn btn-primary">
-          {{ 'Restore'|trans({}) }}
-        </button>
-      </form>
-    {% endblock %}
-  </div>
+  <form id="{{ form_name }}" name="{{ form_name }}" data-route-to-confirm-restore="{{ form_route_to_confirm_restore }}">
+    <input type="hidden" name="{{ form_fields.BACKUP_NAME }}" value="{{ backup_name }}" />
+    <button type="submit" class="btn btn-primary">
+      {{ 'Restore'|trans({}) }}
+    </button>
+  </form>
 {% endblock %}
diff --git a/views/templates/dialogs/dialog-update.html.twig b/views/templates/dialogs/dialog-update.html.twig
@@ -31,27 +31,23 @@
   {% endif %}
 {% endblock %}
 
-{% block dialog_footer %}
-  <div class="dialog__footer">
-    {% block dialog_footer_inner %}
-      <button type="button" class="btn btn-link" data-dismiss="dialog">
-        {{ 'Cancel'|trans({}) }}
-      </button>
+{% block dialog_footer_inner %}
+  <button type="button" class="btn btn-link" data-dismiss="dialog">
+    {{ 'Cancel'|trans({}) }}
+  </button>
 
-      <button
-        type="submit"
-        class="btn btn-primary"
-        form="form-confirm-update"
-      >
-        <img
-          class="dialog__rocket-icon rocket-icon"
-          src="{{ assets_base_path }}/img/rocket_white.svg"
-          width="20"
-          height="20"
-          alt=""
-        />
-        {{ 'Start update'|trans({}) }}
-      </button>
-    {% endblock %}
-  </div>
+  <button
+    type="submit"
+    class="btn btn-primary"
+    form="form-confirm-update"
+  >
+    <img
+      class="dialog__rocket-icon rocket-icon"
+      src="{{ assets_base_path }}/img/rocket_white.svg"
+      width="20"
+      height="20"
+      alt=""
+    />
+    {{ 'Start update'|trans({}) }}
+  </button>
 {% endblock %}