fix(userManager): player bucket no longer clears when adding a new pl…

…ayer closes #61
seiyria · Oct 15, 2015 · e43b7eb · e43b7eb
1 parent db7f09f
commit e43b7eb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/src/js/controllers/managers/userManageCtrl.js b/src/js/controllers/managers/userManageCtrl.js
@@ -110,8 +110,9 @@ site.controller('userManageController', ($scope, $firebaseArray, $firebaseObject
     });
   };
 
-  CurrentUsers.watch.then(null, null, (list) => {
-    $scope.setCurrentPlayerSet(list);
+  CurrentUsers.watch.then(null, null, (data) => {
+    if(!data.isNewSet) return;
+    $scope.setCurrentPlayerSet(data.users);
   });
 
   $scope.hasMultipleSets = () => $scope.listKeys.length > 1;

diff --git a/src/js/controllers/tournaments/inProgressCtrl.js b/src/js/controllers/tournaments/inProgressCtrl.js
@@ -18,7 +18,8 @@ site.controller('inProgressController', ($scope, $timeout, EnsureLoggedIn, Sideb
   $scope.hasAccess = defaultHasAccess();
 
   if(authData) {
-    CurrentUsers.watch.then(null, null, data => {
+    CurrentUsers.watch.then(null, null, currentUsersInfo => {
+      const data = currentUsersInfo.users;
       if(!data.shareIDs) return;
       $scope.hasAccess = defaultHasAccess() || data && data.shareIDs[authData.uid];
     });

diff --git a/src/js/services/currents/currentUsers.js b/src/js/services/currents/currentUsers.js
@@ -5,10 +5,14 @@ site.service('CurrentUsers', ($q, $firebaseObject, FirebaseURL, Auth, UserStatus
   let users = UserStatus.firebase ? $firebaseObject(new Firebase(`${FirebaseURL}/users/${UserStatus.firebase.playerSetUid}/players/${UserStatus.firebase.playerSet}`)) : {};
   const defer = $q.defer();
 
+  let oldSetId = '';
+
   const newUsers = () => {
+    const isNewSet = oldSetId !== UserStatus.firebase.playerSet;
+    oldSetId = UserStatus.firebase.playerSet;
     users = $firebaseObject(new Firebase(`${FirebaseURL}/users/${UserStatus.firebase.playerSetUid}/players/${UserStatus.firebase.playerSet}`));
     users.$loaded(() => {
-      defer.notify(users);
+      defer.notify({ users, isNewSet });
     });
   };
 

diff --git a/src/js/services/managers/userManagement.js b/src/js/services/managers/userManagement.js
@@ -48,7 +48,7 @@ site.service('UserManagement', (FirebaseURL, $mdDialog, Toaster, FilterUtils) =>
   const filterUsers = (users, datatable) => {
     return FilterUtils.filterTable(users, datatable, user => [
       [user.name.toLowerCase()],
-      [user.location.toLowerCase()],
+      [user.location ? user.location.toLowerCase() : ''],
       FilterUtils.getFilterArr(user, 'aliases'),
       FilterUtils.getFilterArr(user, 'games'),
       FilterUtils.getFilterArr(user, 'characters')