gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

handle undefined in the search ordering

Browse Source
This commit is contained in:
zadam 2021-04-26 21:04:22 +02:00
parent 6f49f870ed
commit 3b1fb8024f
4 changed files with 10359 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10386
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -80,7 +80,7 @@
}, },
"devDependencies": { "devDependencies": {
"cross-env": "7.0.3", "cross-env": "7.0.3",
"electron": "13.0.0-beta.17", "electron": "13.0.0-beta.18",
"electron-builder": "22.10.5", "electron-builder": "22.10.5",
"electron-packager": "15.2.0", "electron-packager": "15.2.0",
"electron-rebuild": "2.3.5", "electron-rebuild": "2.3.5",

8
src/services/search/expressions/order_by_and_limit.js
View File

@ -28,6 +28,14 @@ class OrderByAndLimitExp extends Expression {
let valA = valueExtractor.extract(a); let valA = valueExtractor.extract(a);
let valB = valueExtractor.extract(b); let valB = valueExtractor.extract(b);
if (valA === undefined) {
valA = null;
}
if (valB === undefined) {
valB = null;
}
if (valA === null && valB === null) { if (valA === null && valB === null) {
// neither has attribute at all // neither has attribute at all
continue; continue;

2
src/services/search/services/parse.js
View File

@ -361,7 +361,7 @@ function getExpression(tokens, searchContext, level = 0) {
continue; continue;
} }
exp.subExpression = getAggregateExpression();console.log(exp); exp.subExpression = getAggregateExpression();
return exp; return exp;
} }
else if (token === 'not') { else if (token === 'not') {