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

Move every SessionData.findOne(idOrFirstObjectSelector, options) to the ReactiveCache

Browse source
This commit is contained in:
Martin Filser 2023-02-05 11:14:01 +01:00
parent 08e3ca3435
commit 49071ca5fd
3 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/lib/cardSearch.js
View file

@ -62,8 +62,8 @@ export class CardSearchPagedComponent extends BlazeComponent {
} }
getSessionData(sessionId) { getSessionData(sessionId) {
return SessionData.findOne({ return ReactiveCache.getSessionData({
sessionId: sessionId ? sessionId : SessionData.getSessionId(), sessionId: sessionId || SessionData.getSessionId(),
}); });
} }

18
imports/reactiveCache.js
View file

@ -155,6 +155,14 @@ ReactiveCacheServer = {
const ret = Integrations.find(selector, options).fetch(); const ret = Integrations.find(selector, options).fetch();
return ret; return ret;
}, },
getSessionData(idOrFirstObjectSelector, options) {
const ret = SessionData.findOne(idOrFirstObjectSelector, options);
return ret;
},
getSessionDatas(selector, options) {
const ret = SessionData.find(selector, options).fetch();
return ret;
},
getCurrentSetting() { getCurrentSetting() {
const ret = Settings.findOne(); const ret = Settings.findOne();
return ret; return ret;
@ -996,6 +1004,16 @@ ReactiveCache = {
} }
return ret; return ret;
}, },
getSessionData(idOrFirstObjectSelector, options) {
// no reactive cache, otherwise global search will not work anymore
let ret = ReactiveCacheServer.getSessionData(idOrFirstObjectSelector, options);
return ret;
},
getSessionDatas(selector, options) {
// no reactive cache, otherwise global search will not work anymore
let ret = ReactiveCacheServer.getSessionDatas(selector, options);
return ret;
},
getCurrentSetting() { getCurrentSetting() {
let ret; let ret;
if (Meteor.isServer) { if (Meteor.isServer) {

4
server/publications/cards.js
View file

@ -648,7 +648,7 @@ Meteor.publish('brokenCards', function(sessionId) {
Meteor.publish('nextPage', function(sessionId) { Meteor.publish('nextPage', function(sessionId) {
check(sessionId, String); check(sessionId, String);
const session = SessionData.findOne({ sessionId }); const session = ReactiveCache.getSessionData({ sessionId });
const projection = session.getProjection(); const projection = session.getProjection();
projection.skip = session.lastHit; projection.skip = session.lastHit;
@ -658,7 +658,7 @@ Meteor.publish('nextPage', function(sessionId) {
Meteor.publish('previousPage', function(sessionId) { Meteor.publish('previousPage', function(sessionId) {
check(sessionId, String); check(sessionId, String);
const session = SessionData.findOne({ sessionId }); const session = ReactiveCache.getSessionData({ sessionId });
const projection = session.getProjection(); const projection = session.getProjection();
projection.skip = session.lastHit - session.resultsCount - projection.limit; projection.skip = session.lastHit - session.resultsCount - projection.limit;