summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2020-09-23 12:39:53 +0200
committerJulius Härtl <jus@bitgrid.net>2021-01-05 10:06:32 +0100
commit177a30b07f5b4e11c48749e2e49204c141281ad6 (patch)
tree2f53eb73fa3beac75c57acac51941ab6b368d340
parent1dc3f0f48e2ca5435cc268a7ae22033df8ec700c (diff)
downloadnextcloud-server-177a30b07f5b4e11c48749e2e49204c141281ad6.tar.gz
nextcloud-server-177a30b07f5b4e11c48749e2e49204c141281ad6.zip
Make share results distinguishable if there are more than one with the exact same display name
Signed-off-by: Julius Härtl <jus@bitgrid.net>
-rw-r--r--apps/files_sharing/src/components/SharingInput.vue22
1 files changed, 21 insertions, 1 deletions
diff --git a/apps/files_sharing/src/components/SharingInput.vue b/apps/files_sharing/src/components/SharingInput.vue
index dacb1c8a96b..cbf2a0c89b8 100644
--- a/apps/files_sharing/src/components/SharingInput.vue
+++ b/apps/files_sharing/src/components/SharingInput.vue
@@ -240,7 +240,27 @@ export default {
// if there is a condition specified, filter it
const externalResults = this.externalResults.filter(result => !result.condition || result.condition(this))
- this.suggestions = exactSuggestions.concat(suggestions).concat(externalResults).concat(lookupEntry)
+ const allSuggestions = exactSuggestions.concat(suggestions).concat(externalResults).concat(lookupEntry)
+
+ // Count occurances of display names in order to provide a distinguishable description if needed
+ const nameCounts = allSuggestions.reduce((nameCounts, result) => {
+ if (!result.displayName) {
+ return nameCounts
+ }
+ if (!nameCounts[result.displayName]) {
+ nameCounts[result.displayName] = 0
+ }
+ nameCounts[result.displayName]++
+ return nameCounts
+ }, {})
+
+ this.suggestions = allSuggestions.map(item => {
+ // Make sure that items with duplicate displayName get the shareWith applied as a description
+ if (nameCounts[item.displayName] > 1 && !item.desc) {
+ return { ...item, desc: item.shareWith }
+ }
+ return item
+ })
this.loading = false
console.info('suggestions', this.suggestions)