From cb70109ee786300afa84462d5d301e6a0334184c Mon Sep 17 00:00:00 2001 From: zadam Date: Mon, 11 May 2020 23:57:39 +0200 Subject: [PATCH 1/3] fix creating new promoted attributes, closes #1008 (cherry picked from commit 2e0fb8aaf1ffc2d88441d6656164c30b1b2a08ef) --- package-lock.json | 80 +++++++++---------- src/entities/attribute.js | 3 +- src/entities/note.js | 6 +- src/public/app/dialogs/attributes.js | 12 +-- src/public/app/widgets/promoted_attributes.js | 5 +- src/routes/api/attributes.js | 2 +- 6 files changed, 52 insertions(+), 56 deletions(-) diff --git a/package-lock.json b/package-lock.json index 53df9ab4b..837b0d31b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1263,7 +1263,7 @@ "dependencies": { "file-type": { "version": "3.9.0", - "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", + "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=" } } @@ -1539,7 +1539,7 @@ }, "uuid": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", + "resolved": "http://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=" } } @@ -1573,7 +1573,7 @@ "dependencies": { "semver": { "version": "4.3.6", - "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", + "resolved": "http://registry.npmjs.org/semver/-/semver-4.3.6.tgz", "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=" } } @@ -1593,7 +1593,7 @@ }, "bl": { "version": "1.2.2", - "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz", + "resolved": "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz", "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==", "requires": { "readable-stream": "^2.3.5", @@ -1853,12 +1853,12 @@ "dependencies": { "file-type": { "version": "3.9.0", - "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", + "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=" }, "uuid": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", + "resolved": "http://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=" } } @@ -1973,7 +1973,7 @@ }, "readable-stream": { "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", "requires": { "core-util-is": "~1.0.0", @@ -2148,7 +2148,7 @@ }, "chalk": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "requires": { "ansi-styles": "^2.2.1", @@ -2465,7 +2465,7 @@ }, "commander": { "version": "2.8.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz", + "resolved": "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz", "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=", "requires": { "graceful-readlink": ">= 1.0.0" @@ -3128,7 +3128,7 @@ }, "readable-stream": { "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", "requires": { "core-util-is": "~1.0.0", @@ -4957,7 +4957,7 @@ }, "get-stream": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" }, "getpass": { @@ -5221,7 +5221,7 @@ }, "got": { "version": "5.7.1", - "resolved": "https://registry.npmjs.org/got/-/got-5.7.1.tgz", + "resolved": "http://registry.npmjs.org/got/-/got-5.7.1.tgz", "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=", "requires": { "create-error-class": "^3.0.1", @@ -5869,7 +5869,7 @@ }, "into-stream": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz", + "resolved": "http://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz", "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=", "requires": { "from2": "^2.1.1", @@ -6021,7 +6021,7 @@ }, "is-obj": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", + "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=" }, "is-object": { @@ -6621,7 +6621,7 @@ }, "load-json-file": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "requires": { "graceful-fs": "^4.1.2", @@ -7130,7 +7130,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" }, "minipass": { @@ -7230,7 +7230,7 @@ }, "mkdirp": { "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "requires": { "minimist": "0.0.8" @@ -7238,7 +7238,7 @@ "dependencies": { "minimist": { "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" } } @@ -7432,7 +7432,7 @@ }, "get-stream": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" }, "got": { @@ -7468,7 +7468,7 @@ }, "p-cancelable": { "version": "0.4.1", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz", + "resolved": "http://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz", "integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==" }, "p-event": { @@ -7592,7 +7592,7 @@ "dependencies": { "file-type": { "version": "3.9.0", - "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", + "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=" } } @@ -7617,7 +7617,7 @@ "dependencies": { "get-stream": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" }, "pify": { @@ -7674,7 +7674,7 @@ }, "get-stream": { "version": "2.3.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz", + "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz", "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=", "requires": { "object-assign": "^4.0.1", @@ -7704,7 +7704,7 @@ "dependencies": { "get-stream": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" } } @@ -7744,7 +7744,7 @@ }, "pify": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" }, "prepend-http": { @@ -7849,7 +7849,7 @@ }, "readable-stream": { "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", "requires": { "core-util-is": "~1.0.0", @@ -8227,7 +8227,7 @@ }, "onetime": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=" }, "open": { @@ -8379,7 +8379,7 @@ }, "p-is-promise": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz", "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=" }, "p-limit": { @@ -8860,7 +8860,7 @@ }, "get-stream": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" } } @@ -9144,7 +9144,7 @@ "dependencies": { "file-type": { "version": "3.9.0", - "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", + "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=" } } @@ -9169,7 +9169,7 @@ "dependencies": { "get-stream": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" }, "pify": { @@ -9207,7 +9207,7 @@ }, "get-stream": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" } } @@ -9259,7 +9259,7 @@ }, "get-stream": { "version": "2.3.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz", + "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz", "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=", "requires": { "object-assign": "^4.0.1", @@ -9289,7 +9289,7 @@ "dependencies": { "get-stream": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" } } @@ -9477,7 +9477,7 @@ }, "query-string": { "version": "5.1.1", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz", + "resolved": "http://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz", "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==", "requires": { "decode-uri-component": "^0.2.0", @@ -9616,7 +9616,7 @@ }, "readable-stream": { "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { "core-util-is": "~1.0.0", @@ -10484,7 +10484,7 @@ }, "strip-ansi": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "requires": { "ansi-regex": "^2.0.0" @@ -10509,7 +10509,7 @@ }, "strip-dirs": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-1.1.1.tgz", + "resolved": "http://registry.npmjs.org/strip-dirs/-/strip-dirs-1.1.1.tgz", "integrity": "sha1-lgu9EoeETzl1pFWKoQOoJV4kVqA=", "requires": { "chalk": "^1.0.0", @@ -10767,7 +10767,7 @@ }, "through": { "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" }, "through2": { @@ -10786,7 +10786,7 @@ }, "readable-stream": { "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", "requires": { "core-util-is": "~1.0.0", diff --git a/src/entities/attribute.js b/src/entities/attribute.js index b401fd27e..0800d6252 100644 --- a/src/entities/attribute.js +++ b/src/entities/attribute.js @@ -105,7 +105,6 @@ class Attribute extends Entity { // cannot be static! updatePojo(pojo) { - delete pojo.isOwned; delete pojo.__note; } @@ -124,4 +123,4 @@ class Attribute extends Entity { } } -module.exports = Attribute; \ No newline at end of file +module.exports = Attribute; diff --git a/src/entities/note.js b/src/entities/note.js index 5ab002880..64708f0ab 100644 --- a/src/entities/note.js +++ b/src/entities/note.js @@ -411,10 +411,6 @@ class Note extends Entity { } }); - for (const attr of filteredAttributes) { - attr.isOwned = attr.noteId === this.noteId; - } - this.__attributeCache = filteredAttributes; } @@ -946,4 +942,4 @@ class Note extends Entity { } } -module.exports = Note; \ No newline at end of file +module.exports = Note; diff --git a/src/public/app/dialogs/attributes.js b/src/public/app/dialogs/attributes.js index 27630dd24..2cf844420 100644 --- a/src/public/app/dialogs/attributes.js +++ b/src/public/app/dialogs/attributes.js @@ -59,8 +59,8 @@ function AttributesModel() { }); }; - async function showAttributes(attributes) { - const ownedAttributes = attributes.filter(attr => attr.isOwned); + async function showAttributes(noteId, attributes) { + const ownedAttributes = attributes.filter(attr => attr.noteId === noteId); for (const attr of ownedAttributes) { attr.labelValue = attr.type === 'label' ? attr.value : ''; @@ -86,7 +86,7 @@ function AttributesModel() { addLastEmptyRow(); - const inheritedAttributes = attributes.filter(attr => !attr.isOwned); + const inheritedAttributes = attributes.filter(attr => attr.noteId !== noteId); self.inheritedAttributes(inheritedAttributes); } @@ -96,7 +96,7 @@ function AttributesModel() { const attributes = await server.get('notes/' + noteId + '/attributes'); - await showAttributes(attributes); + await showAttributes(noteId, attributes); // attribute might not be rendered immediatelly so could not focus setTimeout(() => $(".attribute-type-select:last").trigger('focus'), 1000); @@ -166,7 +166,7 @@ function AttributesModel() { const attributes = await server.put('notes/' + noteId + '/attributes', attributesToSave); - await showAttributes(attributes); + await showAttributes(noteId, attributes); toastService.showMessage("Attributes have been saved."); }; @@ -311,4 +311,4 @@ $dialog.on('focus', '.label-value', function (e) { $el: $(this), open: true }) -}); \ No newline at end of file +}); diff --git a/src/public/app/widgets/promoted_attributes.js b/src/public/app/widgets/promoted_attributes.js index 8c9e71209..58e025d07 100644 --- a/src/public/app/widgets/promoted_attributes.js +++ b/src/public/app/widgets/promoted_attributes.js @@ -19,6 +19,7 @@ const TPL = ` .promoted-attributes td, .promoted-attributes th { padding: 5px; + min-width: 50px; /* otherwise checkboxes can collapse into 0 width (if there are only checkboxes) */ } @@ -98,7 +99,7 @@ export default class PromotedAttributesWidget extends TabAwareWidget { const $labelCell = $("").append(valueAttr.name); const $input = $("") .prop("tabindex", definitionAttr.position) - .prop("attribute-id", valueAttr.isOwned ? valueAttr.attributeId : '') // if not owned, we'll force creation of a new attribute instead of updating the inherited one + .prop("attribute-id", valueAttr.noteId === this.noteId ? valueAttr.attributeId : '') // if not owned, we'll force creation of a new attribute instead of updating the inherited one .prop("attribute-type", valueAttr.type) .prop("attribute-name", valueAttr.name) .prop("value", valueAttr.value) @@ -266,4 +267,4 @@ export default class PromotedAttributesWidget extends TabAwareWidget { $attr.prop("attribute-id", result.attributeId); } -} \ No newline at end of file +} diff --git a/src/routes/api/attributes.js b/src/routes/api/attributes.js index 25bbaaf7e..131e7a77b 100644 --- a/src/routes/api/attributes.js +++ b/src/routes/api/attributes.js @@ -199,4 +199,4 @@ module.exports = { getEffectiveNoteAttributes, createRelation, deleteRelation -}; \ No newline at end of file +}; From 9d8b8e26a1488448a1d6119edbfa608bd05897ea Mon Sep 17 00:00:00 2001 From: zadam Date: Tue, 12 May 2020 10:28:31 +0200 Subject: [PATCH 2/3] attach extension to download file if note present --- src/routes/api/files.js | 7 +++-- src/routes/api/note_revisions.js | 10 ++----- src/services/notes.js | 5 ++-- src/services/utils.js | 49 ++++++++++++++++++++++++++++---- 4 files changed, 53 insertions(+), 18 deletions(-) diff --git a/src/routes/api/files.js b/src/routes/api/files.js index 54ba741fb..88c18354d 100644 --- a/src/routes/api/files.js +++ b/src/routes/api/files.js @@ -1,6 +1,5 @@ "use strict"; -const noteService = require('../../services/notes'); const protectedSessionService = require('../../services/protected_session'); const repository = require('../../services/repository'); const utils = require('../../services/utils'); @@ -45,7 +44,9 @@ async function downloadNoteFile(noteId, res, contentDisposition = true) { if (contentDisposition) { // (one) reason we're not using the originFileName (available as label) is that it's not // available for older note revisions and thus would be inconsistent - res.setHeader('Content-Disposition', utils.getContentDisposition(note.title || "untitled")); + const filename = utils.formatDownloadTitle(note.title, note.type, note.mime); + + res.setHeader('Content-Disposition', utils.getContentDisposition(filename)); } res.setHeader('Content-Type', note.mime); @@ -70,4 +71,4 @@ module.exports = { openFile, downloadFile, downloadNoteFile -}; \ No newline at end of file +}; diff --git a/src/routes/api/note_revisions.js b/src/routes/api/note_revisions.js index 023ba30ee..7f325f725 100644 --- a/src/routes/api/note_revisions.js +++ b/src/routes/api/note_revisions.js @@ -38,13 +38,7 @@ async function getNoteRevision(req) { * @return {string} */ function getRevisionFilename(noteRevision) { - let filename = noteRevision.title || "untitled"; - - if (noteRevision.type === 'text') { - filename += '.html'; - } else if (['relation-map', 'search'].includes(noteRevision.type)) { - filename += '.json'; - } + let filename = utils.formatDownloadTitle(noteRevision.title, noteRevision.type, noteRevision.mime); const extension = path.extname(filename); const date = noteRevision.dateCreated @@ -158,4 +152,4 @@ module.exports = { eraseAllNoteRevisions, eraseNoteRevision, restoreNoteRevision -}; \ No newline at end of file +}; diff --git a/src/services/notes.js b/src/services/notes.js index 152c72ec4..a04164ef5 100644 --- a/src/services/notes.js +++ b/src/services/notes.js @@ -13,6 +13,7 @@ const Attribute = require('../entities/attribute'); const hoistedNoteService = require('../services/hoisted_note'); const protectedSessionService = require('../services/protected_session'); const log = require('../services/log'); +const utils = require('../services/utils'); const noteRevisionService = require('../services/note_revisions'); const attributeService = require('../services/attributes'); const request = require('./request'); @@ -276,9 +277,9 @@ async function downloadImage(noteId, imageUrl) { const downloadImagePromises = {}; function replaceUrl(content, url, imageNote) { - const quoted = url.replace(/[.*+\-?^${}()|[\]\\]/g, '\\$&'); + const quotedUrl = utils.quoteRegex(url); - return content.replace(new RegExp(`\\s+src=[\"']${quoted}[\"']`, "g"), ` src="api/images/${imageNote.noteId}/${imageNote.title}"`); + return content.replace(new RegExp(`\\s+src=[\"']${quotedUrl}[\"']`, "g"), ` src="api/images/${imageNote.noteId}/${imageNote.title}"`); } async function downloadImages(noteId, content) { diff --git a/src/services/utils.js b/src/services/utils.js index 57af4218e..7cb02ae40 100644 --- a/src/services/utils.js +++ b/src/services/utils.js @@ -5,6 +5,7 @@ const randtoken = require('rand-token').generator({source: 'crypto'}); const unescape = require('unescape'); const escape = require('escape-html'); const sanitize = require("sanitize-filename"); +const mimeTypes = require('mime-types'); function newEntityId() { return randomString(12); @@ -166,10 +167,46 @@ function isStringNote(type, mime) { || STRING_MIME_TYPES.includes(mime); } -function replaceAll(string, replaceWhat, replaceWith) { - const escapedWhat = replaceWhat.replace(/([\/,!\\^${}\[\]().*+?|<>\-&])/g, "\\$&"); +function quoteRegex(url) { + return url.replace(/[.*+\-?^${}()|[\]\\]/g, '\\$&'); +} - return string.replace(new RegExp(escapedWhat, "g"), replaceWith); +function replaceAll(string, replaceWhat, replaceWith) { + const quotedReplaceWhat = quoteRegex(replaceWhat); + + return string.replace(new RegExp(quotedReplaceWhat, "g"), replaceWith); +} + +function formatDownloadTitle(filename, type, mime) { + if (!filename) { + filename = "untitled"; + } + + if (type === 'text') { + return filename + '.html'; + } else if (['relation-map', 'search'].includes(type)) { + return filename + '.json'; + } else { + if (!mime) { + return filename; + } + + mime = mime.toLowerCase(); + const filenameLc = filename.toLowerCase(); + const extensions = mimeTypes.extensions[mime]; + + if (!extensions || extensions.length === 0) { + return filename; + } + + for (const ext of extensions) { + if (filenameLc.endsWith('.' + ext)) { + return filename; + } + } + + return filename + '.' + extensions[0]; + } } module.exports = { @@ -198,5 +235,7 @@ module.exports = { sanitizeFilenameForHeader, getContentDisposition, isStringNote, - replaceAll -}; \ No newline at end of file + quoteRegex, + replaceAll, + formatDownloadTitle +}; From e08b0141a4caf55094d2900bf2ba45ba14f537ed Mon Sep 17 00:00:00 2001 From: zadam Date: Tue, 12 May 2020 10:52:07 +0200 Subject: [PATCH 3/3] when expanding/collpasing, set the flag also to the tree cache --- src/public/app/widgets/note_tree.js | 55 +++++++++++++++-------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/src/public/app/widgets/note_tree.js b/src/public/app/widgets/note_tree.js index 5c4cc4ae5..69cb8a93c 100644 --- a/src/public/app/widgets/note_tree.js +++ b/src/public/app/widgets/note_tree.js @@ -251,8 +251,8 @@ export default class NoteTreeWidget extends TabAwareWidget { this.triggerCommand('setActiveScreen', {screen:'detail'}); } }, - expand: (event, data) => this.setExpandedToServer(data.node.data.branchId, true), - collapse: (event, data) => this.setExpandedToServer(data.node.data.branchId, false), + expand: (event, data) => this.setExpanded(data.node.data.branchId, true), + collapse: (event, data) => this.setExpanded(data.node.data.branchId, false), hotkeys: utils.isMobile() ? undefined : { keydown: await this.getHotKeys() }, dnd5: { autoExpandMS: 600, @@ -929,12 +929,13 @@ export default class NoteTreeWidget extends TabAwareWidget { } } - async setExpandedToServer(branchId, isExpanded) { + async setExpanded(branchId, isExpanded) { utils.assertArguments(branchId); - const expandedNum = isExpanded ? 1 : 0; + const branch = treeCache.getBranch(branchId); + branch.isExpanded = isExpanded; - await server.put('branches/' + branchId + '/expanded/' + expandedNum); + await server.put(`branches/${branchId}/expanded/${isExpanded ? 1 : 0}`); } async reloadTreeFromCache() { @@ -994,7 +995,7 @@ export default class NoteTreeWidget extends TabAwareWidget { return false; } }; - + for (const action of actions) { for (const shortcut of action.effectiveShortcuts) { hotKeyMap[utils.normalizeShortcut(shortcut)] = node => { @@ -1019,83 +1020,83 @@ export default class NoteTreeWidget extends TabAwareWidget { async deleteNotesCommand({node}) { const branchIds = this.getSelectedOrActiveBranchIds(node); - + await branchService.deleteNotes(branchIds); this.clearSelectedNodes(); } - + moveNoteUpCommand({node}) { const beforeNode = node.getPrevSibling(); - + if (beforeNode !== null) { branchService.moveBeforeBranch([node.data.branchId], beforeNode.data.branchId); } } - + moveNoteDownCommand({node}) { const afterNode = node.getNextSibling(); if (afterNode !== null) { branchService.moveAfterBranch([node.data.branchId], afterNode.data.branchId); } } - + moveNoteUpInHierarchyCommand({node}) { branchService.moveNodeUpInHierarchy(node); } - + moveNoteDownInHierarchyCommand({node}) { const toNode = node.getPrevSibling(); - + if (toNode !== null) { branchService.moveToParentNote([node.data.branchId], toNode.data.noteId); } } - + addNoteAboveToSelectionCommand() { const node = this.getFocusedNode(); - + if (!node) { return; } - + if (node.isActive()) { node.setSelected(true); } - + const prevSibling = node.getPrevSibling(); - + if (prevSibling) { prevSibling.setActive(true, {noEvents: true}); - + if (prevSibling.isSelected()) { node.setSelected(false); } - + prevSibling.setSelected(true); } } addNoteBelowToSelectionCommand() { const node = this.getFocusedNode(); - + if (!node) { return; } - + if (node.isActive()) { node.setSelected(true); } - + const nextSibling = node.getNextSibling(); - + if (nextSibling) { nextSibling.setActive(true, {noEvents: true}); - + if (nextSibling.isSelected()) { node.setSelected(false); } - + nextSibling.setSelected(true); } } @@ -1179,4 +1180,4 @@ export default class NoteTreeWidget extends TabAwareWidget { noteCreateService.duplicateNote(node.data.noteId, branch.parentNoteId); } -} \ No newline at end of file +}