Merge pull request #2227 from nextcloud/artonge/feat/order_collection…

…s_files_by_taken_date Order collections files by taken date
nextcloud · Jan 3, 2024 · 38610e7 · 38610e7
2 parents 45836e7 + a39cea3
commit 38610e7
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 24 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_FilesPicker_vue.js b/js/photos-src_components_Collection_CollectionContent_vue-src_components_FilesPicker_vue.js
diff --git a/...tos-src_components_Collection_CollectionContent_vue-src_components_FilesPicker_vue.js.map b/...tos-src_components_Collection_CollectionContent_vue-src_components_FilesPicker_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/src/components/Collection/CollectionContent.vue b/src/components/Collection/CollectionContent.vue
@@ -38,13 +38,13 @@
 			:reset-selection="resetSelection" />
 
 		<!-- No content -->
-		<slot v-if="collectionFileIds.length === 0 && !loading" name="empty-content" />
+		<slot v-if="sortedCollectionFileIds.length === 0 && !loading" name="empty-content" />
 
 		<!-- Media list -->
 		<FilesListViewer v-if="collection !== undefined"
 			:container-element="appContent"
 			class="collection__media"
-			:file-ids="collectionFileIds"
+			:file-ids="sortedCollectionFileIds"
 			:base-height="isMobile ? 120 : 200"
 			:loading="loading">
 			<File slot-scope="{file, distance}"
@@ -125,14 +125,18 @@ export default {
 		files() {
 			return this.$store.getters.files
 		},
+
+		sortedCollectionFileIds() {
+			return this.collectionFileIds.toSorted((fileId1, fileId2) => this.files[fileId1].timestamp < this.files[fileId2].timestamp ? -1 : 1)
+		},
 	},
 
 	methods: {
 		openViewer(fileId) {
 			const file = this.files[fileId]
 			OCA.Viewer.open({
 				fileInfo: file,
-				list: this.collectionFileIds.map(fileId => this.files[fileId]).filter(file => !file.sectionHeader),
+				list: this.sortedCollectionFileIds.map(fileId => this.files[fileId]).filter(file => !file.sectionHeader),
 				loadMore: file.loadMore ? async () => await file.loadMore(true) : () => [],
 				canLoop: file.canLoop,
 			})