Merge pull request #2786 from nextcloud/backport/2772/stable30

[stable30] feat: Ease opening photos picker in album content view

Author: artonge

cypress/e2e/albums.cy.js

@@ -6,7 +6,6 @@ import {
 	addFilesToAlbumFromAlbum,
 	addFilesToAlbumFromAlbumFromHeader,
 	createAnAlbumFromAlbums,
-	deleteAnAlbumFromAlbumContent,
 	goToAlbum,
 	removeSelectionFromAlbum,
 } from './albumsUtils'
@@ -28,7 +27,7 @@ Cypress.on('uncaught:exception', (err) => {
 	}
 })
 
-describe('Manage albums', { testIsolation: true }, () => {
+describe('Manage albums', () => {
 	let user = null
 
 	beforeEach(function () {

cypress/e2e/albumsUtils.ts

@@ -51,7 +51,6 @@ export function addFilesToAlbumFromAlbum(albumName: string, itemsIndex: number[]
 }
 
 export function addFilesToAlbumFromAlbumFromHeader(albumName: string, itemsIndex: number[]) {
-	cy.contains('New').click()
 	cy.contains('Add photos to this album').click()
 	cy.get('.photos-picker__file-list').within(() => {
 		selectMedia(itemsIndex)

js/photos-main.js

@@ -274,9 +274,6 @@ This file is generated from multiple sources. Included packages:
 - css-loader
 	- version: 7.1.2
 	- license: MIT
-- debounce
-	- version: 1.2.1
-	- license: MIT
 - decode-named-character-reference
 	- version: 1.0.2
 	- license: MIT

js/photos-main.js.map

@@ -2,7 +2,6 @@ SPDX-License-Identifier: MIT
 SPDX-License-Identifier: GPL-3.0-or-later
 SPDX-License-Identifier: Apache-2.0
 SPDX-FileCopyrightText: omahlama
-SPDX-FileCopyrightText: debounce developers
 SPDX-FileCopyrightText: Rob Cresswell <[email protected]>
 SPDX-FileCopyrightText: Nextcloud GmbH and Nextcloud contributors
 SPDX-FileCopyrightText: Evan You
@@ -19,9 +18,6 @@ This file is generated from multiple sources. Included packages:
 - blurhash
 	- version: 2.0.5
 	- license: MIT
-- debounce
-	- version: 1.2.1
-	- license: MIT
 - vue-loader
 	- version: 15.11.1
 	- license: MIT

js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Timeline_vue.js

@@ -0,0 +1 @@
+photos-vendors-node_modules_blurhash_dist_esm_index_js-node_modules_vue-material-design-icons_Accoun-3940d6.js.license

js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Timeline_vue.js.map

@@ -13,13 +13,14 @@
 			<HeaderNavigation key="navigation"
 				slot="header"
 				slot-scope="{selectedFileIds, resetSelection}"
-				:class="{'photos-navigation--uploading': uploader.queue?.length > 0}"
 				:loading="loadingCollectionFiles"
 				:params="{ albumName }"
 				:path="'/' + albumName"
 				:title="albumName"
 				@refresh="fetchAlbumContent">
-				<div v-if="album !== undefined && album.location !== ''" slot="subtitle" class="album__location">
+				<div v-if="album !== undefined && album.location !== ''"
+					slot="subtitle"
+					class="album__location">
 					<MapMarker />{{ album.location }}
 				</div>
 
@@ -35,12 +36,12 @@
 				</template>
 
 				<template v-if="album !== undefined" slot="right">
-					<UploadPicker :accept="allowedMimes"
-						:context="uploadContext"
-						:destination="albumAsFolder"
-						:root="uploadContext.root"
-						:multiple="true"
-						@uploaded="onUpload" />
+					<NcButton @click="showAddPhotosModal = true">
+						<template #icon>
+							<Plus :size="20" />
+						</template>
+						{{ t('photos', 'Add photos to this album' ) }}
+					</NcButton>
 
 					<NcButton v-if="sharingEnabled"
 						type="tertiary"
@@ -147,12 +148,8 @@
 <script>
 import { mapActions } from 'vuex'
 
-import { Folder, addNewFileMenuEntry, removeNewFileMenuEntry, davParsePermissions } from '@nextcloud/files'
-import { getCurrentUser } from '@nextcloud/auth'
 import { NcActions, NcActionButton, NcButton, NcDialog, NcModal, NcEmptyContent, NcActionSeparator, NcLoadingIcon, isMobile } from '@nextcloud/vue'
-import { UploadPicker, getUploader } from '@nextcloud/upload'
 import { translate } from '@nextcloud/l10n'
-import debounce from 'debounce'
 
 import Close from 'vue-material-design-icons/Close.vue'
 import Delete from 'vue-material-design-icons/Delete.vue'
@@ -162,7 +159,6 @@ import ImagePlus from 'vue-material-design-icons/ImagePlus.vue'
 import MapMarker from 'vue-material-design-icons/MapMarker.vue'
 import Pencil from 'vue-material-design-icons/Pencil.vue'
 import Plus from 'vue-material-design-icons/Plus.vue'
-import PlusSvg from '@mdi/svg/svg/plus.svg'
 import ShareVariant from 'vue-material-design-icons/ShareVariant.vue'
 
 import FetchFilesMixin from '../mixins/FetchFilesMixin.js'
@@ -176,7 +172,6 @@ import CollectionContent from '../components/Collection/CollectionContent.vue'
 import PhotosPicker from '../components/PhotosPicker.vue'
 import HeaderNavigation from '../components/HeaderNavigation.vue'
 
-import allowedMimes from '../services/AllowedMimes.js'
 import logger from '../services/logger.js'
 
 export default {
@@ -206,7 +201,6 @@ export default {
 		Pencil,
 		Plus,
 		ShareVariant,
-		UploadPicker,
 	},
 
 	mixins: [
@@ -224,26 +218,11 @@ export default {
 
 	data() {
 		return {
-			allowedMimes,
-
 			showAddPhotosModal: false,
 			showManageCollaboratorView: false,
 			showEditAlbumForm: false,
 
 			loadingAddCollaborators: false,
-
-			uploader: getUploader(),
-
-			/** @type {import('@nextcloud/files').Entry} */
-			newFileMenuEntry: {
-				id: 'album-add',
-				displayName: t('photos', 'Add photos to this album'),
-				enabled: (destination) => destination.basename === this.$route.params.albumName,
-				/** Existing icon css class */
-				iconSvgInline: PlusSvg,
-				/** Function to be run after creation */
-				handler: () => { this.showAddPhotosModal = true },
-			},
 		}
 	},
 
@@ -269,47 +248,17 @@ export default {
 			return OC.Share !== undefined
 		},
 
-		/**
-		 * 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: this.$route.name,
-				root: `dav/photos/${getCurrentUser()?.uid}/albums`,
-			}
-		},
-
 		/**
 		 * @return {string} The album's filename based on its name. Useful to fetch the location information and content.
 		 */
 		albumFileName() {
 			return this.$store.getters.getAlbumName(this.albumName)
 		},
-
-		albumAsFolder() {
-			return new Folder({
-				...this.album,
-				owner: getCurrentUser()?.uid ?? '',
-				source: this.album?.source ?? '',
-				permissions: davParsePermissions(this.album.permissions),
-			})
-		},
 	},
 
 	async mounted() {
 		this.fetchAlbum()
 		this.fetchAlbumContent()
-		addNewFileMenuEntry(this.newFileMenuEntry)
-	},
-
-	destroyed() {
-		removeNewFileMenuEntry(this.newFileMenuEntry)
 	},
 
 	methods: {
@@ -368,15 +317,6 @@ export default {
 			}
 		},
 
-		/**
-		 * A new File has been uploaded, let's add it
-		 *
-		 * @param {Upload[]} uploads
-		 */
-		onUpload: debounce(function() {
-			this.fetchAlbumContent()
-		}, 500),
-
 		t: translate,
 	},
 }
@@ -407,26 +347,4 @@ export default {
 		color: var(--color-text-lighter);
 	}
 }
-
-.photos-navigation {
-	position: relative;
-	// Add space at the bottom for the progress bar.
-	&--uploading {
-		margin-bottom: 30px;
-	}
-
-	:deep(.upload-picker) {
-		.upload-picker__progress {
-			position: absolute;
-			bottom: -30px;
-			left: 64px;
-			margin: 0;
-		}
-		.upload-picker__cancel {
-			position: absolute;
-			bottom: -24px;
-			right: 50px;
-		}
-	}
-}
 </style>