paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

pills: Streamline input pills (for user groups).

Browse Source 
The main point of this change is to streamline the core
code for input pills, and we use also modify user groups.

The main change to input_pill.js is that you now
configure a function called `create_item_from_text`, and
that can return an arbitrary object, and it just needs
a field called `display_value`.

Other changes:
    * You now call `input.create(opts)` to create the
      widget.
    * There is no longer a cache, because we can
      write smarter code in typeahead `source` functions
      that exclude ids up front.
    * There is no value/optinalKey complexity, because
      the calling code can supply arbitrary objects and
      do their own external data management on the pill
      items.
    * We eliminate `prependPill`.
    * We eliminate `data`, `keys`, and `values`, and just
      have `items`.
This commit is contained in:
Steve Howell
2018-03-06 09:03:20 -05:00
committed by Tim Abbott
parent 0d29864c6a
commit f0d101edf5
7 changed files with 257 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
static/js/settings_user_groups.js
View File

@@ -34,19 +34,35 @@ exports.populate_user_groups = function () {
}));
var pill_container = $('.pill-container[data-group-pills="' + data.name + '"]');
var pills = input_pill(pill_container);
var pills = input_pill.create({
container: pill_container,
create_item_from_text: user_pill.create_item_from_email,
get_text_from_item: user_pill.get_email_from_item,
});
function get_pill_user_ids() {
return user_pill.get_user_ids(pills);
}
function append_user(user) {
user_pill.append_person({
pill_widget: pills,
person: user,
});
}
data.members.keys().forEach(function (user_id) {
var user = people.get_person_from_user_id(user_id);
if (user) {
pills.pill.append(user.full_name, user_id);
append_user(user);
} else {
blueslip.warn('Unknown user ID ' + user_id + ' in members of user group ' + data.name);
}
});
function update_save_state(draft_group) {
function update_save_state() {
var draft_group = get_pill_user_ids();
var original_group = user_groups.get_user_group_from_id(data.id).members.keys();
var same_groups = _.isEqual(_.sortBy(draft_group), _.sortBy(original_group));
var save_changes = pill_container.siblings('.save-member-changes');
@@ -65,14 +81,13 @@ exports.populate_user_groups = function () {
items: 5,
fixed: true,
dropup: true,
source: people.get_realm_persons,
source: function () {
return user_pill.typeahead_source(pills);
},
highlighter: function (item) {
return typeahead_helper.render_person(item);
},
matcher: function (item) {
if (pills.keys().includes(item.user_id)) {
return false;
}
var query = this.query.toLowerCase();
return (item.email.toLowerCase().indexOf(query) !== -1
|| item.full_name.toLowerCase().indexOf(query) !== -1);
@@ -82,33 +97,22 @@ exports.populate_user_groups = function () {
this.query, matches, "");
},
updater: function (user) {
pills.pill.append(user.full_name, user.user_id);
input.text('');
update_save_state(pills.keys());
append_user(user);
update_save_state();
},
stopAdvance: true,
});
pills.onPillCreate(function (value, reject) {
var person = people.get_by_email(value);
var draft_group = pills.keys();
if (!person || draft_group.includes(person.user_id)) {
return reject();
}
draft_group.push(person.user_id);
update_save_state(draft_group);
return { key: person.user_id, value: person.full_name };
pills.onPillCreate(function () {
update_save_state();
});
pills.onPillRemove(function () {
update_save_state(pills.keys());
update_save_state();
});
$('#user-groups #' + data.id).on('click', '.save-member-changes', function () {
var draft_group = pills.keys();
var draft_group = get_pill_user_ids();
var group_data = user_groups.get_user_group_from_id(data.id);
var original_group = group_data.members.keys();
var added = _.difference(draft_group, original_group);