Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-19 17:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Martin Filser 2023-02-22 22:52:49 +01:00
parent 4d192a0165
commit 81c9bb6899
4 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/components/activities/activities.js
View file

@ -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}}) const ret = ReactiveCache.getUsers({_id: {$in: userIds}})
.map(user => user.profile.fullname) .map(user => user.profile.fullname)
.join(', '); .join(', ');
return ret;
} }
}) })

2
client/components/cards/cardDetails.js
View file

@ -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 },
// }); // });

8
client/components/settings/peopleBody.js
View file

@ -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'))

8
client/components/sidebar/sidebar.js
View file

@ -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)){