MWS: fix editing attachment tiddlers

plugins/tiddlywiki/multiwikiserver/config/MultiWikiServerEnableAttachments.tid

@@ -1,2 +1,2 @@
 title: $:/config/MultiWikiServer/EnableAttachments
-text: no
+text: yes

plugins/tiddlywiki/multiwikiserver/modules/store/sql-tiddler-database.js

@@ -539,6 +539,42 @@ SqlTiddlerDatabase.prototype.getRecipeBags = function(recipe_name) {
 	return rows.map(value => value.bag_name);
 };
 
+/*
+Get the attachment value of a bag, if any exist
+*/
+SqlTiddlerDatabase.prototype.getBagTiddlerAttachmentBlob = function(title,bag_name) {
+	const row = this.engine.runStatementGet(`
+		SELECT t.attachment_blob
+		FROM bags AS b
+		INNER JOIN tiddlers AS t ON b.bag_id = t.bag_id
+		WHERE t.title = $title AND b.bag_name = $bag_name AND t.is_deleted = FALSE
+	`, {
+		$title: title,
+		$bag_name: bag_name
+	});
+	return row ? row.attachment_blob : null;
+};
+
+/*
+Get the attachment value of a recipe, if any exist
+*/
+SqlTiddlerDatabase.prototype.getRecipeTiddlerAttachmentBlob = function(title,recipe_name) {
+	const row = this.engine.runStatementGet(`
+		SELECT t.attachment_blob
+		FROM bags AS b
+		INNER JOIN recipe_bags AS rb ON b.bag_id = rb.bag_id
+		INNER JOIN recipes AS r ON rb.recipe_id = r.recipe_id
+		INNER JOIN tiddlers AS t ON b.bag_id = t.bag_id
+		WHERE r.recipe_name = $recipe_name AND t.title = $title AND t.is_deleted = FALSE
+		ORDER BY rb.position DESC
+		LIMIT 1
+	`, {
+		$title: title,
+		$recipe_name: recipe_name
+	});
+	return row ? row.attachment_blob : null;
+};
+
 exports.SqlTiddlerDatabase = SqlTiddlerDatabase;
 
 })();

plugins/tiddlywiki/multiwikiserver/modules/store/sql-tiddler-store.js

@@ -143,20 +143,24 @@ SqlTiddlerStore.prototype.processOutgoingTiddler = function(tiddlerFields,tiddle
 
 /*
 */
-SqlTiddlerStore.prototype.processIncomingTiddler = function(tiddlerFields) {
+SqlTiddlerStore.prototype.processIncomingTiddler = function(tiddlerFields, exisiting_attachment_blob) {
 	let attachmentSizeLimit = $tw.utils.parseNumber(this.adminWiki.getTiddlerText("$:/config/MultiWikiServer/AttachmentSizeLimit"));
 	if(attachmentSizeLimit < 100 * 1024) {
 		attachmentSizeLimit = 100 * 1024;
 	}
 	const attachmentsEnabled = this.adminWiki.getTiddlerText("$:/config/MultiWikiServer/EnableAttachments","yes") === "yes";
 	const contentTypeInfo = $tw.config.contentTypeInfo[tiddlerFields.type || "text/vnd.tiddlywiki"],
 		isBinary = !!contentTypeInfo && contentTypeInfo.encoding === "base64";
-	if(attachmentsEnabled && isBinary && tiddlerFields.text && tiddlerFields.text.length > attachmentSizeLimit) {
-		const attachment_blob = this.attachmentStore.saveAttachment({
+	const shouldProcessAttachment = ((tiddlerFields.text && tiddlerFields.text.length > attachmentSizeLimit) || (exisiting_attachment_blob && exisiting_attachment_blob?.length < attachmentSizeLimit))
+	if(attachmentsEnabled && isBinary && shouldProcessAttachment) {
+		const attachment_blob = exisiting_attachment_blob || this.attachmentStore.saveAttachment({
 			text: tiddlerFields.text,
 			type: tiddlerFields.type,
 			reference: tiddlerFields.title
 		});
+		if(tiddlerFields?._canonical_uri) {
+			delete tiddlerFields._canonical_uri
+		}
 		return {
 			tiddlerFields: Object.assign({},tiddlerFields,{text: undefined}),
 			attachment_blob: attachment_blob
@@ -244,7 +248,8 @@ SqlTiddlerStore.prototype.createRecipe = function(recipe_name,bag_names,descript
 Returns {tiddler_id:}
 */
 SqlTiddlerStore.prototype.saveBagTiddler = function(incomingTiddlerFields,bag_name) {
-	const {tiddlerFields, attachment_blob} = this.processIncomingTiddler(incomingTiddlerFields);
+	const exisiting_attachment_blob = this.sqlTiddlerDatabase.getBagTiddlerAttachmentBlob(incomingTiddlerFields.title,bag_name)
+	const {tiddlerFields, attachment_blob} = this.processIncomingTiddler(incomingTiddlerFields,exisiting_attachment_blob);
 	const result = this.sqlTiddlerDatabase.saveBagTiddler(tiddlerFields,bag_name,attachment_blob);
 	this.dispatchEvent("change");
 	return result;
@@ -275,7 +280,8 @@ SqlTiddlerStore.prototype.saveBagTiddlerWithAttachment = function(incomingTiddle
 Returns {tiddler_id:,bag_name:}
 */
 SqlTiddlerStore.prototype.saveRecipeTiddler = function(incomingTiddlerFields,recipe_name) {
-	const {tiddlerFields, attachment_blob} = this.processIncomingTiddler(incomingTiddlerFields);
+	const exisiting_attachment_blob = this.sqlTiddlerDatabase.getRecipeTiddlerAttachmentBlob(incomingTiddlerFields.title,recipe_name)
+	const {tiddlerFields, attachment_blob} = this.processIncomingTiddler(incomingTiddlerFields,exisiting_attachment_blob);
 	const result = this.sqlTiddlerDatabase.saveRecipeTiddler(tiddlerFields,recipe_name,attachment_blob);
 	this.dispatchEvent("change");
 	return result;