Add appconfig to always show the unique label of a sharee

Signed-off-by: Julius Härtl <jus@bitgrid.net> Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
nextcloud · Mar 18, 2021 · 96287f3 · 96287f3
1 parent 939db1f
commit 96287f3
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 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/lib/Capabilities.php b/apps/files_sharing/lib/Capabilities.php
@@ -115,7 +115,8 @@ public function getCapabilities() {
 
 		// Sharee searches
 		$res['sharee'] = [
-			'query_lookup_default' => $this->config->getSystemValueBool('gs.enabled', false)
+			'query_lookup_default' => $this->config->getSystemValueBool('gs.enabled', false),
+			'always_show_unique' => $this->config->getAppValue('files_sharing', 'always_show_unique', 'yes') === 'yes',
 		];
 
 		return [

diff --git a/apps/files_sharing/src/components/SharingInput.vue b/apps/files_sharing/src/components/SharingInput.vue
@@ -398,7 +398,9 @@ export default {
 		 */
 		formatForMultiselect(result) {
 			let desc
-			if ((result.value.shareType === this.SHARE_TYPES.SHARE_TYPE_REMOTE
+			if (result.value.shareType === this.SHARE_TYPES.SHARE_TYPE_USER && this.config.shouldAlwaysShowUnique) {
+				desc = result.shareWithDisplayNameUnique ?? ''
+			} else if ((result.value.shareType === this.SHARE_TYPES.SHARE_TYPE_REMOTE
 					|| result.value.shareType === this.SHARE_TYPES.SHARE_TYPE_REMOTE_GROUP
 			) && result.value.server) {
 				desc = t('files_sharing', 'on {server}', { server: result.value.server })

diff --git a/apps/files_sharing/src/services/ConfigService.js b/apps/files_sharing/src/services/ConfigService.js
@@ -229,6 +229,15 @@ export default class Config {
 		return (OC.getCapabilities().files_sharing.sharebymail === undefined) ? false : OC.getCapabilities().files_sharing.sharebymail.password.enforced
 	}
 
+	/**
+	 * @returns {boolean}
+	 * @readonly
+	 * @memberof Config
+	 */
+	get shouldAlwaysShowUnique() {
+		return (OC.getCapabilities().files_sharing?.sharee?.always_show_unique === true)
+	}
+
 	/**
 	 * Is sharing with groups allowed ?
 	 *