github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-03 05:39:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Always wait for promise when loading a topic (#10465)

Browse Source 
It turns out that `setupController` doesn't always wait when returning a
promise, but the `model` hook does. This fixes issues with the
`page:changed` event firing before the transition has complete.
This commit is contained in:
Robin Ward 2020-08-18 11:11:02 -04:00 committed by GitHub
parent 234ae61ed5
commit bad7c287dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 73 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
app/assets/javascripts/discourse/app/routes/topic-from-params.js
View File

@ -9,7 +9,29 @@ import { isTesting } from "discourse-common/config/environment";
export default DiscourseRoute.extend({
// Avoid default model hook
model(params) {
params = params || {};
params.track_visit = true;
const topic = this.modelFor("topic");
const postStream = topic.postStream;
// I sincerely hope no topic gets this many posts
if (params.nearPost === "last") {
params.nearPost = 999999999;
}
params.forceLoad = true;
return postStream
.refresh(params)
.then(() => params)
.catch(e => {
if (!isTesting()) {
// eslint-disable-next-line no-console
console.log("Could not view topic", e);
}
params._loading_error = true;
return params;
});
},
deactivate() {
@ -18,24 +40,17 @@ export default DiscourseRoute.extend({
},
setupController(controller, params, { _discourse_anchor }) {
params = params || {};
params.track_visit = true;
const topic = this.modelFor("topic"),
postStream = topic.postStream,
topicController = this.controllerFor("topic"),
composerController = this.controllerFor("composer");
// I sincerely hope no topic gets this many posts
if (params.nearPost === "last") {
params.nearPost = 999999999;
// Don't do anything else if we couldn't load
// TODO: Tests require this but it seems bad
if (params._loading_error) {
return;
}
params.forceLoad = true;
const topicController = this.controllerFor("topic");
const composerController = this.controllerFor("composer");
const topic = this.modelFor("topic");
const postStream = topic.postStream;
return postStream
.refresh(params)
.then(() => {
// TODO we are seeing errors where closest post is null and this is exploding
// we need better handling and logging for this condition.
@ -87,13 +102,6 @@ export default DiscourseRoute.extend({
topic
});
}
})
.catch(e => {
if (!isTesting()) {
// eslint-disable-next-line no-console
console.log("Could not view topic", e);
}
});
},
actions: {