release 0.42.7

cleanup sqlite to make the distributed archives smaller
promoted attributes widget is now auto-updating, fixes #700
2025-10-27 08:16:40 +01:00 · 2020-06-08 10:43:12 +02:00 · 2020-06-08 10:42:40 +02:00 · 2020-06-08 00:29:52 +02:00 · 2020-06-07 23:57:10 +02:00 · 2020-06-07 23:55:55 +02:00
51 changed files with 611 additions and 375 deletions
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="SQLite - document.db" uuid="d0fd879f-1e1d-4d5c-9c21-0e5cf9ab2976">
+    <data-source source="LOCAL" name="document.db" uuid="b0b03187-36c8-4ec1-bdab-fd4273cd692e">
      <driver-ref>sqlite.xerial</driver-ref>
      <synchronize>true</synchronize>
      <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
-      <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/../trilium-data/document.db</jdbc-url>
+      <jdbc-url>jdbc:sqlite:$USER_HOME$/trilium-data/document.db</jdbc-url>
    </data-source>
  </component>
 </project>
--- a/bin/copy-trilium.sh
+++ b/bin/copy-trilium.sh
@@ -33,6 +33,9 @@ find $DIR/libraries -name "*.map" -type f -delete

 rm -r $DIR/src/public/app

+rm -r $DIR/node_modules/sqlite3/build
+rm -r $DIR/node_modules/sqlite3/deps
+
 sed -i -e 's/app\/desktop.js/app-dist\/desktop.js/g' $DIR/src/views/desktop.ejs
 sed -i -e 's/app\/mobile.js/app-dist\/mobile.js/g' $DIR/src/views/mobile.ejs
-sed -i -e 's/app\/setup.js/app-dist\/setup.js/g' $DIR/src/views/setup.ejs
+sed -i -e 's/app\/setup.js/app-dist\/setup.js/g' $DIR/src/views/setup.ejs
--- a/libraries/ckeditor/ckeditor.js
+++ b/libraries/ckeditor/ckeditor.js
--- a/libraries/ckeditor/ckeditor.js.map
+++ b/libraries/ckeditor/ckeditor.js.map
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "trilium",
-  "version": "0.42.1",
+  "version": "0.42.6",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -1263,7 +1263,7 @@
      "dependencies": {
        "file-type": {
          "version": "3.9.0",
-          "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
+          "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
          "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek="
        }
      }
@@ -1539,7 +1539,7 @@
        },
        "uuid": {
          "version": "2.0.3",
-          "resolved": "http://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
          "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho="
        }
      }
@@ -1573,7 +1573,7 @@
      "dependencies": {
        "semver": {
          "version": "4.3.6",
-          "resolved": "http://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
          "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto="
        }
      }
