From 0afddca0b9a465f3401d35893eb10f52af97c800 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Tue, 22 Aug 2023 15:53:22 +0200 Subject: [PATCH] FIX: displays popup error for any error (#23184) In the past we were only intercepting 429 and 404; it's probably better to surface any error. There are already tests for the 404 and 429, I consider them enough for now. --- .../discourse/lib/chat-messages-loader.js | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/plugins/chat/assets/javascripts/discourse/lib/chat-messages-loader.js b/plugins/chat/assets/javascripts/discourse/lib/chat-messages-loader.js index 98ea712062a..b8264b81e98 100644 --- a/plugins/chat/assets/javascripts/discourse/lib/chat-messages-loader.js +++ b/plugins/chat/assets/javascripts/discourse/lib/chat-messages-loader.js @@ -55,7 +55,7 @@ export default class ChatMessagesLoader { this.canLoadMoreFuture = result.meta.can_load_more_future; this.canLoadMorePast = result.meta.can_load_more_past; } catch (error) { - this.#handleError(error); + popupAjaxError(error); } finally { this.loading = false; } @@ -80,7 +80,7 @@ export default class ChatMessagesLoader { this.canLoadMorePast = result.meta.can_load_more_past; this.fetchedOnce = true; } catch (error) { - this.#handleError(error); + popupAjaxError(error); } finally { this.loading = false; } @@ -111,17 +111,4 @@ export default class ChatMessagesLoader { ? model.messagesManager.messages.find((message) => !message.staged) : model.messagesManager.messages.findLast((message) => !message.staged); } - - #handleError(error) { - switch (error?.jqXHR?.status) { - case 429: - popupAjaxError(error); - break; - case 404: - popupAjaxError(error); - break; - default: - throw error; - } - } }