Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-10-31 13:01:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

restore revision with attachments

Browse Source
This commit is contained in:
zadam 2023-04-19 22:47:33 +02:00
parent 8b46d6c718
commit c6c162cdda
4 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/becca/entities/bnote.js
View File

@ -1569,11 +1569,9 @@ class BNote extends AbstractBeccaEntity {
noteRevision.save(); // to generate noteRevisionId which is then used to save attachments
for (const noteAttachment of this.getAttachments()) {
const attachmentContent = noteAttachment.getContent();
const revisionAttachment = noteAttachment.copy();
revisionAttachment.parentId = noteRevision.noteRevisionId;
revisionAttachment.setContent(attachmentContent, {
revisionAttachment.setContent(noteAttachment.getContent(), {
forceSave: true,
forceCold: true
});

12
src/becca/entities/bnote_revision.js
View File

@ -5,6 +5,8 @@ const utils = require('../../services/utils');
const dateUtils = require('../../services/date_utils');
const becca = require('../becca');
const AbstractBeccaEntity = require("./abstract_becca_entity");
const sql = require("../../services/sql");
const BAttachment = require("./battachment");
/**
* NoteRevision represents snapshot of note's title and content at some point in the past.
@ -92,6 +94,16 @@ class BNoteRevision extends AbstractBeccaEntity {
this._setContent(content, opts);
}
/** @returns {BAttachment[]} */
getAttachments() {
return sql.getRows(`
SELECT attachments.*
FROM attachments
WHERE parentId = ?
AND isDeleted = 0`, [this.noteRevisionId])
.map(row => new BAttachment(row));
}
beforeSaving() {
super.beforeSaving();

9
src/public/app/widgets/type_widgets/attachment_detail.js
View File

@ -28,9 +28,8 @@ export default class AttachmentDetailTypeWidget extends TypeWidget {
async doRefresh(note) {
this.$wrapper.empty();
this.children = [];
this.renderedAttachmentIds = new Set();
const attachment = await server.get(`attachments/${this.noteContext.viewScope.attachmentId}/?includeContent=true`);
const attachment = await server.get(`attachments/${this.attachmentId}/?includeContent=true`);
if (!attachment) {
this.$wrapper.html("<strong>This attachment has been deleted.</strong>");
@ -46,10 +45,14 @@ export default class AttachmentDetailTypeWidget extends TypeWidget {
}
async entitiesReloadedEvent({loadResults}) {
const attachmentChange = loadResults.getAttachments().find(att => att.attachmentId === this.attachment.attachmentId);
const attachmentChange = loadResults.getAttachments().find(att => att.attachmentId === this.attachmentId);
if (attachmentChange?.isDeleted) {
this.refresh(); // all other updates are handled within AttachmentDetailWidget
}
}
get attachmentId() {
return this.noteContext.viewScope.attachmentId;
}
}

24
src/routes/api/note_revisions.js
View File

@ -95,11 +95,27 @@ function restoreNoteRevision(req) {
if (noteRevision) {
const note = noteRevision.getNote();
note.saveNoteRevision();
sql.transactional(() => {
note.saveNoteRevision();
note.title = noteRevision.title;
note.setContent(noteRevision.getContent());
note.save();
for (const oldNoteAttachment of note.getAttachments()) {
oldNoteAttachment.markAsDeleted();
}
let revisionContent = noteRevision.getContent();
for (const revisionAttachment of noteRevision.getAttachments()) {
const noteAttachment = revisionAttachment.copy();
noteAttachment.parentId = note.noteId;
noteAttachment.setContent(revisionAttachment.getContent(), { forceSave: true });
// content is rewritten to point to the restored revision attachments
revisionContent = revisionContent.replaceAll(`attachments/${revisionAttachment.attachmentId}`, `attachments/${noteAttachment.attachmentId}`);
}
note.title = noteRevision.title;
note.setContent(revisionContent, { forceSave: true });
});
}
}