paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-01 20:44:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

stream-settings: Fix live update of selected option in folder dropdown.

Browse Source 
This commit adds code to fix the live update of folder name selected in
dropdown but not saved using "Save changes" button. And this also
includes code for updating the name for folder selected in stream
creation form.
This commit is contained in:
Sahil Batra
2025-08-12 13:11:53 +05:30
committed by Tim Abbott
parent f4cc746ae9
commit 597ead9732
2 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
web/src/stream_create.ts
View File

@@ -715,7 +715,7 @@ export function initialize(): void {
}
}
function set_channel_folder_dropdown_value(folder_id: number): void {
export function set_channel_folder_dropdown_value(folder_id: number): void {
assert(folder_widget !== undefined);
folder_widget.render(folder_id);
}
@@ -726,3 +726,10 @@ export function maybe_reset_channel_folder_dropdown(archived_folder_id: number):
set_channel_folder_dropdown_value(settings_config.no_folder_selected);
}
}
export function get_channel_folder_dropdown_value(): number {
assert(folder_widget !== undefined);
const value = folder_widget.value()!;
assert(typeof value === "number");
return value;
}

22
web/src/stream_settings_ui.ts
View File

@@ -273,17 +273,35 @@ export function update_channel_folder_name(folder_id: number): void {
return;
}
if ($("#subscription_overlay .nothing-selected").css("display") !== "none") {
return;
}
const active_stream_id = stream_settings_components.get_active_data().id;
if (!active_stream_id) {
const selected_folder_id = stream_create.get_channel_folder_dropdown_value();
if (selected_folder_id === folder_id) {
stream_create.set_channel_folder_dropdown_value(folder_id);
}
return;
}
const sub = sub_store.get(active_stream_id)!;
if (sub.folder_id !== folder_id) {
if (sub.folder_id === folder_id) {
settings_components.set_channel_folder_dropdown_value(sub);
return;
}
settings_components.set_channel_folder_dropdown_value(sub);
// Even if the channel opened in the right panel does not belong to
// the updated folder, user can be in process of changing the folder
// to which channel belongs and may have selected the updated folder
// without saving it yet.
const selected_folder_id = settings_components.get_dropdown_list_widget_setting_value(
$("#id_folder_id"),
);
if (selected_folder_id === folder_id) {
settings_components.set_dropdown_list_widget_setting_value("folder_id", selected_folder_id);
}
}
export function reset_dropdown_set_to_archived_folder(folder_id: number): void {