Merge branch 'issue-8151-maintenance-confirmation-dialogs' into develop

Author: exileDev

src/Presentation/Nop.Web/Areas/Admin/Views/Common/Maintenance.cshtml

@@ -74,11 +74,11 @@
                         <nop-card class="col-md-6 col-xs-12 margin-t-5" asp-name="maintenance-delete-already-sent-queued-emails" asp-icon="fas fa-trash-alt" asp-title="@T("Admin.System.Maintenance.DeleteAlreadySentQueuedEmails")" asp-hide-block-attribute-name="@hideDeleteAlreadySentQueuedEmailsBlockAttributeName" asp-hide="@hideDeleteAlreadySentQueuedEmailsBlock" asp-advanced="false">@await Html.PartialAsync("_Maintenance.DeleteAlreadySentQueuedEmails", Model)</nop-card>
                     </div>
                     <div class="row">
-                        <nop-card class="col-md-6 col-xs-12 margin-t-5" asp-name="delete-minification-files" asp-icon="fas fa-trash-alt" asp-title="@T("Admin.System.Maintenance.DeleteMinificationFiles")" asp-hide-block-attribute-name="@hideDeleteMinificationFilesBlockAttributeName" asp-hide="@hideDeleteMinificationFilesBlock" asp-advanced="false">@await Html.PartialAsync("_Maintenance.DeleteMinificationCacheFiles", Model)</nop-card>
+                        <nop-card class="col-md-6 col-xs-12 margin-t-5" asp-name="delete-minification-files-card" asp-icon="fas fa-trash-alt" asp-title="@T("Admin.System.Maintenance.DeleteMinificationFiles")" asp-hide-block-attribute-name="@hideDeleteMinificationFilesBlockAttributeName" asp-hide="@hideDeleteMinificationFilesBlock" asp-advanced="false">@await Html.PartialAsync("_Maintenance.DeleteMinificationCacheFiles", Model)</nop-card>
                         <nop-card class="col-md-6 col-xs-12 margin-t-5" asp-name="maintenance-shrink-database" asp-icon="fas fa-trash-alt" asp-title="@T("Admin.System.Maintenance.ShrinkDatabase")" asp-hide-block-attribute-name="@hideShrinkDatabaseBlockAttributeName" asp-hide="@hideShrinkDatabaseBlock" asp-advanced="false">@await Html.PartialAsync("_Maintenance.ShrinkDatabase", Model)</nop-card>
                     </div>
                     <div class="row">
-                        <nop-card class="col-md-6 col-xs-12 margin-t-5" asp-name="delete-thumb-files" asp-icon="fas fa-trash-alt" asp-title="@T("Admin.System.Maintenance.DeleteThumbFiles")" asp-hide-block-attribute-name="@hideDeleteThumbFilesBlockAttributeName" asp-hide="@hideDeleteThumbFilesBlock" asp-advanced="false">@await Html.PartialAsync("_Maintenance.DeleteThumbFiles", Model)</nop-card>
+                        <nop-card class="col-md-6 col-xs-12 margin-t-5" asp-name="delete-thumb-files-card" asp-icon="fas fa-trash-alt" asp-title="@T("Admin.System.Maintenance.DeleteThumbFiles")" asp-hide-block-attribute-name="@hideDeleteThumbFilesBlockAttributeName" asp-hide="@hideDeleteThumbFilesBlock" asp-advanced="false">@await Html.PartialAsync("_Maintenance.DeleteThumbFiles", Model)</nop-card>
                         <nop-card class="col-md-6 col-xs-12 margin-t-5" asp-name="maintenance-clear-search-history" asp-icon="fas fa-trash-alt" asp-title="@T("Admin.System.Maintenance.ClearSearchHistory")" asp-hide-block-attribute-name="@hideClearSearchHistoryAttributeName" asp-hide="@hideClearSearchHistoryBlock" asp-advanced="false">@await Html.PartialAsync("_Maintenance.ClearSearchHistory", Model)</nop-card>
                     </div>
                     @await Component.InvokeAsync(typeof(AdminWidgetViewComponent), new { widgetZone = AdminWidgetZones.MaintenanceDetailsBlock, additionalData = Model })

