small improvements and fixes

package-lock.json

@@ -3065,9 +3065,9 @@
       }
     },
     "electron": {
-      "version": "10.0.0-beta.17",
+      "version": "10.0.0-beta.19",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-10.0.0-beta.17.tgz",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-10.0.0-beta.19.tgz",
-      "integrity": "sha512-ImDabQ8RwFq4b15qoZndukJLbel+Kg0vsBqXZ9S41NkoDPRbmHTK/MpIsB8KYApqCceqyOZYANoDYrkbB7QO2g==",
+      "integrity": "sha512-UHpCyGfb+tkiJutNLNhH0qm2hELw8zY1g3+kpdH0OFPyMfzvJHQk6+mCz9VzWZNqGGnEpXryY5zQ0Ou/eoMH4A==",
       "dev": true,
       "requires": {
         "@electron/get": "^1.0.1",

package.json

@@ -76,7 +76,7 @@
   },
   "devDependencies": {
     "cross-env": "7.0.2",
-    "electron": "10.0.0-beta.17",
+    "electron": "10.0.0-beta.19",
     "electron-builder": "22.8.0",
     "electron-packager": "15.0.0",
     "electron-rebuild": "1.11.0",

src/routes/api/recent_changes.js

@@ -3,7 +3,7 @@
 const sql = require('../../services/sql');
 const protectedSessionService = require('../../services/protected_session');
 const noteService = require('../../services/notes');
-const noteCacheService = require('../../services/note_cache/note_cache.js');
+const noteCacheService = require('../../services/note_cache/note_cache_service');
 
 function getRecentChanges(req) {
     const {ancestorNoteId} = req.params;

src/routes/api/search.js

@@ -1,10 +1,10 @@
 "use strict";
 
 const repository = require('../../services/repository');
-const noteCacheService = require('../../services/note_cache/note_cache.js');
+const noteCacheService = require('../../services/note_cache/note_cache_service');
 const log = require('../../services/log');
 const scriptService = require('../../services/script');
-const searchService = require('../../services/search/services/search.js');
+const searchService = require('../../services/search/services/search');
 
 function searchNotes(req) {
     const {count, results} = searchService.searchTrimmedNotes(req.params.searchString);

src/services/note_cache/entities/note.js

@@ -170,11 +170,11 @@ class Note {
                 }
             }
 
-            this.flatTextCache += this.title;
+            this.flatTextCache += this.title + ' ';
 
             for (const attr of this.attributes) {
                 // it's best to use space as separator since spaces are filtered from the search string by the tokenization into words
-                this.flatTextCache += (attr.type === 'label' ? '#' : '@') + attr.name;
+                this.flatTextCache += ' ' + (attr.type === 'label' ? '#' : '@') + attr.name;
 
                 if (attr.value) {
                     this.flatTextCache += '=' + attr.value;
@@ -182,6 +182,8 @@ class Note {
             }
 
             this.flatTextCache = this.flatTextCache.toLowerCase();
+
+            console.log(this.flatTextCache);
         }
 
         return this.flatTextCache;

src/services/search.js

@@ -18,7 +18,7 @@ const sql = require('./sql');
 const log = require('./log');
 const parseFilters = require('./search/parse_filters.js');
 const buildSearchQuery = require('./build_search_query');
-const noteCacheService = require('./note_cache/note_cache.js');
+const noteCacheService = require('./note_cache/note_cache_service');
 
 function searchForNotes(searchString) {
     const noteIds = searchForNoteIds(searchString);

src/services/search/expressions/note_cache_flat_text.js

@@ -4,7 +4,7 @@ const Expression = require('./expression');
 const NoteSet = require('../note_set');
 const noteCache = require('../../note_cache/note_cache');
 
-class NoteCacheFulltextExp extends Expression {
+class NoteCacheFlatTextExp extends Expression {
     constructor(tokens) {
         super();
 
@@ -70,7 +70,7 @@ class NoteCacheFulltextExp extends Expression {
 
         for (const note of candidateNotes) {
             // autocomplete should be able to find notes by their noteIds as well (only leafs)
-            if (this.tokens.length === 1 && note.noteId === this.tokens[0]) {
+            if (this.tokens.length === 1 && note.noteId.toLowerCase() === this.tokens[0]) {
                 searchDownThePath(note, [], []);
                 continue;
             }
@@ -134,4 +134,4 @@ class NoteCacheFulltextExp extends Expression {
     }
 }
 
-module.exports = NoteCacheFulltextExp;
+module.exports = NoteCacheFlatTextExp;

src/services/search/services/parse.js

@@ -10,7 +10,7 @@ const RelationWhereExp = require('../expressions/relation_where.js');
 const PropertyComparisonExp = require('../expressions/property_comparison.js');
 const AttributeExistsExp = require('../expressions/attribute_exists.js');
 const LabelComparisonExp = require('../expressions/label_comparison.js');
-const NoteCacheFulltextExp = require('../expressions/note_cache_fulltext.js');
+const NoteCacheFulltextExp = require('../expressions/note_cache_flat_text.js');
 const NoteContentProtectedFulltextExp = require('../expressions/note_content_protected_fulltext.js');
 const NoteContentUnprotectedFulltextExp = require('../expressions/note_content_unprotected_fulltext.js');
 const OrderByAndLimitExp = require('../expressions/order_by_and_limit.js');