diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue index 1e3b6d967..267b9e422 100644 --- a/app/javascript/dashboard/components/ChatList.vue +++ b/app/javascript/dashboard/components/ChatList.vue @@ -537,12 +537,6 @@ function loadMoreConversations() { return; } - // Increment the current page - store.dispatch('conversationPage/setCurrentPage', { - filter: currentPageFilterKey.value, - page: currentFiltersPage.value + 1, - }); - if (!hasAppliedFiltersOrActiveFolders.value) { fetchConversations(); } else if (hasActiveFolders.value) { diff --git a/app/javascript/dashboard/components/widgets/WootWriter/FullEditor.vue b/app/javascript/dashboard/components/widgets/WootWriter/FullEditor.vue index 31b00937a..46763423a 100644 --- a/app/javascript/dashboard/components/widgets/WootWriter/FullEditor.vue +++ b/app/javascript/dashboard/components/widgets/WootWriter/FullEditor.vue @@ -61,17 +61,9 @@ export default { plugins: [imagePastePlugin(this.handleImageUpload)], }; }, - computed: { - contentFromEditor() { - if (editorView) { - return ArticleMarkdownSerializer.serialize(editorView.state.doc); - } - return ''; - }, - }, watch: { modelValue(newValue = '') { - if (newValue !== this.contentFromEditor) { + if (newValue !== this.contentFromEditor()) { this.reloadState(); } }, @@ -96,6 +88,12 @@ export default { this.focusEditorInputField(); }, methods: { + contentFromEditor() { + if (editorView) { + return ArticleMarkdownSerializer.serialize(editorView.state.doc); + } + return ''; + }, openFileBrowser() { this.$refs.imageUploadInput.click(); }, @@ -213,8 +211,8 @@ export default { editorView.focus(); }, emitOnChange() { - this.$emit('update:modelValue', this.contentFromEditor); - this.$emit('input', this.contentFromEditor); + this.$emit('update:modelValue', this.contentFromEditor()); + this.$emit('input', this.contentFromEditor()); }, onKeyup() { this.$emit('keyup'); diff --git a/app/javascript/dashboard/components/widgets/conversation/EmailTranscriptModal.vue b/app/javascript/dashboard/components/widgets/conversation/EmailTranscriptModal.vue index b1d96ea54..a1c99b69e 100644 --- a/app/javascript/dashboard/components/widgets/conversation/EmailTranscriptModal.vue +++ b/app/javascript/dashboard/components/widgets/conversation/EmailTranscriptModal.vue @@ -1,20 +1,22 @@