fixup! feat(OpenConversationsList): expose description

nextcloud · May 3, 2024 · d52b580 · d52b580
1 parent f25ae56
commit d52b580
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 19 deletions.
diff --git a/src/components/LeftSidebar/ConversationsList/Conversation.vue b/src/components/LeftSidebar/ConversationsList/Conversation.vue
@@ -182,12 +182,7 @@ export default {
 
 	setup(props) {
 		const { item, isSearchResult } = toRefs(props)
-		const { counterType, conversationInformation } = useConversationInfo({
-			item,
-			isSearchResult,
-			exposeMessages: !isSearchResult.value,
-			exposeDescription: isSearchResult.value
-		})
+		const { counterType, conversationInformation } = useConversationInfo({ item, isSearchResult })
 
 		return {
 			counterType,

diff --git a/src/components/LeftSidebar/ConversationsList/ConversationSearchResult.vue b/src/components/LeftSidebar/ConversationsList/ConversationSearchResult.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import { inject, toRefs } from 'vue'
+import { inject, toRefs, ref } from 'vue'
 
 import NcListItem from '@nextcloud/vue/dist/Components/NcListItem.js'
 
@@ -64,8 +64,8 @@ export default {
 	setup(props) {
 		const { item } = toRefs(props)
 		const selectedRoom = inject('selectedRoom', null)
-		const exposeDescription = inject('exposeDescription', false)
-		const { counterType, conversationInformation } = useConversationInfo({ item, exposeDescription })
+		const exposeDescriptionRef = inject('exposeDescription', ref(false))
+		const { counterType, conversationInformation } = useConversationInfo({ item, exposeDescriptionRef })
 
 		return {
 			selectedRoom,

diff --git a/src/components/LeftSidebar/OpenConversationsList/OpenConversationsList.vue b/src/components/LeftSidebar/OpenConversationsList/OpenConversationsList.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import { provide } from 'vue'
+import { provide, ref } from 'vue'
 
 import RoomSelector from '../../RoomSelector.vue'
 
@@ -27,7 +27,7 @@ export default {
 	},
 
 	setup() {
-		provide('exposeDescription', true)
+		provide('exposeDescription', ref(true))
 	},
 
 	data() {

diff --git a/src/composables/useConversationInfo.js b/src/composables/useConversationInfo.js
@@ -12,17 +12,20 @@ import { ATTENDEE, CONVERSATION } from '../constants.js'
  * @param {object} payload function payload
  * @param {import('vue').Ref} payload.item conversation item
  * @param {import('vue').Ref} [payload.isSearchResult] whether conversation item appears as search result
- * @param {boolean} [payload.exposeMessages] whether to show messages in conversation item
- * @param {boolean} [payload.exposeDescription] whether to show description in conversation item
+ * @param {import('vue').Ref} [payload.exposeMessagesRef] whether to show messages in conversation item
+ * @param {import('vue').Ref} [payload.exposeDescriptionRef] whether to show description in conversation item
  */
 export function useConversationInfo({
 	item,
 	isSearchResult = ref(null),
-	exposeMessages = false,
-	exposeDescription = false,
+	exposeMessagesRef = ref(null),
+	exposeDescriptionRef = ref(null),
 }) {
+	const exposeMessages = isSearchResult.value !== null ? !isSearchResult.value : exposeMessagesRef.value
+	const exposeDescription = isSearchResult.value !== null ? isSearchResult.value : exposeDescriptionRef.value
+
 	const counterType = computed(() => {
-		if (exposeMessages === false) {
+		if (!exposeMessages) {
 			return ''
 		} else if (item.value.unreadMentionDirect || (item.value.unreadMessages !== 0
 			&& [CONVERSATION.TYPE.ONE_TO_ONE, CONVERSATION.TYPE.ONE_TO_ONE_FORMER].includes(item.value.type)
@@ -45,7 +48,7 @@ export function useConversationInfo({
 	 * e.g. no avatars on mentions.
 	 */
 	const simpleLastChatMessage = computed(() => {
-		if (exposeMessages === false || !hasLastMessage.value) {
+		if (!exposeMessages || !hasLastMessage.value) {
 			return ''
 		}
 
@@ -64,7 +67,7 @@ export function useConversationInfo({
 	 * @return {string} Part of the name until the first space
 	 */
 	const shortLastChatMessageAuthor = computed(() => {
-		if (exposeMessages === false || !hasLastMessage.value || item.value.lastMessage.systemMessage.length) {
+		if (!exposeMessages || !hasLastMessage.value || item.value.lastMessage.systemMessage.length) {
 			return ''
 		}
 
@@ -83,7 +86,7 @@ export function useConversationInfo({
 			return t('spreed', 'Joining conversation …')
 		}
 
-		if (exposeMessages === false) {
+		if (!exposeMessages) {
 			return exposeDescription ? item.value?.description : ''
 		} else if (!hasLastMessage.value) {
 			return t('spreed', 'No messages')