diff --git a/web/src/state_data.ts b/web/src/state_data.ts index 4093087393..33e53e600e 100644 --- a/web/src/state_data.ts +++ b/web/src/state_data.ts @@ -146,6 +146,7 @@ export const user_group_schema = z.object({ direct_subgroup_ids: z.array(z.number()), can_manage_group: z.number(), can_mention_group: z.number(), + deactivated: z.boolean(), }); export const user_topic_schema = z.object({ diff --git a/web/src/user_group_popover.ts b/web/src/user_group_popover.ts index bc18c6952f..893af31d20 100644 --- a/web/src/user_group_popover.ts +++ b/web/src/user_group_popover.ts @@ -101,6 +101,7 @@ export function toggle_user_group_info_popover( group_edit_url: hash_util.group_edit_url(group, "general"), is_guest: current_user.is_guest, is_system_group: group.is_system_group, + deactivated: group.deactivated, }; instance.setContent(ui_util.parse_html(render_user_group_info_popover(args))); }, diff --git a/web/src/user_groups.ts b/web/src/user_groups.ts index 92e0c0b279..e636b1032c 100644 --- a/web/src/user_groups.ts +++ b/web/src/user_groups.ts @@ -57,6 +57,7 @@ export function add(user_group_raw: UserGroupRaw): UserGroup { direct_subgroup_ids: new Set(user_group_raw.direct_subgroup_ids), can_manage_group: user_group_raw.can_manage_group, can_mention_group: user_group_raw.can_mention_group, + deactivated: user_group_raw.deactivated, }; user_group_name_dict.set(user_group.name, user_group); @@ -111,9 +112,19 @@ export function get_user_group_from_name(name: string): UserGroup | undefined { return user_group_name_dict.get(name); } -export function get_realm_user_groups(): UserGroup[] { +export function get_realm_user_groups(include_deactivated = false): UserGroup[] { const user_groups = [...user_group_by_id_dict.values()].sort((a, b) => a.id - b.id); - return user_groups.filter((group) => !group.is_system_group); + return user_groups.filter((group) => { + if (group.is_system_group) { + return false; + } + + if (!include_deactivated && group.deactivated) { + return false; + } + + return true; + }); } export function get_user_groups_allowed_to_mention(): UserGroup[] { diff --git a/web/templates/popovers/user_group_info_popover.hbs b/web/templates/popovers/user_group_info_popover.hbs index 1d76617ea2..bdc989fc66 100644 --- a/web/templates/popovers/user_group_info_popover.hbs +++ b/web/templates/popovers/user_group_info_popover.hbs @@ -9,6 +9,11 @@
{{group_description}}
+ {{#if deactivated}} +
  • + {{t "This group has been deactivated." }} +
    • + {{/if}}
  • {{#if members.length}} @@ -28,7 +33,7 @@ {{t 'This group has no members.'}} {{/if}}
    • - {{#unless (or is_guest is_system_group)}} + {{#unless (or is_guest is_system_group deactivated)}}
  • diff --git a/web/tests/composebox_typeahead.test.js b/web/tests/composebox_typeahead.test.js index 9e9c6d17e2..d4fcccff69 100644 --- a/web/tests/composebox_typeahead.test.js +++ b/web/tests/composebox_typeahead.test.js @@ -432,6 +432,7 @@ const hamletcharacters = user_group_item({ direct_subgroup_ids: new Set([]), can_manage_group: 2, can_mention_group: 2, + deactivated: false, }); const backend = user_group_item({ @@ -445,6 +446,7 @@ const backend = user_group_item({ direct_subgroup_ids: new Set([1]), can_manage_group: 1, can_mention_group: 1, + deactivated: false, }); const call_center = user_group_item({ @@ -458,6 +460,7 @@ const call_center = user_group_item({ direct_subgroup_ids: new Set([]), can_manage_group: 2, can_mention_group: 2, + deactivated: false, }); const make_emoji = (emoji_dict) => ({ diff --git a/web/tests/user_groups.test.js b/web/tests/user_groups.test.js index 2b2da62ba0..7b177f7519 100644 --- a/web/tests/user_groups.test.js +++ b/web/tests/user_groups.test.js @@ -21,6 +21,7 @@ run_test("user_groups", () => { direct_subgroup_ids: new Set([4, 5]), can_manage_group: 1, can_mention_group: 2, + deactivated: false, }; const params = {}; @@ -42,6 +43,7 @@ run_test("user_groups", () => { direct_subgroup_ids: new Set([]), can_manage_group: 1, can_mention_group: 2, + deactivated: false, }; const all = { name: "Everyone", @@ -51,6 +53,17 @@ run_test("user_groups", () => { direct_subgroup_ids: new Set([4, 5, 6]), can_manage_group: 1, can_mention_group: 1, + deactivated: false, + }; + const deactivated_group = { + name: "Deactivated test group", + id: 3, + members: new Set([1, 2, 3]), + is_system_group: false, + direct_subgroup_ids: new Set([4, 5, 6]), + can_manage_group: 1, + can_mention_group: 1, + deactivated: true, }; user_groups.add(admins); @@ -92,11 +105,18 @@ run_test("user_groups", () => { assert.equal(user_groups.get_user_group_from_name("new admins").id, 1); user_groups.add(all); + user_groups.add(deactivated_group); const user_groups_array = user_groups.get_realm_user_groups(); assert.equal(user_groups_array.length, 2); assert.equal(user_groups_array[1].name, "Everyone"); assert.equal(user_groups_array[0].name, "new admins"); + const all_user_groups_array = user_groups.get_realm_user_groups(true); + assert.equal(all_user_groups_array.length, 3); + assert.equal(all_user_groups_array[2].name, "Deactivated test group"); + assert.equal(all_user_groups_array[1].name, "Everyone"); + assert.equal(all_user_groups_array[0].name, "new admins"); + const groups_of_users = user_groups.get_user_groups_of_user(user_id_part_of_a_group); assert.equal(groups_of_users.length, 1); assert.equal(groups_of_users[0].name, "Everyone"); diff --git a/zerver/lib/home.py b/zerver/lib/home.py index 16403698ab..30aef3b275 100644 --- a/zerver/lib/home.py +++ b/zerver/lib/home.py @@ -155,6 +155,7 @@ def build_page_params_for_home_page_load( user_settings_object=True, linkifier_url_template=True, user_list_incomplete=True, + include_deactivated_groups=True, ) if user_profile is not None: