Perf: Optimize trashed pages

Signed-off-by: Kostiantyn Miakshyn <molodchick@gmail.com>

Author: Koc

lib/Db/PageMapper.php

@@ -80,6 +80,36 @@ public function findByFileId(int $fileId, bool $trashed = false): ?Page {
 		}
 	}
 
+	/**
+	 * @param int[] $fileIds
+	 * @return array<int, Page> Indexed by file_id
+	 */
+	public function findByFileIds(array $fileIds, bool $trashed = false): array {
+		if (empty($fileIds)) {
+			return [];
+		}
+
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('*')
+			->from($this->tableName)
+			->where($qb->expr()->in('file_id',
+				$qb->createNamedParameter($fileIds, IQueryBuilder::PARAM_INT_ARRAY)));
+
+		if ($trashed) {
+			$qb->andWhere($qb->expr()->isNotNull('trash_timestamp'));
+		} else {
+			$qb->andWhere($qb->expr()->isNull('trash_timestamp'));
+		}
+
+		$pages = $this->findEntities($qb);
+		$pagesByFileId = [];
+		foreach ($pages as $page) {
+			$pagesByFileId[$page->getFileId()] = $page;
+		}
+
+		return $pagesByFileId;
+	}
+
 	/**
 	 * @return Page[]
 	 */

lib/Service/PageService.php

@@ -245,12 +245,7 @@ private function getPageByFile(File $file, ?Node $parent = null): PageInfo {
 	/**
 	 * @throws NotFoundException
 	 */
-	private function getTrashPageByFile(File $file, string $filename, string $timestamp): PageInfo {
-		try {
-			$page = $this->pageMapper->findByFileId($file->getId(), true);
-		} catch (InvalidPathException|FilesNotFoundException $e) {
-			throw new NotFoundException($e->getMessage(), 0, $e);
-		}
+	private function createTrashPageInfo(File $file, string $filename, string $timestamp, ?Page $page): PageInfo {
 		$lastUserId = ($page !== null) ? $page->getLastUserId() : null;
 		$emoji = ($page !== null) ? $page->getEmoji() : null;
 		$subpageOrder = ($page !== null) ? $page->getSubpageOrder() : null;
@@ -550,7 +545,9 @@ public function findAllTrash(int $collectiveId, string $userId): array {
 		}
 
 		$trashNodes = $this->trashBackend->listTrashForCollective($this->userManager->get($userId), $collectiveId);
-		$trashPageInfos = [];
+
+		// Collect file data and file IDs
+		$fileData = [];
 		foreach ($trashNodes as $node) {
 			$pathParts = pathInfo($node->getName());
 			$filename = $pathParts['filename'];
@@ -570,7 +567,29 @@ public function findAllTrash(int $collectiveId, string $userId): array {
 				continue;
 			}
 
-			$trashPageInfos[] = $this->getTrashPageByFile($node, $filename, $timestamp);
+			$fileData[$node->getId()] = [
+				'node' => $node,
+				'filename' => $filename,
+				'timestamp' => $timestamp
+			];
+		}
+
+		// Single query to get all pages by file IDs
+		$pagesByFileId = $this->pageMapper->findByFileIds(array_keys($fileData), true);
+
+		// Create trash page infos using the pre-loaded pages
+		$trashPageInfos = [];
+		foreach ($fileData as $fileId => $data) {
+			if (!isset($pagesByFileId[$fileId])) {
+				continue;
+			}
+
+			$trashPageInfos[] = $this->createTrashPageInfo(
+				$data['node'],
+				$data['filename'],
+				$data['timestamp'],
+				$pagesByFileId[$fileId],
+			);
 		}
 
 		return $trashPageInfos;

src/components/PageList/PageTrash.vue

@@ -22,8 +22,13 @@
 			class="dialog__page-trash"
 			size="large">
 			<div class="modal__content">
+				<NcEmptyContent v-if="loading('pageTrash')" :name="t('collectives', 'Loading…')">
+					<template #icon>
+						<NcLoadingIcon />
+					</template>
+				</NcEmptyContent>
 				<NcEmptyContent
-					v-if="!sortedTrashPages.length"
+					v-else-if="!sortedTrashPages.length"
 					class="modal__content_empty"
 					:description="t('collectives', 'No deleted pages.')">
 					<template #icon>
@@ -104,10 +109,12 @@ import NcActions from '@nextcloud/vue/components/NcActions'
 import NcButton from '@nextcloud/vue/components/NcButton'
 import NcDialog from '@nextcloud/vue/components/NcDialog'
 import NcEmptyContent from '@nextcloud/vue/components/NcEmptyContent'
+import NcLoadingIcon from '@nextcloud/vue/components/NcLoadingIcon'
 import RestoreIcon from 'vue-material-design-icons/Restore.vue'
 import DeleteIcon from 'vue-material-design-icons/TrashCanOutline.vue'
 import PageIcon from '../Icon/PageIcon.vue'
 import { usePagesStore } from '../../stores/pages.js'
+import { useRootStore } from '../../stores/root.js'
 import { scrollToPage } from '../../util/scrollToElement.js'
 
 export default {
@@ -119,6 +126,7 @@ export default {
 		NcButton,
 		NcDialog,
 		NcEmptyContent,
+		NcLoadingIcon,
 		DeleteIcon,
 		RestoreIcon,
 		PageIcon,
@@ -144,6 +152,7 @@ export default {
 
 	computed: {
 		...mapState(usePagesStore, ['sortedTrashPages']),
+		...mapState(useRootStore, ['loading']),
 
 		titleDate() {
 			return (timestamp) => {
@@ -175,11 +184,13 @@ export default {
 			'deletePage',
 			'expandParents',
 			'restorePage',
+			'getTrashPages',
 			'setHighlightAnimationPageId',
 		]),
 
 		openTrash() {
 			this.showModal = true
+			this.getTrashPages()
 		},
 
 		onClickRestore(trashPage) {

src/views/CollectiveView.vue

@@ -126,7 +126,7 @@ export default {
 		...mapActions(useSessionsStore, ['createSession', 'updateSession', 'closeSession']),
 		...mapActions(useTagsStore, ['getTags']),
 		...mapActions(useTemplatesStore, ['getTemplates']),
-		...mapActions(usePagesStore, ['getPages', 'getTrashPages']),
+		...mapActions(usePagesStore, ['getPages']),
 
 		initSession() {
 			if (this.listenPush) {
@@ -217,7 +217,6 @@ export default {
 			if (this.currentCollectiveCanEdit) {
 				if (!this.currentCollectiveIsPageShare) {
 					promises.push(this.getTemplates(setLoading))
-					promises.push(this.getTrashPages())
 				}
 			}