Skip to content

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

FIX: Open full search on Enter with Ask AI as default (#44010)

Alan Guo Xiang Tanf86c041c3390
diff --git a/plugins/discourse-ai/assets/javascripts/discourse/initializers/ai-search-discoveries.js b/plugins/discourse-ai/assets/javascripts/discourse/initializers/ai-search-discoveries.js
index a1689afbbab..54d98903f4a 100644
--- a/plugins/discourse-ai/assets/javascripts/discourse/initializers/ai-search-discoveries.js
+++ b/plugins/discourse-ai/assets/javascripts/discourse/initializers/ai-search-discoveries.js
@@ -1,5 +1,6 @@
import { get } from "@ember/object";
import { getOwner } from "@ember/owner";
+import { DEFAULT_TYPE_FILTER } from "discourse/components/search-menu";
import { SEARCH_TYPE_DEFAULT } from "discourse/controllers/full-page-search";
import { apiInitializer } from "discourse/lib/api";
import { i18n } from "discourse-i18n";
@@ -225,6 +226,18 @@ export default apiInitializer((api) => {
const query = search.activeGlobalSearchTerm?.trim();
const enterAsks = !search.inTopicContext && asksByDefault();
+ if (
+ enterAsks &&
+ !event.shiftKey &&
+ query &&
+ (searchTerm.args.typeFilter !== DEFAULT_TYPE_FILTER ||
+ discobotDiscoveries.lastQuery === query)
+ ) {
+ searchTerm.args.fullSearch();
+ searchTerm.args.closeSearchMenu();
+ return false;
+ }
+
if (event.shiftKey !== enterAsks && query) {
// asking honours no scope, so picking it leaves any behind
searchTerm.args.clearTopicContext();
diff --git a/plugins/discourse-ai/spec/system/ai_discoveries_search_mode_spec.rb b/plugins/discourse-ai/spec/system/ai_discoveries_search_mode_spec.rb
index e16cb6e0ddc..aa0a217052e 100644
--- a/plugins/discourse-ai/spec/system/ai_discoveries_search_mode_spec.rb
+++ b/plugins/discourse-ai/spec/system/ai_discoveries_search_mode_spec.rb
@@ -71,4 +71,31 @@ describe "AI Discoveries search modes" do
expect(discoveries_search).to have_ask_in_effect
expect(discoveries_search).to have_discovery
end
+
+ it "takes the user to full page search after pressing Enter twice with Ask AI as default" do
+ user.user_option.update!(ai_ask_ai_default: true)
+
+ visit "/"
+ discoveries_search.open.fill_query("miyazaki").submit
+ expect(discoveries_search).to have_discovery
+
+ discoveries_search.submit
+
+ expect(page).to have_current_path("/search?q=miyazaki&search_type=ai_discoveries")
+ end
+
+ it "takes the user to full page search from All topics with Ask AI as default" do
+ user.user_option.update!(ai_ask_ai_default: true)
+
+ visit "/"
+ discoveries_search.open.fill_query("miyazaki").submit
+ expect(discoveries_search).to have_discovery
+
+ discoveries_search.select_search
+ expect(discoveries_search).to have_topic_result(miyazaki_topic)
+
+ discoveries_search.submit
+
+ expect(page).to have_current_path("/search?q=miyazaki")
+ end
end