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

group-settings: Refactor code to set up permission setting widgets.

Browse Source 
This commit refactors code to set up permission setting widgets
by looping over list of settings.
This commit is contained in:
Sahil Batra
2024-11-18 19:37:42 +05:30
committed by Tim Abbott
parent 3af84d6e69
commit cde4c335b1
3 changed files with 44 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
web/src/settings_components.ts
View File

@@ -1548,12 +1548,15 @@ export function set_group_setting_widget_value(
} }
} }
type group_setting_name = export const group_setting_name_schema = z.enum([
| "can_add_members_group" "can_add_members_group",
| "can_join_group" "can_join_group",
| "can_leave_group" "can_leave_group",
| "can_manage_group" "can_manage_group",
| "can_mention_group"; "can_mention_group",
]);
type GroupSettingName = z.infer<typeof group_setting_name_schema>;
export function create_group_setting_widget({ export function create_group_setting_widget({
$pill_container, $pill_container,
@@ -1561,7 +1564,7 @@ export function create_group_setting_widget({
group, group,
}: { }: {
$pill_container: JQuery; $pill_container: JQuery;
setting_name: group_setting_name; setting_name: GroupSettingName;
group?: UserGroup; group?: UserGroup;
}): GroupSettingPillContainer { }): GroupSettingPillContainer {
const pill_widget = group_setting_pill.create_pills($pill_container, setting_name, "group"); const pill_widget = group_setting_pill.create_pills($pill_container, setting_name, "group");

82
web/src/user_group_create.ts
View File

@@ -6,6 +6,7 @@ import {$t, $t_html} from "./i18n.ts";
import * as keydown_util from "./keydown_util.ts"; import * as keydown_util from "./keydown_util.ts";
import * as loading from "./loading.ts"; import * as loading from "./loading.ts";
import * as settings_components from "./settings_components.ts"; import * as settings_components from "./settings_components.ts";
import {realm} from "./state_data.ts";
import type {GroupSettingPillContainer} from "./typeahead_helper.ts"; import type {GroupSettingPillContainer} from "./typeahead_helper.ts";
import * as ui_report from "./ui_report.ts"; import * as ui_report from "./ui_report.ts";
import * as user_group_components from "./user_group_components.ts"; import * as user_group_components from "./user_group_components.ts";
@@ -27,11 +28,13 @@ export function get_name(): string | undefined {
return created_group_name; return created_group_name;
} }
let can_add_members_group_widget: GroupSettingPillContainer | undefined; export const group_setting_widget_map = new Map<string, GroupSettingPillContainer | null>([
let can_join_group_widget: GroupSettingPillContainer | undefined; ["can_add_members_group", null],
let can_leave_group_widget: GroupSettingPillContainer | undefined; ["can_join_group", null],
let can_manage_group_widget: GroupSettingPillContainer | undefined; ["can_leave_group", null],
let can_mention_group_widget: GroupSettingPillContainer | undefined; ["can_manage_group", null],
["can_mention_group", null],
]);
class UserGroupMembershipError { class UserGroupMembershipError {
report_no_members_to_user_group(): void { report_no_members_to_user_group(): void {
@@ -153,42 +156,25 @@ function create_user_group(): void {
const user_ids = user_group_create_members.get_principals(); const user_ids = user_group_create_members.get_principals();
const subgroup_ids = user_group_create_members.get_subgroups(); const subgroup_ids = user_group_create_members.get_subgroups();
assert(can_add_members_group_widget !== undefined); const data: Record<string, string> = {
const can_add_members_group = settings_components.get_group_setting_widget_value(
can_add_members_group_widget,
);
assert(can_manage_group_widget !== undefined);
const can_manage_group =
settings_components.get_group_setting_widget_value(can_manage_group_widget);
assert(can_join_group_widget !== undefined);
const can_join_group =
settings_components.get_group_setting_widget_value(can_join_group_widget);
assert(can_leave_group_widget !== undefined);
const can_leave_group =
settings_components.get_group_setting_widget_value(can_leave_group_widget);
assert(can_mention_group_widget !== undefined);
const can_mention_group =
settings_components.get_group_setting_widget_value(can_mention_group_widget);
const data = {
name: group_name, name: group_name,
description, description,
members: JSON.stringify(user_ids), members: JSON.stringify(user_ids),
subgroups: JSON.stringify(subgroup_ids), subgroups: JSON.stringify(subgroup_ids),
can_add_members_group: JSON.stringify(can_add_members_group),
can_join_group: JSON.stringify(can_join_group),
can_leave_group: JSON.stringify(can_leave_group),
can_mention_group: JSON.stringify(can_mention_group),
can_manage_group: JSON.stringify(can_manage_group),
}; };
loading.make_indicator($("#user_group_creating_indicator"), { loading.make_indicator($("#user_group_creating_indicator"), {
text: $t({defaultMessage: "Creating group..."}), text: $t({defaultMessage: "Creating group..."}),
}); });
const permission_settings = Object.keys(realm.server_supported_permission_settings.group);
for (const setting_name of permission_settings) {
const widget = group_setting_widget_map.get(setting_name);
assert(widget !== undefined);
assert(widget !== null);
const setting_value = settings_components.get_group_setting_widget_value(widget);
data[setting_name] = JSON.stringify(setting_value);
}
void channel.post({ void channel.post({
url: "/json/user_groups/create", url: "/json/user_groups/create",
data, data,
@@ -259,28 +245,12 @@ export function set_up_handlers(): void {
// This will always be enabled when creating a user group. // This will always be enabled when creating a user group.
settings_components.enable_opening_typeahead_on_clicking_label($container); settings_components.enable_opening_typeahead_on_clicking_label($container);
can_add_members_group_widget = settings_components.create_group_setting_widget({ const permission_settings = Object.keys(realm.server_supported_permission_settings.group);
$pill_container: $("#id_new_group_can_add_members_group"), for (const setting_name of permission_settings) {
setting_name: "can_add_members_group", const widget = settings_components.create_group_setting_widget({
}); $pill_container: $(`#id_new_group_${CSS.escape(setting_name)}`),
setting_name: settings_components.group_setting_name_schema.parse(setting_name),
can_manage_group_widget = settings_components.create_group_setting_widget({ });
$pill_container: $("#id_new_group_can_manage_group"), group_setting_widget_map.set(setting_name, widget);
setting_name: "can_manage_group", }
});
can_join_group_widget = settings_components.create_group_setting_widget({
$pill_container: $("#id_new_group_can_join_group"),
setting_name: "can_join_group",
});
can_leave_group_widget = settings_components.create_group_setting_widget({
$pill_container: $("#id_new_group_can_leave_group"),
setting_name: "can_leave_group",
});
can_mention_group_widget = settings_components.create_group_setting_widget({
$pill_container: $("#id_new_group_can_mention_group"),
setting_name: "can_mention_group",
});
} }

36
web/src/user_group_edit.js
View File

@@ -154,35 +154,15 @@ function show_membership_settings(group) {
} }
function show_general_settings(group) { function show_general_settings(group) {
settings_components.create_group_setting_widget({ const permission_settings = Object.keys(realm.server_supported_permission_settings.group);
$pill_container: $("#id_can_add_members_group"), for (const setting_name of permission_settings) {
setting_name: "can_add_members_group", settings_components.create_group_setting_widget({
group, $pill_container: $(`#id_${CSS.escape(setting_name)}`),
}); setting_name,
group,
});
}
settings_components.create_group_setting_widget({
$pill_container: $("#id_can_manage_group"),
setting_name: "can_manage_group",
group,
});
settings_components.create_group_setting_widget({
$pill_container: $("#id_can_join_group"),
setting_name: "can_join_group",
group,
});
settings_components.create_group_setting_widget({
$pill_container: $("#id_can_leave_group"),
setting_name: "can_leave_group",
group,
});
settings_components.create_group_setting_widget({
$pill_container: $("#id_can_mention_group"),
setting_name: "can_mention_group",
group,
});
update_general_panel_ui(group); update_general_panel_ui(group);
} }