Sort User List to bring starred users at top.

zulip · Jun 7, 2016 · ddd1c9b · ddd1c9b
1 parent 4f9d2fe
commit ddd1c9b
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 8 deletions.
diff --git a/frontend_tests/node_tests/presence_list_performance.js b/frontend_tests/node_tests/presence_list_performance.js
@@ -52,31 +52,36 @@ activity.presence_info = {
           num_unread: 0,
           type: 'active',
           type_desc: 'is active',
-          mobile: undefined },
+          mobile: undefined,
+          starred: false },
         { name: 'Jill Hill',
           email: 'jill@zulip.com',
           num_unread: 0,
           type: 'active',
           type_desc: 'is active',
-          mobile: undefined },
+          mobile: undefined,
+          starred: false },
         { name: 'Norbert Oswald',
           email: 'norbert@zulip.com',
           num_unread: 0,
           type: 'active',
           type_desc: 'is active',
-          mobile: undefined },
+          mobile: undefined,
+          starred: false },
         { name: 'Alice Smith',
           email: 'alice@zulip.com',
           num_unread: 0,
           type: 'idle',
           type_desc: 'is not active',
-          mobile: undefined },
+          mobile: undefined,
+          starred: false },
         { name: 'Marky Mark',
           email: 'mark@zulip.com',
           num_unread: 0,
           type: 'idle',
           type_desc: 'is not active',
-          mobile: undefined }
+          mobile: undefined,
+          starred: false }
     ]);
 }());
 

diff --git a/static/js/activity.js b/static/js/activity.js
@@ -252,8 +252,21 @@ exports.update_users = function (user_list) {
         };
     }
 
-    var user_info = _.map(users, info_for);
+    function filter_starred_user(user) {
+        if (user.starred === true) {
+            return user;
+        }
+    }
+
+    // User info unsorted
+    var user_info_unsorted = _.map(users, info_for);
+
+    // Filtering out starred and unstarred users out of all users info
+    var starred_users = _.filter(user_info_unsorted, filter_starred_user);
+    var unstarred_users = _.difference(user_info_unsorted, starred_users);
 
+    // Concatenating starred users with unstarred users to get starred users on top
+    var user_info = starred_users.concat(unstarred_users);
     if (user_list !== undefined) {
         // Render right panel partially
         $.each(user_info, function (index, user) {

diff --git a/static/js/people.js b/static/js/people.js
@@ -14,6 +14,9 @@ exports.get_by_email = function get_by_email(email) {
 };
 
 exports.get_star_status = function get_star_status(email) {
+    if (page_params.starred_users === undefined) {
+        return false;
+    }
     return page_params.starred_users.indexOf(email)>=0;
 };
 

diff --git a/static/js/settings.js b/static/js/settings.js
@@ -679,9 +679,9 @@ exports.star_unstar_user = function (email) {
         success: function (result) {
             var user_index = page_params.starred_users.indexOf(result.email);
             if (user_index >= 0) {
-                page_params.starred_users.splice(user_index, 1);    
+                page_params.starred_users.splice(user_index, 1);
             } else {
-                page_params.starred_users.push(result.email);    
+                page_params.starred_users.push(result.email);
             }
             activity.update_users();
         }