From 530eb0c9bd814c9a96382c12b972078ac25194e3 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Mon, 29 Nov 2021 07:36:48 +0100 Subject: [PATCH] DEV: Throw on non-xhr errors (#15123) Makes it easier to debug post-stream problems when the issue isn't with the server response. --- .../javascripts/discourse/app/models/post-stream.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/app/models/post-stream.js b/app/assets/javascripts/discourse/app/models/post-stream.js index c2b64b3579f..9eeffd6c08c 100644 --- a/app/assets/javascripts/discourse/app/models/post-stream.js +++ b/app/assets/javascripts/discourse/app/models/post-stream.js @@ -1215,17 +1215,21 @@ export default RestModel.extend({ // Handles an error loading a topic based on a HTTP status code. Updates // the text to the correct values. - errorLoading(result) { + errorLoading(error) { const topic = this.topic; this.set("loadingFilter", false); topic.set("errorLoading", true); - const json = result.jqXHR.responseJSON; + if (!error.jqXHR) { + throw error; + } + + const json = error.jqXHR.responseJSON; if (json && json.extras && json.extras.html) { topic.set("errorHtml", json.extras.html); } else { topic.set("errorMessage", I18n.t("topic.server_error.description")); - topic.set("noRetry", result.jqXHR.status === 403); + topic.set("noRetry", error.jqXHR.status === 403); } },