Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-29 17:26:38 +01:00
Code Issues Packages Projects Releases Activity

branches in tree cache should always be loaded if some branchId reference exists

Browse Source
This commit is contained in:
zadam
2019-10-26 09:58:00 +02:00
parent ed9ecf2a57
commit d3c957768f
10 changed files with 25 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/public/javascripts/services/tree_cache.js
View File

@@ -1,4 +1,3 @@
import utils from "./utils.js";
import Branch from "../entities/branch.js";
import NoteShort from "../entities/note_short.js";
import ws from "./ws.js";
@@ -151,28 +150,19 @@ class TreeCache {
this.branches[branch.branchId] = branch;
}
async getBranches(branchIds) {
const missingBranchIds = branchIds.filter(branchId => this.branches[branchId] === undefined);
if (missingBranchIds.length > 0) {
const resp = await server.post('tree/load', { branchIds: branchIds });
this.addResp(resp.notes, resp.branches);
}
return branchIds.map(branchId => {
if (!this.branches[branchId]) {
throw new Error(`Can't find branch ${branchId}`);
}
else {
return this.branches[branchId];
}
});
getBranches(branchIds) {
return branchIds
.map(branchId => this.getBranch(branchId))
.filter(b => b !== null);
}
/** @return Branch */
async getBranch(branchId) {
return (await this.getBranches([branchId]))[0];
/** @return {Branch} */
getBranch(branchId) {
if (!(branchId in this.branches)) {
console.error(`Not existing branch ${branchId}`);
}
return this.branches[branchId];
}
}