Skip to content

Fix message forwarding #7915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 2 commits into from
Sep 15, 2022
Merged

Fix message forwarding #7915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7412e32
Fix the message forwarder not showing up
nickvergessen Sep 14, 2022
d17c0e8
Fix conversation name for one-to-one conversations
nickvergessen Sep 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/components/MessagesList/MessagesGroup/Message/Message.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ the main body of the message as well as a quote.
:is-action-menu-open.sync="isActionMenuOpen"
:is-emoji-picker-open.sync="isEmojiPickerOpen"
:is-reactions-menu-open.sync="isReactionsMenuOpen"
:is-forwarder-open.sync="isForwarderOpen"
:message-api-data="messageApiData"
:message-object="messageObject"
:is-last-read="isLastReadMessage"
Expand Down Expand Up @@ -400,6 +401,7 @@ export default {
isActionMenuOpen: false,
isEmojiPickerOpen: false,
isReactionsMenuOpen: false,
isForwarderOpen: false,
detailedReactionsLoading: false,
}
},
Expand Down Expand Up @@ -566,7 +568,7 @@ export default {
},

showMessageButtonsBar() {
return !this.isSystemMessage && !this.isTemporary && (this.isHovered || this.isActionMenuOpen || this.isEmojiPickerOpen || this.isReactionsMenuOpen)
return !this.isSystemMessage && !this.isTemporary && (this.isHovered || this.isActionMenuOpen || this.isEmojiPickerOpen || this.isReactionsMenuOpen || this.isForwarderOpen)
},

isTemporaryUpload() {
Expand Down
2 changes: 1 addition & 1 deletion src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/Forwarder.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ export default {
},

selectedConversationName() {
return this.$store.getters?.conversation(this.selectedConversationToken).name
return this.$store.getters?.conversation(this.selectedConversationToken).displayName
},

/**
Expand Down
31 changes: 19 additions & 12 deletions src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,10 @@
</NcActionLink>
<NcActionButton v-if="!isCurrentGuest && !isFileShare && !isDeletedMessage"
:close-after-click="true"
@click.stop="showForwarder = true">
<Share slot="icon"
:size="16" />
@click.stop="openForwarder">
<template #icon>
<Share :size="16" />
</template>
{{ t('spreed', 'Forward message') }}
</NcActionButton>
<NcActionSeparator v-if="messageActions.length > 0" />
Expand Down Expand Up @@ -131,9 +132,9 @@
</NcButton>
</NcEmojiPicker>
</template>
<Forwarder v-if="showForwarder"
<Forwarder v-if="isForwarderOpen"
:message-object="messageObject"
@close="showForwarder = false" />
@close="closeForwarder" />
</div>
</template>

Expand Down Expand Up @@ -294,6 +295,11 @@ export default {
required: true,
},

isForwarderOpen: {
type: Boolean,
required: true,
},

canReact: {
type: Boolean,
required: true,
Expand All @@ -310,13 +316,6 @@ export default {
},
},

data() {
return {
// Shows/hides the message forwarder component
showForwarder: false,
}
},

computed: {
conversation() {
return this.$store.getters.conversation(this.token)
Expand Down Expand Up @@ -474,6 +473,14 @@ export default {
this.$emit('update:isReactionsMenuOpen', true)
},

openForwarder() {
this.$emit('update:isForwarderOpen', true)
},

closeForwarder() {
this.$emit('update:isForwarderOpen', false)
},

// Making sure that the click is outside the MessageButtonsBar
handleClickOutside(event) {
if (event.composedPath().indexOf(this.$el) !== -1) {
Expand Down