@@ -1593,7 +1593,7 @@
    },
    "bl": {
      "version": "1.2.2",
-      "resolved": "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
      "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
      "requires": {
        "readable-stream": "^2.3.5",
@@ -1853,12 +1853,12 @@
      "dependencies": {
        "file-type": {
          "version": "3.9.0",
-          "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
+          "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
          "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek="
        },
        "uuid": {
          "version": "2.0.3",
-          "resolved": "http://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
          "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho="
        }
      }
@@ -1973,7 +1973,7 @@
        },
        "readable-stream": {
          "version": "1.1.14",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
          "requires": {
            "core-util-is": "~1.0.0",
@@ -2148,7 +2148,7 @@
    },
    "chalk": {
      "version": "1.1.3",
-      "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
      "requires": {
        "ansi-styles": "^2.2.1",
@@ -2465,7 +2465,7 @@
    },
    "commander": {
      "version": "2.8.1",
-      "resolved": "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
      "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
      "requires": {
        "graceful-readlink": ">= 1.0.0"
@@ -3128,7 +3128,7 @@
        },
        "readable-stream": {
          "version": "1.1.14",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
          "requires": {
            "core-util-is": "~1.0.0",
@@ -3345,9 +3345,9 @@
      }
    },
    "electron": {
-      "version": "9.0.0-beta.24",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-9.0.0-beta.24.tgz",
-      "integrity": "sha512-25L3XMqm/1CCaV5CgU5ZkhKXw9830WeipJrTW0+VC5XTKp/3xHwhxyQ5G1kQnOTJd7IGwOamvw237D6e1YKnng==",
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-9.0.2.tgz",
+      "integrity": "sha512-+a3KegLvQXVjC3b6yBWwZmtWp3tHf9ut27yORAWHO9JRFtKfNf88fi1UvTPJSW8R0sUH7ZEdzN6A95T22KGtlA==",
      "dev": true,
      "requires": {
        "@electron/get": "^1.0.1",
@@ -4957,7 +4957,7 @@
    },
    "get-stream": {
      "version": "3.0.0",
-      "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
    },
    "getpass": {
@@ -5221,7 +5221,7 @@
    },
    "got": {
      "version": "5.7.1",
-      "resolved": "http://registry.npmjs.org/got/-/got-5.7.1.tgz",
+      "resolved": "https://registry.npmjs.org/got/-/got-5.7.1.tgz",
      "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=",
      "requires": {
        "create-error-class": "^3.0.1",
@@ -5869,7 +5869,7 @@
    },
    "into-stream": {
      "version": "3.1.0",
-      "resolved": "http://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz",
      "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=",
      "requires": {
        "from2": "^2.1.1",
@@ -6021,7 +6021,7 @@
    },
    "is-obj": {
      "version": "1.0.1",
-      "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
    },
    "is-object": {
@@ -6621,7 +6621,7 @@
    },
    "load-json-file": {
      "version": "1.1.0",
-      "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
      "requires": {
        "graceful-fs": "^4.1.2",
@@ -7130,7 +7130,7 @@
    },
    "minimist": {
      "version": "1.2.0",
-      "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
    },
    "minipass": {
@@ -7230,7 +7230,7 @@
    },
    "mkdirp": {
      "version": "0.5.1",
-      "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
      "requires": {
        "minimist": "0.0.8"
@@ -7238,7 +7238,7 @@
      "dependencies": {
        "minimist": {
          "version": "0.0.8",
-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
        }
      }
@@ -7432,7 +7432,7 @@
            },
            "get-stream": {
              "version": "3.0.0",
-              "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
              "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
            },
            "got": {
@@ -7468,7 +7468,7 @@
            },
            "p-cancelable": {
              "version": "0.4.1",
-              "resolved": "http://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz",
+              "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz",
              "integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ=="
            },
            "p-event": {
@@ -7592,7 +7592,7 @@
          "dependencies": {
            "file-type": {
              "version": "3.9.0",
-              "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
+              "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
              "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek="
            }
          }
@@ -7617,7 +7617,7 @@
          "dependencies": {
            "get-stream": {
              "version": "3.0.0",
-              "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
              "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
            },
            "pify": {
@@ -7674,7 +7674,7 @@
        },
        "get-stream": {
          "version": "2.3.1",
-          "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz",
          "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=",
          "requires": {
            "object-assign": "^4.0.1",
@@ -7704,7 +7704,7 @@
          "dependencies": {
            "get-stream": {
              "version": "3.0.0",
-              "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
              "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
            }
          }
@@ -7744,7 +7744,7 @@
        },
        "pify": {
          "version": "2.3.0",
-          "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
        },
        "prepend-http": {
@@ -7849,7 +7849,7 @@
        },
        "readable-stream": {
          "version": "1.1.14",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
          "requires": {
            "core-util-is": "~1.0.0",
@@ -8227,7 +8227,7 @@
    },
    "onetime": {
      "version": "1.1.0",
-      "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
      "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k="
    },
    "open": {
@@ -8379,7 +8379,7 @@
    },
    "p-is-promise": {
      "version": "1.1.0",
-      "resolved": "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
      "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4="
    },
    "p-limit": {
@@ -8860,7 +8860,7 @@
            },
            "get-stream": {
              "version": "3.0.0",
-              "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
              "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
            }
          }
@@ -9144,7 +9144,7 @@
          "dependencies": {
            "file-type": {
              "version": "3.9.0",
-              "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
+              "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
              "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek="
            }
          }
@@ -9169,7 +9169,7 @@
          "dependencies": {
            "get-stream": {
              "version": "3.0.0",
-              "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
              "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
            },
            "pify": {
@@ -9207,7 +9207,7 @@
            },
            "get-stream": {
              "version": "3.0.0",
-              "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
              "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
            }
          }
@@ -9259,7 +9259,7 @@
        },
        "get-stream": {
          "version": "2.3.1",
-          "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz",
          "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=",
          "requires": {
            "object-assign": "^4.0.1",
@@ -9289,7 +9289,7 @@
          "dependencies": {
            "get-stream": {
              "version": "3.0.0",
-              "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
              "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
            }
          }
@@ -9477,7 +9477,7 @@
    },
    "query-string": {
      "version": "5.1.1",
-      "resolved": "http://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
      "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
      "requires": {
        "decode-uri-component": "^0.2.0",
@@ -9616,7 +9616,7 @@
    },
    "readable-stream": {
      "version": "2.3.6",
-      "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
      "requires": {
        "core-util-is": "~1.0.0",
@@ -10484,7 +10484,7 @@
    },
    "strip-ansi": {
      "version": "3.0.1",
-      "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
      "requires": {
        "ansi-regex": "^2.0.0"
@@ -10509,7 +10509,7 @@
    },
    "strip-dirs": {
      "version": "1.1.1",
-      "resolved": "http://registry.npmjs.org/strip-dirs/-/strip-dirs-1.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-1.1.1.tgz",
      "integrity": "sha1-lgu9EoeETzl1pFWKoQOoJV4kVqA=",
      "requires": {
        "chalk": "^1.0.0",
@@ -10767,7 +10767,7 @@
    },
    "through": {
      "version": "2.3.8",
-      "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
    },
    "through2": {
@@ -10786,7 +10786,7 @@
        },
        "readable-stream": {
          "version": "1.0.34",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
          "requires": {
            "core-util-is": "~1.0.0",
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "trilium",
  "productName": "Trilium Notes",
  "description": "Trilium Notes",
-  "version": "0.42.2",
+  "version": "0.42.7",
  "license": "AGPL-3.0-only",
  "main": "electron.js",
  "bin": {
@@ -78,7 +78,7 @@
    "yazl": "^2.5.1"
  },
  "devDependencies": {
-    "electron": "9.0.0-beta.24",
+    "electron": "9.0.2",
    "electron-builder": "22.6.0",
    "electron-packager": "14.2.1",
    "electron-rebuild": "1.10.1",
--- a/src/anonymize.js
+++ b/src/anonymize.js
@@ -1,7 +1,24 @@
-const anonymizationService = require('./services/anonymization');
+const backupService = require('./services/backup');
+const sqlInit = require('./services/sql_init');
+require('./entities/entity_constructor');

-anonymizationService.anonymize().then(filePath => {
-    console.log("Anonymized file has been saved to:", filePath);
+sqlInit.dbReady.then(async () => {
+    try {
+        console.log("Starting anonymization...");

-    process.exit(0);
-});
+        const resp = await backupService.anonymize();
+
+        if (resp.success) {
+            console.log("Anonymized file has been saved to: " + resp.anonymizedFilePath);
+
+            process.exit(0);
+        } else {
+            console.log("Anonymization failed.");
+        }
+    }
+    catch (e) {
+        console.error(e.message, e.stack);
+    }
+
+    process.exit(1);
+});
--- a/src/entities/attribute.js
+++ b/src/entities/attribute.js
@@ -105,7 +105,7 @@ class Attribute extends Entity {

    // cannot be static!
    updatePojo(pojo) {
-        delete pojo.__note;
+        delete pojo.__note; // FIXME: probably note necessary anymore
    }

    createClone(type, name, value) {
--- a/src/entities/note.js
+++ b/src/entities/note.js
@@ -541,12 +541,13 @@ class Note extends Entity {
    /**
     * @return {Promise<Attribute>}
     */
-    async addAttribute(type, name, value = "") {
+    async addAttribute(type, name, value = "", isInheritable = false) {
        const attr = new Attribute({
            noteId: this.noteId,
            type: type,
            name: name,
-            value: value
+            value: value,
+            isInheritable: isInheritable
        });

        await attr.save();
@@ -556,12 +557,12 @@ class Note extends Entity {
        return attr;
    }

-    async addLabel(name, value = "") {
-        return await this.addAttribute(LABEL, name, value);
+    async addLabel(name, value = "", isInheritable = false) {
+        return await this.addAttribute(LABEL, name, value, isInheritable);
    }

-    async addRelation(name, targetNoteId) {
-        return await this.addAttribute(RELATION, name, targetNoteId);
+    async addRelation(name, targetNoteId, isInheritable = false) {
+        return await this.addAttribute(RELATION, name, targetNoteId, isInheritable);
    }

    /**
--- a/src/public/app/dialogs/attributes.js
+++ b/src/public/app/dialogs/attributes.js
@@ -152,10 +152,10 @@ function AttributesModel() {
                attr.value = treeService.getNoteIdFromNotePath(attr.selectedPath);
            }
            else if (attr.type === 'label-definition') {
-                attr.value = attr.labelDefinition;
+                attr.value = JSON.stringify(attr.labelDefinition);
            }
            else if (attr.type === 'relation-definition') {
-                attr.value = attr.relationDefinition;
+                attr.value = JSON.stringify(attr.relationDefinition);
            }

            delete attr.labelValue;
--- a/src/public/app/dialogs/clone_to.js
+++ b/src/public/app/dialogs/clone_to.js
@@ -39,13 +39,14 @@ export async function showDialog(noteIds) {
 }

 async function cloneNotesTo(notePath) {
-    const targetNoteId = treeService.getNoteIdFromNotePath(notePath);
+    const {noteId, parentNoteId} = treeService.getNoteIdAndParentIdFromNotePath(notePath);
+    const targetBranchId = await treeCache.getBranchId(parentNoteId, noteId);

    for (const cloneNoteId of clonedNoteIds) {
-        await branchService.cloneNoteTo(cloneNoteId, targetNoteId, $clonePrefix.val());
+        await branchService.cloneNoteTo(cloneNoteId, targetBranchId, $clonePrefix.val());

        const clonedNote = await treeCache.getNote(cloneNoteId);
-        const targetNote = await treeCache.getNote(targetNoteId);
+        const targetNote = await treeCache.getBranch(targetBranchId).getNote();

        toastService.showMessage(`Note "${clonedNote.title}" has been cloned into ${targetNote.title}`);
    }
@@ -64,4 +65,4 @@ $form.on('submit', () => {
    }

    return false;
-});
+});
--- a/src/public/app/dialogs/move_to.js
+++ b/src/public/app/dialogs/move_to.js
@@ -32,10 +32,11 @@ export async function showDialog(branchIds) {
    noteAutocompleteService.showRecentNotes($noteAutoComplete);
 }

-async function moveNotesTo(parentNoteId) {
-    await branchService.moveToParentNote(movedBranchIds, parentNoteId);
+async function moveNotesTo(parentBranchId) {
+    await branchService.moveToParentNote(movedBranchIds, parentBranchId);

-    const parentNote = await treeCache.getNote(parentNoteId);
+    const parentBranch = treeCache.getBranch(parentBranchId);
+    const parentNote = await parentBranch.getNote();

    toastService.showMessage(`Selected notes have been moved into ${parentNote.title}`);
 }
@@ -46,13 +47,12 @@ $form.on('submit', () => {
    if (notePath) {
        $dialog.modal('hide');

-        const noteId = treeService.getNoteIdFromNotePath(notePath);
-
-        moveNotesTo(noteId);
+        const {noteId, parentNoteId} = treeService.getNoteIdAndParentIdFromNotePath(notePath);
+        treeCache.getBranchId(parentNoteId, noteId).then(branchId => moveNotesTo(branchId));
    }
    else {
        console.error("No path to move to.");
    }

    return false;
-});
+});
--- a/src/public/app/dialogs/options/advanced.js
+++ b/src/public/app/dialogs/options/advanced.js
@@ -17,12 +17,18 @@ const TPL = `

 <button id="find-and-fix-consistency-issues-button" class="btn">Find and fix consistency issues</button><br/><br/>

-<h4>Debugging</h4>
+<h4>Anonymize database</h4>
+
+<p>This action will create a new copy of the database and anonymise it (remove all note content and leave only structure and some non-sensitive metadata)
+    for sharing online for debugging purposes without fear of leaking your personal data.</p>

 <button id="anonymize-button" class="btn">Save anonymized database</button><br/><br/>

-<p>This action will create a new copy of the database and anonymise it (remove all note content and leave only structure and metadata)
-    for sharing online for debugging purposes without fear of leaking your personal data.</p>
+<h4>Backup database</h4>
+
+<p>Trilium has automatic backup (daily, weekly, monthly), but you can also trigger backup manually here.</p>
+
+<button id="backup-database-button" class="btn">Backup database now</button><br/><br/>

 <h4>Vacuum database</h4>

@@ -37,6 +43,7 @@ export default class AdvancedOptions {
        this.$forceFullSyncButton = $("#force-full-sync-button");
        this.$fillSyncRowsButton = $("#fill-sync-rows-button");
        this.$anonymizeButton = $("#anonymize-button");
+        this.$backupDatabaseButton = $("#backup-database-button");
        this.$vacuumDatabaseButton = $("#vacuum-database-button");
        this.$findAndFixConsistencyIssuesButton = $("#find-and-fix-consistency-issues-button");

@@ -53,21 +60,32 @@ export default class AdvancedOptions {
        });

        this.$anonymizeButton.on('click', async () => {
-            await server.post('anonymization/anonymize');
+            const resp = await server.post('database/anonymize');

-            toastService.showMessage("Created anonymized database");
+            if (!resp.success) {
+                toastService.showError("Could not create anonymized database, check backend logs for details");
+            }
+            else {
+                toastService.showMessage(`Created anonymized database in ${resp.anonymizedFilePath}`, 10000);
+            }
+        });
+
+        this.$backupDatabaseButton.on('click', async () => {
+            const {backupFile} = await server.post('database/backup-database');
+
+            toastService.showMessage("Database has been backed up to " + backupFile, 10000);
        });

        this.$vacuumDatabaseButton.on('click', async () => {
-            await server.post('cleanup/vacuum-database');
+            await server.post('database/vacuum-database');

            toastService.showMessage("Database has been vacuumed");
        });

        this.$findAndFixConsistencyIssuesButton.on('click', async () => {
-            await server.post('cleanup/find-and-fix-consistency-issues');
+            await server.post('database/find-and-fix-consistency-issues');

            toastService.showMessage("Consistency issues should be fixed.");
        });
    }
-}
+}
--- a/src/public/app/entities/note_short.js
+++ b/src/public/app/entities/note_short.js
@@ -170,6 +170,16 @@ class NoteShort {
     * @returns {Attribute[]} all note's attributes, including inherited ones
     */
    getAttributes(type, name) {
+        return this.__filterAttrs(this.__getCachedAttributes([]), type, name);
+    }
+
+    __getCachedAttributes(path) {
+        // notes/clones cannot form tree cycles, it is possible to create attribute inheritance cycle via templates
+        // when template instance is a parent of template itself
+        if (path.includes(this.noteId)) {
+            return [];
+        }
+
        if (!(this.noteId in noteAttributeCache)) {
            const ownedAttributes = this.getOwnedAttributes();

@@ -177,11 +187,13 @@ class NoteShort {
                ownedAttributes
            ];

+            const newPath = [...path, this.noteId];
+
            for (const templateAttr of ownedAttributes.filter(oa => oa.type === 'relation' && oa.name === 'template')) {
                const templateNote = this.treeCache.notes[templateAttr.value];

-                if (templateNote) {
-                    attrArrs.push(templateNote.getAttributes());
+                if (templateNote && templateNote.noteId !== this.noteId) {
+                    attrArrs.push(templateNote.__getCachedAttributes(newPath));
                }
            }

@@ -189,7 +201,7 @@ class NoteShort {
                for (const parentNote of this.getParentNotes()) {
                    // these virtual parent-child relationships are also loaded into frontend tree cache
                    if (parentNote.type !== 'search') {
-                        attrArrs.push(parentNote.getInheritableAttributes());
+                        attrArrs.push(parentNote.__getInheritableAttributes(newPath));
                    }
                }
            }
@@ -197,7 +209,7 @@ class NoteShort {
            noteAttributeCache.attributes[this.noteId] = attrArrs.flat();
        }

-        return this.__filterAttrs(noteAttributeCache.attributes[this.noteId], type, name);
+        return noteAttributeCache.attributes[this.noteId];
    }

    __filterAttrs(attributes, type, name) {
@@ -212,8 +224,8 @@ class NoteShort {
        }
    }

-    getInheritableAttributes() {
-        const attrs = this.getAttributes();
+    __getInheritableAttributes(path) {
+        const attrs = this.__getCachedAttributes(path);

        return attrs.filter(attr => attr.isInheritable);
    }
@@ -460,4 +472,4 @@ class NoteShort {
    }
 }

-export default NoteShort;
+export default NoteShort;
--- a/src/public/app/services/app_context.js
+++ b/src/public/app/services/app_context.js
@@ -17,6 +17,7 @@ class AppContext extends Component {
        super();

        this.isMainWindow = isMainWindow;
+        this.executors = [];
    }

    setLayout(layout) {
--- a/src/public/app/services/branches.js
+++ b/src/public/app/services/branches.js
@@ -45,7 +45,7 @@ async function moveAfterBranch(branchIdsToMove, afterBranchId) {
    }
 }

-async function moveToParentNote(branchIdsToMove, newParentNoteId) {
+async function moveToParentNote(branchIdsToMove, newParentBranchId) {
    branchIdsToMove = filterRootNote(branchIdsToMove);

    for (const branchIdToMove of branchIdsToMove) {
@@ -56,7 +56,7 @@ async function moveToParentNote(branchIdsToMove, newParentNoteId) {
            continue;
        }

-        const resp = await server.put(`branches/${branchIdToMove}/move-to/${newParentNoteId}`);
+        const resp = await server.put(`branches/${branchIdToMove}/move-to/${newParentBranchId}`);

        if (!resp.success) {
            alert(resp.message);
@@ -198,8 +198,8 @@ ws.subscribeToMessages(async message => {
    }
 });

-async function cloneNoteTo(childNoteId, parentNoteId, prefix) {
-    const resp = await server.put('notes/' + childNoteId + '/clone-to/' + parentNoteId, {
+async function cloneNoteTo(childNoteId, parentBranchId, prefix) {
+    const resp = await server.put(`notes/${childNoteId}/clone-to/${parentBranchId}`, {
        prefix: prefix
    });

@@ -225,4 +225,4 @@ export default {
    moveNodeUpInHierarchy,
    cloneNoteAfter,
    cloneNoteTo
-};
+};
--- a/src/public/app/services/clipboard.js
+++ b/src/public/app/services/clipboard.js
@@ -33,13 +33,13 @@ async function pasteAfter(afterBranchId) {
    }
 }

-async function pasteInto(parentNoteId) {
+async function pasteInto(parentBranchId) {
    if (isClipboardEmpty()) {
        return;
    }

    if (clipboardMode === 'cut') {
-        await branchService.moveToParentNote(clipboardBranchIds, parentNoteId);
+        await branchService.moveToParentNote(clipboardBranchIds, parentBranchId);

        clipboardBranchIds = [];
        clipboardMode = null;
@@ -50,7 +50,7 @@ async function pasteInto(parentNoteId) {
        for (const clipboardBranch of clipboardBranches) {
            const clipboardNote = await clipboardBranch.getNote();

-            await branchService.cloneNoteTo(clipboardNote.noteId, parentNoteId);
+            await branchService.cloneNoteTo(clipboardNote.noteId, parentBranchId);
        }

        // copy will keep clipboardBranchIds and clipboardMode so it's possible to paste into multiple places
@@ -89,4 +89,4 @@ export default {
    cut,
    copy,
    isClipboardEmpty
-}
+}
--- a/src/public/app/services/load_results.js
+++ b/src/public/app/services/load_results.js
@@ -4,7 +4,7 @@ export default class LoadResults {

        this.noteIdToSourceId = {};
        this.sourceIdToNoteIds = {};
-        
+
        this.branches = [];

        this.attributes = [];
@@ -54,8 +54,9 @@ export default class LoadResults {
        this.attributes.push({attributeId, sourceId});
    }

-    getAttributes() {
+    getAttributes(sourceId = 'none') {
        return this.attributes
+            .filter(row => row.sourceId !== sourceId)
            .map(row => this.treeCache.attributes[row.attributeId])
            .filter(attr => !!attr);
    }
@@ -103,10 +104,10 @@ export default class LoadResults {

    /**
     * @return {boolean} true if there are changes which could affect the attributes (including inherited ones)
+     *          notably changes in note itself should not have any effect on attributes
     */
    hasAttributeRelatedChanges() {
-        return Object.keys(this.noteIdToSourceId).length === 0
-            && this.branches.length === 0
+        return this.branches.length === 0
            && this.attributes.length === 0;
    }

@@ -119,4 +120,4 @@ export default class LoadResults {
            && this.contentNoteIdToSourceId.length === 0
            && this.options.length === 0;
    }
-}
+}
--- a/src/public/app/services/main_tree_executors.js
+++ b/src/public/app/services/main_tree_executors.js
@@ -34,7 +34,7 @@ export default class MainTreeExecutors extends Component {
            return;
        }

-        const {note} = await noteCreateService.createNote(activeNote.noteId, {
+        await noteCreateService.createNote(activeNote.noteId, {
            isProtected: activeNote.isProtected,
            saveSelection: false
        });
@@ -56,4 +56,4 @@ export default class MainTreeExecutors extends Component {
            saveSelection: false
        });
    }
-}
+}
--- a/src/public/app/services/protected_session.js
+++ b/src/public/app/services/protected_session.js
@@ -10,7 +10,7 @@ let protectedSessionDeferred = null;

 async function leaveProtectedSession() {
    if (protectedSessionHolder.isProtectedSessionAvailable()) {
-        utils.reloadApp();
+        protectedSessionHolder.resetProtectedSession();
    }
 }

@@ -113,4 +113,4 @@ export default {
    enterProtectedSession,
    leaveProtectedSession,
    setupProtectedSession
-};
+};
--- a/src/public/app/services/tab_context.js
+++ b/src/public/app/services/tab_context.js
@@ -73,7 +73,7 @@ class TabContext extends Component {
        protectedSessionHolder.touchProtectedSessionIfNecessary(this.note);

        if (triggerSwitchEvent) {
-            this.triggerEvent('tabNoteSwitched', {
+            await this.triggerEvent('tabNoteSwitched', {
                tabContext: this,
                notePath: this.notePath
            });
@@ -127,4 +127,4 @@ class TabContext extends Component {
    }
 }

-export default TabContext;
+export default TabContext;
--- a/src/public/app/services/tab_manager.js
+++ b/src/public/app/services/tab_manager.js
@@ -203,7 +203,7 @@ export default class TabManager extends Component {
        if (activate) {
            this.activateTab(tabContext.tabId, false);

-            this.triggerEvent('tabNoteSwitchedAndActivated', {
+            await this.triggerEvent('tabNoteSwitchedAndActivated', {
                tabContext,
                notePath: tabContext.notePath // resolved note path
            });
@@ -238,7 +238,7 @@ export default class TabManager extends Component {
        }

        this.tabsUpdate.scheduleUpdate();
-        
+
        this.setCurrentNotePathToHash();
    }

@@ -249,6 +249,9 @@ export default class TabManager extends Component {
            return;
        }

+        // close dangling autocompletes after closing the tab
+        $(".aa-input").autocomplete("close");
+
        await this.triggerEvent('beforeTabRemove', {tabId});

        if (this.tabContexts.length <= 1) {
@@ -267,9 +270,6 @@ export default class TabManager extends Component {

        this.children = this.children.filter(tc => tc.tabId !== tabId);

-        // remove dangling autocompletes after closing the tab
-        $(".algolia-autocomplete").remove();
-
        this.triggerEvent('tabRemoved', {tabId});

        this.tabsUpdate.scheduleUpdate();
@@ -346,4 +346,4 @@ export default class TabManager extends Component {
            }
        }
    }
-}
+}
--- a/src/public/app/services/tree.js
+++ b/src/public/app/services/tree.js
@@ -162,6 +162,13 @@ function getNoteIdFromNotePath(notePath) {
 }

 function getNoteIdAndParentIdFromNotePath(notePath) {
+    if (notePath === 'root') {
+        return {
+            noteId: 'root',
+            parentNoteId: 'none'
+        };
+    }
+
    let parentNoteId = 'root';
    let noteId = '';

@@ -286,4 +293,4 @@ export default {
    getNotePathTitle,
    getHashValueFromAddress,
    parseNotePath
-};
+};
--- a/src/public/app/services/ws.js
+++ b/src/public/app/services/ws.js
@@ -39,7 +39,18 @@ let consumeQueuePromise = null;

 // most sync events are sent twice - once immediatelly after finishing the transaction and once during the scheduled ping
 // but we want to process only once
-const receivedSyncIds = new Set();
+const processedSyncIds = new Set();
+
+function logRows(syncRows) {
+    const filteredRows = syncRows.filter(row =>
+        !processedSyncIds.has(row.id)
+        && row.entityName !== 'recent_notes'
+        && (row.entityName !== 'options' || row.entityId !== 'openTabs'));
+
+    if (filteredRows.length > 0) {
+        console.debug(utils.now(), "Sync data: ", filteredRows);
+    }
+}

 async function handleMessage(event) {
    const message = JSON.parse(event.data);
@@ -55,20 +66,9 @@ async function handleMessage(event) {
        $outstandingSyncsCount.html(message.outstandingSyncs);

        if (syncRows.length > 0) {
-            const filteredRows = syncRows.filter(row =>
-                !receivedSyncIds.has(row.id)
-                && row.entityName !== 'recent_notes'
-                && (row.entityName !== 'options' || row.entityId !== 'openTabs'));
+            logRows(syncRows);

-            if (filteredRows.length > 0) {
-                console.debug(utils.now(), "Sync data: ", filteredRows);
-            }
-
-            for (const row of filteredRows) {
-                receivedSyncIds.add(row.id);
-            }
-
-            syncDataQueue.push(...filteredRows);
+            syncDataQueue.push(...syncRows);

            // we set lastAcceptedSyncId even before sync processing and send ping so that backend can start sending more updates
            lastAcceptedSyncId = Math.max(lastAcceptedSyncId, syncRows[syncRows.length - 1].id);
@@ -142,13 +142,21 @@ async function runSafely(syncHandler, syncData) {
    }
 }

+/**
+ * TODO: we should rethink the fact that each sync row is sent twice (once at the end of transaction, once periodically)
+ *       and we keep both lastProcessedSyncId and processedSyncIds
+ *       it even seems incorrect that when transaction sync rows are received, we incorrectly increase lastProcessedSyncId
+ *       and then some syncs might lost (or are *all* sync rows sent from transactions?)
+ */
 async function consumeSyncData() {
    if (syncDataQueue.length > 0) {
-        const allSyncData = syncDataQueue;
+        const allSyncRows = syncDataQueue;
        syncDataQueue = [];

+        const nonProcessedSyncRows = allSyncRows.filter(sync => !processedSyncIds.has(sync.id));
+
        try {
-            await processSyncRows(allSyncData);
+            await processSyncRows(nonProcessedSyncRows);
        }
        catch (e) {
            logError(`Encountered error ${e.message}: ${e.stack}, reloading frontend.`);
@@ -157,7 +165,11 @@ async function consumeSyncData() {
            utils.reloadApp();
        }

-        lastProcessedSyncId = Math.max(lastProcessedSyncId, allSyncData[allSyncData.length - 1].id);
+        for (const syncRow of nonProcessedSyncRows) {
+            processedSyncIds.add(syncRow.id);
+        }
+
+        lastProcessedSyncId = Math.max(lastProcessedSyncId, allSyncRows[allSyncRows.length - 1].id);
    }

    checkSyncIdListeners();
@@ -221,18 +233,18 @@ subscribeToMessages(message => {
 async function processSyncRows(syncRows) {
    const missingNoteIds = [];

-    syncRows.forEach(({entityName, entity}) => {
-       if (entityName === 'branches' && !(entity.parentNoteId in treeCache.notes)) {
+    for (const {entityName, entity} of syncRows) {
+        if (entityName === 'branches' && !(entity.parentNoteId in treeCache.notes)) {
            missingNoteIds.push(entity.parentNoteId);
-       }
-       else if (entityName === 'attributes'
-           && entity.type === 'relation'
-           && entity.name === 'template'
-           && !(entity.noteId in treeCache.notes)) {
+        }
+        else if (entityName === 'attributes'
+              && entity.type === 'relation'
+              && entity.name === 'template'
+              && !(entity.noteId in treeCache.notes)) {

-           missingNoteIds.push(entity.value);
-       }
-    });
+            missingNoteIds.push(entity.value);
+        }
+    }

    if (missingNoteIds.length > 0) {
        await treeCache.reloadNotes(missingNoteIds);
@@ -240,16 +252,16 @@ async function processSyncRows(syncRows) {

    const loadResults = new LoadResults(treeCache);

-    syncRows.filter(sync => sync.entityName === 'notes').forEach(sync => {
+    for (const sync of syncRows.filter(sync => sync.entityName === 'notes')) {
        const note = treeCache.notes[sync.entityId];

        if (note) {
            note.update(sync.entity);
            loadResults.addNote(sync.entityId, sync.sourceId);
        }
-    });
+    }

-    syncRows.filter(sync => sync.entityName === 'branches').forEach(sync => {
+    for (const sync of syncRows.filter(sync => sync.entityName === 'branches')) {
        let branch = treeCache.branches[sync.entityId];
        const childNote = treeCache.notes[sync.entity.noteId];
        const parentNote = treeCache.notes[sync.entity.parentNoteId];
@@ -295,9 +307,9 @@ async function processSyncRows(syncRows) {
                }
            }
        }
-    });
+    }

-    syncRows.filter(sync => sync.entityName === 'note_reordering').forEach(sync => {
+    for (const sync of syncRows.filter(sync => sync.entityName === 'note_reordering')) {
        for (const branchId in sync.positions) {
            const branch = treeCache.branches[branchId];

@@ -307,10 +319,10 @@ async function processSyncRows(syncRows) {
        }

        loadResults.addNoteReordering(sync.entityId, sync.sourceId);
-    });
+    }

    // missing reloading the relation target note
-    syncRows.filter(sync => sync.entityName === 'attributes').forEach(sync => {
+    for (const sync of syncRows.filter(sync => sync.entityName === 'attributes')) {
        let attribute = treeCache.attributes[sync.entityId];
        const sourceNote = treeCache.notes[sync.entity.noteId];
        const targetNote = sync.entity.type === 'relation' && treeCache.notes[sync.entity.value];
@@ -346,27 +358,27 @@ async function processSyncRows(syncRows) {
                }
            }
        }
-    });
+    }

-    syncRows.filter(sync => sync.entityName === 'note_contents').forEach(sync => {
+    for (const sync of syncRows.filter(sync => sync.entityName === 'note_contents')) {
        delete treeCache.noteComplementPromises[sync.entityId];

        loadResults.addNoteContent(sync.entityId, sync.sourceId);
-    });
+    }

-    syncRows.filter(sync => sync.entityName === 'note_revisions').forEach(sync => {
+    for (const sync of syncRows.filter(sync => sync.entityName === 'note_revisions')) {
        loadResults.addNoteRevision(sync.entityId, sync.noteId, sync.sourceId);
-    });
+    }

-    syncRows.filter(sync => sync.entityName === 'options').forEach(sync => {
+    for (const sync of syncRows.filter(sync => sync.entityName === 'options')) {
        if (sync.entity.name === 'openTabs') {
-            return; // only noise
+            continue; // only noise
        }

        options.set(sync.entity.name, sync.entity.value);

        loadResults.addOption(sync.entity.name);
-    });
+    }

    if (!loadResults.isEmpty()) {
        if (loadResults.hasAttributeRelatedChanges()) {
--- a/src/public/app/services/zoom.js
+++ b/src/public/app/services/zoom.js
@@ -9,9 +9,11 @@ class ZoomService extends Component {
    constructor() {
        super();

-        options.initializedPromise.then(() => {
-            this.setZoomFactor(options.getFloat('zoomFactor'));
-        });
+        if (utils.isElectron()) {
+            options.initializedPromise.then(() => {
+                this.setZoomFactor(options.getFloat('zoomFactor'));
+            });
+        }
    }

    setZoomFactor(zoomFactor) {
--- a/src/public/app/widgets/collapsible_widgets/note_info.js
+++ b/src/public/app/widgets/collapsible_widgets/note_info.js
@@ -4,7 +4,6 @@ const TPL = `
 <table class="note-info-widget-table">
    <style>
        .note-info-widget-table {
-            table-layout: fixed; 
            width: 100%;
        } 
   
@@ -22,22 +21,23 @@ const TPL = `

    <tr>
        <th>Note ID:</th>
-        <td colspan="3" class="note-info-note-id"></td>
+        <td class="note-info-note-id"></td>
    </tr>
    <tr>
        <th>Created:</th>
-        <td colspan="3" class="note-info-date-created"></td>
+        <td class="note-info-date-created"></td>
    </tr>
    <tr>
        <th>Modified:</th>
-        <td colspan="3" class="note-info-date-modified"></td>
+        <td class="note-info-date-modified"></td>
    </tr>
    <tr>
        <th>Type:</th>
-        <td class="note-info-type"></td>
-        
-        <th>MIME:</th>
-        <td class="note-info-mime"></td>
+        <td>
+            <span class="note-info-type"></span>
+            
+            <span class="note-info-mime"></span>
+        </td>
    </tr>
 </table>
 `;
@@ -69,9 +69,12 @@ export default class NoteInfoWidget extends CollapsibleWidget {

        this.$type.text(note.type);

-        this.$mime
-            .text(note.mime)
-            .attr("title", note.mime);
+        if (note.mime) {
+            this.$mime.text('(' + note.mime + ')');
+        }
+        else {
+            this.$mime.empty();
+        }
    }

    entitiesReloadedEvent({loadResults}) {
--- a/src/public/app/widgets/component.js
+++ b/src/public/app/widgets/component.js
@@ -82,6 +82,10 @@ export default class Component {
        let release;

        try {
+            if (this.mutex.isLocked()) {
+                console.debug("Mutex locked for", this.constructor.name);
+            }
+
            release = await this.mutex.acquire();

            await fun.call(this, data);
@@ -93,4 +97,4 @@ export default class Component {
            }
        }
    }
-}
+}
--- a/src/public/app/widgets/note_detail.js
+++ b/src/public/app/widgets/note_detail.js
@@ -308,9 +308,10 @@ export default class NoteDetailWidget extends TabAwareWidget {
            return;
        }

-        await noteCreateService.createNote(note.noteId, {
+        // without await as this otherwise causes deadlock through component mutex
+        noteCreateService.createNote(note.noteId, {
            isProtected: note.isProtected,
            saveSelection: true
        });
    }
-}
+}
--- a/src/public/app/widgets/note_tree.js
+++ b/src/public/app/widgets/note_tree.js
@@ -64,6 +64,72 @@ const TPL = `
        width: 320px; 
        border-radius: 10px 0 10px 10px;
    }
+    
+    ul.fancytree-container {
+        outline: none !important;
+        background-color: inherit !important;
+    }
+    
+    .fancytree-custom-icon {
+        font-size: 1.3em;
+    }
+    
+    span.fancytree-title {
+        color: inherit !important;
+        background: inherit !important;
+        outline: none !important;
+    }
+    
+    span.fancytree-node.protected > span.fancytree-custom-icon {
+        filter: drop-shadow(2px 2px 2px var(--main-text-color));
+    }
+    
+    span.fancytree-node.multiple-parents .fancytree-title::after {
+        content: " *"
+    }
+    
+    span.fancytree-node.fancytree-active-clone:not(.fancytree-active) .fancytree-title {
+        font-weight: bold;
+    }
+    
+    /* first nesting level has lower left padding to avoid extra left padding. Other levels are not affected */
+    .ui-fancytree > li > ul {
+        padding-left: 5px;
+    }
+    
+    span.fancytree-active .fancytree-title {
+        font-weight: bold;
+        border-color: var(--main-border-color) !important;
+        border-radius: 5px;
+    }
+    
+    span.fancytree-active:not(.fancytree-focused) .fancytree-title {
+        border-style: dashed !important;
+    }
+    
+    span.fancytree-focused .fancytree-title, span.fancytree-focused.fancytree-selected .fancytree-title {
+        color: var(--active-item-text-color) !important;
+        background-color: var(--active-item-background-color) !important;
+        border-color: var(--main-background-color) !important; /* invisible border */
+        border-radius: 5px;
+    }
+    
+    span.fancytree-selected .fancytree-title {
+        color: var(--hover-item-text-color) !important;
+        background-color: var(--hover-item-background-color) !important;
+        border-color: var(--main-background-color) !important; /* invisible border */
+        border-radius: 5px;
+        font-style: italic;
+    }
+    
+    span.fancytree-node:hover span.fancytree-title {
+        border-color: var(--main-border-color) !important;
+        border-radius: 5px;
+    }
+    
+    span.fancytree-node.archived {
+        opacity: 0.6;
+    }
    </style>
    
    <button class="btn btn-sm icon-button bx bx-cog tree-settings-button" title="Tree settings"></button>
@@ -206,6 +272,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
        const treeData = [await this.prepareRootNode()];

        this.$tree.fancytree({
+            titlesTabbable: true,
            autoScroll: true,
            keyboard: false, // we takover keyboard handling in the hotkeys plugin
            extensions: utils.isMobile() ? ["dnd5", "clones"] : ["hotkeys", "dnd5", "clones"],
@@ -265,6 +332,7 @@ export default class NoteTreeWidget extends TabAwareWidget {

                    const notes = this.getSelectedOrActiveNodes(node).map(node => ({
                        noteId: node.data.noteId,
+                        branchId: node.data.branchId,
                        title: node.title
                    }));

@@ -304,17 +372,28 @@ export default class NoteTreeWidget extends TabAwareWidget {
                        });
                    }
                    else {
+                        const jsonStr = dataTransfer.getData("text");
+                        let notes = null;
+
+                        try {
+                            notes = JSON.parse(jsonStr);
+                        }
+                        catch (e) {
+                            console.error(`Cannot parse ${jsonStr} into notes for drop`);
+                            return;
+                        }
+
                        // This function MUST be defined to enable dropping of items on the tree.
                        // data.hitMode is 'before', 'after', or 'over'.

-                        const selectedBranchIds = this.getSelectedOrActiveNodes().map(node => node.data.branchId);
+                        const selectedBranchIds = notes.map(note => note.branchId);

                        if (data.hitMode === "before") {
                            branchService.moveBeforeBranch(selectedBranchIds, node.data.branchId);
                        } else if (data.hitMode === "after") {
                            branchService.moveAfterBranch(selectedBranchIds, node.data.branchId);
                        } else if (data.hitMode === "over") {
-                            branchService.moveToParentNote(selectedBranchIds, node.data.noteId);
+                            branchService.moveToParentNote(selectedBranchIds, node.data.branchId);
                        } else {
                            throw new Error("Unknown hitMode=" + data.hitMode);
                        }
@@ -571,13 +650,18 @@ export default class NoteTreeWidget extends TabAwareWidget {

    /** @return {FancytreeNode[]} */
    getSelectedOrActiveNodes(node = null) {
-        const notes = this.getSelectedNodes(true);
+        const nodes = this.getSelectedNodes(true);

-        if (notes.length === 0) {
-            notes.push(node ? node : this.getActiveNode());
+        // the node you start dragging should be included even if not selected
+        if (node && !nodes.find(n => n.key === node.key)) {
+            nodes.push(node);
        }

-        return notes;
+        if (nodes.length === 0) {
+            nodes.push(this.getActiveNode());
+        }
+
+        return nodes;
    }

    async setExpandedStatusForSubtree(node, isExpanded) {
@@ -634,17 +718,17 @@ export default class NoteTreeWidget extends TabAwareWidget {
        const activeContext = appContext.tabManager.getActiveTabContext();

        if (activeContext && activeContext.notePath) {
-            this.tree.setFocus();
+            this.tree.setFocus(true);

            const node = await this.expandToNote(activeContext.notePath);

            await node.makeVisible({scrollIntoView: true});
-            node.setFocus();
+            node.setFocus(true);
        }
    }

    /** @return {FancytreeNode} */
-    async getNodeFromPath(notePath, expand = false, expandOpts = {}) {
+    async getNodeFromPath(notePath, expand = false) {
        utils.assertArguments(notePath);

        const hoistedNoteId = hoistedNoteService.getHoistedNoteId();
@@ -673,7 +757,12 @@ export default class NoteTreeWidget extends TabAwareWidget {
                }

                if (expand) {
-                    await parentNode.setExpanded(true, expandOpts);
+                    await parentNode.setExpanded(true);
+
+                    // although previous line should set the expanded status, it seems to happen asynchronously
+                    // so we need to make sure it is set properly before calling updateNode which uses this flag
+                    const branch = treeCache.getBranch(parentNode.data.branchId);
+                    branch.isExpanded = true;
                }

                this.updateNode(parentNode);
@@ -713,8 +802,8 @@ export default class NoteTreeWidget extends TabAwareWidget {
    }

    /** @return {FancytreeNode} */
-    async expandToNote(notePath, expandOpts) {
-        return this.getNodeFromPath(notePath, true, expandOpts);
+    async expandToNote(notePath) {
+        return this.getNodeFromPath(notePath, true);
    }

    updateNode(node) {
@@ -729,6 +818,11 @@ export default class NoteTreeWidget extends TabAwareWidget {
        node.icon = this.getIcon(note, isFolder);
        node.extraClasses = this.getExtraClasses(note);
        node.title = (branch.prefix ? (branch.prefix + " - ") : "") + note.title;
+
+        if (node.isExpanded() !== branch.isExpanded) {
+            node.setExpanded(branch.isExpanded, {noEvents: true});
+        }
+
        node.renderTitle();
    }

@@ -760,8 +854,11 @@ export default class NoteTreeWidget extends TabAwareWidget {
        this.toggleInt(this.isEnabled());

        const oldActiveNode = this.getActiveNode();
+        let oldActiveNodeFocused = false;

        if (oldActiveNode) {
+            oldActiveNodeFocused = oldActiveNode.hasFocus();
+
            oldActiveNode.setActive(false);
            oldActiveNode.setFocus(false);
        }
@@ -774,8 +871,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
                    await this.expandToNote(this.tabContext.notePath);
                }

-                newActiveNode.setActive(true, {noEvents: true});
-
+                newActiveNode.setActive(true, {noEvents: true, noFocus: !oldActiveNodeFocused});
                newActiveNode.makeVisible({scrollIntoView: true});
            }
        }
@@ -804,6 +900,7 @@ export default class NoteTreeWidget extends TabAwareWidget {

    async entitiesReloadedEvent({loadResults}) {
        const activeNode = this.getActiveNode();
+        const activeNodeFocused = activeNode && activeNode.hasFocus();
        const nextNode = activeNode ? (activeNode.getNextSibling() || activeNode.getPrevSibling() || activeNode.getParent()) : null;
        const activeNotePath = activeNode ? treeService.getNotePath(activeNode) : null;
        const nextNotePath = nextNode ? treeService.getNotePath(nextNode) : null;
@@ -926,19 +1023,23 @@ export default class NoteTreeWidget extends TabAwareWidget {
            }

            if (node) {
-                node.setActive(true, {noEvents: true});
+                node.setActive(true, {noEvents: true, noFocus: true});
            }
            else {
                // this is used when original note has been deleted and we want to move the focus to the note above/below
                node = await this.expandToNote(nextNotePath);

                if (node) {
-                    this.tree.setFocus();
-                    node.setFocus(true);
-
                    await appContext.tabManager.getActiveTabContext().setNote(nextNotePath);
                }
            }
+
+            const newActiveNode = this.getActiveNode();
+
+            // return focus if the previously active node was also focused
+            if (newActiveNode && activeNodeFocused) {
+                await newActiveNode.setFocus(true);
+            }
        }
    }

@@ -965,7 +1066,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
        if (activeNotePath) {
            const node = await this.getNodeFromPath(activeNotePath, true);

-            await node.setActive(true, {noEvents: true});
+            await node.setActive(true, {noEvents: true, noFocus: true});
        }
    }

@@ -1062,7 +1163,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
        const toNode = node.getPrevSibling();

        if (toNode !== null) {
-            branchService.moveToParentNote([node.data.branchId], toNode.data.noteId);
+            branchService.moveToParentNote([node.data.branchId], toNode.data.branchId);
        }
    }

@@ -1147,7 +1248,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
    }

    pasteNotesFromClipboardCommand({node}) {
-        clipboard.pasteInto(node.data.noteId);
+        clipboard.pasteInto(node.data.branchId);
    }

    pasteNotesAfterFromClipboard({node}) {
--- a/src/public/app/widgets/promoted_attributes.js
+++ b/src/public/app/widgets/promoted_attributes.js
@@ -229,7 +229,7 @@ export default class PromotedAttributesWidget extends TabAwareWidget {
                .prop("title", "Remove this attribute")
                .on('click', async () => {
                    if (valueAttr.attributeId) {
-                        await server.remove("notes/" + this.noteId + "/attributes/" + valueAttr.attributeId);
+                        await server.remove("notes/" + this.noteId + "/attributes/" + valueAttr.attributeId, this.componentId);
                    }

                    $tr.remove();
@@ -263,8 +263,19 @@ export default class PromotedAttributesWidget extends TabAwareWidget {
            type: $attr.prop("attribute-type"),
            name: $attr.prop("attribute-name"),
            value: value
-        });
+        }, this.componentId);

        $attr.prop("attribute-id", result.attributeId);
    }
+
+    entitiesReloadedEvent({loadResults}) {console.log("loadResults", loadResults);
+        // relation/label definitions are very often inherited by tree or template,
+        // it's difficult to detect inheritance so we will
+        if (loadResults.getAttributes(this.componentId).find(attr =>
+            attr.noteId === this.noteId
+            || ['label-definition', 'relation-definition'].includes(attr.type))) {
+
+            this.refresh();
+        }
+    }
 }
--- a/src/public/app/widgets/type_widgets/editable_text.js
+++ b/src/public/app/widgets/type_widgets/editable_text.js
@@ -23,6 +23,7 @@ const mentionSetup = {
                            row.text = row.name = row.noteTitle;
                            row.id = '@' + row.text;
                            row.link = '#' + row.path;
+                            row.notePath = row.path;
                        }

                        res(rows);
@@ -256,4 +257,4 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
            this.textEditor.model.insertContent(imageElement, this.textEditor.model.document.selection);
        } );
    }
-}
+}
--- a/src/public/app/widgets/type_widgets/file.js
+++ b/src/public/app/widgets/type_widgets/file.js
@@ -5,17 +5,23 @@ import TypeWidget from "./type_widget.js";

 const TPL = `
 <div class="note-detail-file note-detail-printable">
+    <style>
+        .file-table td {
+            overflow-wrap: anywhere;
+        }
+    </style>
+
    <table class="file-table">
        <tr>
-            <th nowrap>Note ID:</th>
+            <th>Note ID:</th>
            <td class="file-note-id"></td>
-            <th nowrap>Original file name:</th>
+            <th>Original file name:</th>
            <td class="file-filename"></td>
        </tr>
        <tr>
-            <th nowrap>File type:</th>
+            <th>File type:</th>
            <td class="file-filetype"></td>
-            <th nowrap>File size:</th>
+            <th>File size:</th>
            <td class="file-filesize"></td>
        </tr>
    </table>
@@ -94,7 +100,7 @@ export default class FileTypeWidget extends TypeWidget {
                toastService.showError("Upload of a new file revision failed.");
            }
        });
-        
+
        return this.$widget;
    }

@@ -130,4 +136,4 @@ export default class FileTypeWidget extends TypeWidget {
    getFileUrl() {
        return utils.getUrlForDownload("api/notes/" + this.noteId + "/download");
    }
-}
+}
--- a/src/public/stylesheets/style.css
+++ b/src/public/stylesheets/style.css
@@ -113,71 +113,6 @@ span.fancytree-node.muted { opacity: 0.6; }
    width: 100% !important;
 }

-ul.fancytree-container {
-    outline: none !important;
-    background-color: inherit !important;
-}
-
-.fancytree-custom-icon {
-    font-size: 1.3em;
-}
-
-span.fancytree-title {
-    color: inherit !important;
-    background: inherit !important;
-}
-
-span.fancytree-node.protected > span.fancytree-custom-icon {
-    filter: drop-shadow(2px 2px 2px var(--main-text-color));
-}
-
-span.fancytree-node.multiple-parents .fancytree-title::after {
-    content: " *"
-}
-
-span.fancytree-node.fancytree-active-clone:not(.fancytree-active) .fancytree-title {
-    font-weight: bold;
-}
-
-/* first nesting level has lower left padding to avoid extra left padding. Other levels are not affected */
-.ui-fancytree > li > ul {
-    padding-left: 5px;
-}
-
-span.fancytree-active .fancytree-title {
-    font-weight: bold;
-    border-color: var(--main-border-color) !important;
-    border-radius: 5px;
-}
-
-span.fancytree-active:not(.fancytree-focused) .fancytree-title {
-    border-style: dashed !important;
-}
-
-span.fancytree-focused .fancytree-title, span.fancytree-focused.fancytree-selected .fancytree-title {
-    color: var(--active-item-text-color) !important;
-    background-color: var(--active-item-background-color) !important;
-    border-color: var(--main-background-color) !important; /* invisible border */
-    border-radius: 5px;
-}
-
-span.fancytree-selected .fancytree-title {
-    color: var(--hover-item-text-color) !important;
-    background-color: var(--hover-item-background-color) !important;
-    border-color: var(--main-background-color) !important; /* invisible border */
-    border-radius: 5px;
-    font-style: italic;
-}
-
-span.fancytree-node:hover span.fancytree-title {
-    border-color: var(--main-border-color) !important;
-    border-radius: 5px;
-}
-
-span.fancytree-node.archived {
-    opacity: 0.6;
-}
-
 .ui-autocomplete {
    max-height: 300px;
    overflow-y: auto;
@@ -873,4 +808,4 @@ body {

 .hidden-int, .hidden-ext {
    display: none !important;
-}
+}
--- a/src/routes/api/anonymization.js
+++ b/src/routes/api/anonymization.js
@@ -1,11 +0,0 @@
-"use strict";
-
-const anonymization = require('../../services/anonymization');
-
-async function anonymize() {
-    await anonymization.anonymize();
-}
-
-module.exports = {
-    anonymize
-};
--- a/src/routes/api/branches.js
+++ b/src/routes/api/branches.js
@@ -14,25 +14,33 @@ const TaskContext = require('../../services/task_context');
 */

 async function moveBranchToParent(req) {
-    const {branchId, parentNoteId} = req.params;
+    const {branchId, parentBranchId} = req.params;

+    const parentBranch = await repository.getBranch(parentBranchId);
    const branchToMove = await repository.getBranch(branchId);

-    if (branchToMove.parentNoteId === parentNoteId) {
+    if (!parentBranch || !branchToMove) {
+        return [400, `One or both branches ${branchId}, ${parentBranchId} have not been found`];
+    }
+
+    if (branchToMove.parentNoteId === parentBranch.noteId) {
        return { success: true }; // no-op
    }

-    const validationResult = await treeService.validateParentChild(parentNoteId, branchToMove.noteId, branchId);
+    const validationResult = await treeService.validateParentChild(parentBranch.noteId, branchToMove.noteId, branchId);

    if (!validationResult.success) {
        return [200, validationResult];
    }

-    const maxNotePos = await sql.getValue('SELECT MAX(notePosition) FROM branches WHERE parentNoteId = ? AND isDeleted = 0', [parentNoteId]);
+    const maxNotePos = await sql.getValue('SELECT MAX(notePosition) FROM branches WHERE parentNoteId = ? AND isDeleted = 0', [parentBranch.noteId]);
    const newNotePos = maxNotePos === null ? 0 : maxNotePos + 10;

-    const newBranch = branchToMove.createClone(parentNoteId, newNotePos);
-    newBranch.isExpanded = true;
+    // expanding so that the new placement of the branch is immediately visible
+    parentBranch.isExpanded = true;
+    await parentBranch.save();
+
+    const newBranch = branchToMove.createClone(parentBranch.noteId, newNotePos);
    await newBranch.save();

    branchToMove.isDeleted = true;
@@ -117,6 +125,7 @@ async function setExpanded(req) {
    if (branchId !== 'root') {
        await sql.execute("UPDATE branches SET isExpanded = ? WHERE branchId = ?", [expanded, branchId]);
        // we don't sync expanded label
+        // also this does not trigger updates to the frontend, this would trigger too many reloads
    }
 }

@@ -178,4 +187,4 @@ module.exports = {
    setExpandedForSubtree,
    deleteBranch,
    setPrefix
-};
+};
--- a/src/routes/api/cloning.js
+++ b/src/routes/api/cloning.js
@@ -3,10 +3,10 @@
 const cloningService = require('../../services/cloning');

 async function cloneNoteToParent(req) {
-    const {noteId, parentNoteId} = req.params;
+    const {noteId, parentBranchId} = req.params;
    const {prefix} = req.body;

-    return await cloningService.cloneNoteToParent(noteId, parentNoteId, prefix);
+    return await cloningService.cloneNoteToParent(noteId, parentBranchId, prefix);
 }

 async function cloneNoteAfter(req) {
@@ -18,4 +18,4 @@ async function cloneNoteAfter(req) {
 module.exports = {
    cloneNoteToParent,
    cloneNoteAfter
-};
+};
--- a/src/routes/api/database.js
+++ b/src/routes/api/database.js
@@ -2,8 +2,19 @@

 const sql = require('../../services/sql');
 const log = require('../../services/log');
+const backupService = require('../../services/backup');
 const consistencyChecksService = require('../../services/consistency_checks');

+async function anonymize() {
+    return await backupService.anonymize();
+}
+
+async function backupDatabase() {
+    return {
+        backupFile: await backupService.backupNow("now")
+    };
+}
+
 async function vacuumDatabase() {
    await sql.execute("VACUUM");

@@ -15,6 +26,8 @@ async function findAndFixConsistencyIssues() {
 }

 module.exports = {
+    backupDatabase,
    vacuumDatabase,
-    findAndFixConsistencyIssues
-};
+    findAndFixConsistencyIssues,
+    anonymize
+};
--- a/src/routes/api/export.js
+++ b/src/routes/api/export.js
@@ -11,6 +11,14 @@ async function exportBranch(req, res) {
    const {branchId, type, format, version, taskId} = req.params;
    const branch = await repository.getBranch(branchId);

+    if (!branch) {
+        const message = `Cannot export branch ${branchId} since it does not exist.`;
+        log.error(message);
+
+        res.status(500).send(message);
+        return;
+    }
+
    const taskContext = new TaskContext(taskId, 'export');

    try {
@@ -39,4 +47,4 @@ async function exportBranch(req, res) {

 module.exports = {
    exportBranch
-};
+};
--- a/src/routes/api/login.js
+++ b/src/routes/api/login.js
@@ -16,7 +16,7 @@ const ApiToken = require('../../entities/api_token');

 async function loginSync(req) {
    if (!await sqlInit.schemaExists()) {
-        return [400, { message: "DB schema does not exist, can't sync." }];
+        return [500, { message: "DB schema does not exist, can't sync." }];
    }

    const timestampStr = req.body.timestamp;
@@ -27,7 +27,7 @@ async function loginSync(req) {

    // login token is valid for 5 minutes
    if (Math.abs(timestamp.getTime() - now.getTime()) > 5 * 60 * 1000) {
-        return [400, { message: 'Auth request time is out of sync, please check that both client and server have correct time.' }];
+        return [401, { message: 'Auth request time is out of sync, please check that both client and server have correct time.' }];
    }

    const syncVersion = req.body.syncVersion;
@@ -102,4 +102,4 @@ module.exports = {
    loginSync,
    loginToProtectedSession,
    token
-};
+};
--- a/src/routes/routes.js
+++ b/src/routes/routes.js
@@ -24,8 +24,7 @@ const exportRoute = require('./api/export');
 const importRoute = require('./api/import');
 const setupApiRoute = require('./api/setup');
 const sqlRoute = require('./api/sql');
-const anonymizationRoute = require('./api/anonymization');
-const cleanupRoute = require('./api/cleanup');
+const databaseRoute = require('./api/database');
 const imageRoute = require('./api/image');
 const attributesRoute = require('./api/attributes');
 const scriptRoute = require('./api/script');
@@ -123,7 +122,7 @@ function register(app) {
    apiRoute(POST, '/api/tree/load', treeApiRoute.load);
    apiRoute(PUT, '/api/branches/:branchId/set-prefix', branchesApiRoute.setPrefix);

-    apiRoute(PUT, '/api/branches/:branchId/move-to/:parentNoteId', branchesApiRoute.moveBranchToParent);
+    apiRoute(PUT, '/api/branches/:branchId/move-to/:parentBranchId', branchesApiRoute.moveBranchToParent);
    apiRoute(PUT, '/api/branches/:branchId/move-before/:beforeBranchId', branchesApiRoute.moveBranchBeforeNote);
    apiRoute(PUT, '/api/branches/:branchId/move-after/:afterBranchId', branchesApiRoute.moveBranchAfterNote);
    apiRoute(PUT, '/api/branches/:branchId/expanded/:expanded', branchesApiRoute.setExpanded);
@@ -152,7 +151,7 @@ function register(app) {

    apiRoute(GET, '/api/edited-notes/:date', noteRevisionsApiRoute.getEditedNotesOnDate);

-    apiRoute(PUT, '/api/notes/:noteId/clone-to/:parentNoteId', cloningApiRoute.cloneNoteToParent);
+    apiRoute(PUT, '/api/notes/:noteId/clone-to/:parentBranchId', cloningApiRoute.cloneNoteToParent);
    apiRoute(PUT, '/api/notes/:noteId/clone-after/:afterBranchId', cloningApiRoute.cloneNoteAfter);

    route(GET, '/api/notes/:branchId/export/:type/:format/:version/:taskId', [auth.checkApiAuthOrElectron], exportRoute.exportBranch);
@@ -220,12 +219,15 @@ function register(app) {

    apiRoute(GET, '/api/sql/schema', sqlRoute.getSchema);
    apiRoute(POST, '/api/sql/execute', sqlRoute.execute);
-    apiRoute(POST, '/api/anonymization/anonymize', anonymizationRoute.anonymize);
+    route(POST, '/api/database/anonymize', [auth.checkApiAuthOrElectron, csrfMiddleware], databaseRoute.anonymize, apiResultHandler, false);
+
+    // backup requires execution outside of transaction
+    route(POST, '/api/database/backup-database', [auth.checkApiAuthOrElectron, csrfMiddleware], databaseRoute.backupDatabase, apiResultHandler, false);

    // VACUUM requires execution outside of transaction
-    route(POST, '/api/cleanup/vacuum-database', [auth.checkApiAuthOrElectron, csrfMiddleware], cleanupRoute.vacuumDatabase, apiResultHandler, false);
+    route(POST, '/api/database/vacuum-database', [auth.checkApiAuthOrElectron, csrfMiddleware], databaseRoute.vacuumDatabase, apiResultHandler, false);

-    route(POST, '/api/cleanup/find-and-fix-consistency-issues', [auth.checkApiAuthOrElectron, csrfMiddleware], cleanupRoute.findAndFixConsistencyIssues, apiResultHandler, false);
+    route(POST, '/api/database/find-and-fix-consistency-issues', [auth.checkApiAuthOrElectron, csrfMiddleware], databaseRoute.findAndFixConsistencyIssues, apiResultHandler, false);

    apiRoute(POST, '/api/script/exec', scriptRoute.exec);
    apiRoute(POST, '/api/script/run/:noteId', scriptRoute.run);
@@ -267,4 +269,4 @@ function register(app) {

 module.exports = {
    register
-};
+};
--- a/src/services/anonymization.js
+++ b/src/services/anonymization.js
@@ -1,38 +0,0 @@
-"use strict";
-
-const dataDir = require('./data_dir');
-const dateUtils = require('./date_utils');
-const fs = require('fs-extra');
-const sqlite = require('sqlite');
-
-async function anonymize() {
-    if (!fs.existsSync(dataDir.ANONYMIZED_DB_DIR)) {
-        fs.mkdirSync(dataDir.ANONYMIZED_DB_DIR, 0o700);
-    }
-
-    const anonymizedFile = dataDir.ANONYMIZED_DB_DIR + "/" + "anonymized-" + dateUtils.getDateTimeForFile() + ".db";
-
-    fs.copySync(dataDir.DOCUMENT_PATH, anonymizedFile);
-
-    const db = await sqlite.open(anonymizedFile, {Promise});
-
-    await db.run("UPDATE notes SET title = 'title'");
-    await db.run("UPDATE note_contents SET content = 'text'");
-    await db.run("UPDATE note_revisions SET title = 'title'");
-    await db.run("UPDATE note_revision_contents SET content = 'title'");
-    await db.run("UPDATE attributes SET name = 'name', value = 'value' WHERE type = 'label'");
-    await db.run("UPDATE attributes SET name = 'name' WHERE type = 'relation'");
-    await db.run("UPDATE branches SET prefix = 'prefix' WHERE prefix IS NOT NULL");
-    await db.run(`UPDATE options SET value = 'anonymized' WHERE name IN 
-                    ('documentSecret', 'encryptedDataKey', 'passwordVerificationHash', 
-                     'passwordVerificationSalt', 'passwordDerivedKeySalt')`);
-    await db.run("VACUUM");
-
-    await db.close();
-
-    return anonymizedFile;
-}
-
-module.exports = {
-    anonymize
-};
--- a/src/services/attributes.js
+++ b/src/services/attributes.js
@@ -115,13 +115,24 @@ function isAttributeType(type) {
 }

 function isAttributeDangerous(type, name) {
-    return BUILTIN_ATTRIBUTES.some(attr => 
-        attr.type === attr.type && 
+    return BUILTIN_ATTRIBUTES.some(attr =>
+        attr.type === attr.type &&
        attr.name.toLowerCase() === name.trim().toLowerCase() &&
        attr.isDangerous
    );
 }

+function getBuiltinAttributeNames() {
+    return BUILTIN_ATTRIBUTES
+        .map(attr => attr.name)
+        .concat([
+            'internalLink',
+            'imageLink',
+            'includeNoteLink',
+            'relationMapLink'
+        ]);
+}
+
 module.exports = {
    getNotesWithLabel,
    getNotesWithLabels,
@@ -131,5 +142,6 @@ module.exports = {
    createAttribute,
    getAttributeNames,
    isAttributeType,
-    isAttributeDangerous
-};
+    isAttributeDangerous,
+    getBuiltinAttributeNames
+};
--- a/src/services/backup.js
+++ b/src/services/backup.js
@@ -7,7 +7,11 @@ const dataDir = require('./data_dir');
 const log = require('./log');
 const sqlInit = require('./sql_init');
 const syncMutexService = require('./sync_mutex');
+const attributeService = require('./attributes');
 const cls = require('./cls');
+const utils = require('./utils');
+const sqlite = require('sqlite');
+const sqlite3 = require('sqlite3');

 async function regularBackup() {
    await periodBackup('lastDailyBackupDate', 'daily', 24 * 3600);
@@ -28,28 +32,110 @@ async function periodBackup(optionName, fileName, periodInSeconds) {
    }
 }

+const COPY_ATTEMPT_COUNT = 50;
+
+async function copyFile(backupFile) {
+    const sql = require('./sql');
+
+    try {
+        fs.unlinkSync(backupFile);
+    } catch (e) {
+    } // unlink throws exception if the file did not exist
+
+    let success = false;
+    let attemptCount = 0
+
+    for (; attemptCount < COPY_ATTEMPT_COUNT && !success; attemptCount++) {
+        try {
+            await sql.executeNoWrap(`VACUUM INTO '${backupFile}'`);
+
+            success = true;
+        } catch (e) {
+            log.info(`Copy DB attempt ${attemptCount + 1} failed with "${e.message}", retrying...`);
+        }
+        // we re-try since VACUUM is very picky and it can't run if there's any other query currently running
+        // which is difficult to guarantee so we just re-try
+    }
+
+    return attemptCount !== COPY_ATTEMPT_COUNT;
+}
+
 async function backupNow(name) {
    // we don't want to backup DB in the middle of sync with potentially inconsistent DB state
-    await syncMutexService.doExclusively(async () => {
+    return await syncMutexService.doExclusively(async () => {
        const backupFile = `${dataDir.BACKUP_DIR}/backup-${name}.db`;

-        fs.copySync(dataDir.DOCUMENT_PATH, backupFile);
+        const success = await copyFile(backupFile);

-        log.info("Created backup at " + backupFile);
+        if (success) {
+            log.info("Created backup at " + backupFile);
+        }
+        else {
+            log.error(`Creating backup ${backupFile} failed`);
+        }
+
+        return backupFile;
    });
 }

+async function anonymize() {
+    if (!fs.existsSync(dataDir.ANONYMIZED_DB_DIR)) {
+        fs.mkdirSync(dataDir.ANONYMIZED_DB_DIR, 0o700);
+    }
+
+    const anonymizedFile = dataDir.ANONYMIZED_DB_DIR + "/" + "anonymized-" + dateUtils.getDateTimeForFile() + ".db";
+
+    const success = await copyFile(anonymizedFile);
+
+    if (!success) {
+        return { success: false };
+    }
+
+    const db = await sqlite.open({
+        filename: anonymizedFile,
+        driver: sqlite3.Database
+    });
+
+    await db.run("UPDATE api_tokens SET token = 'API token value'");
+    await db.run("UPDATE notes SET title = 'title'");
+    await db.run("UPDATE note_contents SET content = 'text' WHERE content IS NOT NULL");
+    await db.run("UPDATE note_revisions SET title = 'title'");
+    await db.run("UPDATE note_revision_contents SET content = 'text' WHERE content IS NOT NULL");
+
+    // we want to delete all non-builtin attributes because they can contain sensitive names and values
+    // on the other hand builtin/system attrs should not contain any sensitive info
+    const builtinAttrs = attributeService.getBuiltinAttributeNames().map(name => "'" + utils.sanitizeSql(name) + "'").join(', ');
+
+    await db.run(`UPDATE attributes SET name = 'name', value = 'value' WHERE type = 'label' AND name NOT IN(${builtinAttrs})`);
+    await db.run(`UPDATE attributes SET name = 'name' WHERE type = 'relation' AND name NOT IN (${builtinAttrs})`);
+    await db.run("UPDATE branches SET prefix = 'prefix' WHERE prefix IS NOT NULL");
+    await db.run(`UPDATE options SET value = 'anonymized' WHERE name IN 
+                    ('documentId', 'documentSecret', 'encryptedDataKey', 
+                     'passwordVerificationHash', 'passwordVerificationSalt', 
+                     'passwordDerivedKeySalt', 'username', 'syncServerHost', 'syncProxy') 
+                      AND value != ''`);
+    await db.run("VACUUM");
+
+    await db.close();
+
+    return {
+        success: true,
+        anonymizedFilePath: anonymizedFile
+    };
+}
+
 if (!fs.existsSync(dataDir.BACKUP_DIR)) {
    fs.mkdirSync(dataDir.BACKUP_DIR, 0o700);
 }

 sqlInit.dbReady.then(() => {
-    setInterval(cls.wrap(regularBackup), 60 * 60 * 1000);
+    setInterval(cls.wrap(regularBackup), 4 * 60 * 60 * 1000);

-    // kickoff backup immediately
-    setTimeout(cls.wrap(regularBackup), 1000);
+    // kickoff first backup soon after start up
+    setTimeout(cls.wrap(regularBackup), 5 * 60 * 1000);
 });

 module.exports = {
-    backupNow
-};
+    backupNow,
+    anonymize
+};
--- a/src/services/build.js
+++ b/src/services/build.js
@@ -1 +1 @@
-module.exports = { buildDate:"2020-05-12T16:46:45+02:00", buildRevision: "4f50864ec8346a12d7845cb4c91a3de3b1043d34" };
+module.exports = { buildDate:"2020-06-08T10:43:12+02:00", buildRevision: "4426362799448b6228eedf20e7fc179ce4b3f860" };
--- a/src/services/cloning.js
+++ b/src/services/cloning.js
@@ -9,12 +9,14 @@ const Branch = require('../entities/branch');
 const TaskContext = require("./task_context.js");
 const utils = require('./utils');

-async function cloneNoteToParent(noteId, parentNoteId, prefix) {
-    if (await isNoteDeleted(noteId) || await isNoteDeleted(parentNoteId)) {
+async function cloneNoteToParent(noteId, parentBranchId, prefix) {
+    const parentBranch = await repository.getBranch(parentBranchId);
+
+    if (await isNoteDeleted(noteId) || await isNoteDeleted(parentBranch.noteId)) {
        return { success: false, message: 'Note is deleted.' };
    }

-    const validationResult = await treeService.validateParentChild(parentNoteId, noteId);
+    const validationResult = await treeService.validateParentChild(parentBranch.noteId, noteId);

    if (!validationResult.success) {
        return validationResult;
@@ -22,12 +24,13 @@ async function cloneNoteToParent(noteId, parentNoteId, prefix) {

    const branch = await new Branch({
        noteId: noteId,
-        parentNoteId: parentNoteId,
+        parentNoteId: parentBranch.noteId,
        prefix: prefix,
        isExpanded: 0
    }).save();

-    await sql.execute("UPDATE branches SET isExpanded = 1 WHERE noteId = ?", [parentNoteId]);
+    parentBranch.isExpanded = true; // the new target should be expanded so it immediately shows up to the user
+    await parentBranch.save();

    return { success: true, branchId: branch.branchId };
 }
@@ -111,4 +114,4 @@ module.exports = {
    ensureNoteIsAbsentFromParent,
    toggleNoteInParent,
    cloneNoteAfter
-};
+};
--- a/src/services/import/tar.js
+++ b/src/services/import/tar.js
@@ -47,7 +47,7 @@ async function importTar(taskContext, fileBuffer, importRootNote) {

        return noteIdMap[origNoteId];
    }
-    
+
    function getMeta(filePath) {
        if (!metaFile) {
            return {};
@@ -425,7 +425,7 @@ async function importTar(taskContext, fileBuffer, importRootNote) {
            }

            for (const noteId in createdNoteIds) { // now the noteIds are unique
-                await noteService.scanForLinks(await repository.getNotes(noteId));
+                await noteService.scanForLinks(await repository.getNote(noteId));

                if (!metaFile) {
                    // if there's no meta file then the notes are created based on the order in that tar file but that
@@ -459,4 +459,4 @@ async function importTar(taskContext, fileBuffer, importRootNote) {

 module.exports = {
    importTar
-};
+};
--- a/src/services/import/zip.js
+++ b/src/services/import/zip.js
@@ -454,7 +454,7 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
    });

    for (const noteId in createdNoteIds) { // now the noteIds are unique
-        await noteService.scanForLinks(await repository.getNotes(noteId));
+        await noteService.scanForLinks(await repository.getNote(noteId));

        if (!metaFile) {
            // if there's no meta file then the notes are created based on the order in that tar file but that
@@ -481,4 +481,4 @@ async function importZip(taskContext, fileBuffer, importRootNote) {

 module.exports = {
    importZip
-};
+};
--- a/src/services/keyboard_actions.js
+++ b/src/services/keyboard_actions.js
@@ -32,7 +32,7 @@ const DEFAULT_KEYBOARD_ACTIONS = [
    {
        actionName: "scrollToActiveNote",
        defaultShortcuts: ["CommandOrControl+."],
-        scope: "window" // FIXME - how do we find what note tree should be updated?
+        scope: "window"
    },
    {
        actionName: "searchNotes",
@@ -55,7 +55,7 @@ const DEFAULT_KEYBOARD_ACTIONS = [
        actionName: "collapseTree",
        defaultShortcuts: ["Alt+C"],
        description: "Collapses the complete note tree",
-        scope: "note-tree"
+        scope: "window"
    },
    {
        actionName: "collapseSubtree",
@@ -425,4 +425,4 @@ async function getKeyboardActions() {
 module.exports = {
    DEFAULT_KEYBOARD_ACTIONS,
    getKeyboardActions
-};
+};
--- a/src/services/notes.js
+++ b/src/services/notes.js
@@ -98,7 +98,7 @@ async function createNewNote(params) {
    const parentNote = await repository.getNote(params.parentNoteId);

    if (!parentNote) {
-        throw new Error(`Parent note ${params.parentNoteId} not found.`);
+        throw new Error(`Parent note "${params.parentNoteId}" not found.`);
    }

    if (!params.title || params.title.trim().length === 0) {
@@ -662,7 +662,9 @@ async function scanForLinks(note) {
        const content = await note.getContent();
        const newContent = await saveLinks(note, content);

-        await note.setContent(newContent);
+        if (content !== newContent) {
+            await note.setContent(newContent);
+        }
    }
    catch (e) {
        log.error(`Could not scan for links note ${note.noteId}: ${e.message} ${e.stack}`);
--- a/src/services/sql.js
+++ b/src/services/sql.js
@@ -153,6 +153,10 @@ async function execute(query, params = []) {
    return await wrap(async db => db.run(query, ...params), query);
 }

+async function executeNoWrap(query, params = []) {
+    await dbConnection.run(query, ...params);
+}
+
 async function executeMany(query, params) {
    // essentially just alias
    await getManyRows(query, params);
@@ -264,6 +268,7 @@ module.exports = {
    getMap,
    getColumn,
    execute,
+    executeNoWrap,
    executeMany,
    executeScript,
    transactional,
--- a/src/services/utils.js
+++ b/src/services/utils.js
@@ -205,6 +205,14 @@ function formatDownloadTitle(filename, type, mime) {
            }
        }

+        if (mime === 'application/octet-stream') {
+            // we didn't find any good guess for this one, it will be better to just return
+            // the current name without fake extension. It's possible that the title still preserves to correct
+            // extension too
+
+            return filename;
+        }
+
        return filename + '.' + extensions[0];
    }
 }
Author	SHA1	Message	Date
zadam	535dcb6d12	release 0.42.7	2020-06-08 10:43:12 +02:00
zadam	4426362799	cleanup sqlite to make the distributed archives smaller	2020-06-08 10:42:40 +02:00
zadam	2c609e8136	promoted attributes widget is now auto-updating, fixes #700	2020-06-08 00:29:52 +02:00
zadam	11b73b79ed	refresh promoted attributes when change detected	2020-06-07 23:57:10 +02:00
zadam	e70c862e72	fix import	2020-06-07 23:55:55 +02:00
zadam	b3e66d5a83	fixed command line anonymization	2020-06-07 10:45:41 +02:00
zadam	e8cd821e57	futrther improvements to anonymization	2020-06-07 10:20:48 +02:00
zadam	be7ac74235	better fallback for resolving filenames of binary attachments	2020-06-05 10:40:35 +02:00
zadam	58fa0832f6	fix focusing title after creating a note	2020-06-04 21:44:34 +02:00
zadam	1502b9ce66	prevent attribute inheritance cycle via template, closes #1077	2020-06-04 12:27:41 +02:00
zadam	7307ca385f	release 0.42.6	2020-06-03 14:30:07 +02:00
zadam	c1fd9825aa	fix backup	2020-06-03 12:16:16 +02:00
zadam	9de7d3fc53	fix unloading protected session after clicking on a button, closes #1078	2020-06-03 11:47:30 +02:00
zadam	3c5db844ba	fix tree focusing issues	2020-06-03 11:06:45 +02:00
zadam	e7330c1104	more anonymization	2020-06-03 09:55:05 +02:00
zadam	ec4586b164	fix reference link implementation, closes #1069	2020-06-02 23:54:33 +02:00
zadam	91e5f24798	fix db anonymization	2020-06-02 23:13:55 +02:00
zadam	38723e0189	release 0.42.5	2020-05-31 23:33:30 +02:00
zadam	8c88ce6f65	fix moving/cloning notes broken in 0.42.4, closes #1066	2020-05-31 22:33:02 +02:00
zadam	4d22959e28	release 0.42.4	2020-05-31 10:33:12 +02:00
zadam	50a28d8c51	the node you start dragging should be included even if not selected	2020-05-31 10:32:35 +02:00
zadam	e25b633ec4	better error logging in backup	2020-05-31 10:24:59 +02:00
zadam	75bd395669	fix extra refresh because of duplicated sync event, closes #1063	2020-05-30 22:35:18 +02:00
zadam	5e353a5612	improved drag & drop	2020-05-30 10:30:21 +02:00
zadam	6b359b7796	return 401 when auth request is out of sync, closes #1056	2020-05-29 22:06:36 +02:00
zadam	13f9d037dc	safer backup to file using VACUUM INTO + possibility to explicitly ask for backup now	2020-05-29 21:55:08 +02:00
zadam	1911d64c1c	fix long filename overflowing, closes #1052	2020-05-29 20:36:48 +02:00
zadam	d4c3f1b3f2	upgrade to ckeditor 19.1.0	2020-05-27 22:08:06 +02:00
zadam	3db84daf94	fix hiding autocompletes after closing tab, closes #1034	2020-05-22 19:30:21 +02:00
zadam	2526715aa4	release 0.42.3	2020-05-20 08:54:55 +02:00
zadam	04c573e212	set default executors	2020-05-20 08:54:37 +02:00
zadam	58f4f5d1e6	fix deadlock after "cut to note", closes #1030	2020-05-19 22:58:08 +02:00
zadam	fa5d982a55	fix exporting root note, closes #1024	2020-05-17 21:07:54 +02:00
zadam	108afe8896	fix incorrect processing of sync rows, closes #1019	2020-05-14 13:08:06 +02:00