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

compose_recipient: Remove own user pill if other recipients are added. 

This commit removes own user pill from recipient box if other
recipients are added.

Fixes part of zulip#31629.
This commit is contained in:
Pratik Chanda 2024-09-18 02:08:04 +05:30 committed by Tim Abbott
parent 8230f394fb
commit bc623369c3
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/src/compose_pm_pill.ts
View File

@ -51,6 +51,12 @@ export function clear(): void {
}
export function set_from_typeahead(person: User): void {
const current_user_ids = get_user_ids();
// Remove current user from recipient if user adds other recipient
if (current_user_ids.length === 1 && current_user_ids.at(0) === people.my_current_user_id()) {
clear();
}
user_pill.append_person({
pill_widget: widget,
person,

17
web/tests/compose_pm_pill.test.js
View File

@ -16,6 +16,13 @@ let pills = {
};
run_test("pills", ({override, override_rewire}) => {
const me = {
email: "me@example.com",
user_id: 30,
full_name: "Me Myself",
date_joined: new Date(),
};
const othello = {
user_id: 1,
email: "othello@example.com",
@ -34,6 +41,8 @@ run_test("pills", ({override, override_rewire}) => {
full_name: "Hamlet",
};
people.initialize_current_user(me.user_id);
people.add_active_user(me);
people.add_active_user(othello);
people.add_active_user(iago);
people.add_active_user(hamlet);
@ -161,7 +170,7 @@ run_test("pills", ({override, override_rewire}) => {
compose_pm_pill.set_from_typeahead(othello);
compose_pm_pill.set_from_typeahead(hamlet);
const user_ids = compose_pm_pill.get_user_ids();
let user_ids = compose_pm_pill.get_user_ids();
assert.deepEqual(user_ids, [othello.user_id, hamlet.user_id]);
const user_ids_string = compose_pm_pill.get_user_ids_string();
@ -185,6 +194,12 @@ run_test("pills", ({override, override_rewire}) => {
assert.ok(pills_cleared);
assert.ok(appendValue_called);
assert.ok(text_cleared);
compose_pm_pill.set_from_typeahead(me);
compose_pm_pill.set_from_typeahead(othello);
user_ids = compose_pm_pill.get_user_ids();
assert.deepEqual(user_ids, [othello.user_id]);
});
run_test("has_unconverted_data", ({override}) => {