src/Presentation/Nop.Web/Areas/Admin/Views/Common/_Maintenance.ClearSearchHistory.cshtml

@@ -9,15 +9,23 @@
                 </p>
             </div>
             <div>
-                <button type="submit" name="clear-search-history" class="btn btn-default">
+                <button type="button" id="clear-search-history" class="btn btn-default">
                     <i class="far fa-trash-can"></i>
                     @T("Admin.System.Maintenance.ClearSearchHistory.Button")
                 </button>
                 <script>
                     $(function() {
-                        $("button[name='clear-search-history']").on("click", function () {
+                        $("#clear-search-history-action-confirmation-submit-button").on("click", function () {
                             $("html, body").animate({ scrollTop: 0 }, 400);
                             showThrobber('@Html.Raw(JavaScriptEncoder.Default.Encode(T("Admin.System.Maintenance.ClearSearchHistory.Progress").Text))');
+
+                            const opener = $("#clear-search-history");
+                            opener.prop({
+                                name: "clear-search-history",
+                                type: "submit"
+                            });
+
+                            opener.click();
                         });
                     });
                 </script>
@@ -35,4 +43,5 @@
             </div>
         </div>
     }
-</div>
+</div>
+<nop-action-confirmation asp-button-id="clear-search-history" />

src/Presentation/Nop.Web/Areas/Admin/Views/Common/_Maintenance.DBBackups.cshtml

@@ -44,7 +44,7 @@
     })
 </div>
 <div class="card-footer">
-    <button type="submit" id="backup-database" name="backup-database" class="btn btn-primary">
+    <button type="button" id="backup-database" class="btn btn-primary">
         @T("Admin.System.Maintenance.BackupDatabase.BackupNow")
     </button>
     <script>
@@ -61,8 +61,16 @@
         };
 
         $(function() {
-            $("#backup-database").on("click", function () {
+            $("#backup-database-action-confirmation-submit-button").on("click", function () {
                 showProgress();
+
+                const opener = $("#backup-database");
+                opener.prop({
+                    name: "backup-database",
+                    type: "submit"
+                });
+
+                opener.click();
             });
         });
     </script>
@@ -82,4 +90,5 @@
     function renderDelete(data, type, row, meta) {
         return '<button type="submit" class="btn btn-default" onclick="submitBackupAction(\'' + row.Name + '\',\'delete-backup\')"><i class="far fa-trash-can"></i>@T("Admin.System.Maintenance.BackupDatabase.Delete").Text</button>';
     }
-</script>
+</script>
+<nop-action-confirmation asp-button-id="backup-database" />

src/Presentation/Nop.Web/Areas/Admin/Views/Common/_Maintenance.DeleteAbandonedCarts.cshtml

@@ -11,14 +11,14 @@
     </div>
     <div class="form-group row">
         <div class="col-md-6 offset-md-6">
-            <button type="submit" name="delete-abondoned-carts" class="btn btn-default">
+            <button type="submit" name="delete-abondoned-carts" id="delete-abondoned-carts" class="btn btn-default">
                 <i class="far fa-trash-can"></i>
                 @T("Admin.Common.Delete")
             </button>
         </div>
     </div>
     @if (Model.DeleteAbandonedCarts.NumberOfDeletedItems.HasValue)
-                            {
+    {
     <div class="form-group row">
         <div class="col-md-12">
             <div class="alert alert-success alert-dismissible no-margin">
@@ -27,5 +27,6 @@
             </div>
         </div>
     </div>
-                            }
-</div>
+    }
+</div>
+<nop-action-confirmation asp-button-id="delete-abondoned-carts" />

src/Presentation/Nop.Web/Areas/Admin/Views/Common/_Maintenance.DeleteAlreadySentQueuedEmails.cshtml

@@ -19,7 +19,7 @@
         </div>
         <div class="form-group row">
             <div class="col-md-6 offset-md-6">
-                <button type="submit" name="delete-already-sent-queued-emails" class="btn btn-default">
+                <button type="submit" name="delete-already-sent-queued-emails" id="delete-already-sent-queued-emails" class="btn btn-default">
                     <i class="far fa-trash-can"></i>
                     @T("Admin.Common.Delete")
                 </button>
@@ -36,4 +36,5 @@
                 </div>
             </div>
         }
-    </div>
+</div>
+<nop-action-confirmation asp-button-id="delete-already-sent-queued-emails" />

src/Presentation/Nop.Web/Areas/Admin/Views/Common/_Maintenance.DeleteFiles.cshtml

@@ -19,7 +19,7 @@
     </div>
     <div class="form-group row">
         <div class="col-md-6 offset-md-6">
-            <button type="submit" name="delete-exported-files" class="btn btn-default">
+            <button type="submit" name="delete-exported-files" id="delete-exported-files" class="btn btn-default">
                 <i class="far fa-trash-can"></i>
                 @T("Admin.Common.Delete")
             </button>
@@ -36,4 +36,5 @@
             </div>
         </div>
     }
