Skip to content

Commit 6d707e6

Browse files
committed
feat: hook up message replys
1 parent 442f136 commit 6d707e6

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

src/components/layout/Editor.vue

+7-3
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@
195195
<button class="no-animate send" v-if="editorConvoMode" @click.prevent="createAction(newMessage).then(closeEditor);" :disabled="!canCreate() || !newMessage.content.body.length || !newMessage.content.subject.length || !newMessage.receiver_ids.length">
196196
<i class="fa fa-paper-plane" aria-hidden="true"></i>&nbsp;&nbsp;&nbsp;Send
197197
</button>
198-
<button class="no-animate send" v-if="!editorConvoMode" @click.prevent="updateAction().then(closeEditor);" :disabled="!canUpdate() || !newMessage.content.body.length">
198+
<button class="no-animate send" v-if="!editorConvoMode" @click.prevent="updateAction(newMessage).then(closeEditor);" :disabled="!canUpdate() || !newMessage.content.body.length">
199199
<i class="fa fa-paper-plane" aria-hidden="true"></i>&nbsp;&nbsp;&nbsp;Send Reply
200200
</button>
201201

@@ -238,7 +238,7 @@ import Multiselect from '@vueform/multiselect'
238238
import { usersApi } from '@/api'
239239
240240
export default {
241-
props: ['editorConvoMode', 'threadEditorMode', 'postEditorMode', 'createAction', 'updateAction', 'showEditor', 'thread' ],
241+
props: ['editorConvoMode', 'threadEditorMode', 'postEditorMode', 'createAction', 'updateAction', 'showEditor', 'thread', 'currentMessage' ],
242242
emits: ['close'],
243243
components: { ImageUploader, Multiselect },
244244
setup(props, { emit }) {
@@ -272,7 +272,7 @@ export default {
272272
draftStatus: null,
273273
postMaxLength: window.post_max_length,
274274
posting: { post: { title: '', body: '', thread_id: props?.thread?.id } },
275-
newMessage: { receiver_ids: [], content: { subject: '', body: '' } },
275+
newMessage: { receiver_ids: [], conversation_id: null, content: { subject: '', body: '' } },
276276
rightToLeft: false,
277277
threadTitleEl: null,
278278
msgTagsInput: {
@@ -304,6 +304,10 @@ export default {
304304
watch(() => props.showEditor, visible => {
305305
console.log(visible, props.threadEditorMode)
306306
if (visible && props.threadEditorMode) nextTick(() => v.threadTitleEl.focus())
307+
if (visible && props.currentMessage) {
308+
v.newMessage = props.currentMessage
309+
console.log(v.newMessage)
310+
}
307311
})
308312
309313
return { ...toRefs(v), canLock, canCreate, canUpdate, canSticky, canModerate, canCreatePoll, cancel, closeEditor }

src/views/Messages.vue

+3-2
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
<delete-conversation-modal :show="showDeleteConversationModal" :conversation-id="selectedDeletedConvoId" @close="showDeleteConversationModal = false" @success="reload()" />
149149
<delete-message-modal :show="showDeleteMessageModal" :message-id="selectedMessageId" @close="showDeleteMessageModal = false" @success="deleteMessageSuccess()" />
150150
<report-message-modal :show="showReportMessageModal" :message-id="selectedMessageId" @close="showReportMessageModal = false" @success="showReportMessageModal = false" />
151-
<editor :showEditor="showEditor" @close="showEditor = false" :editorConvoMode="editorConvoMode" :create-action="createConversation" />
151+
<editor :showEditor="showEditor" @close="showEditor = false" :editorConvoMode="editorConvoMode" :current-message="{ conversation_id: newMessage?.conversation_id, receiver_ids: newMessage?.receiver_ids, content: { body: newMessage?.content?.body } }" :create-action="createConversation" :update-action="createMessage" />
152152
</template>
153153

154154
<script>
@@ -298,6 +298,7 @@ export default {
298298
const canCreateConversation = () => true
299299
const canCreateMessage = () => true
300300
const createConversation = convo => messagesApi.convos.create(convo).then(reload)
301+
const createMessage = msg => messagesApi.create(msg).then(reload)
301302
302303
const listMessageReceivers = message => {
303304
let receiverNames = []
@@ -342,7 +343,7 @@ export default {
342343
}
343344
})
344345
345-
return { ...toRefs(v), reload, createConversation, loadRecentMessages, preloadConversation, loadConversation, loadMoreMessages, canDeleteConversation, canDeleteMessage, addQuote, canCreateConversation, canCreateMessage, deleteMessageSuccess, listMessageReceivers, humanDate }
346+
return { ...toRefs(v), reload, createMessage, createConversation, loadRecentMessages, preloadConversation, loadConversation, loadMoreMessages, canDeleteConversation, canDeleteMessage, addQuote, canCreateConversation, canCreateMessage, deleteMessageSuccess, listMessageReceivers, humanDate }
346347
}
347348
}
348349
</script>

0 commit comments

Comments
 (0)