From 34350748122a974dafcd81743dca84ee1d22c060 Mon Sep 17 00:00:00 2001
From: "Grigorii K. Shartsev" <me@shgk.me>
Date: Tue, 12 Dec 2023 19:44:46 +0100
Subject: [PATCH] fix: upload photo from files picker to album

Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
---
 src/components/FilesPicker.vue   | 38 ++++++++++++++++++++++++++------
 src/views/AlbumContent.vue       |  7 ++++++
 src/views/SharedAlbumContent.vue |  1 +
 3 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/src/components/FilesPicker.vue b/src/components/FilesPicker.vue
index 1c2c70599..0503b914b 100644
--- a/src/components/FilesPicker.vue
+++ b/src/components/FilesPicker.vue
@@ -65,9 +65,10 @@
 		<div class="file-picker__actions">
 			<UploadPicker :accept="allowedMimes"
 				:context="uploadContext"
-				:destination="photosLocation"
+				:destination="album.basename"
+				:root="uploadContext.root"
 				:multiple="true"
-				@uploaded="refreshFiles" />
+				@uploaded="emitUploadedEvent" />
 			<NcButton type="primary" :disabled="loading || selectedFileIds.length === 0" @click="emitPickedEvent">
 				<template #icon>
 					<ImagePlus v-if="!loading" />
@@ -95,6 +96,7 @@ import FilesSelectionMixin from '../mixins/FilesSelectionMixin.js'
 import FilesByMonthMixin from '../mixins/FilesByMonthMixin.js'
 import UserConfig from '../mixins/UserConfig.js'
 import allowedMimes from '../services/AllowedMimes.js'
+import { getCurrentUser } from '@nextcloud/auth'
 
 export default {
 	name: 'FilesPicker',
@@ -124,6 +126,10 @@ export default {
 	],
 
 	props: {
+		album: {
+			type: Object,
+			required: true,
+		},
 		// Label to show in the submit button.
 		destination: {
 			type: String,
@@ -143,13 +149,15 @@ export default {
 		},
 	},
 
+	emits: [
+		'files-uploaded',
+		'files-picked',
+	],
+
 	data() {
 		return {
 			allowedMimes,
 			targetMonth: null,
-			uploadContext: {
-				route: 'albumpicker',
-			},
 		}
 	},
 
@@ -157,6 +165,22 @@ export default {
 		...mapGetters([
 			'files',
 		]),
+
+		/**
+		 * The upload picker context
+		 * We're uploading to the album folder, and the backend handle
+		 * the writing to the default location as well as the album update.
+		 * The context is also used for the NewFileMenu.
+		 *
+		 * @return {Album&{route: string, root: string}}
+		 */
+		 uploadContext() {
+			return {
+				...this.album,
+				route: 'albumpicker',
+				root: `dav/photos/${getCurrentUser()?.uid}/albums`,
+			}
+		},
 	},
 
 	watch: {
@@ -172,8 +196,8 @@ export default {
 			this.fetchFiles('', {}, this.blacklistIds)
 		},
 
-		refreshFiles() {
-			this.fetchFiles('', { firstResult: 0 }, [...this.blacklistIds, ...this.fetchedFileIds], true)
+		emitUploadedEvent() {
+			this.$emit('files-uploaded')
 		},
 
 		emitPickedEvent() {
diff --git a/src/views/AlbumContent.vue b/src/views/AlbumContent.vue
index 331c14852..cd31e5c02 100644
--- a/src/views/AlbumContent.vue
+++ b/src/views/AlbumContent.vue
@@ -132,8 +132,10 @@
 			:name="t('photos', 'Add photos to {albumName}', {albumName: albumName})"
 			@close="showAddPhotosModal = false">
 			<FilesPicker v-if="album !== undefined"
+				:album="album"
 				:destination="album.basename"
 				:blacklist-ids="albumFileIds"
+				@files-uploaded="handleFilesUploaded"
 				@files-picked="handleFilesPicked" />
 		</NcModal>
 
@@ -351,6 +353,11 @@ export default {
 			}
 		},
 
+		handleFilesUploaded() {
+			this.showAddPhotosModal = false
+			this.onUpload()
+		},
+
 		async handleFilesPicked(fileIds) {
 			this.showAddPhotosModal = false
 			await this.addFilesToCollection({ collectionFileName: this.album.filename, fileIdsToAdd: fileIds })
diff --git a/src/views/SharedAlbumContent.vue b/src/views/SharedAlbumContent.vue
index ff5645d69..8ce6ae374 100644
--- a/src/views/SharedAlbumContent.vue
+++ b/src/views/SharedAlbumContent.vue
@@ -116,6 +116,7 @@
 			:name="t('photos', 'Add photos to {albumName}', {albumName: albumOriginalName})"
 			@close="showAddPhotosModal = false">
 			<FilesPicker v-if="album !== undefined"
+				:album="album"
 				:destination="album.basename"
 				:blacklist-ids="albumFileIds"
 				:loading="loadingAddFilesToAlbum"