Merge pull request #2660 from nextcloud/backport/2658/stable29

[stable29] feat: Check upload directory share state
nextcloud · Sep 25, 2024 · d216d2c · d216d2c
2 parents 9760a43 + 8830803
commit d216d2c
Show file tree

Hide file tree

Showing 12 changed files with 56 additions and 28 deletions.
diff --git a/js/photos-main.js b/js/photos-main.js
diff --git a/js/photos-main.js.map b/js/photos-main.js.map
diff --git a/...e_modules_vue-material-design-icons_FolderMultipleImage_vue-src_views_AlbumContent_vue.js b/...e_modules_vue-material-design-icons_FolderMultipleImage_vue-src_views_AlbumContent_vue.js
diff --git a/...dules_vue-material-design-icons_FolderMultipleImage_vue-src_views_AlbumContent_vue.js.map b/...dules_vue-material-design-icons_FolderMultipleImage_vue-src_views_AlbumContent_vue.js.map
diff --git a/js/photos-public.js b/js/photos-public.js
diff --git a/js/photos-public.js.map b/js/photos-public.js.map
diff --git a/js/photos-src_components_Collection_CollectionContent_vue-src_components_PhotosPicker_vue.js b/js/photos-src_components_Collection_CollectionContent_vue-src_components_PhotosPicker_vue.js
diff --git a/...os-src_components_Collection_CollectionContent_vue-src_components_PhotosPicker_vue.js.map b/...os-src_components_Collection_CollectionContent_vue-src_components_PhotosPicker_vue.js.map
diff --git a/js/photos-src_views_SharedAlbumContent_vue.js b/js/photos-src_views_SharedAlbumContent_vue.js
diff --git a/js/photos-src_views_SharedAlbumContent_vue.js.map b/js/photos-src_views_SharedAlbumContent_vue.js.map
diff --git a/lib/Sabre/Album/AlbumRoot.php b/lib/Sabre/Album/AlbumRoot.php
@@ -29,6 +29,7 @@
 use OCA\Photos\Album\AlbumWithFiles;
 use OCA\Photos\Service\UserConfigService;
 use OCP\Files\Folder;
+use OCP\Files\InvalidDirectoryException;
 use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;
 use Sabre\DAV\Exception\Conflict;
@@ -106,6 +107,10 @@ public function createFile($name, $data = null) {
 				throw new Conflict('The destination exists and is not a folder');
 			}
 
+			if ($photosFolder->isShared()) {
+				throw new InvalidDirectoryException('The destination is a received share');
+			}
+
 			// Check for conflict and rename the file accordingly
 			$newName = \basename(\OC_Helper::buildNotExistingFileName($photosLocation, $name));
 

diff --git a/src/components/PhotosPicker.vue b/src/components/PhotosPicker.vue
@@ -61,18 +61,25 @@
 
 		<!-- The actions on the bottom -->
 		<template #actions>
-			<UploadPicker :accept="allowedMimes"
-				:context="uploadContext"
-				:destination="photosLocationFolder"
-				:multiple="true"
-				@uploaded="refreshFiles" />
-			<NcButton type="primary" :disabled="loading || selectedFileIds.length === 0" @click="emitPickedEvent">
-				<template #icon>
-					<ImagePlus v-if="!loading" />
-					<NcLoadingIcon v-if="loading" />
-				</template>
-				{{ t('photos', 'Add to {destination}', { destination }) }}
-			</NcButton>
+			<div class="photos-picker__actions">
+				<div class="photos-picker__actions__buttons">
+					<UploadPicker :accept="allowedMimes"
+						:context="uploadContext"
+						:destination="photosLocationFolder"
+						:multiple="true"
+						@uploaded="refreshFiles" />
+					<NcButton type="primary" :disabled="loading || selectedFileIds.length === 0" @click="emitPickedEvent">
+						<template #icon>
+							<ImagePlus v-if="!loading" />
+							<NcLoadingIcon v-if="loading" />
+						</template>
+						{{ t('photos', 'Add to {destination}', { destination }) }}
+					</NcButton>
+				</div>
+				<NcNoteCard v-if="photosLocationFolder.attributes['owner-id'] !== currentUser" type="warning">
+					{{ t('photos', 'The destination folder is owned by {owner}', { owner: photosLocationFolder.attributes['owner-id'] }) }}
+				</NcNoteCard>
+			</div>
 		</template>
 
 		<FilesListViewer class="photos-picker__file-list"
@@ -107,11 +114,12 @@
 
 <script>
 import { UploadPicker } from '@nextcloud/upload'
-import { NcButton, NcDialog, NcLoadingIcon, NcSelect, useIsMobile } from '@nextcloud/vue'
+import { NcButton, NcDialog, NcLoadingIcon, NcSelect, NcNoteCard, useIsMobile } from '@nextcloud/vue'
 import { defineComponent } from 'vue'
 import { mapGetters } from 'vuex'
 
 import moment from '@nextcloud/moment'
+import { getCurrentUser } from '@nextcloud/auth'
 
 import ImagePlus from 'vue-material-design-icons/ImagePlus.vue'
 
@@ -134,6 +142,7 @@ export default defineComponent({
 		NcDialog,
 		NcLoadingIcon,
 		NcSelect,
+		NcNoteCard,
 		UploadPicker,
 	},
 
@@ -194,6 +203,7 @@ export default defineComponent({
 			uploadContext: {
 				route: 'albumpicker',
 			},
+			currentUser: getCurrentUser(),
 		}
 	},
 
@@ -298,5 +308,18 @@ export default defineComponent({
 			justify-content: center;
 		}
 	}
+
+	&__actions {
+		display: flex;
+		flex-direction: column;
+		flex-grow: 1;
+
+		&__buttons {
+			display: flex;
+			align-items: center;
+			justify-content: end;
+			gap: 16px;
+		}
+	}
 }
 </style>