paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-13 02:17:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

popup_banners: Improve connection error banner.

Browse Source 
This commit makes the following changes:
- Prevents the codepath in load_messages in message_fetch and
  get_events in server_events from interfering with each other.
- The banner label now displays the time interval after which the
  connection will be retried.
- The loading indicator now shows on the banner when the retry is in
  progress via the JS logic.

Co-authored-by: Sayam Samal <sayam@zulip.com>

Fixes #33924.
This commit is contained in:
Kislay Verma
2025-03-14 14:00:11 +05:30
committed by Tim Abbott
parent 4ec32a170d
commit a3a0419e9c
3 changed files with 104 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
web/src/message_fetch.ts
View File

@@ -371,6 +371,11 @@ export function get_parameters_for_message_fetch_api(
return data;
}
// We keep track of the load messages timeout at a module level
// to prevent multiple load messages requests from the error codepath
// from stacking up by cancelling the previous timeout.
let load_messages_timeout: ReturnType<typeof setTimeout> | undefined;
export function load_messages(opts: MessageFetchOptions, attempt = 1): void {
const data = get_parameters_for_message_fetch_api(opts);
let update_loading_indicator =
@@ -393,7 +398,10 @@ export function load_messages(opts: MessageFetchOptions, attempt = 1): void {
url: "/json/messages",
data,
success(raw_data) {
popup_banners.close_connection_error_popup_banner(true);
if (load_messages_timeout !== undefined) {
clearTimeout(load_messages_timeout);
}
popup_banners.close_connection_error_popup_banner("message_fetch");
const data = response_schema.parse(raw_data);
get_messages_success(data, opts);
},
@@ -402,7 +410,10 @@ export function load_messages(opts: MessageFetchOptions, attempt = 1): void {
// We successfully reached the server, so hide the
// connection error notice, even if the request failed
// for other reasons.
popup_banners.close_connection_error_popup_banner(true);
if (load_messages_timeout !== undefined) {
clearTimeout(load_messages_timeout);
}
popup_banners.close_connection_error_popup_banner("message_fetch");
}
if (
@@ -442,14 +453,16 @@ export function load_messages(opts: MessageFetchOptions, attempt = 1): void {
return;
}
const delay_secs = util.get_retry_backoff_seconds(xhr, attempt, true);
popup_banners.open_connection_error_popup_banner({
caller: "message_fetch",
retry_delay_secs: delay_secs,
on_retry_callback() {
load_messages(opts, attempt + 1);
},
});
const delay_secs = util.get_retry_backoff_seconds(xhr, attempt, true);
setTimeout(() => {
load_messages_timeout = setTimeout(() => {
load_messages(opts, attempt + 1);
}, delay_secs * 1000);
},