gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

server-ts: Port revisions service

Browse Source
This commit is contained in:
Elian Doran 2024-02-17 19:44:46 +02:00
parent a58abffe58
commit 246a90d73c
No known key found for this signature in database
8 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/becca/entities/abstract_becca_entity.ts
View File

@ -33,11 +33,12 @@ abstract class AbstractBeccaEntity<T extends AbstractBeccaEntity<T>> {
protected utcDateModified?: string; protected utcDateModified?: string;
protected dateCreated?: string; protected dateCreated?: string;
protected dateModified?: string; protected dateModified?: string;
protected isProtected?: boolean;
protected isSynced?: boolean; protected isSynced?: boolean;
protected blobId?: string; protected blobId?: string;
isProtected?: boolean;
protected beforeSaving() { protected beforeSaving() {
const constructorData = (this.constructor as unknown as ConstructorData<T>); const constructorData = (this.constructor as unknown as ConstructorData<T>);
if (!(this as any)[constructorData.primaryKeyName]) { if (!(this as any)[constructorData.primaryKeyName]) {

2
src/routes/api/revisions.js
View File

@ -1,7 +1,7 @@
"use strict"; "use strict";
const beccaService = require('../../becca/becca_service.js'); const beccaService = require('../../becca/becca_service.js');
const revisionService = require('../../services/revisions.js'); const revisionService = require('../../services/revisions');
const utils = require('../../services/utils'); const utils = require('../../services/utils');
const sql = require('../../services/sql'); const sql = require('../../services/sql');
const cls = require('../../services/cls'); const cls = require('../../services/cls');

2
src/routes/routes.js
View File

@ -28,7 +28,7 @@ const branchesApiRoute = require('./api/branches.js');
const attachmentsApiRoute = require('./api/attachments.js'); const attachmentsApiRoute = require('./api/attachments.js');
const autocompleteApiRoute = require('./api/autocomplete.js'); const autocompleteApiRoute = require('./api/autocomplete.js');
const cloningApiRoute = require('./api/cloning.js'); const cloningApiRoute = require('./api/cloning.js');
const revisionsApiRoute = require('./api/revisions.js'); const revisionsApiRoute = require('./api/revisions');
const recentChangesApiRoute = require('./api/recent_changes.js'); const recentChangesApiRoute = require('./api/recent_changes.js');
const optionsApiRoute = require('./api/options.js'); const optionsApiRoute = require('./api/options.js');
const passwordApiRoute = require('./api/password'); const passwordApiRoute = require('./api/password');

2
src/services/bulk_actions.js
View File

@ -1,5 +1,5 @@
const log = require('./log'); const log = require('./log');
const revisionService = require('./revisions.js'); const revisionService = require('./revisions');
const becca = require('../becca/becca'); const becca = require('../becca/becca');
const cloningService = require('./cloning.js'); const cloningService = require('./cloning.js');
const branchService = require('./branches.js'); const branchService = require('./branches.js');

2
src/services/consistency_checks.js
View File

@ -9,7 +9,7 @@ const cls = require('./cls');
const entityChangesService = require('./entity_changes'); const entityChangesService = require('./entity_changes');
const optionsService = require('./options'); const optionsService = require('./options');
const BBranch = require('../becca/entities/bbranch'); const BBranch = require('../becca/entities/bbranch');
const revisionService = require('./revisions.js'); const revisionService = require('./revisions');
const becca = require('../becca/becca'); const becca = require('../becca/becca');
const utils = require('../services/utils'); const utils = require('../services/utils');
const eraseService = require('../services/erase.js'); const eraseService = require('../services/erase.js');

2
src/services/erase.js
View File

@ -1,5 +1,5 @@
const sql = require("./sql"); const sql = require("./sql");
const revisionService = require("./revisions.js"); const revisionService = require("./revisions");
const log = require("./log.ts"); const log = require("./log.ts");
const entityChangesService = require("./entity_changes"); const entityChangesService = require("./entity_changes");
const optionService = require("./options"); const optionService = require("./options");

2
src/services/notes.js
View File

@ -7,7 +7,7 @@ const cls = require('../services/cls');
const protectedSessionService = require('../services/protected_session'); const protectedSessionService = require('../services/protected_session');
const log = require('../services/log'); const log = require('../services/log');
const utils = require('../services/utils'); const utils = require('../services/utils');
const revisionService = require('./revisions.js'); const revisionService = require('./revisions');
const request = require('./request.js'); const request = require('./request.js');
const path = require('path'); const path = require('path');
const url = require('url'); const url = require('url');

16
src/services/revisions.js → src/services/revisions.ts
View File

@ -1,14 +1,12 @@
"use strict"; "use strict";
const log = require('./log'); import log = require('./log');
const sql = require('./sql'); import sql = require('./sql');
const protectedSessionService = require('./protected_session'); import protectedSessionService = require('./protected_session');
const dateUtils = require('./date_utils'); import dateUtils = require('./date_utils');
import BNote = require('../becca/entities/bnote');
/** function protectRevisions(note: BNote) {
* @param {BNote} note
*/
function protectRevisions(note) {
if (!protectedSessionService.isProtectedSessionAvailable()) { if (!protectedSessionService.isProtectedSessionAvailable()) {
throw new Error(`Cannot (un)protect revisions of note '${note.noteId}' without active protected session`); throw new Error(`Cannot (un)protect revisions of note '${note.noteId}' without active protected session`);
} }
@ -18,7 +16,7 @@ function protectRevisions(note) {
try { try {
const content = revision.getContent(); const content = revision.getContent();
revision.isProtected = note.isProtected; revision.isProtected = !!note.isProtected;
// this will force de/encryption // this will force de/encryption
revision.setContent(content, {forceSave: true}); revision.setContent(content, {forceSave: true});