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

group_settings: Include tab selected in right section in url hash.

Browse Source 
The url hash for a group edit view now includes "general" or
"members" in the end depending upon which tab is selected in
the right section.

Fixes #28678.
This commit is contained in:
Sahil Batra
2024-01-30 19:56:56 +05:30
committed by Tim Abbott
parent 79975ae27e
commit 61d481559f
4 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/hash_util.ts
View File

@@ -147,8 +147,8 @@ export function stream_edit_url(sub: StreamSubscription, right_side_tab: string)
)}/${right_side_tab}`; )}/${right_side_tab}`;
} }
export function group_edit_url(group: UserGroup): string { export function group_edit_url(group: UserGroup, right_side_tab: string): string {
const hash = `#groups/${group.id}/${internal_url.encodeHashComponent(group.name)}`; const hash = `#groups/${group.id}/${internal_url.encodeHashComponent(group.name)}/${right_side_tab}`;
return hash; return hash;
} }

6
web/src/hashchange.js
View File

@@ -262,7 +262,8 @@ function do_hashchange_overlay(old_hash) {
} }
if (base === "groups") { if (base === "groups") {
user_group_edit.change_state(section); const right_side_tab = hash_parser.get_current_nth_hash_section(3);
user_group_edit.change_state(section, right_side_tab);
} }
if (base === "settings") { if (base === "settings") {
@@ -329,7 +330,8 @@ function do_hashchange_overlay(old_hash) {
} }
if (base === "groups") { if (base === "groups") {
user_group_edit.launch(section); const right_side_tab = hash_parser.get_current_nth_hash_section(3);
user_group_edit.launch(section, right_side_tab);
return; return;
} }

15
web/src/user_group_edit.js
View File

@@ -38,11 +38,6 @@ let group_list_widget;
let group_list_toggler; let group_list_toggler;
let active_group_id; let active_group_id;
function setup_group_edit_hash(group) {
const hash = hash_util.group_edit_url(group);
browser_history.update(hash);
}
function get_user_group_id(target) { function get_user_group_id(target) {
const $row = $(target).closest( const $row = $(target).closest(
".group-row, .user_group_settings_wrapper, .save-button, .group_settings_header", ".group-row, .user_group_settings_wrapper, .save-button, .group_settings_header",
@@ -303,6 +298,8 @@ export function setup_group_settings(group) {
$(".group_setting_section").hide(); $(".group_setting_section").hide();
$(`[data-group-section="${CSS.escape(key)}"]`).show(); $(`[data-group-section="${CSS.escape(key)}"]`).show();
select_tab = key; select_tab = key;
const hash = hash_util.group_edit_url(group, select_tab);
browser_history.update(hash);
}, },
}); });
@@ -413,7 +410,6 @@ export function show_group_settings(group) {
$(".group-row.active").removeClass("active"); $(".group-row.active").removeClass("active");
show_user_group_settings_pane.settings(group); show_user_group_settings_pane.settings(group);
row_for_group_id(group.id).addClass("active"); row_for_group_id(group.id).addClass("active");
setup_group_edit_hash(group);
setup_group_settings(group); setup_group_settings(group);
} }
@@ -559,7 +555,7 @@ export function update_group(group_id) {
} }
} }
export function change_state(section) { export function change_state(section, right_side_tab) {
if (section === "new") { if (section === "new") {
do_open_create_user_group(); do_open_create_user_group();
redraw_user_group_list(); redraw_user_group_list();
@@ -592,6 +588,7 @@ export function change_state(section) {
// based on the tab that is active. It is `your-groups` // based on the tab that is active. It is `your-groups`
// tab by default. // tab by default.
redraw_user_group_list(); redraw_user_group_list();
select_tab = right_side_tab;
switch_to_group_row(group); switch_to_group_row(group);
} }
return; return;
@@ -970,7 +967,7 @@ export function initialize() {
); );
} }
export function launch(section) { export function launch(section, right_side_tab) {
setup_page(() => { setup_page(() => {
overlays.open_overlay({ overlays.open_overlay({
name: "group_subscriptions", name: "group_subscriptions",
@@ -979,7 +976,7 @@ export function launch(section) {
browser_history.exit_overlay(); browser_history.exit_overlay();
}, },
}); });
change_state(section); change_state(section, right_side_tab);
}); });
if (!get_active_data().id) { if (!get_active_data().id) {
if (section === "new") { if (section === "new") {

2
web/src/user_group_popover.ts
View File

@@ -96,7 +96,7 @@ export function toggle_user_group_info_popover(
group_name: group.name, group_name: group.name,
group_description: group.description, group_description: group.description,
members: sort_group_members(fetch_group_members([...group.members])), members: sort_group_members(fetch_group_members([...group.members])),
group_edit_url: hash_util.group_edit_url(group), group_edit_url: hash_util.group_edit_url(group, "general"),
is_guest: current_user.is_guest, is_guest: current_user.is_guest,
}; };
instance.setContent(ui_util.parse_html(render_user_group_info_popover(args))); instance.setContent(ui_util.parse_html(render_user_group_info_popover(args)));