diff options
| -rw-r--r-- | packages/backend/src/server/api/endpoints/notes/versions.ts | 6 | ||||
| -rw-r--r-- | packages/frontend/src/components/SkOldNoteWindow.vue | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/backend/src/server/api/endpoints/notes/versions.ts b/packages/backend/src/server/api/endpoints/notes/versions.ts index d236cea64e..416fddcb7b 100644 --- a/packages/backend/src/server/api/endpoints/notes/versions.ts +++ b/packages/backend/src/server/api/endpoints/notes/versions.ts @@ -50,13 +50,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- for (const edit of edits) { editArray.push({ - oldDate: edit.oldDate, + oldDate: edit.oldDate as Date | null ?? null, updatedAt: edit.updatedAt, - text: edit.oldText, + text: edit.oldText ?? edit.newText ?? null, }); } - editArray = editArray.sort((a, b) => { return new Date(b.oldDate).getTime() - new Date(a.oldDate).getTime(); }); + editArray = editArray.sort((a, b) => { return new Date(b.oldDate ?? b.updatedAt).getTime() - new Date(a.oldDate ?? a.updatedAt).getTime(); }); return editArray; }); diff --git a/packages/frontend/src/components/SkOldNoteWindow.vue b/packages/frontend/src/components/SkOldNoteWindow.vue index f3dfa4858e..522348f6b9 100644 --- a/packages/frontend/src/components/SkOldNoteWindow.vue +++ b/packages/frontend/src/components/SkOldNoteWindow.vue @@ -120,7 +120,7 @@ if (noteViewInterruptors.length > 0) { } const replaceContent = () => { - note.text = props.oldText; + props.oldText ? note.text = props.oldText : undefined; note.createdAt = props.updatedAt; }; replaceContent(); |