mirror of https://github.com/zulip/zulip.git
recent_view: Fix marking topic as read resulting in error.
Since we were trying to close dialog widget regardless of caller after marking messages as read, it results in an error if the dialog widget is not open especially since there was no dialog widget involved in the process. So, track the id of the dialog widget which called the `read` `op` and operate on it based on it's status if there was a dialog widget involved.
This commit is contained in:
parent
e51962d6ac
commit
1c7c8cede8
|
@ -46,6 +46,11 @@ export function active_modal(): string | undefined {
|
||||||
return `#${CSS.escape($micromodal.attr("id")!)}`;
|
return `#${CSS.escape($micromodal.attr("id")!)}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function is_active(modal_id: string): boolean {
|
||||||
|
const $micromodal = $(".micromodal.modal--open");
|
||||||
|
return $micromodal.attr("id") === modal_id;
|
||||||
|
}
|
||||||
|
|
||||||
// If conf.autoremove is true, the modal element will be removed from the DOM
|
// If conf.autoremove is true, the modal element will be removed from the DOM
|
||||||
// once the modal is hidden.
|
// once the modal is hidden.
|
||||||
// conf also accepts the following optional properties:
|
// conf also accepts the following optional properties:
|
||||||
|
|
|
@ -87,6 +87,7 @@ function bulk_update_read_flags_for_narrow(
|
||||||
messages_read_till_now?: number;
|
messages_read_till_now?: number;
|
||||||
num_after?: number;
|
num_after?: number;
|
||||||
} = {},
|
} = {},
|
||||||
|
caller_modal_id?: string,
|
||||||
): void {
|
): void {
|
||||||
let response_html;
|
let response_html;
|
||||||
const request = {
|
const request = {
|
||||||
|
@ -139,11 +140,16 @@ function bulk_update_read_flags_for_narrow(
|
||||||
loading_indicator_displayed = true;
|
loading_indicator_displayed = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bulk_update_read_flags_for_narrow(narrow, op, {
|
bulk_update_read_flags_for_narrow(
|
||||||
anchor: data.last_processed_id,
|
narrow,
|
||||||
messages_read_till_now,
|
op,
|
||||||
num_after: FOLLOWUP_BATCH_SIZE,
|
{
|
||||||
});
|
anchor: data.last_processed_id,
|
||||||
|
messages_read_till_now,
|
||||||
|
num_after: FOLLOWUP_BATCH_SIZE,
|
||||||
|
},
|
||||||
|
caller_modal_id,
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
if (loading_indicator_displayed) {
|
if (loading_indicator_displayed) {
|
||||||
// Only show the success message if a progress banner was displayed.
|
// Only show the success message if a progress banner was displayed.
|
||||||
|
@ -181,8 +187,11 @@ function bulk_update_read_flags_for_narrow(
|
||||||
unread.clear_old_unreads_missing();
|
unread.clear_old_unreads_missing();
|
||||||
blueslip.log("Cleared old_unreads_missing after bankruptcy.");
|
blueslip.log("Cleared old_unreads_missing after bankruptcy.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (caller_modal_id) {
|
||||||
|
modals.close_if_open(caller_modal_id);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
dialog_widget.close();
|
|
||||||
},
|
},
|
||||||
error(xhr) {
|
error(xhr) {
|
||||||
let parsed;
|
let parsed;
|
||||||
|
@ -196,11 +205,16 @@ function bulk_update_read_flags_for_narrow(
|
||||||
// If we hit the rate limit, just continue without showing any error.
|
// If we hit the rate limit, just continue without showing any error.
|
||||||
const milliseconds_to_wait = 1000 * parsed.data["retry-after"];
|
const milliseconds_to_wait = 1000 * parsed.data["retry-after"];
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
bulk_update_read_flags_for_narrow(narrow, op, {
|
bulk_update_read_flags_for_narrow(
|
||||||
anchor,
|
narrow,
|
||||||
messages_read_till_now,
|
op,
|
||||||
num_after,
|
{
|
||||||
});
|
anchor,
|
||||||
|
messages_read_till_now,
|
||||||
|
num_after,
|
||||||
|
},
|
||||||
|
caller_modal_id,
|
||||||
|
);
|
||||||
}, milliseconds_to_wait);
|
}, milliseconds_to_wait);
|
||||||
} else {
|
} else {
|
||||||
// TODO: Ideally this would be a ui_report.error();
|
// TODO: Ideally this would be a ui_report.error();
|
||||||
|
@ -210,8 +224,10 @@ function bulk_update_read_flags_for_narrow(
|
||||||
status: xhr.status,
|
status: xhr.status,
|
||||||
body: xhr.responseText,
|
body: xhr.responseText,
|
||||||
});
|
});
|
||||||
|
if (caller_modal_id && modals.is_active(caller_modal_id)) {
|
||||||
|
dialog_widget.hide_dialog_spinner();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
dialog_widget.hide_dialog_spinner();
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -626,8 +642,8 @@ export function mark_topic_as_unread(stream_id: number, topic: string): void {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function mark_all_as_read(): void {
|
export function mark_all_as_read(modal_id?: string): void {
|
||||||
bulk_update_read_flags_for_narrow(all_unread_messages_narrow, "add");
|
bulk_update_read_flags_for_narrow(all_unread_messages_narrow, "add", {}, modal_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function mark_pm_as_read(user_ids_string: string): void {
|
export function mark_pm_as_read(user_ids_string: string): void {
|
||||||
|
|
Loading…
Reference in New Issue