-</div>
+</div>
+<nop-action-confirmation asp-button-id="delete-exported-files" />

src/Presentation/Nop.Web/Areas/Admin/Views/Common/_Maintenance.DeleteGuests.cshtml

@@ -27,7 +27,7 @@
     </div>
     <div class="form-group row">
         <div class="col-md-6 offset-md-6">
-            <button type="submit" name="delete-guests" class="btn btn-default">
+            <button type="submit" name="delete-guests" id="delete-guests" class="btn btn-default">
                 <i class="far fa-trash-can"></i>
                 @T("Admin.Common.Delete")
             </button>
@@ -45,3 +45,4 @@
         </div>
     }
 </div>
+<nop-action-confirmation asp-button-id="delete-guests" />

src/Presentation/Nop.Web/Areas/Admin/Views/Common/_Maintenance.DeleteMinificationCacheFiles.cshtml

@@ -8,7 +8,7 @@
                     @T("Admin.System.Maintenance.DeleteMinificationFiles.Text")
                 </p>
             </div>
-            <button type="submit" name="delete-minification-files" class="btn btn-default">
+            <button type="submit" name="delete-minification-files" id="delete-minification-files" class="btn btn-default">
                 <i class="far fa-trash-can"></i>
                 @T("Admin.Common.Delete")
             </button>
@@ -25,4 +25,5 @@
             </div>
         </div>
     }
-</div>
+</div>
+<nop-action-confirmation asp-button-id="delete-minification-files" />

src/Presentation/Nop.Web/Areas/Admin/Views/Common/_Maintenance.DeleteThumbFiles.cshtml

@@ -19,7 +19,7 @@
                         </p>
 
                         <div>
-                            <button type = "submit" name = "delete-thumb-files" class ="btn btn-default" >
+                            <button type="submit" name="delete-thumb-files" id="delete-thumb-files" class="btn btn-default" >
                                 <i class ="far fa-trash-can" ></i >
                                 @T("Admin.Common.Delete")
                             </button >
@@ -37,4 +37,5 @@
                 }
             </div>
     </div>
-</div>
+</div>
+<nop-action-confirmation asp-button-id="delete-thumb-files" />

src/Presentation/Nop.Web/Areas/Admin/Views/Common/_Maintenance.ReindexDatabaseTables.cshtml

@@ -8,19 +8,28 @@
                 </p>
             </div>
             <div>
-                <button type="submit" name="re-index" class="btn btn-default">
+                <button type="button" id="re-index" class="btn btn-default">
                     <i class="fas fa-gears"></i>
                     @T("Admin.System.Maintenance.ReIndexTables.ReIndexNow")
                 </button>
                 <script>
                     $(function() {
-                        $("button[name='re-index']").on("click", function () {
+                        $("#re-index-action-confirmation-submit-button").on("click", function () {
                             $("html, body").animate({ scrollTop: 0 }, 400);
                             showThrobber('@Html.Raw(JavaScriptEncoder.Default.Encode(T("Admin.System.Maintenance.ReIndexTables.Progress").Text))');
+
+                            const opener = $("#re-index");
+                            opener.prop({
+                                name: "re-index",
+                                type: "submit"
+                            });
+
+                            opener.click();
                         });
                     });
                 </script>
             </div>
         </div>
     </div>
-</div>
+</div>
+<nop-action-confirmation asp-button-id="re-index" />