fix(pageShare): No page deletion and page trash in page shares

Signed-off-by: Jonas <[email protected]>
nextcloud · Dec 11, 2023 · 012eeb5 · 012eeb5
1 parent 78935e5
commit 012eeb5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/lib/Controller/PublicPageTrashController.php b/lib/Controller/PublicPageTrashController.php
@@ -79,6 +79,10 @@ private function getShare(): CollectiveShareInfo {
 			if ($this->share === null) {
 				throw new NotFoundException('Failed to get shared collective');
 			}
+
+			if ($this->share->getPageId() !== 0) {
+				throw new NotFoundException('Shared page does not support page trash');
+			}
 		}
 
 		return $this->share;

diff --git a/src/components/Collective.vue b/src/components/Collective.vue
@@ -49,6 +49,7 @@ export default {
 		...mapGetters([
 			'currentCollective',
 			'currentCollectiveCanEdit',
+			'currentCollectiveIsPageShare',
 			'currentFileIdPage',
 			'currentPage',
 			'loading',
@@ -172,7 +173,7 @@ export default {
 		async getPages() {
 			await this.dispatchGetPages()
 				.catch(displayError('Could not fetch pages'))
-			if (this.currentCollectiveCanEdit) {
+			if (this.currentCollectiveCanEdit && !this.currentCollectiveIsPageShare) {
 				await this.dispatchGetTrashPages()
 					.catch(displayError('Could not fetch page trash'))
 			}
@@ -184,7 +185,7 @@ export default {
 		async getPagesBackground() {
 			await this.dispatchGetPages(false)
 				.catch(displayError('Could not fetch pages'))
-			if (this.currentCollectiveCanEdit) {
+			if (this.currentCollectiveCanEdit && !this.currentCollectiveIsPageShare) {
 				await this.dispatchGetTrashPages()
 					.catch(displayError('Could not fetch page trash'))
 			}

diff --git a/src/components/Page/PageActionMenu.vue b/src/components/Page/PageActionMenu.vue
@@ -94,7 +94,7 @@
 			</NcActionButton>
 
 			<!-- Delete page -->
-			<NcActionButton v-if="currentCollectiveCanEdit && !isLandingPage"
+			<NcActionButton v-if="displayDeleteAction"
 				:close-after-click="true"
 				@click="deletePage(pageId)">
 				<template #icon>
@@ -203,6 +203,7 @@ export default {
 		...mapGetters([
 			'currentCollective',
 			'currentCollectiveCanEdit',
+			'currentCollectiveIsPageShare',
 			'hasSubpages',
 			'isFullWidthView',
 			'loading',
@@ -224,6 +225,12 @@ export default {
 			return this.lastUserId && this.lastUserDisplayName
 		},
 
+		displayDeleteAction() {
+			return this.currentCollectiveCanEdit
+				&& !this.currentCollectiveIsPageShare
+				&& !this.isLandingPage
+		},
+
 		toggleOutlineString() {
 			return this.showing('outline')
 				? t('collectives', 'Hide outline')

diff --git a/src/components/PageList.vue b/src/components/PageList.vue
@@ -213,6 +213,7 @@ export default {
 
 		displayTrash() {
 			return this.currentCollectiveCanEdit
+				&& !this.currentCollectiveIsPageShare
 				&& ('files_trashbin' in this.OC.appswebroots)
 				&& !this.loading('collectives')
 		},