Zulip server and web application. Open-source team chat that helps teams stay productive and focused.
add_subscribers_pill: Only let the latest fetch hide the spinner.
Shubham Padiad6695080ea08
diff --git a/web/src/add_group_members_pill.ts b/web/src/add_group_members_pill.tsindex f82bd1c2ecf..d1e52bdc768 100644--- a/web/src/add_group_members_pill.ts+++ b/web/src/add_group_members_pill.ts@@ -1,4 +1,3 @@-import {$} from "jquery";import assert from "minimalistic-assert";import * as add_subscribers_pill from "./add_subscribers_pill.ts";@@ -87,6 +86,7 @@ export function create_item_from_text(}export function create({+ $parent_container,$pill_container,get_potential_members,get_potential_groups,@@ -94,6 +94,7 @@ export function create({onPillCreateAction,onPillRemoveAction,}: {+ $parent_container: JQuery;$pill_container: JQuery;get_potential_members: () => User[];get_potential_groups: () => UserGroup[];@@ -111,14 +112,24 @@ export function create({});if (onPillCreateAction) {+ // Each pill starts its own subscriber fetch, and a fetch waits+ // only for the pills present when it started, so only the most+ // recent fetch knows about every pill and may hide the spinner.+ let latest_fetch_id = 0;+ const $loading_spinner = $parent_container.find(".add-group-member-loading-spinner");pill_widget.onPillCreate(() => {void (async () => {- loading.make_indicator($(".add-group-member-loading-spinner"), {+ latest_fetch_id += 1;+ const fetch_id = latest_fetch_id;+ loading.make_indicator($loading_spinner, {height: 56, // 4em at 14px / 1em});const user_ids = await get_pill_user_ids(pill_widget);+ if (fetch_id !== latest_fetch_id) {+ return;+ }onPillCreateAction(user_ids, get_pill_group_ids(pill_widget));- loading.destroy_indicator($(".add-group-member-loading-spinner"));+ loading.destroy_indicator($loading_spinner);})();});}@@ -167,12 +178,14 @@ export function set_up_handlers({$parent_container,pill_selector,button_selector,+ spinner_selector,action,}: {get_pill_widget: () => CombinedPillContainer;$parent_container: JQuery;pill_selector: string;button_selector: string;+ spinner_selector: string;action: ({pill_user_ids,pill_group_ids,@@ -189,8 +202,9 @@ export function set_up_handlers({*/function callback(): void {const pill_widget = get_pill_widget();+ const $loading_spinner = $parent_container.find(spinner_selector);void (async () => {- loading.make_indicator($(".add-group-member-loading-spinner"), {+ loading.make_indicator($loading_spinner, {height: 56, // 4em at 14px / 1em});const pill_user_ids = await get_pill_user_ids(pill_widget);@@ -202,7 +216,7 @@ export function set_up_handlers({if (get_pill_widget() !== pill_widget) {return;}- loading.destroy_indicator($(".add-group-member-loading-spinner"));+ loading.destroy_indicator($loading_spinner);const pill_group_ids = get_pill_group_ids(pill_widget);action({pill_user_ids, pill_group_ids});})();diff --git a/web/src/add_subscribers_pill.ts b/web/src/add_subscribers_pill.tsindex 127cc2d2473..e413484820c 100644--- a/web/src/add_subscribers_pill.ts+++ b/web/src/add_subscribers_pill.ts@@ -1,4 +1,3 @@-import {$} from "jquery";import assert from "minimalistic-assert";import * as blueslip from "./blueslip.ts";@@ -139,6 +138,7 @@ export function set_up_handlers_for_add_button_state(}export function create({+ $parent_container,$pill_container,get_potential_subscribers,get_user_groups,@@ -148,6 +148,7 @@ export function create({add_button_pill_update_callback,onTextInputCallback,}: {+ $parent_container: JQuery;$pill_container: JQuery;get_potential_subscribers: () => User[];get_user_groups: () => UserGroup[];@@ -167,14 +168,24 @@ export function create({});if (onPillCreateAction) {+ // Each pill starts its own subscriber fetch, and a fetch waits+ // only for the pills present when it started, so only the most+ // recent fetch knows about every pill and may hide the spinner.+ let latest_fetch_id = 0;+ const $loading_spinner = $parent_container.find(".add-subscriber-loading-spinner");pill_widget.onPillCreate(() => {void (async () => {- loading.make_indicator($(".add-subscriber-loading-spinner"), {+ latest_fetch_id += 1;+ const fetch_id = latest_fetch_id;+ loading.make_indicator($loading_spinner, {height: 28, // 2em at 14px / 1em});const user_ids = await get_pill_user_ids(pill_widget);+ if (fetch_id !== latest_fetch_id) {+ return;+ }onPillCreateAction(user_ids);- loading.destroy_indicator($(".add-subscriber-loading-spinner"));+ loading.destroy_indicator($loading_spinner);})();});}@@ -253,12 +264,14 @@ export function set_up_handlers({$parent_container,pill_selector,button_selector,+ spinner_selector,action,}: {get_pill_widget: () => CombinedPillContainer;$parent_container: JQuery;pill_selector: string;button_selector: string;+ spinner_selector: string;action: ({pill_user_ids}: {pill_user_ids: number[]}) => void;}): void {/*@@ -290,8 +303,9 @@ export function set_up_handlers({*/function callback(): void {const pill_widget = get_pill_widget();+ const $loading_spinner = $parent_container.find(spinner_selector);void (async () => {- loading.make_indicator($(".add-subscriber-loading-spinner"), {+ loading.make_indicator($loading_spinner, {height: 28, // 2em at 14px / 1em});const pill_user_ids = await get_pill_user_ids(pill_widget);@@ -303,7 +317,7 @@ export function set_up_handlers({if (get_pill_widget() !== pill_widget) {return;}- loading.destroy_indicator($(".add-subscriber-loading-spinner"));+ loading.destroy_indicator($loading_spinner);action({pill_user_ids});})();}diff --git a/web/src/stream_create_subscribers.ts b/web/src/stream_create_subscribers.tsindex 9689fe8a634..cd427fd2c78 100644--- a/web/src/stream_create_subscribers.ts+++ b/web/src/stream_create_subscribers.ts@@ -54,6 +54,7 @@ function build_pill_widget({const get_potential_subscribers = stream_create_subscribers_data.get_potential_subscribers;const get_user_groups = user_groups.get_all_realm_user_groups;return add_subscribers_pill.create({+ $parent_container,$pill_container,get_potential_subscribers,get_user_groups,diff --git a/web/src/stream_edit_subscribers.ts b/web/src/stream_edit_subscribers.tsindex 6b331211d33..c58614cbb41 100644--- a/web/src/stream_edit_subscribers.ts+++ b/web/src/stream_edit_subscribers.ts@@ -129,13 +129,13 @@ function update_notification_choice_checkbox(added_user_count: number): void {}}-async function stream_edit_update_notification_choice(): Promise<void> {- loading.make_indicator($(".add-subscriber-loading-spinner"), {+async function stream_edit_update_notification_choice($loading_spinner: JQuery): Promise<void> {+ loading.make_indicator($loading_spinner, {height: 28, // 2em at 14px / 1em});const pill_count = (await add_subscribers_pill.get_pill_user_ids(pill_widget)).length;update_notification_choice_checkbox(pill_count);- loading.destroy_indicator($(".add-subscriber-loading-spinner"));+ loading.destroy_indicator($loading_spinner);}export function enable_subscriber_management({@@ -156,10 +156,12 @@ export function enable_subscriber_management({return peer_data.potential_subscribers(stream_id);}+ const $loading_spinner = $parent_container.find(".add-subscriber-loading-spinner");const pill_update_callback = function (): void {- void stream_edit_update_notification_choice();+ void stream_edit_update_notification_choice($loading_spinner);};pill_widget = add_subscribers_pill.create({+ $parent_container,$pill_container,get_potential_subscribers,onPillCreateAction: pill_update_callback,@@ -556,6 +558,7 @@ export function initialize(): void {$parent_container: $("#channels_overlay_container"),pill_selector: ".edit_subscribers_for_stream .pill-container",button_selector: ".edit_subscribers_for_stream .add-subscriber-button",+ spinner_selector: ".edit_subscribers_for_stream .add-subscriber-loading-spinner",action: subscribe_new_users,});diff --git a/web/src/user_group_create_members.ts b/web/src/user_group_create_members.tsindex fce34b93918..667370656ad 100644--- a/web/src/user_group_create_members.ts+++ b/web/src/user_group_create_members.ts@@ -74,6 +74,7 @@ function build_pill_widget({$parent_container}: {$parent_container: JQuery}): voconst $pill_container = $parent_container.find(".pill-container");pill_widget = add_group_members_pill.create({+ $parent_container,$pill_container,get_potential_members: user_group_create_members_data.get_potential_members,get_potential_groups: user_group_create_members_data.get_potential_subgroups,diff --git a/web/src/user_group_edit_members.ts b/web/src/user_group_edit_members.tsindex e89a8eb6b98..718d7c729a2 100644--- a/web/src/user_group_edit_members.ts+++ b/web/src/user_group_edit_members.ts@@ -147,6 +147,7 @@ export function enable_member_management({if (!group.is_system_group) {const $pill_container = $parent_container.find(".pill-container");pill_widget = add_group_members_pill.create({+ $parent_container,$pill_container,get_potential_members,get_potential_groups: get_potential_subgroups,@@ -617,6 +618,7 @@ export function initialize(): void {$parent_container: $("#groups_overlay_container"),pill_selector: ".edit_members_for_user_group .pill-container",button_selector: ".edit_members_for_user_group .add-member-button",+ spinner_selector: ".edit_members_for_user_group .add-group-member-loading-spinner",action: add_new_members,});