浏览代码

Move every Users.find(idOrFirstObjectSelector, options) to the ReactiveCache (directory client/)

Martin Filser 2 年之前
父节点
当前提交
81c9bb6899

+ 4 - 3
client/components/activities/activities.js

@@ -329,9 +329,10 @@ Template.commentReactions.helpers({
     return Meteor.userId() && userIds.includes(Meteor.userId());
     return Meteor.userId() && userIds.includes(Meteor.userId());
   },
   },
   userNames(userIds) {
   userNames(userIds) {
-    return Users.find({_id: {$in: userIds}})
-                .map(user => user.profile.fullname)
-                .join(', ');
+    const ret = ReactiveCache.getUsers({_id: {$in: userIds}})
+      .map(user => user.profile.fullname)
+      .join(', ');
+    return ret;
   }
   }
 })
 })
 
 

+ 1 - 1
client/components/cards/cardDetails.js

@@ -1605,7 +1605,7 @@ Template.cardAssigneesPopup.onCreated(function () {
   //   "teams.teamId": { $in: currBoard.teams.map(t => t.teamId) },
   //   "teams.teamId": { $in: currBoard.teams.map(t => t.teamId) },
   // };
   // };
 
 
-  // let boardTeamUsers = Users.find(query, {
+  // let boardTeamUsers = ReactiveCache.getUsers(query, {
   //   sort: { sort: 1 },
   //   sort: { sort: 1 },
   // });
   // });
 
 

+ 4 - 4
client/components/settings/peopleBody.js

@@ -161,11 +161,11 @@ BlazeComponent.extendComponent({
     return teams;
     return teams;
   },
   },
   peopleList() {
   peopleList() {
-    const users = Users.find(this.findUsersOptions.get(), {
+    const users = ReactiveCache.getUsers(this.findUsersOptions.get(), {
       sort: { username: 1 },
       sort: { username: 1 },
       fields: { _id: true },
       fields: { _id: true },
     });
     });
-    this.numberPeople.set(users.count(false));
+    this.numberPeople.set(users.length);
     return users;
     return users;
   },
   },
   orgNumber() {
   orgNumber() {
@@ -1073,7 +1073,7 @@ Template.newUserPopup.events({
 Template.settingsOrgPopup.events({
 Template.settingsOrgPopup.events({
   'click #deleteButton'(event) {
   'click #deleteButton'(event) {
     event.preventDefault();
     event.preventDefault();
-    if(Users.find({"orgs.orgId": this.orgId}).count() > 0)
+    if (ReactiveCache.getUsers({"orgs.orgId": this.orgId}).length > 0)
     {
     {
       let orgClassList = document.getElementById("deleteOrgWarningMessage").classList;
       let orgClassList = document.getElementById("deleteOrgWarningMessage").classList;
       if(orgClassList.contains('hide'))
       if(orgClassList.contains('hide'))
@@ -1091,7 +1091,7 @@ Template.settingsOrgPopup.events({
 Template.settingsTeamPopup.events({
 Template.settingsTeamPopup.events({
   'click #deleteButton'(event) {
   'click #deleteButton'(event) {
     event.preventDefault();
     event.preventDefault();
-    if(Users.find({"teams.teamId": this.teamId}).count() > 0)
+    if (ReactiveCache.getUsers({"teams.teamId": this.teamId}).length > 0)
     {
     {
       let teamClassList = document.getElementById("deleteTeamWarningMessage").classList;
       let teamClassList = document.getElementById("deleteTeamWarningMessage").classList;
       if(teamClassList.contains('hide'))
       if(teamClassList.contains('hide'))

+ 4 - 4
client/components/sidebar/sidebar.js

@@ -1718,13 +1718,13 @@ BlazeComponent.extendComponent({
                 "teams.teamId": { $in: boardTeams.map(t => t.teamId) },
                 "teams.teamId": { $in: boardTeams.map(t => t.teamId) },
               };
               };
 
 
-              const boardTeamUsers = Users.find(query, {
+              const boardTeamUsers = ReactiveCache.getUsers(query, {
                 sort: { sort: 1 },
                 sort: { sort: 1 },
               });
               });
 
 
               if(boardTeams !== undefined && boardTeams.length > 0){
               if(boardTeams !== undefined && boardTeams.length > 0){
                 let index;
                 let index;
-                if(boardTeamUsers && boardTeamUsers.count() > 0){
+                if (boardTeamUsers && boardTeamUsers.length > 0) {
                   boardTeamUsers.forEach((u) => {
                   boardTeamUsers.forEach((u) => {
                     index = members.findIndex(function(m){ return m.userId == u._id});
                     index = members.findIndex(function(m){ return m.userId == u._id});
                     if(index == -1){
                     if(index == -1){
@@ -1817,13 +1817,13 @@ BlazeComponent.extendComponent({
             "teams.teamId": stringTeamId
             "teams.teamId": stringTeamId
           };
           };
 
 
-          const boardTeamUsers = Users.find(query, {
+          const boardTeamUsers = ReactiveCache.getUsers(query, {
             sort: { sort: 1 },
             sort: { sort: 1 },
           });
           });
 
 
           if(currentBoard.teams !== undefined && currentBoard.teams.length > 0){
           if(currentBoard.teams !== undefined && currentBoard.teams.length > 0){
             let index;
             let index;
-            if(boardTeamUsers && boardTeamUsers.count() > 0){
+            if (boardTeamUsers && boardTeamUsers.length > 0) {
               boardTeamUsers.forEach((u) => {
               boardTeamUsers.forEach((u) => {
                 index = members.findIndex(function(m){ return m.userId == u._id});
                 index = members.findIndex(function(m){ return m.userId == u._id});
                 if(index !== -1 && (u.isAdmin === undefined || u.isAdmin == false)){
                 if(index !== -1 && (u.isAdmin === undefined || u.isAdmin == false)){