From 40d5739a8007f80099e11a9bacb63f6e1f8e840f Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 10 Sep 2020 15:01:53 +1000
Subject: [PATCH] DEV: Review fixes for bookmark-list (#10642)

Make removeBookmark return a promise and do not use setProperties for no reason.

More context at https://review.discourse.org/t/fix-add-bookmark-list-component-10451/14450/3
---
 .../discourse/app/components/bookmark-list.js | 35 ++++++++++++-------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/bookmark-list.js b/app/assets/javascripts/discourse/app/components/bookmark-list.js
index 637b72b7122..546b9bf5e33 100644
--- a/app/assets/javascripts/discourse/app/components/bookmark-list.js
+++ b/app/assets/javascripts/discourse/app/components/bookmark-list.js
@@ -1,4 +1,5 @@
 import Component from "@ember/component";
+import { Promise } from "rsvp";
 import I18n from "I18n";
 import { action } from "@ember/object";
 import showModal from "discourse/lib/show-modal";
@@ -13,18 +14,28 @@ export default Component.extend({
 
   @action
   removeBookmark(bookmark) {
-    const deleteBookmark = () => {
-      return bookmark
-        .destroy()
-        .then(() => this._removeBookmarkFromList(bookmark));
-    };
-    if (!bookmark.reminder_at) {
-      return deleteBookmark();
-    }
-    bootbox.confirm(I18n.t("bookmarks.confirm_delete"), (result) => {
-      if (result) {
+    return new Promise((resolve, reject) => {
+      const deleteBookmark = () => {
+        bookmark
+          .destroy()
+          .then(() => {
+            this._removeBookmarkFromList(bookmark);
+            resolve(true);
+          })
+          .catch((error) => {
+            reject(error);
+          });
+      };
+      if (!bookmark.reminder_at) {
         return deleteBookmark();
       }
+      bootbox.confirm(I18n.t("bookmarks.confirm_delete"), (result) => {
+        if (result) {
+          deleteBookmark();
+        } else {
+          resolve(false);
+        }
+      });
     });
   },
 
@@ -50,9 +61,7 @@ export default Component.extend({
       title: "post.bookmarks.edit",
       modalClass: "bookmark-with-reminder",
     });
-    controller.setProperties({
-      afterSave: () => this.reload(),
-    });
+    controller.set("afterSave", () => this.reload());
   },
 
   _removeBookmarkFromList(bookmark) {