Merge pull request #24880 from nextcloud/backport/stable19/23017

juliusknorr · web-flow · commit 0849262c7f8d · 2021-01-05T15:12:27.000+01:00
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/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php
@@ -226,6 +226,9 @@ protected function formatShare(IShare $share, Node $recipientNode = null): array
 			$sharedWith = $this->userManager->get($share->getSharedWith());
 			$result['share_with'] = $share->getSharedWith();
 			$result['share_with_displayname'] = $sharedWith !== null ? $sharedWith->getDisplayName() : $share->getSharedWith();
+			$result['share_with_displayname_unique'] = $sharedWith !== null ? (
+				 $sharedWith->getEMailAddress() !== '' ? $sharedWith->getEMailAddress() : $sharedWith->getUID()
+			) : $share->getSharedWith();
 		} elseif ($share->getShareType() === IShare::TYPE_GROUP) {
 			$group = $this->groupManager->get($share->getSharedWith());
 			$result['share_with'] = $share->getSharedWith();
diff --git a/apps/files_sharing/src/components/SharingEntry.vue b/apps/files_sharing/src/components/SharingEntry.vue
@@ -30,7 +30,7 @@
 			:menu-position="'left'"
 			:url="share.shareWithAvatar" />
 		<div v-tooltip.auto="tooltip" class="sharing-entry__desc">
-			<h5>{{ title }}</h5>
+			<h5>{{ title }}<span v-if="!isUnique" class="sharing-entry__desc-unique"> ({{ share.shareWithDisplayNameUnique }})</span></h5>
 		</div>
 		<Actions
 			menu-align="right"
@@ -384,6 +384,9 @@ export default {
 		p {
 			color: var(--color-text-maxcontrast);
 		}
+		&-unique {
+			color: var(--color-text-maxcontrast);
+		}
 	}
 	&__actions {
 		margin-left: auto;
diff --git a/apps/files_sharing/src/components/SharingEntrySimple.vue b/apps/files_sharing/src/components/SharingEntrySimple.vue
@@ -64,6 +64,10 @@ export default {
 			type: String,
 			default: '',
 		},
+		isUnique: {
+			type: Boolean,
+			default: true,
+		},
 	},
 
 }
diff --git 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.shareWithDisplayNameUnique }
+				}
+				return item
+			})
 
 			this.loading = false
 			console.info('suggestions', this.suggestions)
@@ -393,6 +413,7 @@ export default {
 				isNoUser: result.value.shareType !== this.SHARE_TYPES.SHARE_TYPE_USER,
 				displayName: result.name || result.label,
 				desc,
+				shareWithDisplayNameUnique: result.shareWithDisplayNameUnique || '',
 				icon: this.shareTypeToIcon(result.value.shareType),
 			}
 		},
diff --git a/apps/files_sharing/src/mixins/SharesMixin.js b/apps/files_sharing/src/mixins/SharesMixin.js
@@ -42,6 +42,10 @@ export default {
 			type: Share,
 			default: null,
 		},
