Merge pull request #5304 from nextcloud/backport/5302/stable28

[stable28] fix(mention): use new url schema
nextcloud · Jan 26, 2024 · dff227c · dff227c
2 parents 21a2a31 + e70b554
commit dff227c
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 23 deletions.
diff --git a/cypress/e2e/nodes/Mentions.spec.js b/cypress/e2e/nodes/Mentions.spec.js
@@ -72,8 +72,11 @@ describe('Test mentioning users', () => {
 
 		return cy.wait(`@${autocompleteReauestAlias}`)
 			.then(() => {
+				cy.intercept({ method: 'PUT', url: '**/mention' }).as('putMention')
 				cy.get('.tippy-box .suggestion-list').contains(mention).click()
 				cy.get('span.mention').contains(mention).should('be.visible')
+				cy.wait('@putMention')
+					.its('response.statusCode').should('eq', 200)
 			})
 	})
 

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/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-init.js b/js/text-init.js
diff --git a/js/text-init.js.map b/js/text-init.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/Suggestion/Mention/suggestions.js b/src/components/Suggestion/Mention/suggestions.js
@@ -6,8 +6,9 @@ import createSuggestions from '../suggestions.js'
 const USERS_LIST_ENDPOINT_URL = generateUrl('apps/text/api/v1/users')
 
 const emitMention = ({ session, props }) => {
-	axios.put(generateUrl('apps/text/session/mention'), {
-		documentId: session.documentId,
+	const documentId = session.documentId
+	axios.put(generateUrl(`apps/text/session/${documentId}/mention`), {
+		documentId,
 		sessionId: session.id,
 		sessionToken: session.token,
 		mention: props.id,