Merge pull request #47365 from nextcloud/fix/share-sorting

fix(files_sharing): Sort by correct share attribute ("share with displayname")
nextcloud · Aug 21, 2024 · cf56874 · cf56874
2 parents 1907eee + d6cfcd7
commit cf56874
Show file tree

Hide file tree

Showing 90 changed files with 143 additions and 140 deletions.
diff --git a/apps/files_sharing/src/views/SharingTab.vue b/apps/files_sharing/src/views/SharingTab.vue
@@ -82,11 +82,12 @@
 </template>
 
 <script>
-import { CollectionList } from 'nextcloud-vue-collections'
-import { generateOcsUrl } from '@nextcloud/router'
-import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar.js'
 import axios from '@nextcloud/axios'
+import { orderBy } from '@nextcloud/files'
 import { loadState } from '@nextcloud/initial-state'
+import { generateOcsUrl } from '@nextcloud/router'
+import { CollectionList } from 'nextcloud-vue-collections'
+import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar.js'
 
 import Config from '../services/ConfigService.ts'
 import { shareWithTitle } from '../utils/SharedWithMe.js'
@@ -260,16 +261,18 @@ export default {
 		 */
 		processShares({ data }) {
 			if (data.ocs && data.ocs.data && data.ocs.data.length > 0) {
-				// 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) => {
-						const localCompare = a.title.localeCompare(b.title)
-						if (localCompare !== 0) {
-							return localCompare
-						}
-						return b.createdTime - a.createdTime
-					})
+				const shares = orderBy(
+					data.ocs.data.map(share => new Share(share)),
+					[
+						// First order by the "share with" label
+						(share) => share.shareWithDisplayName,
+						// Then by the label
+						(share) => share.label,
+						// And last resort order by createdTime
+						(share) => share.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/4696-4696.js b/dist/4696-4696.js
diff --git a/dist/4696-4696.js.map b/dist/4696-4696.js.map
diff --git a/dist/8707-8707.js b/dist/8707-8707.js
diff --git a/dist/8953-8953.js.license → dist/8707-8707.js.license b/dist/8953-8953.js.license → dist/8707-8707.js.license
diff --git a/dist/8707-8707.js.map b/dist/8707-8707.js.map
diff --git a/dist/8707-8707.js.map.license b/dist/8707-8707.js.map.license
@@ -0,0 +1 @@
+8707-8707.js.license
diff --git a/dist/8953-8953.js b/dist/8953-8953.js
diff --git a/dist/8953-8953.js.map b/dist/8953-8953.js.map
diff --git a/dist/8953-8953.js.map.license b/dist/8953-8953.js.map.license
diff --git a/dist/comments-comments-app.js b/dist/comments-comments-app.js
diff --git a/dist/comments-comments-app.js.map b/dist/comments-comments-app.js.map
diff --git a/dist/comments-comments-tab.js b/dist/comments-comments-tab.js
diff --git a/dist/comments-comments-tab.js.map b/dist/comments-comments-tab.js.map
diff --git a/dist/core-legacy-unified-search.js b/dist/core-legacy-unified-search.js
diff --git a/dist/core-legacy-unified-search.js.map b/dist/core-legacy-unified-search.js.map
diff --git a/dist/core-login.js b/dist/core-login.js
diff --git a/dist/core-login.js.map b/dist/core-login.js.map
diff --git a/dist/core-main.js b/dist/core-main.js
diff --git a/dist/core-main.js.map b/dist/core-main.js.map
diff --git a/dist/core-profile.js b/dist/core-profile.js
diff --git a/dist/core-profile.js.map b/dist/core-profile.js.map
diff --git a/dist/dav-settings-personal-availability.js b/dist/dav-settings-personal-availability.js
diff --git a/dist/dav-settings-personal-availability.js.map b/dist/dav-settings-personal-availability.js.map