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

Fix sort operator

Browse source 
* Add server publications for next and previous page
* Add ability to sort ascending or descending
This commit is contained in:
John R. Supplee 2021-02-25 18:38:51 +02:00
parent 250e79f53c
commit 43f40c4085
5 changed files with 239 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

49
client/components/main/globalSearch.js
View file

@ -116,7 +116,12 @@ BlazeComponent.extendComponent({
// eslint-disable-next-line no-console
// console.log('selector:', sessionData.getSelector());
// console.log('session data:', sessionData);
const cards = Cards.find({ _id: { $in: sessionData.cards } });
const projection = sessionData.getProjection();
projection.skip = 0;
const cards = Cards.find(
{ _id: { $in: sessionData.cards } },
projection,
);
this.queryErrors = sessionData.errors;
if (this.queryErrors.length) {
this.hasQueryErrors.set(true);
@ -201,6 +206,7 @@ BlazeComponent.extendComponent({
'^(?<quote>["\'])(?<text>.*?)\\k<quote>(\\s+|$)',
'u',
);
const reNegatedOperator = new RegExp('^-(?<operator>.*)$');
const operators = {
'operator-board': 'boards',
@ -223,6 +229,7 @@ BlazeComponent.extendComponent({
'operator-modified': 'modifiedAt',
'operator-comment': 'comments',
'operator-has': 'has',
'operator-sort': 'sort',
};
const predicates = {
@ -346,13 +353,22 @@ BlazeComponent.extendComponent({
}
}
} else if (operatorMap[op] === 'sort') {
let negated = false;
const m = value.match(reNegatedOperator);
if (m) {
value = m.groups.operator;
negated = true;
}
if (!predicateTranslations.sorts[value]) {
this.parsingErrors.push({
tag: 'operator-sort-invalid',
value,
});
} else {
value = predicateTranslations.sorts[value];
value = {
name: predicateTranslations.sorts[value],
order: negated ? 'des' : 'asc',
};
}
} else if (operatorMap[op] === 'status') {
if (!predicateTranslations.status[value]) {
@ -437,20 +453,10 @@ BlazeComponent.extendComponent({
},
nextPage() {
sessionData = this.getSessionData();
const params = {
limit: this.resultsPerPage,
selector: sessionData.getSelector(),
skip: sessionData.lastHit,
};
const sessionData = this.getSessionData();
this.autorun(() => {
const handle = Meteor.subscribe(
'globalSearch',
SessionData.getSessionId(),
params,
);
const handle = Meteor.subscribe('nextPage', sessionData.sessionId);
Tracker.nonreactive(() => {
Tracker.autorun(() => {
if (handle.ready()) {
@ -464,21 +470,10 @@ BlazeComponent.extendComponent({
},
previousPage() {
sessionData = this.getSessionData();
const params = {
limit: this.resultsPerPage,
selector: sessionData.getSelector(),
skip:
sessionData.lastHit - sessionData.resultsCount - this.resultsPerPage,
};
const sessionData = this.getSessionData();
this.autorun(() => {
const handle = Meteor.subscribe(
'globalSearch',
SessionData.getSessionId(),
params,
);
const handle = Meteor.subscribe('previousPage', sessionData.sessionId);
Tracker.nonreactive(() => {
Tracker.autorun(() => {
if (handle.ready()) {