release 0.29.1

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "trilium",
-  "version": "0.28.3",
+  "version": "0.29.0-beta",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -2,7 +2,7 @@
   "name": "trilium",
   "productName": "Trilium Notes",
   "description": "Trilium Notes",
-  "version": "0.29.0-beta",
+  "version": "0.29.1",
   "license": "AGPL-3.0-only",
   "main": "electron.js",
   "bin": {

src/public/javascripts/services/export.js

@@ -23,6 +23,10 @@ $("#import-upload").change(async function() {
     const formData = new FormData();
     formData.append('upload', this.files[0]);
 
+    // this is done to reset the field otherwise triggering import same file again would not work
+    // https://github.com/zadam/trilium/issues/388
+    $("#import-upload").val('');
+
     await $.ajax({
         url: baseApiUrl + 'notes/' + importNoteId + '/import',
         headers: server.getHeaders(),

src/public/javascripts/services/file.js

@@ -10,6 +10,10 @@ $("#file-upload").change(async function() {
     const formData = new FormData();
     formData.append('upload', this.files[0]);
 
+    // this is done to reset the field otherwise triggering import same file again would not work
+    // https://github.com/zadam/trilium/issues/388
+    $("#file-upload").val('');
+
     const resp = await $.ajax({
         url: baseApiUrl + 'notes/' + noteDetailService.getCurrentNoteId() + '/upload',
         headers: server.getHeaders(),

src/services/build.js

@@ -1 +1 @@
-module.exports = { buildDate:"2019-02-03T15:44:19+01:00", buildRevision: "afd5f4823f1f605300f906a61e8822e857b9ee5f" };
+module.exports = { buildDate:"2019-02-12T20:30:07+01:00", buildRevision: "8b250ed523f851afc0923342827679e805329838" };

src/services/consistency_checks.js

@@ -92,38 +92,39 @@ async function findBrokenReferenceIssues() {
     await findIssues(`
           SELECT branchId, branches.noteId
           FROM branches LEFT JOIN notes USING(noteId)
-          WHERE notes.noteId IS NULL`,
+          WHERE branches.isDeleted = 0 AND notes.noteId IS NULL`,
         ({branchId, noteId}) => `Branch ${branchId} references missing note ${noteId}`);
 
     await findIssues(`
           SELECT branchId, branches.noteId AS parentNoteId
           FROM branches LEFT JOIN notes ON notes.noteId = branches.parentNoteId
-          WHERE branches.branchId != 'root' AND notes.noteId IS NULL`,
+          WHERE branches.isDeleted = 0 AND branches.branchId != 'root' AND notes.noteId IS NULL`,
         ({branchId, noteId}) => `Branch ${branchId} references missing parent note ${noteId}`);
 
     await findIssues(`
           SELECT attributeId, attributes.noteId
           FROM attributes LEFT JOIN notes USING(noteId)
-          WHERE notes.noteId IS NULL`,
+          WHERE attributes.isDeleted = 0 AND notes.noteId IS NULL`,
         ({attributeId, noteId}) => `Attribute ${attributeId} references missing source note ${noteId}`);
 
     // empty targetNoteId for relations is a special fixable case so not covered here
     await findIssues(`
-          SELECT attributeId, attributes.noteId
+          SELECT attributeId, attributes.value AS noteId
           FROM attributes LEFT JOIN notes ON notes.noteId = attributes.value
-          WHERE attributes.type = 'relation' AND attributes.value != '' AND notes.noteId IS NULL`,
+          WHERE attributes.isDeleted = 0 AND attributes.type = 'relation' 
+            AND attributes.value != '' AND notes.noteId IS NULL`,
         ({attributeId, noteId}) => `Relation ${attributeId} references missing note ${noteId}`);
 
     await findIssues(`
           SELECT linkId, links.noteId
           FROM links LEFT JOIN notes USING(noteId)
-          WHERE notes.noteId IS NULL`,
+          WHERE links.isDeleted = 0 AND notes.noteId IS NULL`,
         ({linkId, noteId}) => `Link ${linkId} references missing source note ${noteId}`);
 
     await findIssues(`
           SELECT linkId, links.noteId
           FROM links LEFT JOIN notes ON notes.noteId = links.targetNoteId
-          WHERE notes.noteId IS NULL`,
+          WHERE links.isDeleted = 0 AND notes.noteId IS NULL`,
         ({linkId, noteId}) => `Link ${linkId} references missing target note ${noteId}`);
 
     await findIssues(`