Merge pull request #57354 from nextcloud/fix/comments-node-api

fix(comments): adjust Activity integration for changed Node API

Author: susnux

apps/comments/src/comments-activity-tab.ts

@@ -1,8 +1,10 @@
-/**
+/*!
  * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import type { INode } from '@nextcloud/files'
+
 import moment from '@nextcloud/moment'
 import { createPinia, PiniaVuePlugin } from 'pinia'
 import Vue, { type ComponentPublicInstance } from 'vue'
@@ -19,7 +21,7 @@ let ActivityTabPluginInstance
  */
 export function registerCommentsPlugins() {
 	window.OCA.Activity.registerSidebarAction({
-		mount: async (el, { fileInfo, reload }) => {
+		mount: async (el: HTMLElement, { node, reload }: { node: INode, reload: () => void }) => {
 			const pinia = createPinia()
 
 			if (!ActivityTabPluginView) {
@@ -32,10 +34,10 @@ export function registerCommentsPlugins() {
 				pinia,
 				propsData: {
 					reloadCallback: reload,
-					resourceId: fileInfo.id,
+					resourceId: node.fileid,
 				},
 			})
-			logger.info('Comments plugin mounted in Activity sidebar action', { fileInfo })
+			logger.info('Comments plugin mounted in Activity sidebar action', { node })
 		},
 		unmount: () => {
 			// destroy previous instance if available
@@ -45,9 +47,15 @@ export function registerCommentsPlugins() {
 		},
 	})
 
-	window.OCA.Activity.registerSidebarEntries(async ({ fileInfo, limit, offset }) => {
-		const { data: comments } = await getComments({ resourceType: 'files', resourceId: fileInfo.id }, { limit, offset })
-		logger.debug('Loaded comments', { fileInfo, comments })
+	window.OCA.Activity.registerSidebarEntries(async ({ node, limit, offset }: { node: INode, limit?: number, offset?: number }) => {
+		const { data: comments } = await getComments(
+			{ resourceType: 'files', resourceId: node.fileid },
+			{
+				limit,
+				offset: offset ?? 0,
+			},
+		)
+		logger.debug('Loaded comments', { node, comments })
 		const { default: CommentView } = await import('./views/ActivityCommentEntry.vue')
 		// @ts-expect-error Types are broken for Vue2
 		const CommentsViewObject = Vue.extend(CommentView)
@@ -62,7 +70,7 @@ export function registerCommentsPlugins() {
 					el: element,
 					propsData: {
 						comment,
-						resourceId: fileInfo.id,
+						resourceId: node.fileid,
 						reloadCallback: reload,
 					},
 				})