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

user_pill: Fix type annotations. 

Change the type annotation of current_items in create_item_from_email
to InputPillItem<CombinedPillItem>.
This commit is contained in:
afeefuddin 2024-05-14 02:02:49 +05:30 committed by Tim Abbott
parent 0927e03677
commit bf3eb2c269
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
web/src/user_pill.ts
View File

@ -4,7 +4,7 @@ import * as input_pill from "./input_pill";
import type {User} from "./people"; import type {User} from "./people";
import * as people from "./people"; import * as people from "./people";
import {realm} from "./state_data"; import {realm} from "./state_data";
import type {CombinedPillContainer} from "./typeahead_helper"; import type {CombinedPillContainer, CombinedPillItem} from "./typeahead_helper";
import * as user_status from "./user_status"; import * as user_status from "./user_status";
// This will be used for pills for things like composing // This will be used for pills for things like composing
@ -22,15 +22,18 @@ export type UserPillData = User & {type: "user"};
export function create_item_from_email( export function create_item_from_email(
email: string, email: string,
current_items: InputPillItem<UserPill>[], current_items: CombinedPillItem[],
pill_config?: InputPillConfig | undefined, pill_config?: InputPillConfig | undefined,
): InputPillItem<UserPill> | undefined { ): InputPillItem<UserPill> | undefined {
// For normal Zulip use, we need to validate the email for our realm. // For normal Zulip use, we need to validate the email for our realm.
const filtered_current_items = current_items.flatMap((item) =>
item.type === "user" ? item : [],
);
const user = people.get_by_email(email); const user = people.get_by_email(email);
if (!user) { if (!user) {
if (realm.realm_is_zephyr_mirror_realm) { if (realm.realm_is_zephyr_mirror_realm) {
const existing_emails = current_items.map((item) => item.email); const existing_emails = filtered_current_items.map((item) => item.email);
if (existing_emails.includes(email)) { if (existing_emails.includes(email)) {
return undefined; return undefined;
@ -54,7 +57,7 @@ export function create_item_from_email(
return undefined; return undefined;
} }
const existing_ids = current_items.map((item) => item.user_id); const existing_ids = filtered_current_items.map((item) => item.user_id);
if (existing_ids.includes(user.user_id)) { if (existing_ids.includes(user.user_id)) {
return undefined; return undefined;