Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-09-22 01:50:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Move every Org.findOne() to the ReactiveCache

Browse source
This commit is contained in:
Martin Filser 2023-02-04 00:23:03 +01:00
parent 79ea4d6d1e
commit 2ab34d3b87
4 changed files with 32 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -192,7 +192,7 @@ BlazeComponent.extendComponent({
Template.orgRow.helpers({ Template.orgRow.helpers({
orgData() { orgData() {
return Org.findOne(this.orgId); return ReactiveCache.getOrg(this.orgId);
}, },
}); });
@ -229,7 +229,7 @@ Template.editUserPopup.onCreated(function () {
Template.editOrgPopup.helpers({ Template.editOrgPopup.helpers({
org() { org() {
return Org.findOne(this.orgId); return ReactiveCache.getOrg(this.orgId);
}, },
errorMessage() { errorMessage() {
return Template.instance().errorMessage.get(); return Template.instance().errorMessage.get();
@ -302,7 +302,7 @@ Template.newUserPopup.onCreated(function () {
Template.newOrgPopup.helpers({ Template.newOrgPopup.helpers({
org() { org() {
return Org.findOne(this.orgId); return ReactiveCache.getOrg(this.orgId);
}, },
errorMessage() { errorMessage() {
return Template.instance().errorMessage.get(); return Template.instance().errorMessage.get();
@ -354,7 +354,7 @@ Template.newUserPopup.helpers({
BlazeComponent.extendComponent({ BlazeComponent.extendComponent({
onCreated() {}, onCreated() {},
org() { org() {
return Org.findOne(this.orgId); return ReactiveCache.getOrg(this.orgId);
}, },
events() { events() {
return [ return [
@ -564,7 +564,7 @@ BlazeComponent.extendComponent({
Template.editOrgPopup.events({ Template.editOrgPopup.events({
submit(event, templateInstance) { submit(event, templateInstance) {
event.preventDefault(); event.preventDefault();
const org = Org.findOne(this.orgId); const org = ReactiveCache.getOrg(this.orgId);
const orgDisplayName = templateInstance const orgDisplayName = templateInstance
.find('.js-orgDisplayName') .find('.js-orgDisplayName')

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

@ -1644,7 +1644,7 @@ BlazeComponent.extendComponent({
Template.removeBoardOrgPopup.helpers({ Template.removeBoardOrgPopup.helpers({
org() { org() {
return Org.findOne(this.orgId); return ReactiveCache.getOrg(this.orgId);
}, },
}); });

6
client/components/users/userAvatar.js
View file

@ -89,18 +89,18 @@ BlazeComponent.extendComponent({
Template.boardOrgRow.helpers({ Template.boardOrgRow.helpers({
orgData() { orgData() {
return Org.findOne(this.orgId); return ReactiveCache.getOrg(this.orgId);
}, },
}); });
Template.boardOrgName.helpers({ Template.boardOrgName.helpers({
orgName() { orgName() {
const org = Org.findOne(this.orgId); const org = ReactiveCache.getOrg(this.orgId);
return org && org.orgDisplayName; return org && org.orgDisplayName;
}, },
orgViewPortWidth() { orgViewPortWidth() {
const org = Org.findOne(this.orgId); const org = ReactiveCache.getOrg(this.orgId);
return ((org && org.orgDisplayName.length) || 1) * 12; return ((org && org.orgDisplayName.length) || 1) * 12;
}, },
}); });

23
imports/reactiveCache.js
View file

@ -43,6 +43,10 @@ ReactiveCacheServer = {
const ret = Users.findOne(id); const ret = Users.findOne(id);
return ret; return ret;
}, },
getOrg(id) {
const ret = Org.findOne(id);
return ret;
},
getActivity(id) { getActivity(id) {
const ret = Activities.findOne(id); const ret = Activities.findOne(id);
return ret; return ret;
@ -161,6 +165,16 @@ ReactiveCacheClient = {
const ret = this.__user.get(id); const ret = this.__user.get(id);
return ret; return ret;
}, },
getOrg(id) {
if (!this.__org) {
this.__org = new DataCache(_id => {
const _ret = Org.findOne(_id);
return _ret;
});
}
const ret = this.__org.get(id);
return ret;
},
getActivity(id) { getActivity(id) {
if (!this.__activity) { if (!this.__activity) {
this.__activity = new DataCache(_id => { this.__activity = new DataCache(_id => {
@ -290,6 +304,15 @@ ReactiveCache = {
} }
return ret; return ret;
}, },
getOrg(id) {
let ret;
if (Meteor.isServer) {
ret = ReactiveCacheServer.getOrg(id);
} else {
ret = ReactiveCacheClient.getOrg(id);
}
return ret;
},
getActivity(id) { getActivity(id) {
let ret; let ret;
if (Meteor.isServer) { if (Meteor.isServer) {