From 5ad0a04f18be19071aa055840ab4d329d148405c Mon Sep 17 00:00:00 2001 From: Corban-Lee Jones Date: Fri, 2 Aug 2024 21:42:43 +0100 Subject: [PATCH] use delete modal for subscriptions --- apps/static/js/home/subscriptions.js | 59 +++++++++++++++++++++++----- apps/templates/home/index.html | 3 +- 2 files changed, 51 insertions(+), 11 deletions(-) diff --git a/apps/static/js/home/subscriptions.js b/apps/static/js/home/subscriptions.js index 058d9ff..7f25e40 100644 --- a/apps/static/js/home/subscriptions.js +++ b/apps/static/js/home/subscriptions.js @@ -394,20 +394,59 @@ $(document).on("selectedServerChange", async function() { // Delete button on the 'edit subscription' modal $("#deleteEditSub").on("click", async function() { - const subId = $("#subId").val(); - await deleteSubscription(subId); - await loadSubscriptions(getCurrentlyActiveServer().guild_id); + const subId = parseInt($("#subId").val()); + const sub = subTable.row(function(idx, data, node) { return data.id === subId }).data(); + $("#subFormModal").modal("hide"); - showToast("danger", "Deleted Subscription", "Subscription ID: " + subId); + + await confirmDeleteModal( + "Confirm Delete", + `Do you wish to permanently delete ${sub.name}?`, + async () => { + await deleteSubscription(subId); + await loadSubscriptions(getCurrentlyActiveServer().guild_id); + showToast("danger", "Deleted Subscription", "Subscription ID: " + subId); + }, + async () => { + $("#subFormModal").modal("show"); + } + ); }); -async function deleteSelectedSubscriptions() { - var rows = subTable.rows(".selected").data(); - $.each(rows, async function() { - await deleteSubscription(this.id); - showToast("danger", "Deleted Subscription", "Subscription ID: " + this.id); +function arrayToHtmlList(array, bold=false) { + $ul = $("