Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

user_group_pill: Fix type annotations. 

Change type annotations of get_user_ids and create_item_from_group_name
to accept CombinedPillContainer and InputPillItem<CombinedPillItem>
respectively.
This commit is contained in:
afeefuddin 2024-04-23 18:02:00 +05:30 committed by Tim Abbott
parent 0f622d3025
commit 0927e03677
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/src/user_group_pill.ts
View File

@ -1,5 +1,5 @@
import type {InputPillContainer, InputPillItem} from "./input_pill"; import type {InputPillContainer, InputPillItem} from "./input_pill";
import type {CombinedPillContainer} from "./typeahead_helper"; import type {CombinedPillContainer, CombinedPillItem} from "./typeahead_helper";
import type {UserGroup} from "./user_groups"; import type {UserGroup} from "./user_groups";
import * as user_groups from "./user_groups"; import * as user_groups from "./user_groups";
@ -19,7 +19,7 @@ function display_pill(group: UserGroup): string {
export function create_item_from_group_name( export function create_item_from_group_name(
group_name: string, group_name: string,
current_items: InputPillItem<UserGroupPill>[], current_items: CombinedPillItem[],
): InputPillItem<UserGroupPill> | undefined { ): InputPillItem<UserGroupPill> | undefined {
group_name = group_name.trim(); group_name = group_name.trim();
const group = user_groups.get_user_group_from_name(group_name); const group = user_groups.get_user_group_from_name(group_name);
@ -27,7 +27,9 @@ export function create_item_from_group_name(
return undefined; return undefined;
} }
const in_current_items = current_items.find((item) => item.id === group.id); const in_current_items = current_items
.flatMap((item) => (item.type === "user_group" ? item : []))
.find((item) => item.id === group.id);
if (in_current_items !== undefined) { if (in_current_items !== undefined) {
return undefined; return undefined;
} }
@ -51,8 +53,8 @@ function get_user_ids_from_user_groups(items: InputPillItem<UserGroupPill>[]): n
]); ]);
} }
export function get_user_ids(pill_widget: UserGroupPillWidget): number[] { export function get_user_ids(pill_widget: UserGroupPillWidget | CombinedPillContainer): number[] {
const items = pill_widget.items(); const items = pill_widget.items().flatMap((item) => (item.type === "user_group" ? item : []));
let user_ids = get_user_ids_from_user_groups(items); let user_ids = get_user_ids_from_user_groups(items);
user_ids = [...new Set(user_ids)]; user_ids = [...new Set(user_ids)];
user_ids.sort((a, b) => a - b); user_ids.sort((a, b) => a - b);