Merge pull request #4848 from nextcloud/backport/stable26/4844

[stable26] fix(editorApi): Use attachment resolver in MarkdownContentEditor
nextcloud · Oct 11, 2023 · 1953911 · 1953911
2 parents e52cc33 + 98c50ff
commit 1953911
Show file tree

Hide file tree

Showing 16 changed files with 45 additions and 25 deletions.
diff --git a/js/editor.js b/js/editor.js
diff --git a/js/editor.js.map b/js/editor.js.map
diff --git a/js/files-modal.js b/js/files-modal.js
diff --git a/js/files-modal.js.map b/js/files-modal.js.map
diff --git a/js/text-editors.js b/js/text-editors.js
diff --git a/js/text-editors.js.map b/js/text-editors.js.map
diff --git a/js/text-files.js b/js/text-files.js
diff --git a/js/text-files.js.map b/js/text-files.js.map
diff --git a/js/text-public.js b/js/text-public.js
diff --git a/js/text-public.js.map b/js/text-public.js.map
diff --git a/js/text-text.js b/js/text-text.js
diff --git a/js/text-text.js.map b/js/text-text.js.map
diff --git a/js/text-viewer.js b/js/text-viewer.js
diff --git a/js/text-viewer.js.map b/js/text-viewer.js.map
diff --git a/src/components/Editor/MarkdownContentEditor.vue b/src/components/Editor/MarkdownContentEditor.vue
@@ -40,8 +40,10 @@ import MenuBar from '../Menu/MenuBar.vue'
 import { Editor } from '@tiptap/core'
 /* eslint-disable import/no-named-as-default */
 import History from '@tiptap/extension-history'
-import { EDITOR, IS_RICH_EDITOR, useLinkClickHook } from '../Editor.provider.js'
+import { getCurrentUser } from '@nextcloud/auth'
+import { ATTACHMENT_RESOLVER, EDITOR, IS_RICH_EDITOR, useLinkClickHook } from '../Editor.provider.js'
 import { createMarkdownSerializer } from '../../extensions/Markdown.js'
+import AttachmentResolver from '../../services/AttachmentResolver.js'
 import markdownit from '../../markdownit/index.js'
 import { RichText } from '../../extensions/index.js'
 import ReadonlyBar from '../Menu/ReadonlyBar.vue'
@@ -55,12 +57,15 @@ export default {
 		const val = {}
 
 		Object.defineProperties(val, {
-			[IS_RICH_EDITOR]: {
-				get: () => true,
-			},
 			[EDITOR]: {
 				get: () => this.$editor,
 			},
+			[ATTACHMENT_RESOLVER]: {
+				get: () => this.$attachmentResolver,
+			},
+			[IS_RICH_EDITOR]: {
+				get: () => true,
+			},
 		})
 
 		return val
@@ -75,6 +80,14 @@ export default {
 			type: Boolean,
 			default: false,
 		},
+		relativePath: {
+			type: String,
+			default: '',
+		},
+		shareToken: {
+			type: String,
+			default: null,
+		},
 		showOutlineOutside: {
 			type: Boolean,
 			default: false,
@@ -97,6 +110,11 @@ export default {
 	created() {
 		this.$editor = this.createEditor()
 		this.$editor.setOptions({ editable: !this.readOnly })
+		this.$attachmentResolver = new AttachmentResolver({
+			currentDirectory: this.relativePath?.match(/.*\//),
+			user: getCurrentUser(),
+			shareToken: this.shareToken,
+		})
 	},
 
 	beforeDestroy() {

diff --git a/src/editor.js b/src/editor.js
@@ -212,6 +212,8 @@ window.OCA.Text.createEditor = async function({
 				: h(MarkdownContentEditor, {
 					props: {
 						content: data.content,
+						relativePath: filePath,
+						shareToken,
 						readOnly: data.readOnly,
 						showOutlineOutside: data.showOutlineOutside,
 					},