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

FIX: race conditions in search menu (#9262) 

Race conditions could lead the previous query search term to be used in the next query. This commit also attempts to simplify code.
This commit is contained in:
Joffrey JAFFEUX 2020-03-24 15:16:42 +01:00 committed by GitHub
parent 61c1af0124
commit 58ced428ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,8 @@ createWidget("search-term", {
} }
const val = this.attrs.value; const val = this.attrs.value;
const newVal = $(`#${this.buildId()}`).val(); // remove zero-width chars
const newVal = e.target.value.replace(/[\u200B-\u200D\uFEFF]/, "");
if (newVal !== val) { if (newVal !== val) {
this.sendWidgetAction("searchTermChanged", newVal); this.sendWidgetAction("searchTermChanged", newVal);

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

@ -1,5 +1,5 @@
import { get } from "@ember/object"; import { get } from "@ember/object";
import { debounce, later } from "@ember/runloop"; import { debounce, cancel } from "@ember/runloop";
import { popupAjaxError } from "discourse/lib/ajax-error"; import { popupAjaxError } from "discourse/lib/ajax-error";
import { searchForTerm, isValidSearchTerm } from "discourse/lib/search"; import { searchForTerm, isValidSearchTerm } from "discourse/lib/search";
import { createWidget } from "discourse/widgets/widget"; import { createWidget } from "discourse/widgets/widget";
@ -23,28 +23,17 @@ initSearchData();
// Helps with debouncing and cancelling promises // Helps with debouncing and cancelling promises
const SearchHelper = { const SearchHelper = {
_activeSearch: null, _activeSearch: null,
_cancelSearch: null,
// for cancelling debounced search // for cancelling debounced search
cancel() { cancel() {
if (this._activeSearch) { if (this._activeSearch) {
this._activeSearch.abort(); cancel(this._activeSearch);
this._activeSearch = null;
} }
this._cancelSearch = true;
later(() => (this._cancelSearch = false), 400);
}, },
perform(widget) { perform(widget) {
if (this._cancelSearch) { this.cancel();
this._cancelSearch = null;
return;
}
if (this._activeSearch) {
this._activeSearch.abort();
this._activeSearch = null;
}
const { term, typeFilter, contextEnabled } = searchData; const { term, typeFilter, contextEnabled } = searchData;
const searchContext = contextEnabled ? widget.searchContext() : null; const searchContext = contextEnabled ? widget.searchContext() : null;
@ -67,11 +56,6 @@ const SearchHelper = {
this._activeSearch this._activeSearch
.then(content => { .then(content => {
searchData.noResults = content.resultTypes.length === 0; searchData.noResults = content.resultTypes.length === 0;
if (content.grouped_search_result) {
searchData.term = content.grouped_search_result.term;
}
searchData.results = content; searchData.results = content;
if (searchContext && searchContext.type === "topic") { if (searchContext && searchContext.type === "topic") {