From b3b7d88481b537a4617eb582ecaa6befa750561a Mon Sep 17 00:00:00 2001
From: Rimian Perkins <hello@rimian.com.au>
Date: Thu, 14 Nov 2019 14:07:45 +1100
Subject: [PATCH] spinner on subscription cancel

---
 .../admin-plugins-discourse-patrons-subscriptions.js.es6  | 7 ++++++-
 .../discourse/routes/user-subscriptions.js.es6            | 7 ++++++-
 .../admin/plugins-discourse-patrons-subscriptions.hbs     | 8 +++++++-
 .../discourse/templates/user/subscriptions.hbs            | 8 +++++++-
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/assets/javascripts/discourse/routes/admin-plugins-discourse-patrons-subscriptions.js.es6 b/assets/javascripts/discourse/routes/admin-plugins-discourse-patrons-subscriptions.js.es6
index 7644224..bfca9f0 100644
--- a/assets/javascripts/discourse/routes/admin-plugins-discourse-patrons-subscriptions.js.es6
+++ b/assets/javascripts/discourse/routes/admin-plugins-discourse-patrons-subscriptions.js.es6
@@ -15,12 +15,17 @@ export default Discourse.Route.extend({
         I18n.t("yes_value"),
         confirmed => {
           if (confirmed) {
+            subscription.set("loading", true);
+
             subscription
               .destroy()
               .then(result => subscription.set("status", result.status))
               .catch(data =>
                 bootbox.alert(data.jqXHR.responseJSON.errors.join("\n"))
-              );
+              )
+              .finally(() => {
+                subscription.set("loading", false);
+              });
           }
         }
       );
diff --git a/assets/javascripts/discourse/routes/user-subscriptions.js.es6 b/assets/javascripts/discourse/routes/user-subscriptions.js.es6
index a02059b..571e2ac 100644
--- a/assets/javascripts/discourse/routes/user-subscriptions.js.es6
+++ b/assets/javascripts/discourse/routes/user-subscriptions.js.es6
@@ -23,12 +23,17 @@ export default Discourse.Route.extend({
         I18n.t("yes_value"),
         confirmed => {
           if (confirmed) {
+            subscription.set("loading", true);
+
             subscription
               .destroy()
               .then(result => subscription.set("status", result.status))
               .catch(data =>
                 bootbox.alert(data.jqXHR.responseJSON.errors.join("\n"))
-              );
+              )
+              .finally(() => {
+                subscription.set("loading", false);
+              });
           }
         }
       );
diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-subscriptions.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-subscriptions.hbs
index 2f62c27..8a1b26d 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-subscriptions.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-subscriptions.hbs
@@ -23,7 +23,13 @@
       <td>{{subscription.plan.id}}</td>
       <td>{{subscription.status}}</td>
       <td class="td-right">{{format-unix-date subscription.created}}</td>
-      <td class="td-right">{{d-button disabled=subscription.canceled label="cancel" action=(route-action "cancelSubscription" subscription) icon="times"}}</td>
+      <td class="td-right">
+        {{#if subscription.loading}}
+          {{loading-spinner size="small"}}
+        {{else}}
+          {{d-button disabled=subscription.canceled label="cancel" action=(route-action "cancelSubscription" subscription) icon="times"}}
+        {{/if}}
+      </td>
     </tr>
   {{/each}}
 </table>
diff --git a/assets/javascripts/discourse/templates/user/subscriptions.hbs b/assets/javascripts/discourse/templates/user/subscriptions.hbs
index 8c5d958..5c29c11 100644
--- a/assets/javascripts/discourse/templates/user/subscriptions.hbs
+++ b/assets/javascripts/discourse/templates/user/subscriptions.hbs
@@ -16,7 +16,13 @@
         <td>{{subscription.plan.subscriptionRate}}</td>
         <td>{{subscription.status}}</td>
         <td>{{format-unix-date subscription.created}}</td>
-        <td class="td-right">{{d-button disabled=subscription.canceled label="cancel" action=(route-action "cancelSubscription" subscription) icon="times"}}</td>
+        <td class="td-right">
+          {{#if subscription.loading}}
+            {{loading-spinner size="small"}}
+          {{else}}
+            {{d-button disabled=subscription.canceled label="cancel" action=(route-action "cancelSubscription" subscription) icon="times"}}
+          {{/if}}
+        </td>
       </tr>
     {{/each}}
   </table>