From 1c2782a5228a8506e89b23bb7e1d1cb67a5d413b Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Mon, 18 May 2020 20:10:33 +0300
Subject: [PATCH] Fix sorting users if there are users without nicknames or IDs

---
 src/store/modules/users.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/store/modules/users.js b/src/store/modules/users.js
index 2a1540e3..0b6061cb 100644
--- a/src/store/modules/users.js
+++ b/src/store/modules/users.js
@@ -51,9 +51,11 @@ const users = {
         return
       }
 
-      state.fetchedUsers = [...usersWithoutSwapped, ...users].sort((a, b) =>
-        a.nickname.localeCompare(b.nickname)
-      )
+      const updatedUsers = [...usersWithoutSwapped, ...users]
+      state.fetchedUsers = updatedUsers
+        .filter(user => user.nickname && user.id)
+        .sort((a, b) => a.nickname.localeCompare(b.nickname))
+        .concat(updatedUsers.filter(user => !user.nickname || !user.id))
     },
     SET_COUNT: (state, count) => {
       state.totalUsersCount = count
-- 
GitLab