Merge pull request #28860 from nextcloud/backport/28822/stable22

[stable22] Add email addresses to contacts menu
nextcloud · Sep 18, 2021 · 4ac4c0a · 4ac4c0a
2 parents 81cd110 + 74ba526
commit 4ac4c0a
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 5 deletions.
diff --git a/core/js/dist/login.js b/core/js/dist/login.js
diff --git a/core/js/dist/login.js.map b/core/js/dist/login.js.map
diff --git a/core/js/dist/main.js b/core/js/dist/main.js
diff --git a/core/js/dist/main.js.map b/core/js/dist/main.js.map
diff --git a/core/src/OC/contactsmenu/contact.handlebars b/core/src/OC/contactsmenu/contact.handlebars
@@ -6,6 +6,7 @@
 <div class="body">
 	<div class="full-name">{{contact.fullName}}</div>
 	<div class="last-message">{{contact.lastMessage}}</div>
+	<div class="email-address">{{contact.emailAddresses}}</div>
 </div>
 {{#if contact.topAction}}
 <a class="top-action" href="{{contact.topAction.hyperlink}}" title="{{contact.topAction.title}}">

diff --git a/lib/private/Contacts/ContactsMenu/Entry.php b/lib/private/Contacts/ContactsMenu/Entry.php
@@ -165,6 +165,7 @@ public function jsonSerialize(): array {
 			'topAction' => $topAction,
 			'actions' => $otherActions,
 			'lastMessage' => '',
+			'emailAddresses' => $this->getEMailAddresses(),
 		];
 	}
 }
diff --git a/tests/lib/Contacts/ContactsMenu/EntryTest.php b/tests/lib/Contacts/ContactsMenu/EntryTest.php
@@ -96,16 +96,18 @@ public function testSetGetProperties() {
 
 	public function testJsonSerialize() {
 		$expectedJson = [
-			'id' => 123,
+			'id' => '123',
 			'fullName' => 'Guadalupe Frisbey',
 			'topAction' => null,
 			'actions' => [],
 			'lastMessage' => '',
 			'avatar' => null,
+			'emailAddresses' => ['user@example.com']
 		];
 
 		$this->entry->setId(123);
 		$this->entry->setFullName('Guadalupe Frisbey');
+		$this->entry->addEMailAddress('user@example.com');
 		$json = $this->entry->jsonSerialize();
 
 		$this->assertEquals($expectedJson, $json);