A platform for community discussion. Free, open, simple.
FIX: Trigger Discobot discoveries from category and tag pages (#39810)
Rafael dos Santos Silva841436cd7fea
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.jsindex 429455ea0ca..4007ee92a65 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,4 +1,5 @@import { apiInitializer } from "discourse/lib/api";+import { isScopedSearch } from "../lib/search-discoveries-context";export default apiInitializer((api) => {const currentUser = api.getCurrentUser();@@ -25,9 +26,8 @@ export default apiInitializer((api) => {const query = searchMenu.search.activeGlobalSearchTerm;- // We only trigger discover when searching on all topics.if (- searchMenu.search?.searchContext?.type ||+ isScopedSearch(searchMenu.search) ||discobotDiscoveries.lastQuery === query) {return true;@@ -50,8 +50,7 @@ export default apiInitializer((api) => {return true;}- // We only trigger discover when searching on all topics.- if (search?.searchContext?.type) {+ if (isScopedSearch(search)) {return true;}diff --git a/plugins/discourse-ai/assets/javascripts/discourse/lib/search-discoveries-context.js b/plugins/discourse-ai/assets/javascripts/discourse/lib/search-discoveries-context.jsnew file mode 100644index 00000000000..8ad7886a071--- /dev/null+++ b/plugins/discourse-ai/assets/javascripts/discourse/lib/search-discoveries-context.js@@ -0,0 +1,8 @@+// Mirrors SearchMenu#searchContext: only topic and PM contexts actually scope+// the search request. Category and tag pages set search.searchContext but the+// menu still searches globally there, so discoveries should still trigger.+export function isScopedSearch(search) {+ return (+ search?.inTopicContext || search?.searchContext?.type === "private_messages"+ );+}diff --git a/plugins/discourse-ai/test/javascripts/unit/lib/search-discoveries-context-test.js b/plugins/discourse-ai/test/javascripts/unit/lib/search-discoveries-context-test.jsnew file mode 100644index 00000000000..44d14ec1c55--- /dev/null+++ b/plugins/discourse-ai/test/javascripts/unit/lib/search-discoveries-context-test.js@@ -0,0 +1,44 @@+import { module, test } from "qunit";+import { isScopedSearch } from "discourse/plugins/discourse-ai/discourse/lib/search-discoveries-context";++module("Unit | Lib | search-discoveries-context", function () {+ test("returns false when there is no search context", function (assert) {+ assert.false(isScopedSearch({}));+ assert.false(isScopedSearch(null));+ assert.false(isScopedSearch(undefined));+ });++ test("returns false on category and tag pages", function (assert) {+ assert.false(+ isScopedSearch({ searchContext: { type: "category" } }),+ "category context still searches globally from the menu"+ );+ assert.false(+ isScopedSearch({ searchContext: { type: "tag" } }),+ "tag context still searches globally from the menu"+ );+ assert.false(+ isScopedSearch({ searchContext: { type: "tagIntersection" } }),+ "tag intersection context still searches globally from the menu"+ );+ assert.false(+ isScopedSearch({ searchContext: { type: "user" } }),+ "user context still searches globally from the menu"+ );+ });++ test("returns true when scoped to a topic", function (assert) {+ assert.true(+ isScopedSearch({+ inTopicContext: true,+ searchContext: { type: "topic" },+ })+ );+ });++ test("returns true when scoped to the PM inbox", function (assert) {+ assert.true(+ isScopedSearch({ searchContext: { type: "private_messages" } })+ );+ });+});