github-mirrors/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-04-23 21:47:10 -04:00
Code Issues Projects Releases Packages Wiki Activity

Move every Attachments.findOne() to the ReactiveCache

Browse source
This commit is contained in:
Martin Filser 2023-02-04 00:30:55 +01:00
parent fe2015735a
commit 3fc9c6efe7
5 changed files with 30 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -66,7 +66,7 @@ function getPrevAttachmentId(currentAttachmentId) {
function openAttachmentViewer(attachmentId){
const attachment = Attachments.findOne({_id: attachmentId});
const attachment = ReactiveCache.getAttachment(attachmentId);
$("#attachment-name").text(attachment.name);

23
imports/reactiveCache.js
View file

@ -39,6 +39,10 @@ ReactiveCacheServer = {
const ret = CustomFields.find(selector).fetch();
return ret;
},
getAttachment(id) {
const ret = Attachments.findOne(id);
return ret;
},
getUser(id) {
const ret = Users.findOne(id);
return ret;
@ -159,6 +163,16 @@ ReactiveCacheClient = {
const ret = this.__customFields.get(Jsons.stringify(selector));
return ret;
},
getAttachment(id) {
if (!this.__attachment) {
this.__attachment = new DataCache(_id => {
const _ret = Attachments.findOne(_id);
return _ret;
});
}
const ret = this.__attachment.get(id);
return ret;
},
getUser(id) {
if (!this.__user) {
this.__user = new DataCache(userId => {
@ -309,6 +323,15 @@ ReactiveCache = {
}
return ret;
},
getAttachment(id) {
let ret;
if (Meteor.isServer) {
ret = ReactiveCacheServer.getAttachment(id);
} else {
ret = ReactiveCacheClient.getAttachment(id);
}
return ret;
},
getUser(id) {
let ret;
if (Meteor.isServer) {

2
models/activities.js
View file

@ -44,7 +44,7 @@ Activities.helpers({
return ReactiveCache.getCardComment(this.commentId);
},
attachment() {
return Attachments.findOne(this.attachmentId);
return ReactiveCache.getAttachment(this.attachmentId);
},
checklist() {
return Checklists.findOne(this.checklistId);

8
models/attachments.js
View file

@ -151,20 +151,20 @@ if (Meteor.isServer) {
check(fileObjId, String);
check(storageDestination, String);
const fileObj = Attachments.findOne({_id: fileObjId});
const fileObj = ReactiveCache.getAttachment(fileObjId);
moveToStorage(fileObj, storageDestination, fileStoreStrategyFactory);
},
renameAttachment(fileObjId, newName) {
check(fileObjId, String);
check(newName, String);
const fileObj = Attachments.findOne({_id: fileObjId});
const fileObj = ReactiveCache.getAttachment(fileObjId);
rename(fileObj, newName, fileStoreStrategyFactory);
},
validateAttachment(fileObjId) {
check(fileObjId, String);
const fileObj = Attachments.findOne({_id: fileObjId});
const fileObj = ReactiveCache.getAttachment(fileObjId);
const isValid = Promise.await(isFileValid(fileObj, attachmentUploadMimeTypes, attachmentUploadSize, attachmentUploadExternalProgram));
if (!isValid) {
@ -177,7 +177,7 @@ if (Meteor.isServer) {
Meteor.call('validateAttachment', fileObjId);
const fileObj = Attachments.findOne({_id: fileObjId});
const fileObj = ReactiveCache.getAttachment(fileObjId);
if (fileObj) {
Meteor.defer(() => Meteor.call('moveAttachmentToStorage', fileObjId, storageDestination));

2
models/cards.js
View file

@ -804,7 +804,7 @@ Cards.helpers({
cover() {
if (!this.coverId) return false;
const cover = Attachments.findOne(this.coverId);
const cover = ReactiveCache.getAttachment(this.coverId);
// if we return a cover before it is fully stored, we will get errors when we try to display it
// todo XXX we could return a default "upload pending" image in the meantime?
return cover && cover.link() && cover;