mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 19:49:01 +01:00 
			
		
		
		
	server-ts: Port revisions service
This commit is contained in:
		
							parent
							
								
									a58abffe58
								
							
						
					
					
						commit
						246a90d73c
					
				| @ -33,10 +33,11 @@ abstract class AbstractBeccaEntity<T extends AbstractBeccaEntity<T>> { | ||||
|     protected utcDateModified?: string; | ||||
|     protected dateCreated?: string; | ||||
|     protected dateModified?: string; | ||||
|     protected isProtected?: boolean; | ||||
|     protected isSynced?: boolean; | ||||
| 
 | ||||
|      | ||||
|     protected blobId?: string; | ||||
|   | ||||
|     isProtected?: boolean; | ||||
| 
 | ||||
|     protected beforeSaving() { | ||||
|         const constructorData = (this.constructor as unknown as ConstructorData<T>); | ||||
|  | ||||
| @ -1,7 +1,7 @@ | ||||
| "use strict"; | ||||
| 
 | ||||
| const beccaService = require('../../becca/becca_service.js'); | ||||
| const revisionService = require('../../services/revisions.js'); | ||||
| const revisionService = require('../../services/revisions'); | ||||
| const utils = require('../../services/utils'); | ||||
| const sql = require('../../services/sql'); | ||||
| const cls = require('../../services/cls'); | ||||
|  | ||||
| @ -28,7 +28,7 @@ const branchesApiRoute = require('./api/branches.js'); | ||||
| const attachmentsApiRoute = require('./api/attachments.js'); | ||||
| const autocompleteApiRoute = require('./api/autocomplete.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 optionsApiRoute = require('./api/options.js'); | ||||
| const passwordApiRoute = require('./api/password'); | ||||
|  | ||||
| @ -1,5 +1,5 @@ | ||||
| const log = require('./log'); | ||||
| const revisionService = require('./revisions.js'); | ||||
| const revisionService = require('./revisions'); | ||||
| const becca = require('../becca/becca'); | ||||
| const cloningService = require('./cloning.js'); | ||||
| const branchService = require('./branches.js'); | ||||
|  | ||||
| @ -9,7 +9,7 @@ const cls = require('./cls'); | ||||
| const entityChangesService = require('./entity_changes'); | ||||
| const optionsService = require('./options'); | ||||
| const BBranch = require('../becca/entities/bbranch'); | ||||
| const revisionService = require('./revisions.js'); | ||||
| const revisionService = require('./revisions'); | ||||
| const becca = require('../becca/becca'); | ||||
| const utils = require('../services/utils'); | ||||
| const eraseService = require('../services/erase.js'); | ||||
|  | ||||
| @ -1,5 +1,5 @@ | ||||
| const sql = require("./sql"); | ||||
| const revisionService = require("./revisions.js"); | ||||
| const revisionService = require("./revisions"); | ||||
| const log = require("./log.ts"); | ||||
| const entityChangesService = require("./entity_changes"); | ||||
| const optionService = require("./options"); | ||||
|  | ||||
| @ -7,7 +7,7 @@ const cls = require('../services/cls'); | ||||
| const protectedSessionService = require('../services/protected_session'); | ||||
| const log = require('../services/log'); | ||||
| const utils = require('../services/utils'); | ||||
| const revisionService = require('./revisions.js'); | ||||
| const revisionService = require('./revisions'); | ||||
| const request = require('./request.js'); | ||||
| const path = require('path'); | ||||
| const url = require('url'); | ||||
|  | ||||
| @ -1,14 +1,12 @@ | ||||
| "use strict"; | ||||
| 
 | ||||
| const log = require('./log'); | ||||
| const sql = require('./sql'); | ||||
| const protectedSessionService = require('./protected_session'); | ||||
| const dateUtils = require('./date_utils'); | ||||
| import log = require('./log'); | ||||
| import sql = require('./sql'); | ||||
| import protectedSessionService = require('./protected_session'); | ||||
| import dateUtils = require('./date_utils'); | ||||
| import BNote = require('../becca/entities/bnote'); | ||||
| 
 | ||||
| /** | ||||
|  * @param {BNote} note | ||||
|  */ | ||||
| function protectRevisions(note) { | ||||
| function protectRevisions(note: BNote) { | ||||
|     if (!protectedSessionService.isProtectedSessionAvailable()) { | ||||
|         throw new Error(`Cannot (un)protect revisions of note '${note.noteId}' without active protected session`); | ||||
|     } | ||||
| @ -18,7 +16,7 @@ function protectRevisions(note) { | ||||
|             try { | ||||
|                 const content = revision.getContent(); | ||||
| 
 | ||||
|                 revision.isProtected = note.isProtected; | ||||
|                 revision.isProtected = !!note.isProtected; | ||||
| 
 | ||||
|                 // this will force de/encryption
 | ||||
|                 revision.setContent(content, {forceSave: true}); | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Elian Doran
						Elian Doran