Merge pull request #10720 from nextcloud/fix/noid/shared-items-fixups

fix(sharedItems): minor refactoring and style fixes
nextcloud · Oct 17, 2023 · 78215c9 · 78215c9
2 parents 8dbaa3a + 9c86af4
commit 78215c9
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 25 deletions.
diff --git a/src/components/ChatView.vue b/src/components/ChatView.vue
@@ -51,6 +51,10 @@
 			:container="containerId"
 			has-typing-indicator
 			:aria-label="t('spreed', 'Post message')" />
+
+		<!-- File upload dialog -->
+		<NewMessageUploadEditor />
+
 		<TransitionWrapper name="fade">
 			<NcButton v-show="!isChatScrolledToBottom"
 				type="secondary"
@@ -74,6 +78,7 @@ import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import GuestWelcomeWindow from './GuestWelcomeWindow.vue'
 import MessagesList from './MessagesList/MessagesList.vue'
 import NewMessage from './NewMessage/NewMessage.vue'
+import NewMessageUploadEditor from './NewMessage/NewMessageUploadEditor.vue'
 import TransitionWrapper from './TransitionWrapper.vue'
 
 import { CONVERSATION } from '../constants.js'
@@ -88,6 +93,7 @@ export default {
 		ChevronDoubleDown,
 		MessagesList,
 		NewMessage,
+		NewMessageUploadEditor,
 		TransitionWrapper,
 		GuestWelcomeWindow,
 	},

diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
@@ -514,13 +514,15 @@ export default {
 
 		linkToFile() {
 			if (this.isFileShare) {
-				return this.messageParameters?.file?.link
+				const firstFileKey = (Object.keys(this.messageParameters).find(key => key.startsWith('file')))
+				return this.messageParameters?.[firstFileKey]?.link
+			} else {
+				return ''
 			}
-			return ''
 		},
 
 		isFileShare() {
-			return this.message === '{file}' && this.messageParameters?.file
+			return Object.keys(Object(this.messageParameters)).some(key => key.startsWith('file'))
 		},
 
 		isCurrentGuest() {
@@ -542,7 +544,6 @@ export default {
 
 		isPollMessage() {
 			return this.messageType === 'comment'
-				&& this.message === '{object}'
 				&& this.messageParameters?.object?.type === 'talk-poll'
 		},
 

diff --git a/src/components/NewMessage/NewMessage.vue b/src/components/NewMessage/NewMessage.vue
@@ -137,9 +137,6 @@
 			</template>
 		</form>
 
-		<!-- File upload dialog -->
-		<NewMessageUploadEditor />
-
 		<!-- Poll creation dialog -->
 		<NewMessagePollEditor v-if="showPollEditor"
 			:token="token"
@@ -175,7 +172,6 @@ import NewMessageAudioRecorder from './NewMessageAudioRecorder.vue'
 import NewMessageNewFileDialog from './NewMessageNewFileDialog.vue'
 import NewMessagePollEditor from './NewMessagePollEditor.vue'
 import NewMessageTypingIndicator from './NewMessageTypingIndicator.vue'
-import NewMessageUploadEditor from './NewMessageUploadEditor.vue'
 
 import { CONVERSATION, PARTICIPANT, PRIVACY } from '../../constants.js'
 import { EventBus } from '../../services/EventBus.js'
@@ -211,7 +207,6 @@ export default {
 		NewMessageNewFileDialog,
 		NewMessagePollEditor,
 		NewMessageTypingIndicator,
-		NewMessageUploadEditor,
 		Quote,
 		// Icons
 		BellOff,

diff --git a/src/components/NewMessage/NewMessageUploadEditor.vue b/src/components/NewMessage/NewMessageUploadEditor.vue
@@ -139,14 +139,14 @@ export default {
 		},
 
 		voiceMessageName() {
-			if (!this.firstFile.file.name) {
+			if (!this.firstFile?.file?.name) {
 				return ''
 			}
 			return this.firstFile.file.name
 		},
 
 		voiceMessageLocalURL() {
-			if (!this.firstFile.file.localURL) {
+			if (!this.firstFile?.file?.localURL) {
 				return ''
 			}
 			return this.firstFile.file.localURL

diff --git a/src/components/Quote.vue b/src/components/Quote.vue
@@ -172,8 +172,7 @@ export default {
 		},
 
 		isFileShareMessage() {
-			return this.message === '{file}'
-				&& 'file' in this.messageParameters
+			return Object.keys(Object(this.messageParameters)).some(key => key.startsWith('file'))
 		},
 
 		richParameters() {

diff --git a/src/components/RightSidebar/SharedItems/SharedItems.vue b/src/components/RightSidebar/SharedItems/SharedItems.vue
@@ -40,7 +40,7 @@
 			<div v-else-if="isOther"
 				:key="item.id"
 				class="shared-items__other">
-				<a v-if="item.messageParameters.object.link"
+				<a v-if="item.messageParameters.object?.link"
 					:href="item.messageParameters.object.link"
 					target="_blank">
 					{{ item.messageParameters.object.name }}

diff --git a/src/components/RightSidebar/SharedItems/SharedItemsTab.vue b/src/components/RightSidebar/SharedItems/SharedItemsTab.vue
@@ -20,8 +20,8 @@
 -->
 
 <template>
-	<div class="shared-items">
-		<LoadingComponent v-if="loading" class="shared-items__loading" />
+	<div class="shared-items-tab">
+		<LoadingComponent v-if="loading" class="shared-items-tab__loading" />
 
 		<template v-else>
 			<!-- Shared items grouped by type -->
@@ -64,7 +64,7 @@
 
 			<!-- No shared content -->
 			<NcEmptyContent v-else-if="!hasSharedItems && !hasRelatedResources"
-				class="shared-items__empty-content"
+				class="shared-items-tab__empty-content"
 				:name="t('spreed', 'No shared items')">
 				<template #icon>
 					<FolderMultipleImage :size="20" />
@@ -227,7 +227,7 @@ export default {
 	}
 }
 
-.shared-items {
+.shared-items-tab {
 	display: flex;
 	flex-direction: column;
 	height: 100%;

diff --git a/src/store/messagesStore.js b/src/store/messagesStore.js
@@ -567,10 +567,13 @@ const actions = {
 
 		context.commit('addMessage', message)
 
-		if ((message.messageType === 'comment' && message.message === '{file}' && message.messageParameters?.file)
-			|| (message.messageType === 'voice-message' && message.message === '{file}' && message.messageParameters?.file)
-			|| (message.messageType === 'comment' && message.message === '{object}' && message.messageParameters?.object)) {
-			sharedItemsStore.addSharedItemFromMessage(message)
+		if (message.messageParameters && (message.messageType === 'comment' || message.messageType === 'voice-message')) {
+			if (message.messageParameters?.object || message.messageParameters?.file) {
+				// Handle voice messages, shares with single file, polls, deck cards, e.t.c
+				sharedItemsStore.addSharedItemFromMessage(message)
+			} else if (Object.keys(message.messageParameters).some(key => key.startsWith('file'))) {
+				// Handle shares with multiple files
+			}
 		}
 	},
 
@@ -1297,7 +1300,7 @@ const actions = {
 			delete message.parent
 		}
 
-		if (message.message === '{object}' && message.messageParameters.object) {
+		if (message.messageParameters?.object) {
 			const richObject = message.messageParameters.object
 			const response = await postRichObjectToConversation(
 				targetToken,

diff --git a/src/utils/getItemTypeFromMessage.js b/src/utils/getItemTypeFromMessage.js
@@ -1,7 +1,7 @@
 import { SHARED_ITEM } from '../constants.js'
 
 export const getItemTypeFromMessage = function(message) {
-	if (message.message === '{object}') {
+	if (message.messageParameters?.object) {
 		if (message.messageParameters.object.type === 'geo-location') {
 			return SHARED_ITEM.TYPES.LOCATION
 		} else if (message.messageParameters.object.type === 'deck-card') {
@@ -11,7 +11,7 @@ export const getItemTypeFromMessage = function(message) {
 		} else {
 			return SHARED_ITEM.TYPES.OTHER
 		}
-	} else if (message.message === '{file}') {
+	} else if (message.messageParameters?.file) {
 		const messageType = message.messageType || ''
 		const mimetype = message.messageParameters.file?.mimetype || ''
 		if (messageType === 'record-audio' || messageType === 'record-video') {