discourse/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-09 14:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Discard old search results if search term changes when moving posts to a different topic (#14117)

Browse Source 
This also fixes an incorrect usage of `debounce`.

Meta topic: https://meta.discourse.org/t/odd-search-behaviour-when-moving-messages-as-a-staff-member/201261?u=osama.
This commit is contained in:
Osama Sayegh 2021-08-23 21:03:52 +03:00 committed by GitHub
parent a230362f65
commit 19632ecfbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
app/assets/javascripts/discourse/app/components/choose-topic.js
View File

@ -4,6 +4,7 @@ import discourseDebounce from "discourse-common/lib/debounce";
import { isEmpty } from "@ember/utils"; import { isEmpty } from "@ember/utils";
import { next, schedule } from "@ember/runloop"; import { next, schedule } from "@ember/runloop";
import { searchForTerm } from "discourse/lib/search"; import { searchForTerm } from "discourse/lib/search";
import { INPUT_DELAY } from "discourse-common/config/environment";
export default Component.extend({ export default Component.extend({
loading: null, loading: null,
@ -68,7 +69,7 @@ export default Component.extend({
oldTopicTitle: this.topicTitle, oldTopicTitle: this.topicTitle,
}); });
this.search(this.topicTitle); this.searchDebounced(this.topicTitle);
}, },
@discourseComputed("label") @discourseComputed("label")
@ -85,48 +86,48 @@ export default Component.extend({
this.set("loading", false); this.set("loading", false);
}, },
searchDebounced(title) {
discourseDebounce(this, this.search, title, INPUT_DELAY);
},
search(title) { search(title) {
discourseDebounce( if (!this.element || this.isDestroying || this.isDestroyed) {
this, return;
function () { }
if (!this.element || this.isDestroying || this.isDestroyed) {
return; if (isEmpty(title) && isEmpty(this.additionalFilters)) {
this.setProperties({ topics: null, loading: false });
return;
}
const currentTopicId = this.currentTopicId;
const titleWithFilters = `${title} ${this.additionalFilters}`;
let searchParams = {};
if (!isEmpty(title)) {
searchParams.typeFilter = "topic";
searchParams.restrictToArchetype = "regular";
searchParams.searchForId = true;
}
searchForTerm(titleWithFilters, searchParams).then((results) => {
// search term changed after the request was fired but before we
// got a response, ignore results.
if (title !== this.topicTitle) {
return;
}
if (results && results.posts && results.posts.length > 0) {
this.set(
"topics",
results.posts.mapBy("topic").filter((t) => t.id !== currentTopicId)
);
if (this.topics.length === 1) {
this.send("chooseTopic", this.topics[0]);
} }
} else {
if (isEmpty(title) && isEmpty(this.additionalFilters)) { this.setProperties({ topics: null, loading: false });
this.setProperties({ topics: null, loading: false }); }
return; });
}
const currentTopicId = this.currentTopicId;
const titleWithFilters = `${title} ${this.additionalFilters}`;
let searchParams = {};
if (!isEmpty(title)) {
searchParams.typeFilter = "topic";
searchParams.restrictToArchetype = "regular";
searchParams.searchForId = true;
}
searchForTerm(titleWithFilters, searchParams).then((results) => {
if (results && results.posts && results.posts.length > 0) {
this.set(
"topics",
results.posts
.mapBy("topic")
.filter((t) => t.id !== currentTopicId)
);
if (this.topics.length === 1) {
this.send("chooseTopic", this.topics[0]);
}
} else {
this.setProperties({ topics: null, loading: false });
}
});
},
title,
300
);
}, },
actions: { actions: {