+		isUnique: {
+			type: Boolean,
+			default: true,
+		},
 	},
 
 	data() {
diff --git a/apps/files_sharing/src/models/Share.js b/apps/files_sharing/src/models/Share.js
@@ -150,6 +150,10 @@ export default class Share {
 			|| this.#share.share_with
 	}
 
+	get shareWithDisplayNameUnique() {
+		return this.#share.share_with_displayname_unique || this.#share.share_with
+	}
+
 	/**
 	 * Get the share with avatar if any
 	 *
diff --git a/apps/files_sharing/src/views/SharingList.vue b/apps/files_sharing/src/views/SharingList.vue
@@ -26,6 +26,7 @@
 			:key="share.id"
 			:file-info="fileInfo"
 			:share="share"
+			:is-unique="isUnique(share)"
 			@remove:share="removeShare" />
 	</ul>
 </template>
@@ -34,6 +35,7 @@
 // eslint-disable-next-line no-unused-vars
 import Share from '../models/Share'
 import SharingEntry from '../components/SharingEntry'
+import ShareTypes from '../mixins/ShareTypes'
 
 export default {
 	name: 'SharingList',
@@ -42,6 +44,8 @@ export default {
 		SharingEntry,
 	},
 
+	mixins: [ShareTypes],
+
 	props: {
 		fileInfo: {
 			type: Object,
@@ -59,6 +63,13 @@ export default {
 		hasShares() {
 			return this.shares.length === 0
 		},
+		isUnique() {
+			return (share) => {
+				return [...this.shares].filter((item) => {
+					return share.type === this.SHARE_TYPES.SHARE_TYPE_USER && share.shareWithDisplayName === item.shareWithDisplayName
+				}).length <= 1
+			}
+		},
 	},
 
 	methods: {
diff --git a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
@@ -576,6 +576,7 @@ public function dataGetShare() {
 			'share_type' => \OCP\Share::SHARE_TYPE_USER,
 			'share_with' => 'userId',
 			'share_with_displayname' => 'userDisplay',
+			'share_with_displayname_unique' => 'userId@example.com',
 			'uid_owner' => 'initiatorId',
 			'displayname_owner' => 'initiatorDisplay',
 			'item_type' => 'file',
@@ -773,6 +774,7 @@ public function testGetShare(\OCP\Share\IShare $share, array $result) {
 		$user = $this->getMockBuilder(IUser::class)->getMock();
 		$user->method('getUID')->willReturn('userId');
 		$user->method('getDisplayName')->willReturn('userDisplay');
+		$user->method('getEMailAddress')->willReturn('userId@example.com');
 
 		$group = $this->getMockBuilder('OCP\IGroup')->getMock();
 		$group->method('getGID')->willReturn('groupId');
@@ -3427,6 +3429,8 @@ public function dataFormatShare() {
 		$initiator->method('getDisplayName')->willReturn('initiatorDN');
 		$recipient = $this->getMockBuilder(IUser::class)->getMock();
 		$recipient->method('getDisplayName')->willReturn('recipientDN');
+		$recipient->method('getEmailAddress')->willReturn('recipient');
+
 
 		$result = [];
 
@@ -3466,6 +3470,7 @@ public function dataFormatShare() {
 				'file_target' => 'myTarget',
 				'share_with' => 'recipient',
 				'share_with_displayname' => 'recipient',
+				'share_with_displayname_unique' => 'recipient',
 				'note' => 'personal note',
 				'label' => null,
 				'mail_send' => 0,
@@ -3502,6 +3507,7 @@ public function dataFormatShare() {
 				'file_target' => 'myTarget',
 				'share_with' => 'recipient',
 				'share_with_displayname' => 'recipientDN',
+				'share_with_displayname_unique' => 'recipient',
 				'mail_send' => 0,
 				'mimetype' => 'myMimeType',
 				'has_preview' => false,
@@ -3552,6 +3558,7 @@ public function dataFormatShare() {
 				'file_target' => 'myTarget',
 				'share_with' => 'recipient',
 				'share_with_displayname' => 'recipient',
+				'share_with_displayname_unique' => 'recipient',
 				'mail_send' => 0,
 				'mimetype' => 'myMimeType',
 				'has_preview' => false,
@@ -3598,6 +3605,7 @@ public function dataFormatShare() {
 				'file_target' => 'myTarget',
 				'share_with' => 'recipient',
 				'share_with_displayname' => 'recipient',
+				'share_with_displayname_unique' => 'recipient',
 				'mail_send' => 0,
 				'mimetype' => 'myMimeType',
 				'has_preview' => false,
@@ -4145,6 +4153,7 @@ public function dataFormatShare() {
 				'file_target' => 'myTarget',
 				'share_with' => 'recipient',
 				'share_with_displayname' => 'recipient',
+				'share_with_displayname_unique' => 'recipient',
 				'mail_send' => 0,
 				'mimetype' => 'mimeWithPreview',
 				'has_preview' => true,
diff --git a/lib/private/Collaboration/Collaborators/MailPlugin.php b/lib/private/Collaboration/Collaborators/MailPlugin.php
@@ -136,6 +136,8 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
 										'shareType' => Share::SHARE_TYPE_USER,
 										'shareWith' => $cloud->getUser(),
 									],
+									'shareWithDisplayNameUnique' => !empty($emailAddress) ? $emailAddress : $cloud->getUser()
+
 								]];
 								$searchResult->addResultSet($userType, [], $singleResult);
 								$searchResult->markExactIdMatch($emailType);
@@ -170,6 +172,7 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
 										'shareType' => Share::SHARE_TYPE_USER,
 										'shareWith' => $cloud->getUser(),
 									],
+									'shareWithDisplayNameUnique' => !empty($emailAddress) ? $emailAddress : $cloud->getUser()
 								];
 								continue;
 							}
diff --git a/lib/private/Collaboration/Collaborators/RemotePlugin.php b/lib/private/Collaboration/Collaborators/RemotePlugin.php
@@ -103,7 +103,8 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_USER,
 								'shareWith' => $remoteUser
-							]
+							],
+							'shareWithDisplayNameUnique' => $contact['EMAIL'] !== null && $contact['EMAIL'] !== '' ? $contact['EMAIL'] : $contact['UID'],
 						];
 					}
 
diff --git a/lib/private/Collaboration/Collaborators/UserPlugin.php b/lib/private/Collaboration/Collaborators/UserPlugin.php
@@ -126,6 +126,7 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
 						'shareType' => Share::SHARE_TYPE_USER,
 						'shareWith' => $uid,
 					],
+					'shareWithDisplayNameUnique' => !empty($userEmail) ? $userEmail : $uid,
 				];
 			} else {
 				$addToWideResults = false;
@@ -147,6 +148,7 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
 							'shareType' => IShare::TYPE_USER,
 							'shareWith' => $uid,
 						],
+						'shareWithDisplayNameUnique' => !empty($userEmail) ? $userEmail : $uid,
 					];
 				}
 			}
@@ -166,12 +168,15 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
 				}
 
 				if ($addUser) {
+					$uid = $user->getUID();
+					$userEmail = $user->getEMailAddress();
 					$result['exact'][] = [
 						'label' => $user->getDisplayName(),
 						'value' => [
 							'shareType' => Share::SHARE_TYPE_USER,
 							'shareWith' => $user->getUID(),
 						],
+						'shareWithDisplayNameUnique' => $userEmail !== null && $userEmail !== '' ? $userEmail : $uid,
 					];
 				}
 			}
diff --git a/tests/lib/Collaboration/Collaborators/MailPluginTest.php b/tests/lib/Collaboration/Collaborators/MailPluginTest.php
@@ -385,7 +385,7 @@ public function dataGetEmail() {
 					]
 				],
 				false,
-				['users' => [], 'exact' => ['users' => [['uuid' => 'uid1', 'name' => 'User', 'label' => 'User (test@example.com)','value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test'],]]]],
+				['users' => [], 'exact' => ['users' => [['uuid' => 'uid1', 'name' => 'User', 'label' => 'User (test@example.com)','value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test'], 'shareWithDisplayNameUnique' => 'test@example.com']]]],
 				true,
 				false,
 			],
@@ -443,8 +443,8 @@ public function dataGetEmail() {
 				],
 				true,
 				['users' => [
-					['uuid' => 'uid1', 'name' => 'User1', 'label' => 'User1 (test@example.com)', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
-					['uuid' => 'uid2', 'name' => 'User2', 'label' => 'User2 (test@example.de)', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
+					['uuid' => 'uid1', 'name' => 'User1', 'label' => 'User1 (test@example.com)', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1'], 'shareWithDisplayNameUnique' => 'test@example.com'],
+					['uuid' => 'uid2', 'name' => 'User2', 'label' => 'User2 (test@example.de)', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test2'], 'shareWithDisplayNameUnique' => 'test@example.de'],
 				], 'emails' => [], 'exact' => ['users' => [], 'emails' => []]],
 				false,
 				true,
@@ -603,7 +603,7 @@ public function dataGetEmailGroupsOnly() {
 						'UID' => 'User'
 					]
 				],
-				['users' => [['label' => 'User (test@example.com)', 'uuid' => 'User', 'name' => 'User', 'value' => ['shareType' => 0, 'shareWith' => 'test'],]], 'emails' => [], 'exact' => ['emails' => [], 'users' => []]],
+				['users' => [['label' => 'User (test@example.com)', 'uuid' => 'User', 'name' => 'User', 'value' => ['shareType' => 0, 'shareWith' => 'test'],'shareWithDisplayNameUnique' => 'test@example.com',]], 'emails' => [], 'exact' => ['emails' => [], 'users' => []]],
 				false,
 				false,
 				[
diff --git a/tests/lib/Collaboration/Collaborators/UserPluginTest.php b/tests/lib/Collaboration/Collaborators/UserPluginTest.php

Original file line number	Diff line number	Diff line change
`@@ -150,6 +150,10 @@ export default class Share {`
`150`	`150`	`\|\| this.#share.share_with`
`151`	`151`	`}`
`152`	`152`
	`153`	`+ get shareWithDisplayNameUnique() {`
	`154`	`+ return this.#share.share_with_displayname_unique \|\| this.#share.share_with`
	`155`	`+ }`
	`156`	`+`
`153`	`157`	`/**`
`154`	`158`	`* Get the share with avatar if any`
`155`	`159`	`*`