Merge pull request #37878 from 2lar/sortingfixbranch

nextcloud · Aug 7, 2024 · 3da69fc · 3da69fc
2 parents 6cc0827 + 6cf1aed
commit 3da69fc
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 10 deletions.
diff --git a/apps/files_sharing/src/views/SharingTab.vue b/apps/files_sharing/src/views/SharingTab.vue
@@ -260,11 +260,16 @@ export default {
 		 */
 		processShares({ data }) {
 			if (data.ocs && data.ocs.data && data.ocs.data.length > 0) {
-				// create Share objects and sort by newest
+				// create Share objects and sort by title in alphabetical order and then by creation time
 				const shares = data.ocs.data
 					.map(share => new Share(share))
-					.sort((a, b) => b.createdTime - a.createdTime)
-
+					.sort((a, b) => {
+						const localCompare = a.title.localeCompare(b.title)
+						if (localCompare !== 0) {
+							return localCompare
+						}
+						return b.createdTime - a.createdTime
+					})
 				this.linkShares = shares.filter(share => share.type === this.SHARE_TYPES.SHARE_TYPE_LINK || share.type === this.SHARE_TYPES.SHARE_TYPE_EMAIL)
 				this.shares = shares.filter(share => share.type !== this.SHARE_TYPES.SHARE_TYPE_LINK && share.type !== this.SHARE_TYPES.SHARE_TYPE_EMAIL)
 

diff --git a/dist/9549-9549.js → dist/6880-6880.js b/dist/9549-9549.js → dist/6880-6880.js
diff --git a/dist/9549-9549.js.license → dist/6880-6880.js.license b/dist/9549-9549.js.license → dist/6880-6880.js.license
diff --git a/dist/6880-6880.js.map b/dist/6880-6880.js.map
diff --git a/dist/6880-6880.js.map.license b/dist/6880-6880.js.map.license
@@ -0,0 +1 @@
+6880-6880.js.license
diff --git a/dist/9549-9549.js.map b/dist/9549-9549.js.map
diff --git a/dist/9549-9549.js.map.license b/dist/9549-9549.js.map.license
diff --git a/dist/files_sharing-files_sharing_tab.js b/dist/files_sharing-files_sharing_tab.js
diff --git a/dist/files_sharing-files_sharing_tab.js.map b/dist/files_sharing-files_sharing_tab.js.map