zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-06 03:53:59 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/stable'

Browse source
This commit is contained in:
zadam 2022-02-10 23:40:18 +01:00
commit 67cce5f817
14 changed files with 127 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

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

4
src/becca/entities/etapi_token.js
View file

@ -42,7 +42,9 @@ class EtapiToken extends AbstractEntity {
/** @type {boolean} */
this.isDeleted = !!row.isDeleted;
this.becca.etapiTokens[this.etapiTokenId] = this;
if (this.etapiTokenId) {
this.becca.etapiTokens[this.etapiTokenId] = this;
}
}
init() {

30
src/public/app/dialogs/options/etapi.js
View file

@ -48,46 +48,46 @@ const TPL = `
export default class EtapiOptions {
constructor() {
$("#options-etapi").html(TPL);
$("#create-etapi-token").on("click", async () => {
const promptDialog = await import('../../dialogs/prompt.js');
const tokenName = await promptDialog.ask({
title: "New ETAPI token",
message: "Please enter new token's name",
defaultValue: "new token"
message: "Please enter new token's name",
defaultValue: "new token"
});
if (!tokenName.trim()) {
alert("Token name can't be empty");
return;
}
const {token} = await server.post('etapi-tokens', {tokenName});
await promptDialog.ask({
const {authToken} = await server.post('etapi-tokens', {tokenName});
await promptDialog.ask({
title: "ETAPI token created",
message: 'Copy the created token into clipboard. Trilium stores the token hashed and this is the last time you see it.',
defaultValue: token
message: 'Copy the created token into clipboard. Trilium stores the token hashed and this is the last time you see it.',
defaultValue: authToken
});
this.refreshTokens();
});
this.refreshTokens();
}
async refreshTokens() {
const $noTokensYet = $("#no-tokens-yet");
const $tokensTable = $("#tokens-table");
const tokens = await server.get('etapi-tokens');
$noTokensYet.toggle(tokens.length === 0);
$tokensTable.toggle(tokens.length > 0);
const $tokensTableBody = $tokensTable.find("tbody");
$tokensTableBody.empty();
for (const token of tokens) {
$tokensTableBody.append(
$("<tr>")
@ -112,7 +112,7 @@ export default class EtapiOptions {
});
await server.patch(`etapi-tokens/${etapiTokenId}`, {name: tokenName});
this.refreshTokens();
}

7
src/public/app/dialogs/prompt.js
View file

@ -13,9 +13,9 @@ let shownCb;
export function ask({ title, message, defaultValue, shown }) {
shownCb = shown;
$("#prompt-title").text(title || "Prompt");
$question = $("<label>")
.prop("for", "prompt-dialog-answer")
.text(message);
@ -51,7 +51,8 @@ $dialog.on("hidden.bs.modal", () => {
}
});
$form.on('submit', () => {
$form.on('submit', e => {
e.preventDefault();
resolve($answer.val());
$dialog.modal('hide');

71
src/public/app/services/tab_manager.js
View file

@ -7,11 +7,14 @@ import treeService from "./tree.js";
import utils from "./utils.js";
import NoteContext from "./note_context.js";
import appContext from "./app_context.js";
import Mutex from "../utils/mutex.js";
export default class TabManager extends Component {
constructor() {
super();
this.mutex = new Mutex();
this.activeNtxId = null;
// elements are arrays of note contexts for each tab (one main context + subcontexts [splits])
@ -292,51 +295,55 @@ export default class TabManager extends Component {
}
async removeNoteContext(ntxId) {
const noteContextToRemove = this.getNoteContextById(ntxId);
// removing note context is async process which can take some time, if users presses CTRL-W quickly, two
// close events could interleave which would then lead to attempting to activate already removed context.
await this.mutex.runExclusively(async () => {
const noteContextToRemove = this.getNoteContextById(ntxId);
if (noteContextToRemove.isMainContext()) {
// forbid removing last main note context
// this was previously allowed (was replaced with empty tab) but this proved to be prone to race conditions
const mainNoteContexts = this.getNoteContexts().filter(nc => nc.isMainContext());
if (noteContextToRemove.isMainContext()) {
// forbid removing last main note context
// this was previously allowed (was replaced with empty tab) but this proved to be prone to race conditions
const mainNoteContexts = this.getNoteContexts().filter(nc => nc.isMainContext());
if (mainNoteContexts.length === 1) {
mainNoteContexts[0].setEmpty();
return;
if (mainNoteContexts.length === 1) {
mainNoteContexts[0].setEmpty();
return;
}
}
}
// close dangling autocompletes after closing the tab
$(".aa-input").autocomplete("close");
// close dangling autocompletes after closing the tab
$(".aa-input").autocomplete("close");
const noteContextsToRemove = noteContextToRemove.getSubContexts();
const ntxIdsToRemove = noteContextsToRemove.map(nc => nc.ntxId);
const noteContextsToRemove = noteContextToRemove.getSubContexts();
const ntxIdsToRemove = noteContextsToRemove.map(nc => nc.ntxId);
await this.triggerEvent('beforeTabRemove', { ntxIds: ntxIdsToRemove });
await this.triggerEvent('beforeTabRemove', { ntxIds: ntxIdsToRemove });
if (!noteContextToRemove.isMainContext()) {
await this.activateNoteContext(noteContextToRemove.getMainContext().ntxId);
}
else if (this.mainNoteContexts.length <= 1) {
await this.openAndActivateEmptyTab();
}
else if (ntxIdsToRemove.includes(this.activeNtxId)) {
const idx = this.mainNoteContexts.findIndex(nc => nc.ntxId === noteContextToRemove.ntxId);
if (idx === this.mainNoteContexts.length - 1) {
await this.activatePreviousTabCommand();
if (!noteContextToRemove.isMainContext()) {
await this.activateNoteContext(noteContextToRemove.getMainContext().ntxId);
}
else {
await this.activateNextTabCommand();
else if (this.mainNoteContexts.length <= 1) {
await this.openAndActivateEmptyTab();
}
}
else if (ntxIdsToRemove.includes(this.activeNtxId)) {
const idx = this.mainNoteContexts.findIndex(nc => nc.ntxId === noteContextToRemove.ntxId);
this.children = this.children.filter(nc => !ntxIdsToRemove.includes(nc.ntxId));
if (idx === this.mainNoteContexts.length - 1) {
await this.activatePreviousTabCommand();
}
else {
await this.activateNextTabCommand();
}
}
this.recentlyClosedTabs.push(noteContextsToRemove);
this.children = this.children.filter(nc => !ntxIdsToRemove.includes(nc.ntxId));
this.triggerEvent('noteContextRemoved', {ntxIds: ntxIdsToRemove});
this.recentlyClosedTabs.push(noteContextsToRemove);
this.tabsUpdate.scheduleUpdate();
this.triggerEvent('noteContextRemoved', {ntxIds: ntxIdsToRemove});
this.tabsUpdate.scheduleUpdate();
});
}
tabReorderEvent({ntxIdsInOrder}) {

2
src/public/app/services/tree.js
View file

@ -65,7 +65,7 @@ async function resolveNotePathToSegments(notePath, hoistedNoteId = 'root', logEr
if (!parents.length) {
if (logErrors) {
ws.logError(`No parents found for ${childNoteId} (${child.title}) for path ${notePath}`);
ws.logError(`No parents found for note ${childNoteId} (${child.title}) for path ${notePath}`);
}
return;

28
src/public/app/utils/mutex.js Normal file
View file

@ -0,0 +1,28 @@
export default class Mutex {
constructor() {
this.current = Promise.resolve();
}
/** @returns {Promise} */
lock() {
let resolveFun;
const subPromise = new Promise(resolve => resolveFun = () => resolve());
// Caller gets a promise that resolves when the current outstanding lock resolves
const newPromise = this.current.then(() => resolveFun);
// Don't allow the next request until the new promise is done
this.current = subPromise;
// Return the new promise
return newPromise;
};
async runExclusively(cb) {
const unlock = await this.lock();
try {
await cb();
}
finally {
unlock();
}
}
}

2
src/public/stylesheets/ckeditor-theme.css
View file

@ -91,6 +91,8 @@ body {
--ck-color-table-focused-cell-background: var(--more-accented-background-color);
--ck-color-labeled-field-label-background: var(--accented-background-color);
/* todo lists */
--ck-color-todo-list-checkmark-border: var(--main-border-color);

10
src/routes/api/etapi_tokens.js
View file

@ -2,16 +2,14 @@ const etapiTokenService = require("../../services/etapi_tokens");
function getTokens() {
const tokens = etapiTokenService.getTokens();
tokens.sort((a, b) => a.utcDateCreated < b.utcDateCreated ? -1 : 1);
return tokens;
}
function createToken(req) {
return {
authToken: etapiTokenService.createToken(req.body.tokenName)
};
return etapiTokenService.createToken(req.body.tokenName);
}
function patchToken(req) {
@ -27,4 +25,4 @@ module.exports = {
createToken,
patchToken,
deleteToken
};
};

2
src/services/build.js
View file

@ -1 +1 @@
module.exports = { buildDate:"2022-02-02T21:38:21+01:00", buildRevision: "0917fc8be171253449219cf29c0e603ac29eb26e" };
module.exports = { buildDate:"2022-02-09T22:52:36+01:00", buildRevision: "23daaa2387a0655685377f0a541d154aeec2aae8" };

35
src/services/etapi_tokens.js
View file

@ -19,7 +19,7 @@ function createToken(tokenName) {
name: tokenName,
tokenHash
}).save();
return {
authToken: `${etapiToken.etapiTokenId}_${token}`
};
@ -29,14 +29,14 @@ function parseAuthToken(auth) {
if (!auth) {
return null;
}
const chunks = auth.split("_");
if (chunks.length === 1) {
return { token: auth }; // legacy format without etapiTokenId
}
else if (chunks.length === 2) {
return {
return {
etapiTokenId: chunks[0],
token: chunks[1]
}
@ -48,20 +48,20 @@ function parseAuthToken(auth) {
function isValidAuthHeader(auth) {
const parsed = parseAuthToken(auth);
if (!parsed) {
return false;
}
const authTokenHash = getTokenHash(parsed.token);
const authTokenHash = getTokenHash(parsed.token);
if (parsed.etapiTokenId) {
const etapiToken = becca.getEtapiToken(parsed.etapiTokenId);
if (!etapiToken) {
return false;
}
return etapiToken.tokenHash === authTokenHash;
}
else {
@ -70,31 +70,30 @@ function isValidAuthHeader(auth) {
return true;
}
}
return false;
}
}
function renameToken(etapiTokenId, newName) {
const etapiToken = becca.getEtapiToken(etapiTokenId);
if (!etapiToken) {
throw new Error(`Token ${etapiTokenId} does not exist`);
}
etapiToken.name = newName;
etapiToken.save();
}
function deleteToken(etapiTokenId) {
const etapiToken = becca.getEtapiToken(etapiTokenId);
if (!etapiToken) {
return; // ok, already deleted
}
etapiToken.isDeleted = true;
etapiToken.save();
etapiToken.markAsDeletedSimple();
}
module.exports = {
@ -104,4 +103,4 @@ module.exports = {
deleteToken,
parseAuthToken,
isValidAuthHeader
};
};

9
src/services/export/zip.js
View file

@ -13,6 +13,7 @@ const fs = require("fs");
const becca = require("../../becca/becca");
const RESOURCE_DIR = require('../../services/resource_dir').RESOURCE_DIR;
const archiver = require('archiver');
const log = require("../log");
/**
* @param {TaskContext} taskContext
@ -54,7 +55,7 @@ function exportToZip(taskContext, branch, format, res) {
let existingExtension = path.extname(fileName).toLowerCase();
let newExtension;
if (fileName.length > 30) {
fileName = fileName.substr(0, 30);
}
@ -254,7 +255,9 @@ ${content}
</html>`;
}
return html.prettyPrint(content, {indent_size: 2});
return content.length < 100000
? html.prettyPrint(content, {indent_size: 2})
: content;
}
else if (noteMeta.format === 'markdown') {
let markdownContent = mdService.toMarkdown(content);
@ -274,6 +277,8 @@ ${content}
const notePaths = {};
function saveNote(noteMeta, filePathPrefix) {
log.info(`Exporting note ${noteMeta.noteId}`);
if (noteMeta.isClone) {
const targetUrl = getTargetUrl(noteMeta.noteId, noteMeta);

5
src/services/notes.js
View file

@ -634,7 +634,10 @@ function undeleteBranch(branchId, deleteId, taskContext) {
taskContext.increaseProgressCount();
if (note.isDeleted && note.deleteId === deleteId) {
new Note(note).save();
// becca entity was already created as skeleton in "new Branch()" above
const noteEntity = becca.getNote(note.noteId);
noteEntity.updateFromRow(note);
noteEntity.save();
const attributes = sql.getRows(`
SELECT * FROM attributes

2
src/views/dialogs/prompt.ejs
View file

@ -1,5 +1,5 @@
<div id="prompt-dialog" class="modal mx-auto" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
<form id="prompt-dialog-form">
<div class="modal-header">