fixup! feat(OpenConversationsList): expose description

nextcloud · May 2, 2024 · f25ae56 · f25ae56
1 parent 8c77926
commit f25ae56
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/components/LeftSidebar/ConversationsList/Conversation.spec.js b/src/components/LeftSidebar/ConversationsList/Conversation.spec.js
@@ -191,10 +191,11 @@ describe('Conversation.vue', () => {
 				testConversationLabel(item, 'Guest: hello')
 			})
 
-			test('displays last message for search results', () => {
+			test('displays description for search results', () => {
 				// search results have no actor id
 				item.actorId = null
-				testConversationLabel(item, 'Alice: hello', true)
+				item.description = 'This is a description'
+				testConversationLabel(item, 'This is a description', true)
 			})
 		})
 

diff --git a/src/components/LeftSidebar/ConversationsList/Conversation.vue b/src/components/LeftSidebar/ConversationsList/Conversation.vue
@@ -182,7 +182,12 @@ export default {
 
 	setup(props) {
 		const { item, isSearchResult } = toRefs(props)
-		const { counterType, conversationInformation } = useConversationInfo({ item, isSearchResult, exposeMessages: true, exposeDescription: true })
+		const { counterType, conversationInformation } = useConversationInfo({
+			item,
+			isSearchResult,
+			exposeMessages: !isSearchResult.value,
+			exposeDescription: isSearchResult.value
+		})
 
 		return {
 			counterType,

diff --git a/src/composables/useConversationInfo.js b/src/composables/useConversationInfo.js
@@ -83,8 +83,10 @@ export function useConversationInfo({
 			return t('spreed', 'Joining conversation …')
 		}
 
-		if (exposeMessages === false || !hasLastMessage.value) {
+		if (exposeMessages === false) {
 			return exposeDescription ? item.value?.description : ''
+		} else if (!hasLastMessage.value) {
+			return t('spreed', 'No messages')
 		}
 
 		if (shortLastChatMessageAuthor.value === '') {