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

stream_pill: Fix type annotations. 

Change type annotations of get_user_ids and create_item_from_stream_name
to accept CombinedPillContainer and InputPillItem<CombinedPillItem>
respectively.
This commit is contained in:
afeefuddin 2024-04-23 18:00:17 +05:30 committed by Tim Abbott
parent 0b7c63a695
commit 0f622d3025
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/stream_pill.ts
View File

@ -2,7 +2,7 @@ import type {InputPillContainer, InputPillItem} from "./input_pill";
import * as peer_data from "./peer_data"; import * as peer_data from "./peer_data";
import * as stream_data from "./stream_data"; import * as stream_data from "./stream_data";
import type {StreamSubscription} from "./sub_store"; import type {StreamSubscription} from "./sub_store";
import type {CombinedPillContainer} from "./typeahead_helper"; import type {CombinedPillContainer, CombinedPillItem} from "./typeahead_helper";
export type StreamPill = { export type StreamPill = {
type: "stream"; type: "stream";
@ -21,7 +21,7 @@ function display_pill(sub: StreamSubscription): string {
export function create_item_from_stream_name( export function create_item_from_stream_name(
stream_name: string, stream_name: string,
current_items: InputPillItem<StreamPill>[], current_items: CombinedPillItem[],
): InputPillItem<StreamPill> | undefined { ): InputPillItem<StreamPill> | undefined {
stream_name = stream_name.trim(); stream_name = stream_name.trim();
if (!stream_name.startsWith("#")) { if (!stream_name.startsWith("#")) {
@ -34,7 +34,9 @@ export function create_item_from_stream_name(
return undefined; return undefined;
} }
const existing_ids = current_items.map((item) => item.stream_id); const existing_ids = current_items
.flatMap((item) => (item.type === "stream" ? item : []))
.map((item) => item.stream_id);
if (existing_ids.includes(sub.stream_id)) { if (existing_ids.includes(sub.stream_id)) {
return undefined; return undefined;
} }
@ -62,8 +64,8 @@ function get_user_ids_from_subs(items: InputPillItem<StreamPill>[]): number[] {
return user_ids; return user_ids;
} }
export function get_user_ids(pill_widget: StreamPillWidget): number[] { export function get_user_ids(pill_widget: StreamPillWidget | CombinedPillContainer): number[] {
const items = pill_widget.items(); const items = pill_widget.items().flatMap((item) => (item.type === "stream" ? item : []));
let user_ids = get_user_ids_from_subs(items); let user_ids = get_user_ids_from_subs(items);
user_ids = [...new Set(user_ids)]; user_ids = [...new Set(user_ids)];