From b2b9657a0b8a64674aa0a360493dfd861b152ff6 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 14 Feb 2025 11:02:10 +0000
Subject: [PATCH] FIX: Image uploads in site-settings and profile (#31350)

Followup to 310cd513d88e3670c7008682ae4b35414084a17d. The `uploadDone`
callback returns the whole upload object, so we need to extract the URL
from it in these cases.
---
 .../admin/addon/components/site-settings/upload.hbs    |  2 +-
 .../admin/addon/components/site-settings/upload.js     |  8 +++++++-
 .../discourse/app/controllers/preferences/profile.js   | 10 ++++++++++
 .../discourse/app/templates/preferences/profile.hbs    |  4 ++--
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/admin/addon/components/site-settings/upload.hbs b/app/assets/javascripts/admin/addon/components/site-settings/upload.hbs
index c421c746bdb..7dcbe21bb11 100644
--- a/app/assets/javascripts/admin/addon/components/site-settings/upload.hbs
+++ b/app/assets/javascripts/admin/addon/components/site-settings/upload.hbs
@@ -1,7 +1,7 @@
 <UppyImageUploader
   @imageUrl={{this.value}}
   @placeholderUrl={{this.setting.placeholder}}
-  @onUploadDone={{fn (mut this.value)}}
+  @onUploadDone={{this.uploadDone}}
   @onUploadDeleted={{fn (mut this.value) null}}
   @additionalParams={{hash for_site_setting=true}}
   @type="site_setting"
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/upload.js b/app/assets/javascripts/admin/addon/components/site-settings/upload.js
index ac849a73642..6db6b3b4aae 100644
--- a/app/assets/javascripts/admin/addon/components/site-settings/upload.js
+++ b/app/assets/javascripts/admin/addon/components/site-settings/upload.js
@@ -1,3 +1,9 @@
 import Component from "@ember/component";
+import { action } from "@ember/object";
 
-export default class Upload extends Component {}
+export default class Upload extends Component {
+  @action
+  uploadDone(upload) {
+    this.set("value", upload.url);
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/profile.js b/app/assets/javascripts/discourse/app/controllers/preferences/profile.js
index 81385d3b7a7..673dfb411c5 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/profile.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/profile.js
@@ -136,6 +136,16 @@ export default class ProfileController extends Controller {
     }
   }
 
+  @action
+  profileBackgroundUploadDone(upload) {
+    this.model.set("profile_background_upload_url", upload.url);
+  }
+
+  @action
+  cardBackgroundUploadDone(upload) {
+    this.model.set("card_background_upload_url", upload.url);
+  }
+
   @action
   save() {
     this.set("saved", false);
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs
index bec6f0b5ae4..db20d5c1490 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs
@@ -96,7 +96,7 @@
         <div class="controls">
           <UppyImageUploader
             @imageUrl={{this.model.profile_background_upload_url}}
-            @onUploadDone={{fn (mut this.model.profile_background_upload_url)}}
+            @onUploadDone={{this.profileBackgroundUploadDone}}
             @onUploadDeleted={{fn
               (mut this.model.profile_background_upload_url)
               null
@@ -121,7 +121,7 @@
         <div class="controls">
           <UppyImageUploader
             @imageUrl={{this.model.card_background_upload_url}}
-            @onUploadDone={{fn (mut this.model.card_background_upload_url)}}
+            @onUploadDone={{this.cardBackgroundUploadDone}}
             @onUploadDeleted={{fn
               (mut this.model.card_background_upload_url)
               null