paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-16 11:52:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use user_id in admin_user_list.handlebars.

Browse Source 
For our user administration, we now primarily work with user ids
that get put into data-user-id attributes.  We still put emails in the
tags to make our Casper tests easy to maintain.

This requires a minor change to the back end to pass down user ids
for the /users endpoint (in get_members_backend).
This commit is contained in:
Steve Howell
2017-02-14 15:45:38 -08:00
committed by Tim Abbott
parent c49789778c
commit d406d34fe0
8 changed files with 48 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
frontend_tests/casper_tests/13-user-deactivation.js
View File

@@ -18,9 +18,9 @@ casper.then(function () {
// Test user deactivation and reactivation // Test user deactivation and reactivation
casper.then(function () { casper.then(function () {
casper.waitUntilVisible('.user_row[id="user_cordelia@zulip.com"]', function () { casper.waitUntilVisible('.user_row[data-email="cordelia@zulip.com"]', function () {
casper.test.assertSelectorHasText('.user_row[id="user_cordelia@zulip.com"]', 'Deactivate'); casper.test.assertSelectorHasText('.user_row[data-email="cordelia@zulip.com"]', 'Deactivate');
casper.click('.user_row[id="user_cordelia@zulip.com"] .deactivate'); casper.click('.user_row[data-email="cordelia@zulip.com"] .deactivate');
casper.test.assertTextExists('Deactivate cordelia@zulip.com', 'Deactivate modal has right user'); casper.test.assertTextExists('Deactivate cordelia@zulip.com', 'Deactivate modal has right user');
casper.test.assertTextExists('Deactivate now', 'Deactivate now button available'); casper.test.assertTextExists('Deactivate now', 'Deactivate now button available');
casper.click('#do_deactivate_user_button'); casper.click('#do_deactivate_user_button');
@@ -28,23 +28,23 @@ casper.then(function () {
}); });
casper.then(function () { casper.then(function () {
casper.waitUntilVisible('.user_row[id="user_cordelia@zulip.com"].deactivated_user', function () { casper.waitUntilVisible('.user_row[data-email="cordelia@zulip.com"].deactivated_user', function () {
casper.test.assertSelectorHasText('.user_row[id="user_cordelia@zulip.com"]', 'Reactivate'); casper.test.assertSelectorHasText('.user_row[data-email="cordelia@zulip.com"]', 'Reactivate');
casper.click('.user_row[id="user_cordelia@zulip.com"] .reactivate'); casper.click('.user_row[data-email="cordelia@zulip.com"] .reactivate');
}); });
}); });
casper.then(function () { casper.then(function () {
casper.waitUntilVisible('.user_row[id="user_cordelia@zulip.com"]:not(.deactivated_user)', function () { casper.waitUntilVisible('.user_row[data-email="cordelia@zulip.com"]:not(.deactivated_user)', function () {
casper.test.assertSelectorHasText('.user_row[id="user_cordelia@zulip.com"]', 'Deactivate'); casper.test.assertSelectorHasText('.user_row[data-email="cordelia@zulip.com"]', 'Deactivate');
}); });
}); });
casper.then(function () { casper.then(function () {
// Test Deactivated users section of admin page // Test Deactivated users section of admin page
casper.waitUntilVisible('.user_row[id="user_cordelia@zulip.com"]', function () { casper.waitUntilVisible('.user_row[data-email="cordelia@zulip.com"]', function () {
casper.test.assertSelectorHasText('.user_row[id="user_cordelia@zulip.com"]', 'Deactivate'); casper.test.assertSelectorHasText('.user_row[data-email="cordelia@zulip.com"]', 'Deactivate');
casper.click('.user_row[id="user_cordelia@zulip.com"] .deactivate'); casper.click('.user_row[data-email="cordelia@zulip.com"] .deactivate');
casper.test.assertTextExists('Deactivate cordelia@zulip.com', 'Deactivate modal has right user'); casper.test.assertTextExists('Deactivate cordelia@zulip.com', 'Deactivate modal has right user');
casper.test.assertTextExists('Deactivate now', 'Deactivate now button available'); casper.test.assertTextExists('Deactivate now', 'Deactivate now button available');
casper.click('#do_deactivate_user_button'); casper.click('#do_deactivate_user_button');
@@ -62,15 +62,15 @@ casper.then(function () {
casper.click("li[data-section='deactivated-users-admin']"); casper.click("li[data-section='deactivated-users-admin']");
casper.waitUntilVisible('#admin_deactivated_users_table .user_row[id="user_cordelia@zulip.com"] .reactivate', function () { casper.waitUntilVisible('#admin_deactivated_users_table .user_row[data-email="cordelia@zulip.com"] .reactivate', function () {
casper.test.assertSelectorHasText('#admin_deactivated_users_table .user_row[id="user_cordelia@zulip.com"]', 'Reactivate'); casper.test.assertSelectorHasText('#admin_deactivated_users_table .user_row[data-email="cordelia@zulip.com"]', 'Reactivate');
casper.click('#admin_deactivated_users_table .user_row[id="user_cordelia@zulip.com"] .reactivate'); casper.click('#admin_deactivated_users_table .user_row[data-email="cordelia@zulip.com"] .reactivate');
}); });
}); });
casper.then(function () { casper.then(function () {
casper.waitUntilVisible('#admin_deactivated_users_table .user_row[id="user_cordelia@zulip.com"] button:not(.reactivate)', function () { casper.waitUntilVisible('#admin_deactivated_users_table .user_row[data-email="cordelia@zulip.com"] button:not(.reactivate)', function () {
casper.test.assertSelectorHasText('#admin_deactivated_users_table .user_row[id="user_cordelia@zulip.com"]', 'Deactivate'); casper.test.assertSelectorHasText('#admin_deactivated_users_table .user_row[data-email="cordelia@zulip.com"]', 'Deactivate');
}); });
}); });
@@ -81,22 +81,22 @@ casper.then(function () {
}); });
casper.then(function () { casper.then(function () {
casper.waitUntilVisible('.user_row[id="user_new-user-bot@zulip.com"]', function () { casper.waitUntilVisible('.user_row[data-email="new-user-bot@zulip.com"]', function () {
casper.test.assertSelectorHasText('.user_row[id="user_new-user-bot@zulip.com"]', 'Deactivate'); casper.test.assertSelectorHasText('.user_row[data-email="new-user-bot@zulip.com"]', 'Deactivate');
casper.click('.user_row[id="user_new-user-bot@zulip.com"] .deactivate'); casper.click('.user_row[data-email="new-user-bot@zulip.com"] .deactivate');
}); });
}); });
casper.then(function () { casper.then(function () {
casper.waitUntilVisible('.user_row[id="user_new-user-bot@zulip.com"].deactivated_user', function () { casper.waitUntilVisible('.user_row[data-email="new-user-bot@zulip.com"].deactivated_user', function () {
casper.test.assertSelectorHasText('.user_row[id="user_new-user-bot@zulip.com"]', 'Reactivate'); casper.test.assertSelectorHasText('.user_row[data-email="new-user-bot@zulip.com"]', 'Reactivate');
casper.click('.user_row[id="user_new-user-bot@zulip.com"] .reactivate'); casper.click('.user_row[data-email="new-user-bot@zulip.com"] .reactivate');
}); });
}); });
casper.then(function () { casper.then(function () {
casper.waitUntilVisible('.user_row[id="user_new-user-bot@zulip.com"]:not(.deactivated_user)', function () { casper.waitUntilVisible('.user_row[data-email="new-user-bot@zulip.com"]:not(.deactivated_user)', function () {
casper.test.assertSelectorHasText('.user_row[id="user_new-user-bot@zulip.com"]', 'Deactivate'); casper.test.assertSelectorHasText('.user_row[data-email="new-user-bot@zulip.com"]', 'Deactivate');
}); });
}); });

5
frontend_tests/node_tests/dispatch.js
View File

@@ -200,6 +200,7 @@ var event_fixtures = {
op: 'update', op: 'update',
bot: { bot: {
email: 'the-bot@example.com', email: 'the-bot@example.com',
user_id: 4321,
full_name: 'The Bot Has A New Name', full_name: 'The Bot Has A New Name',
}, },
}, },
@@ -546,11 +547,11 @@ run(function (override, capture, args) {
event = event_fixtures.realm_bot__update; event = event_fixtures.realm_bot__update;
override('bot_data', 'update', capture(['email', 'bot'])); override('bot_data', 'update', capture(['email', 'bot']));
override('admin', 'update_user_full_name', capture(['update_email', 'name'])); override('admin', 'update_user_full_name', capture(['update_user_id', 'name']));
dispatch(event); dispatch(event);
assert_same(args.email, event.bot.email); assert_same(args.email, event.bot.email);
assert_same(args.bot, event.bot); assert_same(args.bot, event.bot);
assert_same(args.update_email, event.bot.email); assert_same(args.update_user_id, event.bot.user_id);
assert_same(args.name, event.bot.full_name); assert_same(args.name, event.bot.full_name);
}); });

22
static/js/admin.js
View File

@@ -17,10 +17,10 @@ exports.show_or_hide_menu_item = function () {
} }
}; };
function get_user_info(email) { function get_user_info(user_id) {
var self = {}; var self = {};
self.user_row = $("tr[id='user_" + email + "']"); self.user_row = $("tr.user_row[data-user-id='" + user_id + "']");
self.form_row = $("tr[id='user_form_" + email + "']"); self.form_row = $("tr.user-name-form[data-user-id='" + user_id + "']");
return self; return self;
} }
@@ -30,12 +30,12 @@ function get_email_for_user_row(row) {
return email; return email;
} }
exports.update_user_full_name = function (email, new_full_name) { exports.update_user_full_name = function (user_id, new_full_name) {
if (!meta.loaded) { if (!meta.loaded) {
return; return;
} }
var user_info = get_user_info(email); var user_info = get_user_info(user_id);
var user_row = user_info.user_row; var user_row = user_info.user_row;
var form_row = user_info.form_row; var form_row = user_info.form_row;
@@ -772,8 +772,8 @@ function _setup_page() {
}); });
$(".admin_user_table, .admin_bot_table").on("click", ".open-user-form", function (e) { $(".admin_user_table, .admin_bot_table").on("click", ".open-user-form", function (e) {
var email = $(e.currentTarget).data("email"); var user_id = $(e.currentTarget).attr("data-user-id");
var user_info = get_user_info(email); var user_info = get_user_info(user_id);
var user_row = user_info.user_row; var user_row = user_info.user_row;
var form_row = user_info.form_row; var form_row = user_info.form_row;
var reset_button = form_row.find(".reset_edit_user"); var reset_button = form_row.find(".reset_edit_user");
@@ -781,6 +781,12 @@ function _setup_page() {
var full_name = form_row.find("input[name='full_name']"); var full_name = form_row.find("input[name='full_name']");
var admin_status = $('#administration-status').expectOne(); var admin_status = $('#administration-status').expectOne();
var person = people.get_person_from_user_id(user_id);
if (!person) {
return;
}
// Show user form. // Show user form.
user_row.hide(); user_row.hide();
form_row.show(); form_row.show();
@@ -794,7 +800,7 @@ function _setup_page() {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
var url = "/json/users/" + encodeURIComponent(email); var url = "/json/users/" + encodeURIComponent(person.email);
var data = { var data = {
full_name: JSON.stringify(full_name.val()), full_name: JSON.stringify(full_name.val()),
}; };

2
static/js/server_events.js
View File

@@ -92,7 +92,7 @@ function dispatch_normal_event(event) {
bot_data.remove(event.bot.email); bot_data.remove(event.bot.email);
} else if (event.op === 'update') { } else if (event.op === 'update') {
bot_data.update(event.bot.email, event.bot); bot_data.update(event.bot.email, event.bot);
admin.update_user_full_name(event.bot.email, event.bot.full_name); admin.update_user_full_name(event.bot.user_id, event.bot.full_name);
} }
break; break;

2
static/js/user_events.js
View File

@@ -19,7 +19,7 @@ exports.update_person = function update(person) {
if (_.has(person, 'full_name')) { if (_.has(person, 'full_name')) {
people.set_full_name(person_obj, person.full_name); people.set_full_name(person_obj, person.full_name);
admin.update_user_full_name(person.email, person.full_name); admin.update_user_full_name(person.user_id, person.full_name);
activity.redraw(); activity.redraw();
message_live_update.update_user_full_name(person.user_id, person.full_name); message_live_update.update_user_full_name(person.user_id, person.full_name);
pm_list.update_private_messages(); pm_list.update_private_messages();

6
static/templates/admin_user_list.handlebars
View File

@@ -1,5 +1,5 @@
{{#with user}} {{#with user}}
<tr class="user_row" id="user_{{email}}"> <tr class="user_row" data-user-id="{{user_id}}" data-email="{{email}}">
<td> <td>
<span class="user_name">{{full_name}}</span> <span class="user_name">{{full_name}}</span>
</td> </td>
@@ -35,7 +35,7 @@
{{/if}} {{/if}}
</span> </span>
{{#if is_active}} {{#if is_active}}
<button class="button btn-primary open-user-form" title="{{t 'Edit User' }}" data-email="{{email}}"> <button class="button btn-primary open-user-form" title="{{t 'Edit User' }}" data-user-id="{{user_id}}">
<i class="icon-vector-pencil"></i> <i class="icon-vector-pencil"></i>
</button> </button>
{{/if}} {{/if}}
@@ -44,7 +44,7 @@
</td> </td>
</tr> </tr>
{{#if is_active}} {{#if is_active}}
<tr class="user-name-form display-none" id="user_form_{{email}}"> <tr class="user-name-form display-none" data-user-id="{{user_id}}">
<td colspan="{{#if is_bot}}4{{else}}3{{/if}}"> <td colspan="{{#if is_bot}}4{{else}}3{{/if}}">
<form class="form-horizontal name-setting"> <form class="form-horizontal name-setting">
<input type="hidden" name="is_full_name" value="true" /> <input type="hidden" name="is_full_name" value="true" />

1
zerver/tests/tests.py
View File

@@ -823,6 +823,7 @@ class BotTest(ZulipTestCase):
self.assertEqual(len(bots), 1) self.assertEqual(len(bots), 1)
bot = bots[0] bot = bots[0]
self.assertEqual(bot['bot_owner'], 'hamlet@zulip.com') self.assertEqual(bot['bot_owner'], 'hamlet@zulip.com')
self.assertEqual(bot['user_id'], get_user_profile_by_email('hambot-bot@zulip.com').id)
def test_add_bot_with_username_in_use(self): def test_add_bot_with_username_in_use(self):
# type: () -> None # type: () -> None

1
zerver/views/users.py
View File

@@ -301,6 +301,7 @@ def get_members_backend(request, user_profile):
"is_active": profile.is_active, "is_active": profile.is_active,
"is_admin": (profile in admins), "is_admin": (profile in admins),
"email": profile.email, "email": profile.email,
"user_id": profile.id,
"avatar_url": avatar_url} "avatar_url": avatar_url}
if profile.is_bot and profile.bot_owner is not None: if profile.is_bot and profile.bot_owner is not None:
member["bot_owner"] = profile.bot_owner.email member["bot_owner"] = profile.bot_owner.email