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

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.
This commit is contained in:
Joffrey JAFFEUX 2023-08-22 15:53:22 +02:00 committed by GitHub
parent 89259205d6
commit 0afddca0b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/chat/assets/javascripts/discourse/lib/chat-messages-loader.js
View File

@ -55,7 +55,7 @@ export default class ChatMessagesLoader {
this.canLoadMoreFuture = result.meta.can_load_more_future; this.canLoadMoreFuture = result.meta.can_load_more_future;
this.canLoadMorePast = result.meta.can_load_more_past; this.canLoadMorePast = result.meta.can_load_more_past;
} catch (error) { } catch (error) {
this.#handleError(error); popupAjaxError(error);
} finally { } finally {
this.loading = false; this.loading = false;
} }
@ -80,7 +80,7 @@ export default class ChatMessagesLoader {
this.canLoadMorePast = result.meta.can_load_more_past; this.canLoadMorePast = result.meta.can_load_more_past;
this.fetchedOnce = true; this.fetchedOnce = true;
} catch (error) { } catch (error) {
this.#handleError(error); popupAjaxError(error);
} finally { } finally {
this.loading = false; this.loading = false;
} }
@ -111,17 +111,4 @@ export default class ChatMessagesLoader {
? model.messagesManager.messages.find((message) => !message.staged) ? model.messagesManager.messages.find((message) => !message.staged)
: model.messagesManager.messages.findLast((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;
}
}
} }