mirror of
https://github.com/zulip/zulip.git
synced 2026-06-30 21:11:04 +08:00
87b3642b62
Fixes #29825. Clicking on remove button will not delete the row anymore. We will add a strikethrough to the user pill and email text. `Remove` button will change to `Add` on click to undo this action. Re-adding a user explicitly should will not undo the soft remove on their row. e.g If `Iago` was added as part of a group and crossed out. Now, adding another group with Iago as part of it should not undo the soft remove. We maintain a seperate set of soft removed users, but we will not remove those users from the main user list on clicking `Remove`. That list can only be modified by actions with the input pills. We will subtract the soft removed user ids from main user id list when sending the request to add subscribers to the new channel. I've not added extra puppetteer tests, since adding users was not part of the existing tests.
85 lines
2.7 KiB
TypeScript
85 lines
2.7 KiB
TypeScript
import _ from "lodash";
|
|
|
|
import * as people from "./people";
|
|
import type {User} from "./people";
|
|
import {current_user} from "./state_data";
|
|
|
|
let user_id_set: Set<number>;
|
|
let soft_remove_user_id_set: Set<number>;
|
|
|
|
export function initialize_with_current_user(): void {
|
|
user_id_set = new Set([current_user.user_id]);
|
|
soft_remove_user_id_set = new Set();
|
|
}
|
|
|
|
export function sorted_user_ids(): number[] {
|
|
const users = people.get_users_from_ids([...user_id_set]);
|
|
people.sort_but_pin_current_user_on_top(users);
|
|
return users.map((user) => user.user_id);
|
|
}
|
|
|
|
export function get_all_user_ids(): number[] {
|
|
const potential_subscribers = people.get_realm_users();
|
|
const user_ids = potential_subscribers.map((user) => user.user_id);
|
|
// sort for determinism
|
|
user_ids.sort((a, b) => a - b);
|
|
return user_ids;
|
|
}
|
|
|
|
export function get_principals(): number[] {
|
|
// Return list of user ids which were selected by user.
|
|
return _.difference([...user_id_set], [...soft_remove_user_id_set]);
|
|
}
|
|
|
|
export function get_potential_subscribers(): User[] {
|
|
const potential_subscribers = people.get_realm_users();
|
|
return potential_subscribers.filter((user) => !user_id_set.has(user.user_id));
|
|
}
|
|
|
|
export function must_be_subscribed(user_id: number): boolean {
|
|
return !current_user.is_admin && user_id === current_user.user_id;
|
|
}
|
|
|
|
export function add_user_ids(user_ids: number[]): void {
|
|
for (const user_id of user_ids) {
|
|
if (!user_id_set.has(user_id)) {
|
|
const user = people.maybe_get_user_by_id(user_id);
|
|
if (user) {
|
|
user_id_set.add(user_id);
|
|
// Re-adding a user explicitly will not undo the soft remove on their row.
|
|
// e.g If `Iago` was added as part of a group and crossed out.
|
|
// Now, adding another group with Iago as part of it should not undo the soft remove.
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
export function remove_user_ids(user_ids: number[]): void {
|
|
for (const user_id of user_ids) {
|
|
user_id_set.delete(user_id);
|
|
undo_soft_remove_user_id(user_id);
|
|
}
|
|
}
|
|
|
|
export function sync_user_ids(user_ids: number[]): void {
|
|
// Current user does not have their pill in their input
|
|
// box, so we need to make sure that we don't delete
|
|
// it unnecessarily while syncing.
|
|
if (user_id_set.has(current_user.user_id)) {
|
|
user_ids.push(current_user.user_id);
|
|
}
|
|
user_id_set = new Set(user_ids);
|
|
}
|
|
|
|
export function soft_remove_user_id(user_id: number): void {
|
|
soft_remove_user_id_set.add(user_id);
|
|
}
|
|
|
|
export function undo_soft_remove_user_id(user_id: number): void {
|
|
soft_remove_user_id_set.delete(user_id);
|
|
}
|
|
|
|
export function user_id_in_soft_remove_list(user_id: number): boolean {
|
|
return soft_remove_user_id_set.has(user_id);
|
|
}
|