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

FIX: Improve quick search speed and result highlights (#14610)

This commit is contained in:
Penar Musaraj 2021-10-14 15:24:11 -04:00 committed by GitHub
parent 9b835e1003
commit 2a7280ac48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/discourse/app/widgets/search-menu.js
View File

@ -15,7 +15,7 @@ import { CANCELLED_STATUS } from "discourse/lib/autocomplete";
const CATEGORY_SLUG_REGEXP = /(\#[a-zA-Z0-9\-:]*)$/gi; const CATEGORY_SLUG_REGEXP = /(\#[a-zA-Z0-9\-:]*)$/gi;
const USERNAME_REGEXP = /(\@[a-zA-Z0-9\-\_]*)$/gi; const USERNAME_REGEXP = /(\@[a-zA-Z0-9\-\_]*)$/gi;
const SUGGESTIONS_REGEXP = /(in:|status:|order:|:)([a-zA-Z]*)$/gi; const SUGGESTIONS_REGEXP = /(in:|status:|order:|:)([a-zA-Z]*)$/gi;
export const TOPIC_REPLACE_REGEXP = /\stopic:\d+/i; export const TOPIC_REPLACE_REGEXP = /\btopic:\d+\s?/i;
export const MODIFIER_REGEXP = /.*(\#|\@|:).*$/gi; export const MODIFIER_REGEXP = /.*(\#|\@|:).*$/gi;
export const DEFAULT_TYPE_FILTER = "exclude_topics"; export const DEFAULT_TYPE_FILTER = "exclude_topics";
@ -385,10 +385,14 @@ export default createWidget("search-menu", {
const highlightTerm = searchData.term.replace(TOPIC_REPLACE_REGEXP, ""); const highlightTerm = searchData.term.replace(TOPIC_REPLACE_REGEXP, "");
this.searchService().set("highlightTerm", highlightTerm); this.searchService().set("highlightTerm", highlightTerm);
} }
searchData.loading = SearchHelper.includesTopics() ? true : false;
const delay = SearchHelper.includesTopics() ? 400 : 200; if (SearchHelper.includesTopics()) {
discourseDebounce(SearchHelper, SearchHelper.perform, this, delay); searchData.loading = true;
SearchHelper.perform(this);
} else {
searchData.loading = false;
discourseDebounce(SearchHelper, SearchHelper.perform, this, 400);
}
}, },
moreOfType(type) { moreOfType(type) {

11
app/assets/javascripts/discourse/tests/acceptance/search-test.js
View File

@ -197,6 +197,17 @@ acceptance("Search - Anonymous", function (needs) {
"highlights the post correctly" "highlights the post correctly"
); );
await fillIn("#search-term", "topic:280 interface");
await focus("input#search-term");
await triggerKeyEvent(".search-menu", "keydown", 40);
await click(document.activeElement);
assert.equal(
query("#post_7 span.highlighted").textContent.trim(),
"interface",
"highlights the post when term is after modifier"
);
await click(".clear-search"); await click(".clear-search");
assert.equal(query("#search-term").value, "", "clear button works"); assert.equal(query("#search-term").value, "", "clear button works");
}); });