mirror of
https://ghfast.top/https://github.com/discourse/discourse-ai.git
synced 2026-07-16 11:36:23 +08:00
3800728d52
This PR addresses a bug where uploads weren't being cleared after successfully posting a new private message in the AI bot conversations interface. Here's what the changes do: ## Main Fix: - Makes the `prepareAndSubmitToBot()` method async and adds proper error handling - Adds `this.uploads.clear()` after successful submission to clear all uploads - Adds a test to verify that the "New Question" button properly resets the UI with no uploads ## Additional Improvements: 1. **Dynamic Character Length Validation**: - Uses `siteSettings.min_personal_message_post_length` instead of hardcoded 10 characters - Updates the error message to show the dynamic character count - Adds proper pluralization in the localization file for the error message 2. **Bug Fixes**: - Adds null checks with optional chaining (`link?.topic?.id`) in the sidebar code to prevent potential errors 3. **Code Organization**: - Moves error handling from the service to the controller for better separation of concerns
100 lines
2.6 KiB
JavaScript
100 lines
2.6 KiB
JavaScript
import { action } from "@ember/object";
|
|
import { next } from "@ember/runloop";
|
|
import Service, { service } from "@ember/service";
|
|
import { tracked } from "@ember-compat/tracked-built-ins";
|
|
import { ajax } from "discourse/lib/ajax";
|
|
import { getUploadMarkdown } from "discourse/lib/uploads";
|
|
import { i18n } from "discourse-i18n";
|
|
|
|
export default class AiBotConversationsHiddenSubmit extends Service {
|
|
@service aiConversationsSidebarManager;
|
|
@service appEvents;
|
|
@service composer;
|
|
@service dialog;
|
|
@service router;
|
|
@service siteSettings;
|
|
|
|
@tracked loading = false;
|
|
|
|
personaId;
|
|
targetUsername;
|
|
uploads = [];
|
|
|
|
inputValue = "";
|
|
|
|
@action
|
|
focusInput() {
|
|
this.composer.destroyDraft();
|
|
this.composer.close();
|
|
next(() => {
|
|
document.getElementById("ai-bot-conversations-input").focus();
|
|
});
|
|
}
|
|
|
|
@action
|
|
async submitToBot() {
|
|
if (
|
|
this.inputValue.length <
|
|
this.siteSettings.min_personal_message_post_length
|
|
) {
|
|
return this.dialog.alert({
|
|
message: i18n(
|
|
"discourse_ai.ai_bot.conversations.min_input_length_message",
|
|
{ count: this.siteSettings.min_personal_message_post_length }
|
|
),
|
|
didConfirm: () => this.focusInput(),
|
|
didCancel: () => this.focusInput(),
|
|
});
|
|
}
|
|
|
|
// Don't submit if there are still uploads in progress
|
|
if (document.querySelector(".ai-bot-upload--in-progress")) {
|
|
return this.dialog.alert({
|
|
message: i18n("discourse_ai.ai_bot.conversations.uploads_in_progress"),
|
|
});
|
|
}
|
|
|
|
this.loading = true;
|
|
const title = i18n("discourse_ai.ai_bot.default_pm_prefix");
|
|
|
|
// Prepare the raw content with any uploads appended
|
|
let rawContent = this.inputValue;
|
|
|
|
// Append upload markdown if we have uploads
|
|
if (this.uploads && this.uploads.length > 0) {
|
|
rawContent += "\n\n";
|
|
|
|
this.uploads.forEach((upload) => {
|
|
const uploadMarkdown = getUploadMarkdown(upload);
|
|
rawContent += uploadMarkdown + "\n";
|
|
});
|
|
}
|
|
|
|
try {
|
|
const response = await ajax("/posts.json", {
|
|
method: "POST",
|
|
data: {
|
|
raw: rawContent,
|
|
title,
|
|
archetype: "private_message",
|
|
target_recipients: this.targetUsername,
|
|
meta_data: { ai_persona_id: this.personaId },
|
|
},
|
|
});
|
|
|
|
// Reset uploads after successful submission
|
|
this.uploads = [];
|
|
this.inputValue = "";
|
|
|
|
this.appEvents.trigger("discourse-ai:bot-pm-created", {
|
|
id: response.topic_id,
|
|
slug: response.topic_slug,
|
|
title,
|
|
});
|
|
|
|
this.router.transitionTo(response.post_url);
|
|
} finally {
|
|
this.loading = false;
|
|
}
|
|
}
|
|
}
|
