From 67c6dd7bee1b64aff332d0b841549f47377fe345 Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Sat, 25 Feb 2023 19:34:30 +0100 Subject: [PATCH] Move every Team.find(idOrFirstObjectSelector, options) to the ReactiveCache (directory client/) --- client/components/settings/peopleBody.js | 13 ++++++++----- client/components/sidebar/sidebar.js | 8 ++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/client/components/settings/peopleBody.js b/client/components/settings/peopleBody.js index e9c7a7fb3..b2c74e291 100644 --- a/client/components/settings/peopleBody.js +++ b/client/components/settings/peopleBody.js @@ -153,11 +153,11 @@ BlazeComponent.extendComponent({ return orgs; }, teamList() { - const teams = Team.find(this.findTeamsOptions.get(), { + const teams = ReactiveCache.getTeams(this.findTeamsOptions.get(), { sort: { teamDisplayName: 1 }, fields: { _id: true }, }); - this.numberTeams.set(teams.count(false)); + this.numberTeams.set(teams.length); return teams; }, peopleList() { @@ -257,7 +257,8 @@ Template.editUserPopup.helpers({ return ret; }, teamsDatas() { - return Team.find({}, {sort: { teamDisplayName: 1 }}); + const ret = ReactiveCache.getTeams({}, {sort: { teamDisplayName: 1 }}); + return ret; }, isSelected(match) { const userId = Template.instance().data.userId; @@ -331,7 +332,8 @@ Template.newUserPopup.helpers({ return ret; }, teamsDatas() { - return Team.find({}, {sort: { teamDisplayName: 1 }}); + const ret = ReactiveCache.getTeams({}, {sort: { teamDisplayName: 1 }}); + return ret; }, isSelected(match) { const userId = Template.instance().data.userId; @@ -421,7 +423,8 @@ BlazeComponent.extendComponent({ BlazeComponent.extendComponent({ onCreated() {}, teamsDatas() { - return Team.find({}, {sort: { teamDisplayName: 1 }}); + const ret = ReactiveCache.getTeams({}, {sort: { teamDisplayName: 1 }}); + return ret; }, events() { return [ diff --git a/client/components/sidebar/sidebar.js b/client/components/sidebar/sidebar.js index 3fffe801e..e8addd84c 100644 --- a/client/components/sidebar/sidebar.js +++ b/client/components/sidebar/sidebar.js @@ -382,11 +382,11 @@ Template.membersWidget.helpers({ }, AtLeastOneTeamWasCreated(){ - let teams = Team.find({}, {sort: { createdAt: -1 }}); + let teams = ReactiveCache.getTeams({}, {sort: { createdAt: -1 }}); if(teams === undefined) return false; - return teams.count() > 0; + return teams.length > 0; }, }); @@ -1753,8 +1753,8 @@ BlazeComponent.extendComponent({ Template.addBoardTeamPopup.helpers({ teamsDatas() { - let teams = Team.find({}, {sort: { teamDisplayName: 1 }}); - return teams; + let ret = ReactiveCache.getTeams({}, {sort: { teamDisplayName: 1 }}); + return ret; }, });