Skip to content

A platform for community discussion. Free, open, simple.

FIX: Resolve broken uploads in AI bot docked composer (#39712)

Keegan George9f6588ce597c
diff --git a/app/assets/stylesheets/common/components/docked-composer.scss b/app/assets/stylesheets/common/components/docked-composer.scss
index fe339524213..87ad2a715e4 100644
--- a/app/assets/stylesheets/common/components/docked-composer.scss
+++ b/app/assets/stylesheets/common/components/docked-composer.scss
@@ -189,6 +189,7 @@
gap: 0.5em;
width: 100%;
max-width: var(--docked-composer-max-width);
+ padding-block: 1rem;
padding-left: var(--docked-composer-content-offset);
margin: 0 auto;
box-sizing: border-box;
diff --git a/frontend/discourse/app/components/docked-composer.gjs b/frontend/discourse/app/components/docked-composer.gjs
index 2e46e150231..ec80b2c6ea1 100644
--- a/frontend/discourse/app/components/docked-composer.gjs
+++ b/frontend/discourse/app/components/docked-composer.gjs
@@ -212,6 +212,10 @@ export default class DockedComposer extends Component {
this.uploads.push(upload);
},
});
+
+ if (this.fileInputEl) {
+ this.uppyUpload.setup(this.fileInputEl);
+ }
}
@action
diff --git a/plugins/discourse-ai/assets/javascripts/discourse/services/ai-bot-docked-submit.js b/plugins/discourse-ai/assets/javascripts/discourse/services/ai-bot-docked-submit.js
index cdd991a3044..09b4e5ce6d0 100644
--- a/plugins/discourse-ai/assets/javascripts/discourse/services/ai-bot-docked-submit.js
+++ b/plugins/discourse-ai/assets/javascripts/discourse/services/ai-bot-docked-submit.js
@@ -12,31 +12,39 @@ export default class AiBotDockedSubmit extends Service {
@tracked loading = false;
async submitReply({ topicId, raw, uploads, inProgressUploadsCount }) {
- if (!topicId || !raw) {
+ if (!topicId) {
return null;
}
- const minLength = this.siteSettings.min_personal_message_post_length;
- if (raw.trim().length < minLength) {
+ if (inProgressUploadsCount > 0) {
this.dialog.alert({
- message: i18n(
- "discourse_ai.ai_bot.conversations.min_input_length_message",
- { count: minLength }
- ),
+ message: i18n("discourse_ai.ai_bot.conversations.uploads_in_progress"),
});
return null;
}
- if (inProgressUploadsCount > 0) {
+ const hasUploads = uploads?.length > 0;
+
+ if (!raw && !hasUploads) {
+ return null;
+ }
+
+ const minLength = this.siteSettings.min_personal_message_post_length;
+ if (!hasUploads && raw.trim().length < minLength) {
this.dialog.alert({
- message: i18n("discourse_ai.ai_bot.conversations.uploads_in_progress"),
+ message: i18n(
+ "discourse_ai.ai_bot.conversations.min_input_length_message",
+ { count: minLength }
+ ),
});
return null;
}
- let rawContent = raw;
- if (uploads?.length) {
- rawContent += "\n\n";
+ let rawContent = raw || "";
+ if (hasUploads) {
+ if (rawContent.length) {
+ rawContent += "\n\n";
+ }
uploads.forEach((upload) => {
rawContent += getUploadMarkdown(upload) + "\n";
});
diff --git a/plugins/discourse-ai/test/javascripts/unit/services/ai-bot-docked-submit-test.js b/plugins/discourse-ai/test/javascripts/unit/services/ai-bot-docked-submit-test.js
index a3b4662fd15..f3fb8bca82e 100644
--- a/plugins/discourse-ai/test/javascripts/unit/services/ai-bot-docked-submit-test.js
+++ b/plugins/discourse-ai/test/javascripts/unit/services/ai-bot-docked-submit-test.js
@@ -20,13 +20,18 @@ module("Unit | Service | ai-bot-docked-submit", function (hooks) {
assert.strictEqual(result, null);
});
- test("returns null when raw is missing", async function (assert) {
+ test("returns null when raw is empty and no uploads", async function (assert) {
const service = getOwner(this).lookup("service:ai-bot-docked-submit");
- const result = await service.submitReply({ topicId: 42, raw: "" });
+ const result = await service.submitReply({
+ topicId: 42,
+ raw: "",
+ uploads: [],
+ inProgressUploadsCount: 0,
+ });
assert.strictEqual(result, null);
});
- test("returns null and alerts when raw is shorter than min length", async function (assert) {
+ test("returns null and alerts when raw is shorter than min length and no uploads", async function (assert) {
const service = getOwner(this).lookup("service:ai-bot-docked-submit");
let requestsCount = 0;
pretender.post("/posts.json", () => {
@@ -45,6 +50,76 @@ module("Unit | Service | ai-bot-docked-submit", function (hooks) {
assert.strictEqual(requestsCount, 0, "no POST when too short");
});
+ test("submits with only uploads and no raw text", async function (assert) {
+ const service = getOwner(this).lookup("service:ai-bot-docked-submit");
+ let rawSent;
+ pretender.post("/posts.json", (request) => {
+ const params = new URLSearchParams(request.requestBody);
+ rawSent = params.get("raw");
+ return response(200, { id: 1, topic_id: 42 });
+ });
+
+ const result = await service.submitReply({
+ topicId: 42,
+ raw: "",
+ uploads: [
+ {
+ short_url: "upload://abc123.pdf",
+ original_filename: "document.pdf",
+ extension: "pdf",
+ filesize: 1024,
+ },
+ ],
+ inProgressUploadsCount: 0,
+ });
+
+ assert.notStrictEqual(
+ result,
+ null,
+ "submission succeeds with only uploads"
+ );
+ assert.true(
+ rawSent.includes("upload://abc123.pdf"),
+ "upload markdown is sent"
+ );
+ });
+
+ test("skips min length check when uploads are present", async function (assert) {
+ const service = getOwner(this).lookup("service:ai-bot-docked-submit");
+ let rawSent;
+ pretender.post("/posts.json", (request) => {
+ const params = new URLSearchParams(request.requestBody);
+ rawSent = params.get("raw");
+ return response(200, { id: 1, topic_id: 42 });
+ });
+
+ const result = await service.submitReply({
+ topicId: 42,
+ raw: "hi",
+ uploads: [
+ {
+ short_url: "upload://abc123.png",
+ original_filename: "screenshot.png",
+ extension: "png",
+ width: 400,
+ height: 300,
+ },
+ ],
+ inProgressUploadsCount: 0,
+ });
+
+ assert.notStrictEqual(
+ result,
+ null,
+ "submission succeeds with short text + uploads"
+ );
+ assert.true(rawSent.includes("hi"), "raw text preserved");
+ assert.true(
+ rawSent.includes("upload://abc123.png"),
+ "upload markdown appended"
+ );
+ });
+
test("returns null when uploads are still in progress", async function (assert) {
const service = getOwner(this).lookup("service:ai-bot-docked-submit");
let requestsCount = 0;