merging back and forth with tabsets-pro

Author: evandor

components/helper/SidePanelMessagesMarkup.vue

@@ -37,6 +37,7 @@
 import { formatDistance } from 'date-fns'
 import { useQuasar } from 'quasar'
 import { useMessagesStore } from 'src/messages/stores/messagesStore'
+import useSidePanelMessagesMarkupView from 'src/tabsets/components/helper/sidePanelMessagesMarkupView'
 import DeleteBookmarksByUrlDialog from 'src/tabsets/components/messageDialogs/DeleteBookmarksByUrlDialog.vue'
 import { Message } from 'src/tabsets/models/Message'
 import { ref, watchEffect } from 'vue'
@@ -47,6 +48,8 @@ const messages = ref<Message[]>([])
 const showDetails = ref(true)
 const messageCount = ref(0)
 
+const { clearMessage } = useSidePanelMessagesMarkupView()
+
 watchEffect(async () => {
   const msgs = useMessagesStore().getUnreadMessages
   messages.value = msgs.slice(0, 20)
@@ -57,12 +60,12 @@ const toggleShowDetails = () => (showDetails.value = !showDetails.value)
 
 const clearMessages = async () => {
   for (const m of messages.value) {
-    deleteMessage(m)
+    await clearMessage(m.id)
   }
 }
 
 const deleteMessage = async (m: Message) => {
-  useMessagesStore().deleteMessage(m.id)
+  await clearMessage(m.id)
 }
 
 const formatDate = (timestamp: number | undefined) =>

components/helper/SidePanelTabsetReferencesMarkup.vue

@@ -57,13 +57,17 @@ const sharedWith = ref<string>('')
 const showDetails = ref(true)
 const shared = ref<object[]>([])
 
-const updateSharedInfo = async () => {}
+const updateSharedInfo = async () => {
+  // no op
+}
 
 watchEffect(async () => {
   await updateSharedInfo()
 })
 
-const removeShare = async (email: string) => {}
+const removeShare = async (email: string) => {
+  // no op
+}
 
 const toggleShowDetails = () => (showDetails.value = !showDetails.value)
 </script>

components/helper/sidePanelMessagesMarkupView.ts

@@ -0,0 +1,11 @@
+import { useMessagesStore } from 'src/messages/stores/messagesStore'
+
+export default function useSidePanelMessagesMarkupView() {
+  const clearMessage = async (messageId: string) => {
+    useMessagesStore().deleteMessage(messageId)
+  }
+
+  return {
+    clearMessage,
+  }
+}