A platform for community discussion. Free, open, simple.
FIX: AI bot submits during IME composition (#40167)
Keegan George3cbe4ac33f75
diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-bot-conversations.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-bot-conversations.gjsindex 288cd2c0790..5c5f12816a7 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-bot-conversations.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-bot-conversations.gjs@@ -223,7 +223,9 @@ export default class AiBotConversations extends Component {if (event.target.tagName !== "TEXTAREA") {return;}- if (event.key === "Enter" && !event.shiftKey) {+ if (event.key === "Enter" && !event.shiftKey && !event.isComposing) {+ event.preventDefault();+ event.stopPropagation();this.prepareAndSubmitToBot();}}diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-helper-custom-prompt.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-helper-custom-prompt.gjsindex c3049e48dac..a660fc93458 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-helper-custom-prompt.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-helper-custom-prompt.gjs@@ -10,7 +10,7 @@ import { i18n } from "discourse-i18n";export default class AiHelperCustomPrompt extends Component {@actionsendInput(event) {- if (event.key !== "Enter") {+ if (event.key !== "Enter" || event.isComposing) {return;}return this.args.submit(this.args.promptArgs);diff --git a/plugins/discourse-ai/test/javascripts/acceptance/ai-bot-conversations-test.js b/plugins/discourse-ai/test/javascripts/acceptance/ai-bot-conversations-test.jsnew file mode 100644index 00000000000..bde68818ae6--- /dev/null+++ b/plugins/discourse-ai/test/javascripts/acceptance/ai-bot-conversations-test.js@@ -0,0 +1,60 @@+import { fillIn, triggerKeyEvent, visit } from "@ember/test-helpers";+import { test } from "qunit";+import { acceptance } from "discourse/tests/helpers/qunit-helpers";++acceptance("AI Bot - Conversations IME handling", function (needs) {+ let postRequests = 0;++ needs.user({+ ai_enabled_agents: [],+ ai_enabled_chat_bots: [+ {+ id: 1,+ model_name: "gpt-4",+ username: "gpt-4",+ is_agent: false,+ },+ ],+ });++ needs.settings({+ discourse_ai_enabled: true,+ ai_bot_enabled: true,+ min_personal_message_post_length: 10,+ });++ needs.pretender((server, helper) => {+ server.get("/discourse-ai/ai-bot/conversations.json", () => {+ return helper.response({+ conversations: [],+ meta: { has_more: false },+ });+ });++ server.post("/posts.json", () => {+ postRequests += 1;+ return helper.response({+ id: 1,+ topic_id: 1,+ topic_slug: "ai-conversation",+ post_url: "/t/ai-conversation/1/1",+ });+ });+ });++ test("does not submit when Enter is pressed during IME composition", async function (assert) {+ postRequests = 0;++ await visit("/discourse-ai/ai-bot/conversations");+ await fillIn(+ "#ai-bot-conversations-input",+ "これはテスト入力として十分長い文章です"+ );++ await triggerKeyEvent("#ai-bot-conversations-input", "keydown", "Enter", {+ isComposing: true,+ });++ assert.strictEqual(postRequests, 0, "does not request /posts.json");+ });+});diff --git a/plugins/discourse-ai/test/javascripts/integration/components/ai-helper-custom-prompt-test.gjs b/plugins/discourse-ai/test/javascripts/integration/components/ai-helper-custom-prompt-test.gjsnew file mode 100644index 00000000000..4f414442245--- /dev/null+++ b/plugins/discourse-ai/test/javascripts/integration/components/ai-helper-custom-prompt-test.gjs@@ -0,0 +1,47 @@+import { tracked } from "@glimmer/tracking";+import { render, triggerKeyEvent } from "@ember/test-helpers";+import { module, test } from "qunit";+import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import AiHelperCustomPrompt from "discourse/plugins/discourse-ai/discourse/components/ai-helper-custom-prompt";++class TestState {+ @tracked value = "test";+}++module("Integration | Component | ai-helper-custom-prompt", function (hooks) {+ setupRenderingTest(hooks);++ test("does not submit when Enter is pressed during IME composition", async function (assert) {+ let submitted = false;+ const submit = () => (submitted = true);+ const state = new TestState();++ await render(+ <template>+ <AiHelperCustomPrompt @value={{state.value}} @submit={{submit}} />+ </template>+ );++ await triggerKeyEvent(".ai-custom-prompt__input", "keydown", "Enter", {+ isComposing: true,+ });++ assert.false(submitted, "does not submit during IME composition");+ });++ test("submits when Enter is pressed outside of IME composition", async function (assert) {+ let submitted = false;+ const submit = () => (submitted = true);+ const state = new TestState();++ await render(+ <template>+ <AiHelperCustomPrompt @value={{state.value}} @submit={{submit}} />+ </template>+ );++ await triggerKeyEvent(".ai-custom-prompt__input", "keydown", "Enter");++ assert.true(submitted, "submits on Enter without IME composition");+ });+});