Discource-C
/
discourse-ai
mirror of https://github.com/discourse/discourse-ai.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Diff modal closing along with composer menu on mobile (#803) 

The `DiffModal` is triggered after selecting an option in the composer helper menu. After selecting an option, we should close the composer helper menu and only show the diff modal. On mobile, there was an edge-case where `this.args.close()` for was causing the closing of both the `DiffModal` and the `AiComposerHelperMenu`. This PR resolves that by ensuring the menu is closed _first_ asynchronously, followed by opening the relevant modal.
This commit is contained in:
Keegan George 2024-09-16 14:00:41 -07:00 committed by GitHub
parent 03eccbe392
commit 493d65af1f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
assets/javascripts/discourse/components/ai-composer-helper-menu.gjs
View File

@ -109,19 +109,20 @@ export default class AiComposerHelperMenu extends Component {
}
@action
suggestChanges(option) {
async suggestChanges(option) {
await this.args.close();
if (option.name === "illustrate_post") {
this.modal.show(ThumbnailSuggestion, {
return this.modal.show(ThumbnailSuggestion, {
model: {
mode: option.id,
selectedText: this.args.data.selectedText,
thumbnails: this.thumbnailSuggestions,
},
});
return this.args.close();
}
this.modal.show(ModalDiffModal, {
return this.modal.show(ModalDiffModal, {
model: {
mode: option.id,
selectedText: this.args.data.selectedText,
@ -130,7 +131,6 @@ export default class AiComposerHelperMenu extends Component {
customPromptValue: this.customPromptValue,
},
});
return this.args.close();
}
@action

15
spec/system/ai_helper/ai_composer_helper_spec.rb
View File

@ -342,4 +342,19 @@ RSpec.describe "AI Composer helper", type: :system, js: true do
expect(page).to have_no_css(".d-editor-button-bar button.ai-helper-trigger")
end
end
context "when triggering composer AI helper", mobile: true do
it "should close the composer helper before showing the diff modal" do
visit("/latest")
page.find("#create-topic").click
composer.fill_content(input)
composer.click_toolbar_button("ai-helper-trigger")
DiscourseAi::Completions::Llm.with_prepared_responses([input]) do
ai_helper_menu.select_helper_model(CompletionPrompt::TRANSLATE)
expect(ai_helper_menu).to have_no_context_menu
expect(diff_modal).to be_visible
end
end
end
end