Merge pull request #2518 from nextcloud/artonge/backport/2514/stable28

[stable28] Various fix from 30
nextcloud · Jul 4, 2024 · cf0bf4e · cf0bf4e
2 parents 759d49a + aa45e5d
commit cf0bf4e
Show file tree

Hide file tree

Showing 20 changed files with 65 additions and 59 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/...ue-material-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-3c3243.js b/...ue-material-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-3c3243.js
diff --git a/...aterial-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-3c3243.js.map b/...aterial-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-3c3243.js.map
diff --git a/...ue-material-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-e1736f.js b/...ue-material-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-e1736f.js
diff --git a/...aterial-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-e1736f.js.map b/...aterial-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-e1736f.js.map
diff --git a/...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-7ffa74.js b/...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-7ffa74.js
diff --git a/...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-7ffa74.js.map b/...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-7ffa74.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_AlbumContent_vue.js b/js/photos-src_views_AlbumContent_vue.js
diff --git a/js/photos-src_views_AlbumContent_vue.js.map b/js/photos-src_views_AlbumContent_vue.js.map
diff --git a/js/photos-src_views_Folders_vue.js b/js/photos-src_views_Folders_vue.js
diff --git a/js/photos-src_views_Folders_vue.js.map b/js/photos-src_views_Folders_vue.js.map
diff --git a/src/components/Collection/CollectionContent.vue b/src/components/Collection/CollectionContent.vue
@@ -41,7 +41,7 @@
 		<slot v-if="sortedCollectionFileIds.length === 0 && !loading" name="empty-content" />
 
 		<!-- Media list -->
-		<FilesListViewer v-if="collection !== undefined"
+		<FilesListViewer v-if="collection !== undefined && sortedCollectionFileIds.length > 0 "
 			:container-element="appContent"
 			class="collection__media"
 			:file-ids="sortedCollectionFileIds"

diff --git a/src/router/index.js b/src/router/index.js
@@ -127,7 +127,7 @@ const router = new Router({
 		{
 			path: '/albums/:albumName*',
 			component: AlbumContent,
-			name: 'albums',
+			name: 'albumsContent',
 			props: route => ({
 				albumName: route.params.albumName,
 			}),
@@ -150,7 +150,7 @@ const router = new Router({
 		{
 			path: '/sharedalbums/:albumName*',
 			component: SharedAlbumContent,
-			name: 'sharedAlbums',
+			name: 'sharedAlbumsContent',
 			props: route => ({
 				albumName: route.params.albumName,
 			}),
@@ -181,7 +181,7 @@ const router = new Router({
 		{
 			path: '/places/:placeName*',
 			component: PlaceContent,
-			name: 'places',
+			name: 'placesContent',
 			props: route => ({
 				placeName: route.params.placeName,
 			}),

diff --git a/src/views/AlbumContent.vue b/src/views/AlbumContent.vue
@@ -20,9 +20,8 @@
  -
  -->
 <template>
-	<div>
-		<CollectionContent v-if="true"
-			ref="collectionContent"
+	<div class="album-container">
+		<CollectionContent ref="collectionContent"
 			:collection="album"
 			:collection-file-ids="albumFileIds"
 			:loading="loadingCollection || loadingCollectionFiles"
@@ -53,8 +52,7 @@
 				</template>
 
 				<template v-if="album !== undefined" slot="right">
-					<UploadPicker v-if="album.nbItems !== 0"
-						:accept="allowedMimes"
+					<UploadPicker :accept="allowedMimes"
 						:context="uploadContext"
 						:destination="albumAsFolder"
 						:root="uploadContext.root"
@@ -127,7 +125,8 @@
 			</NcEmptyContent>
 		</CollectionContent>
 
-		<PhotosPicker :open.sync="showAddPhotosModal"
+		<PhotosPicker v-if="album !== undefined"
+			:open.sync="showAddPhotosModal"
 			:blacklist-ids="albumFileIds"
 			:destination="album.basename"
 			:name="t('photos', 'Add photos to {albumName}', {albumName: albumName})"
@@ -402,6 +401,14 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.album-container {
+	height: 100%;
+
+	:deep(.collection) {
+		height: 100%;
+	}
+}
+
 .album {
 	&__title {
 		width: 100%;
@@ -426,19 +433,19 @@ export default {
 	&--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;
+	:deep(.upload-picker) {
+		.upload-picker__progress {
+			position: absolute;
+			bottom: -30px;
+			left: 64px;
+			margin: 0;
+		}
+		.upload-picker__cancel {
+			position: absolute;
+			bottom: -24px;
+			right: 50px;
+		}
 	}
 }
 </style>
diff --git a/src/views/Folders.vue b/src/views/Folders.vue
@@ -321,21 +321,20 @@ export default {
 	&--uploading {
 		margin-bottom: 30px;
 	}
-}
 
-:deep(.upload-picker) {
-	.upload-picker__progress {
-		position: absolute;
-		bottom: -30px;
-		left: 64px;
-		margin: 0;
-	}
+	:deep(.upload-picker) {
+		.upload-picker__progress {
+			position: absolute;
+			bottom: -30px;
+			left: 64px;
+			margin: 0;
+		}
 
-	.upload-picker__cancel {
-		position: absolute;
-		bottom: -24px;
-		right: 50px;
+		.upload-picker__cancel {
+			position: absolute;
+			bottom: -24px;
+			right: 50px;
+		}
 	}
 }
-
 </style>