Merge pull request #24864 from nextcloud/bugfix/noid/always-show-exte…

…rnal-share Also include external share results in recommendations
nextcloud · Dec 30, 2020 · 5e3fe1c · 5e3fe1c
2 parents 40832ac + 9f5ada5
commit 5e3fe1c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/apps/files_sharing/js/dist/files_sharing_tab.js b/apps/files_sharing/js/dist/files_sharing_tab.js
diff --git a/apps/files_sharing/js/dist/files_sharing_tab.js.map b/apps/files_sharing/js/dist/files_sharing_tab.js.map
diff --git a/apps/files_sharing/src/components/SharingInput.vue b/apps/files_sharing/src/components/SharingInput.vue
@@ -294,6 +294,8 @@ export default {
 				return
 			}
 
+			const externalResults = this.externalResults.filter(result => !result.condition || result.condition(this))
+
 			const exact = request.data.ocs.data.exact
 
 			// flatten array of arrays
@@ -302,6 +304,7 @@ export default {
 			// remove invalid data and format to user-select layout
 			this.recommendations = this.filterOutExistingShares(rawRecommendations)
 				.map(share => this.formatForMultiselect(share))
+				.concat(externalResults)
 
 			this.loading = false
 			console.info('recommendations', this.recommendations)