paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 13:03:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

people: Allow deactivated users pills in compose box.

Browse Source 
This commit treats deactivated users as valid users
for compose box which prevents the PM list to collapse
when a deactivated user in the PM list is clicked.

Part of #13766

Co-authored-by: Signior-X <b19188@students.iitmandi.ac.in>
This commit is contained in:
Hashir Sarwar
2020-07-22 16:39:38 +05:00
committed by Tim Abbott
parent 44a298b671
commit 7b9ed4ff2e
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend_tests/node_tests/people.js
View File

@@ -312,7 +312,7 @@ test_people("basics", () => {
assert.equal(people.get_non_active_human_ids().length, 1);
assert.equal(people.get_active_human_count(), 1);
assert.equal(people.is_active_user_for_popover(isaac.user_id), false);
assert.equal(people.is_valid_email_for_compose(isaac.email), false);
assert.equal(people.is_valid_email_for_compose(isaac.email), true);
people.add_active_user(bot_botson);
assert.equal(people.is_active_user_for_popover(bot_botson.user_id), true);
@@ -1077,7 +1077,7 @@ test_people("initialize", () => {
assert.ok(people.is_cross_realm_email("bot@example.com"));
assert.ok(people.is_valid_email_for_compose("bot@example.com"));
assert.ok(people.is_valid_email_for_compose("alice@example.com"));
assert.ok(!people.is_valid_email_for_compose("retiree@example.com"));
assert.ok(people.is_valid_email_for_compose("retiree@example.com"));
assert.ok(!people.is_valid_email_for_compose("totally-bogus-username@example.com"));
assert.ok(people.is_valid_bulk_emails_for_compose(["bot@example.com", "alice@example.com"]));
assert.ok(!people.is_valid_bulk_emails_for_compose(["not@valid.com", "alice@example.com"]));

6
frontend_tests/node_tests/top_left_corner.js
View File

@@ -62,6 +62,12 @@ run_test("narrowing", ({override}) => {
top_left_corner.handle_narrow_activated(filter);
assert.ok(!pm_expanded);
pm_expanded = false;
people.deactivate(alice);
filter = new Filter([{operator: "pm-with", operand: "alice@example.com"}]);
top_left_corner.handle_narrow_activated(filter);
assert.ok(pm_expanded);
filter = new Filter([{operator: "is", operand: "mentioned"}]);
top_left_corner.handle_narrow_activated(filter);
assert.ok($(".top_left_mentions").hasClass("active-filter"));

5
static/js/people.js
View File

@@ -730,7 +730,10 @@ export function is_valid_email_for_compose(email) {
if (!person) {
return false;
}
return active_user_dict.has(person.user_id);
// we allow deactivated users in compose so that
// one can attempt to reply to threads that contained them.
return true;
}
export function is_valid_bulk_emails_for_compose(emails) {