paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-07 23:43:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

groups: Remove list specifying group settings with new API format.

Browse Source 
All the groups are now following the new API format, making the list
redundant.
This commit is contained in:
Shubham Padia
2024-10-22 10:42:14 +00:00
committed by Tim Abbott
parent 9f9d5b2f98
commit 1f0906aef7
6 changed files with 67 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/settings_components.ts
View File

@@ -1043,7 +1043,7 @@ export function populate_data_for_realm_settings_request(
continue; continue;
} }
const realm_group_settings_using_new_api_format = new Set([ const realm_group_settings = new Set([
"can_access_all_users_group", "can_access_all_users_group",
"can_add_custom_emoji_group", "can_add_custom_emoji_group",
"can_create_groups", "can_create_groups",
@@ -1058,7 +1058,7 @@ export function populate_data_for_realm_settings_request(
"direct_message_initiator_group", "direct_message_initiator_group",
"direct_message_permission_group", "direct_message_permission_group",
]); ]);
if (realm_group_settings_using_new_api_format.has(property_name)) { if (realm_group_settings.has(property_name)) {
const old_value = get_realm_settings_property_value( const old_value = get_realm_settings_property_value(
// eslint-disable-next-line @typescript-eslint/consistent-type-assertions // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
("realm_" + property_name) as RealmSettingProperty, ("realm_" + property_name) as RealmSettingProperty,

15
zerver/lib/events.py
View File

@@ -292,16 +292,9 @@ def fetch_initial_state_data(
for property_name in Realm.property_types: for property_name in Realm.property_types:
state["realm_" + property_name] = getattr(realm, property_name) state["realm_" + property_name] = getattr(realm, property_name)
for ( for setting_name in Realm.REALM_PERMISSION_GROUP_SETTINGS:
setting_name, setting_value = getattr(realm, setting_name)
permission_configuration, state["realm_" + setting_name] = get_group_setting_value_for_api(setting_value)
) in Realm.REALM_PERMISSION_GROUP_SETTINGS.items():
if setting_name in Realm.REALM_PERMISSION_GROUP_SETTINGS_WITH_NEW_API_FORMAT:
setting_value = getattr(realm, setting_name)
state["realm_" + setting_name] = get_group_setting_value_for_api(setting_value)
continue
state["realm_" + setting_name] = getattr(realm, permission_configuration.id_field_name)
state["realm_create_public_stream_policy"] = ( state["realm_create_public_stream_policy"] = (
get_corresponding_policy_value_for_group_setting( get_corresponding_policy_value_for_group_setting(
@@ -1114,7 +1107,7 @@ def apply_event(
if user_id != person_user_id if user_id != person_user_id
] ]
for setting_name in Realm.REALM_PERMISSION_GROUP_SETTINGS_WITH_NEW_API_FORMAT: for setting_name in Realm.REALM_PERMISSION_GROUP_SETTINGS:
if not isinstance(state["realm_" + setting_name], int): if not isinstance(state["realm_" + setting_name], int):
state["realm_" + setting_name].direct_members = [ state["realm_" + setting_name].direct_members = [
user_id user_id

16
zerver/models/realms.py
View File

@@ -807,22 +807,6 @@ class Realm(models.Model): # type: ignore[django-manager-missing] # django-stub
), ),
) )
REALM_PERMISSION_GROUP_SETTINGS_WITH_NEW_API_FORMAT = [
"create_multiuse_invite_group",
"can_access_all_users_group",
"can_add_custom_emoji_group",
"can_create_groups",
"can_create_private_channel_group",
"can_create_public_channel_group",
"can_create_web_public_channel_group",
"can_delete_any_message_group",
"can_delete_own_message_group",
"can_manage_all_groups",
"can_move_messages_between_channels_group",
"direct_message_initiator_group",
"direct_message_permission_group",
]
DIGEST_WEEKDAY_VALUES = [0, 1, 2, 3, 4, 5, 6] DIGEST_WEEKDAY_VALUES = [0, 1, 2, 3, 4, 5, 6]
# Icon is the square mobile icon. # Icon is the square mobile icon.

4
zerver/tests/test_events.py
View File

@@ -4038,13 +4038,11 @@ class RealmPropertyActionTest(BaseAction):
for prop in Realm.REALM_PERMISSION_GROUP_SETTINGS: for prop in Realm.REALM_PERMISSION_GROUP_SETTINGS:
with self.settings(SEND_DIGEST_EMAILS=True): with self.settings(SEND_DIGEST_EMAILS=True):
self.do_set_realm_permission_group_setting_test(prop) self.do_set_realm_permission_group_setting_test(prop)
for prop in Realm.REALM_PERMISSION_GROUP_SETTINGS_WITH_NEW_API_FORMAT:
if Realm.REALM_PERMISSION_GROUP_SETTINGS[prop].require_system_group: if Realm.REALM_PERMISSION_GROUP_SETTINGS[prop].require_system_group:
# Anonymous system groups aren't relevant when # Anonymous system groups aren't relevant when
# restricted to system groups. # restricted to system groups.
continue continue
with self.settings(SEND_DIGEST_EMAILs=True): with self.settings(SEND_DIGEST_EMAILS=True):
self.do_set_realm_permission_group_setting_to_anonymous_groups_test(prop) self.do_set_realm_permission_group_setting_to_anonymous_groups_test(prop)
def do_set_realm_user_default_setting_test(self, name: str) -> None: def do_set_realm_user_default_setting_test(self, name: str) -> None:

114
zerver/tests/test_realm.py
View File

@@ -1745,13 +1745,11 @@ class RealmAPITest(ZulipTestCase):
self.assertEqual(getattr(realm, setting_name), default_group.usergroup_ptr) self.assertEqual(getattr(realm, setting_name), default_group.usergroup_ptr)
for user_group in all_system_user_groups: for user_group in all_system_user_groups:
value = orjson.dumps(user_group.id).decode() value = orjson.dumps(
if setting_name in Realm.REALM_PERMISSION_GROUP_SETTINGS_WITH_NEW_API_FORMAT: {
value = orjson.dumps( "new": user_group.id,
{ }
"new": user_group.id, ).decode()
}
).decode()
if ( if (
( (
@@ -1788,62 +1786,55 @@ class RealmAPITest(ZulipTestCase):
if setting_permission_configuration.require_system_group: if setting_permission_configuration.require_system_group:
leadership_group = NamedUserGroup.objects.get(name="leadership", realm=realm) leadership_group = NamedUserGroup.objects.get(name="leadership", realm=realm)
value = orjson.dumps(leadership_group.id).decode() value = orjson.dumps(
if setting_name in Realm.REALM_PERMISSION_GROUP_SETTINGS_WITH_NEW_API_FORMAT: {
value = orjson.dumps( "new": leadership_group.id,
{ }
"new": leadership_group.id, ).decode()
}
).decode()
result = self.client_patch("/json/realm", {setting_name: value}) result = self.client_patch("/json/realm", {setting_name: value})
self.assert_json_error(result, f"'{setting_name}' must be a system user group.") self.assert_json_error(result, f"'{setting_name}' must be a system user group.")
if setting_name in Realm.REALM_PERMISSION_GROUP_SETTINGS_WITH_NEW_API_FORMAT: admins_group = NamedUserGroup.objects.get(name=SystemGroups.ADMINISTRATORS, realm=realm)
admins_group = NamedUserGroup.objects.get( moderators_group = NamedUserGroup.objects.get(name=SystemGroups.MODERATORS, realm=realm)
name=SystemGroups.ADMINISTRATORS, realm=realm value = orjson.dumps(
{
"new": {
"direct_members": [],
"direct_subgroups": [admins_group.id, leadership_group.id],
}
}
).decode()
result = self.client_patch("/json/realm", {setting_name: value})
self.assert_json_error(result, f"'{setting_name}' must be a system user group.")
value = orjson.dumps(
{
"new": {
"direct_members": [],
"direct_subgroups": [admins_group.id, moderators_group.id],
}
}
).decode()
result = self.client_patch("/json/realm", {setting_name: value})
self.assert_json_error(result, f"'{setting_name}' must be a system user group.")
group = admins_group
if setting_permission_configuration.allowed_system_groups:
group = NamedUserGroup.objects.get(
name=setting_permission_configuration.allowed_system_groups[0], realm=realm
) )
moderators_group = NamedUserGroup.objects.get(
name=SystemGroups.MODERATORS, realm=realm
)
value = orjson.dumps(
{
"new": {
"direct_members": [],
"direct_subgroups": [admins_group.id, leadership_group.id],
}
}
).decode()
result = self.client_patch("/json/realm", {setting_name: value})
self.assert_json_error(result, f"'{setting_name}' must be a system user group.")
value = orjson.dumps( value = orjson.dumps(
{ {
"new": { "new": {
"direct_members": [], "direct_members": [],
"direct_subgroups": [admins_group.id, moderators_group.id], "direct_subgroups": [group.id],
}
} }
).decode() }
result = self.client_patch("/json/realm", {setting_name: value}) ).decode()
self.assert_json_error(result, f"'{setting_name}' must be a system user group.") realm = self.update_with_api(setting_name, value)
self.assertEqual(getattr(realm, setting_name), group.usergroup_ptr)
group = admins_group
if setting_permission_configuration.allowed_system_groups:
group = NamedUserGroup.objects.get(
name=setting_permission_configuration.allowed_system_groups[0], realm=realm
)
value = orjson.dumps(
{
"new": {
"direct_members": [],
"direct_subgroups": [group.id],
}
}
).decode()
realm = self.update_with_api(setting_name, value)
self.assertEqual(getattr(realm, setting_name), group.usergroup_ptr)
def do_test_realm_permission_group_setting_update_api_with_anonymous_groups( def do_test_realm_permission_group_setting_update_api_with_anonymous_groups(
self, setting_name: str self, setting_name: str
@@ -2037,13 +2028,10 @@ class RealmAPITest(ZulipTestCase):
for prop in Realm.REALM_PERMISSION_GROUP_SETTINGS: for prop in Realm.REALM_PERMISSION_GROUP_SETTINGS:
with self.subTest(property=prop): with self.subTest(property=prop):
self.do_test_realm_permission_group_setting_update_api(prop) self.do_test_realm_permission_group_setting_update_api(prop)
if Realm.REALM_PERMISSION_GROUP_SETTINGS[prop].require_system_group:
for prop in Realm.REALM_PERMISSION_GROUP_SETTINGS_WITH_NEW_API_FORMAT: # Anonymous system groups aren't relevant when
if Realm.REALM_PERMISSION_GROUP_SETTINGS[prop].require_system_group: # restricted to system groups.
# Anonymous system groups aren't relevant when continue
# restricted to system groups.
continue
with self.subTest(property=prop):
self.do_test_realm_permission_group_setting_update_api_with_anonymous_groups(prop) self.do_test_realm_permission_group_setting_update_api_with_anonymous_groups(prop)
# Not in Realm.property_types because org_type has # Not in Realm.property_types because org_type has

26
zerver/views/realm.py
View File

@@ -356,26 +356,18 @@ def update_realm(
data[k] = v data[k] = v
for setting_name, permission_configuration in Realm.REALM_PERMISSION_GROUP_SETTINGS.items(): for setting_name, permission_configuration in Realm.REALM_PERMISSION_GROUP_SETTINGS.items():
setting_group_id_name = permission_configuration.id_field_name
expected_current_setting_value = None expected_current_setting_value = None
if setting_name in Realm.REALM_PERMISSION_GROUP_SETTINGS_WITH_NEW_API_FORMAT: assert setting_name in req_group_setting_vars
assert setting_name in req_group_setting_vars if req_group_setting_vars[setting_name] is None:
if req_group_setting_vars[setting_name] is None: continue
continue
setting_value = req_group_setting_vars[setting_name] setting_value = req_group_setting_vars[setting_name]
new_setting_value = parse_group_setting_value(setting_value.new, setting_name) new_setting_value = parse_group_setting_value(setting_value.new, setting_name)
if setting_value.old is not None: if setting_value.old is not None:
expected_current_setting_value = parse_group_setting_value( expected_current_setting_value = parse_group_setting_value(
setting_value.old, setting_name setting_value.old, setting_name
) )
else:
assert setting_group_id_name in req_group_setting_vars
if req_group_setting_vars[setting_group_id_name] is None:
continue
new_setting_value = req_group_setting_vars[setting_group_id_name]
current_value = getattr(realm, setting_name) current_value = getattr(realm, setting_name)
current_setting_api_value = get_group_setting_value_for_api(current_value) current_setting_api_value = get_group_setting_value_for_api(current_value)