From 5f975b510cc5741a78c1712f6de2bcd422bd913c Mon Sep 17 00:00:00 2001
From: grandeljay <github.jay@grandel.anonaddy.me>
Date: Fri, 10 Feb 2023 15:23:31 +0100
Subject: [PATCH] Allow deleting wish

---
 src/assets/js/parts/wish.js      | 65 ++++++++++++++++++++++++++++++++
 src/assets/js/parts/wishlists.js | 61 ------------------------------
 2 files changed, 65 insertions(+), 61 deletions(-)

diff --git a/src/assets/js/parts/wish.js b/src/assets/js/parts/wish.js
index 0f6852b5..7008d662 100644
--- a/src/assets/js/parts/wish.js
+++ b/src/assets/js/parts/wish.js
@@ -3,6 +3,7 @@ const wish_button_fulfil_wish       = '.ui.button.wish-fulfil';
 const wish_button_visit             = '.ui.button.wish-visit';
 const wish_button_options           = '.ui.button.wish-options';
 const wish_button_options_edit      = wish_button_options + ' .item.wish-edit';
+const wish_button_options_delete    = wish_button_options + ' .item.wish-delete';
 
 var wish;
 
@@ -29,6 +30,9 @@ function wish_set_to(wish_data) {
 
     /** Edit */
     $(wish_button_options_edit).removeClass('disabled');
+
+    /** Delete */
+    $(wish_button_options_delete).removeClass('disabled');
 }
 
 function wish_unset() {
@@ -281,6 +285,67 @@ $(function () {
     /**
      * Options: Delete
      */
+    $(document).on('click', wish_button_options_delete, function() {
+        var button_delete = $(this);
+        var card         = button_delete.closest('.ui.card');
+        var column       = card.closest('.column');
+
+        /**
+         * Save global-scope wish since it will be unset when the wish-details
+         * modal is closed.
+         */
+        var wish_local = wish;
+
+        $('body')
+        .modal({
+            'title'     : wishthis.strings.modal.wish.delete.title,
+            'content'   : wishthis.strings.modal.wish.delete.content,
+            'class'     : 'tiny',
+            'actions'   : [
+                {
+                    'text'  : wishthis.strings.modal.wish.delete.approve,
+                    'class' : 'approve primary'
+                },
+                {
+                    'text' : wishthis.strings.modal.wish.delete.deny
+                }
+            ],
+            'onApprove' : function (button_approve) {
+                /**
+                 * Delete wish
+                 */
+                var modal = button_approve.closest('.ui.modal');
+
+                button_approve.addClass('loading');
+
+                var wish_delete = new URLSearchParams({
+                    'wish_id' : wish_local.id
+                });
+
+                fetch('/api/wishes', {
+                    'method' : 'DELETE',
+                    'body'   : wish_delete,
+                })
+                .then(handleFetchError)
+                .then(handleFetchResponse)
+                .then(function(response) {
+                    column.fadeOut(200);
+
+                    $('body').toast({ message: wishthis.strings.toast.wish.delete });
+
+                    modal.modal('hide');
+
+                    setTimeout(() => {
+                        $('.ui.dropdown.filter.priority').api('query');
+                    }, 200);
+                });
+
+                return false;
+            }
+        })
+        .modal('show');
+
+    });
     /** */
 
 });
diff --git a/src/assets/js/parts/wishlists.js b/src/assets/js/parts/wishlists.js
index 403f6d5f..1e4d7439 100644
--- a/src/assets/js/parts/wishlists.js
+++ b/src/assets/js/parts/wishlists.js
@@ -311,67 +311,6 @@ $(function () {
         }
     });
 
-    /**
-     * Delete Wish
-     */
-    $(document).on('click', '.wish-delete', function () {
-        var buttonDelete = $(this);
-        var card         = buttonDelete.closest('.ui.card');
-        var column       = card.closest('.column');
-        var modalDefault = $('.ui.modal.default');
-
-        modalDefault
-        .modal({
-            title    : wishthis.strings.modal.wish.delete.title,
-            content  : wishthis.strings.modal.wish.delete.content,
-            class    : 'tiny',
-            actions  : [
-                {
-                    text : wishthis.strings.modal.wish.delete.approve,
-                    class: 'approve primary'
-                },
-                {
-                    text: wishthis.strings.modal.wish.delete.deny
-                }
-            ],
-            autoShow : true,
-            onApprove: function (buttonApprove) {
-                buttonApprove.addClass('loading');
-
-                /**
-                 * Delete wish
-                 */
-                buttonDelete.api({
-                    'action'     : 'delete wish',
-                    'method'     : 'DELETE',
-                    'beforeSend' : function (settings) {
-                        var wish_id = card.attr('data-id');
-
-                        settings.urlData.wishid = wish_id;
-
-                        console.log(wish_id);
-
-                        return settings;
-                    },
-                    'on'         : 'now',
-                    'onSuccess'  : function () {
-                        column.fadeOut(800);
-
-                        $('body').toast({ message: wishthis.strings.toast.wish.delete });
-
-                        modalDefault.modal('hide');
-
-                        setTimeout(() => {
-                            $('.ui.dropdown.filter.priority').api('query');
-                        }, 800);
-                    },
-                });
-
-                return false;
-            }
-        });
-    });
-
     /**
      * Add wish
      */