From 34c642a49a20df46d7dde3060278887305a7b0d1 Mon Sep 17 00:00:00 2001 From: zadam Date: Wed, 14 Jun 2023 00:28:59 +0200 Subject: [PATCH] rename attachment --- .../app/widgets/buttons/attachments_actions.js | 18 +++++++++++++++++- .../widgets/type_widgets/attachment_detail.js | 2 +- .../app/widgets/type_widgets/options/etapi.js | 4 ++-- src/public/stylesheets/style.css | 2 +- src/routes/api/attachments.js | 18 +++++++++++++++++- src/routes/api/files.js | 1 + src/routes/routes.js | 1 + 7 files changed, 40 insertions(+), 6 deletions(-) diff --git a/src/public/app/widgets/buttons/attachments_actions.js b/src/public/app/widgets/buttons/attachments_actions.js index 20e5a7d03..5480ded24 100644 --- a/src/public/app/widgets/buttons/attachments_actions.js +++ b/src/public/app/widgets/buttons/attachments_actions.js @@ -26,12 +26,14 @@ const TPL = ` + aria-expanded="false" class="icon-action icon-action-always-border bx bx-dots-vertical-rounded" + style="position: relative; top: 5px;">
Open externally Download + Rename attachment Upload new revision Copy link to clipboard Convert attachment into note @@ -129,4 +131,18 @@ export default class AttachmentActionsWidget extends BasicWidget { await ws.waitForMaxKnownEntityChangeId(); await appContext.tabManager.getActiveContext().setNote(newNote.noteId); } + + async renameAttachmentCommand() { + const attachmentTitle = await dialogService.prompt({ + title: "Rename attachment", + message: "Please enter new attachment's name", + defaultValue: this.attachment.title + }); + + if (!attachmentTitle?.trim()) { + return; + } + + await server.put(`attachments/${this.attachmentId}/rename`, {title: attachmentTitle}); + } } diff --git a/src/public/app/widgets/type_widgets/attachment_detail.js b/src/public/app/widgets/type_widgets/attachment_detail.js index f3636176b..d336879de 100644 --- a/src/public/app/widgets/type_widgets/attachment_detail.js +++ b/src/public/app/widgets/type_widgets/attachment_detail.js @@ -14,8 +14,8 @@ const TPL = ` } .attachment-detail .links-wrapper { - padding: 16px; font-size: larger; + padding: 16px 0 16px 0; } .attachment-detail .attachment-wrapper { diff --git a/src/public/app/widgets/type_widgets/options/etapi.js b/src/public/app/widgets/type_widgets/options/etapi.js index 2fa773f8f..2de97c738 100644 --- a/src/public/app/widgets/type_widgets/options/etapi.js +++ b/src/public/app/widgets/type_widgets/options/etapi.js @@ -109,8 +109,8 @@ export default class EtapiOptions extends OptionsWidget { message: "Please enter new token's name", defaultValue: oldName }); - - if(tokenName === null) { + + if (!tokenName?.trim()) { return; } diff --git a/src/public/stylesheets/style.css b/src/public/stylesheets/style.css index 9603dd032..63dca0def 100644 --- a/src/public/stylesheets/style.css +++ b/src/public/stylesheets/style.css @@ -110,7 +110,7 @@ button.close:hover { .icon-action { border: 1px solid transparent; padding: 5px; - width: 35px; + width: 37px; height: 35px; cursor: pointer; font-size: 1.5em; diff --git a/src/routes/api/attachments.js b/src/routes/api/attachments.js index 5b8049b24..4714b0fe5 100644 --- a/src/routes/api/attachments.js +++ b/src/routes/api/attachments.js @@ -1,5 +1,6 @@ const becca = require("../../becca/becca"); const blobService = require("../../services/blob.js"); +const ValidationError = require("../../errors/validation_error"); function getAttachmentBlob(req) { const preview = req.query.preview === 'true'; @@ -41,7 +42,7 @@ function uploadAttachment(req) { const note = becca.getNoteOrThrow(noteId); - const attachment = note.saveAttachment({ + note.saveAttachment({ role: 'file', mime: file.mimetype, title: file.originalname, @@ -53,6 +54,20 @@ function uploadAttachment(req) { }; } +function renameAttachment(req) { + const {title} = req.body; + const {attachmentId} = req.params; + + const attachment = becca.getAttachmentOrThrow(attachmentId); + + if (!title?.trim()) { + throw new ValidationError("Title must not be empty"); + } + + attachment.title = title; + attachment.save(); +} + function deleteAttachment(req) { const {attachmentId} = req.params; @@ -77,6 +92,7 @@ module.exports = { getAllAttachments, saveAttachment, uploadAttachment, + renameAttachment, deleteAttachment, convertAttachmentToNote }; diff --git a/src/routes/api/files.js b/src/routes/api/files.js index 044865707..4da4f53a6 100644 --- a/src/routes/api/files.js +++ b/src/routes/api/files.js @@ -35,6 +35,7 @@ function updateFile(req) { function updateAttachment(req) { const attachment = becca.getAttachmentOrThrow(req.params.attachmentId); const file = req.file; + attachment.getNote().saveRevision(); attachment.mime = file.mimetype.toLowerCase(); diff --git a/src/routes/routes.js b/src/routes/routes.js index 3869b7136..c91d09fff 100644 --- a/src/routes/routes.js +++ b/src/routes/routes.js @@ -159,6 +159,7 @@ function register(app) { apiRoute(GET, '/api/attachments/:attachmentId/all', attachmentsApiRoute.getAllAttachments); apiRoute(PST, '/api/attachments/:attachmentId/convert-to-note', attachmentsApiRoute.convertAttachmentToNote); apiRoute(DEL, '/api/attachments/:attachmentId', attachmentsApiRoute.deleteAttachment); + apiRoute(PUT, '/api/attachments/:attachmentId/rename', attachmentsApiRoute.renameAttachment); apiRoute(GET, '/api/attachments/:attachmentId/blob', attachmentsApiRoute.getAttachmentBlob); route(GET, '/api/attachments/:attachmentId/image/:filename', [auth.checkApiAuthOrElectron], imageRoute.returnAttachedImage); route(GET, '/api/attachments/:attachmentId/open', [auth.checkApiAuthOrElectron], filesRoute.openAttachment);