refactor: clean up event methods #41
@@ -26,7 +26,6 @@ const props = defineProps<Props>()
|
||||
// Emits
|
||||
const emit = defineEmits<{
|
||||
close: []
|
||||
sent: []
|
||||
}>()
|
||||
|
||||
const mailStore = useMailStore()
|
||||
@@ -222,7 +221,6 @@ const handleSend = async () => {
|
||||
text: editor.value?.getText() || '',
|
||||
},
|
||||
})
|
||||
emit('sent')
|
||||
} catch (error) {
|
||||
console.error('[Mail][Composer] Failed to send message:', error)
|
||||
}
|
||||
|
||||
@@ -23,72 +23,30 @@ const props = withDefaults(defineProps<Props>(), {
|
||||
// Emits
|
||||
const emit = defineEmits<{
|
||||
open: [message: EntityObject]
|
||||
toggleSelection: [message: EntityObject]
|
||||
activateSelectionMode: [message: EntityObject]
|
||||
toggleSelectAll: [value: boolean]
|
||||
clearSelection: []
|
||||
moveSelection: []
|
||||
deleteSelection: []
|
||||
selectionMode: [message: EntityObject]
|
||||
selectionToggleOne: [message: EntityObject]
|
||||
selectionToggleAll: [value: boolean]
|
||||
selectionClear: []
|
||||
selectionMove: []
|
||||
selectionDelete: []
|
||||
}>()
|
||||
|
||||
const longPressTimer = ref<number | null>(null)
|
||||
const longPressActivated = ref(false)
|
||||
const suppressNextClick = ref(false)
|
||||
const LONG_PRESS_MS = 450
|
||||
|
||||
const LONG_PRESS_MS = 400
|
||||
const selectedIdSet = computed(() => new Set(props.selectionList))
|
||||
|
||||
const currentMessages = computed(() => props.messages ?? [])
|
||||
|
||||
const getMessageTimestamp = (message: EntityObject): string | null => {
|
||||
return message.properties.received
|
||||
|| message.properties.sent
|
||||
|| message.modified
|
||||
|| message.created
|
||||
|| null
|
||||
}
|
||||
|
||||
const getMessageTimeValue = (message: EntityObject): number => {
|
||||
const timestamp = getMessageTimestamp(message)
|
||||
if (!timestamp) {
|
||||
return 0
|
||||
}
|
||||
|
||||
const timeValue = new Date(timestamp).getTime()
|
||||
return Number.isNaN(timeValue) ? 0 : timeValue
|
||||
}
|
||||
|
||||
const selectionCount = computed(() => props.selectionList.length)
|
||||
|
||||
const hasSelection = computed(() => selectionCount.value > 0)
|
||||
|
||||
const allCurrentMessagesSelected = computed(() => {
|
||||
return currentMessages.value.length > 0 && currentMessages.value.every(message => isSelected(message))
|
||||
})
|
||||
const selectionCount = computed(() => props.selectionList.length ?? 0)
|
||||
|
||||
// Sorted messages (newest first)
|
||||
const sortedMessages = computed(() => {
|
||||
return [...currentMessages.value].sort((a, b) => {
|
||||
const dateA = getMessageTimeValue(a)
|
||||
const dateB = getMessageTimeValue(b)
|
||||
return [...props.messages].sort((a, b) => {
|
||||
const dateA = timeStamp(a) ?? 0
|
||||
const dateB = timeStamp(b) ?? 0
|
||||
return dateB - dateA
|
||||
})
|
||||
})
|
||||
|
||||
// Read/Unread counts from collection properties
|
||||
const unreadCount = computed(() => {
|
||||
return props.selectedCollection?.properties.unread ?? 0
|
||||
})
|
||||
|
||||
const totalCount = computed(() => {
|
||||
return props.selectedCollection?.properties.total ?? 0
|
||||
})
|
||||
|
||||
// True only when the collection explicitly provides total/unread counts
|
||||
const hasCountData = computed(() => {
|
||||
return props.selectedCollection?.properties.total != null
|
||||
})
|
||||
|
||||
const isOpened = (message: EntityObject): boolean => {
|
||||
if (!props.selectedMessage) return false
|
||||
return (message.identifier === props.selectedMessage.identifier)
|
||||
@@ -98,8 +56,23 @@ const isSelected = (message: EntityObject): boolean => {
|
||||
return selectedIdSet.value.has(message.identifier)
|
||||
}
|
||||
|
||||
const timeStamp = (message: EntityObject): number | null => {
|
||||
const timestamp = message.properties.received
|
||||
|| message.properties.sent
|
||||
|| message.modified
|
||||
|| message.created
|
||||
|| null
|
||||
|
||||
if (!timestamp) {
|
||||
return null
|
||||
}
|
||||
|
||||
const timeValue = new Date(timestamp).getTime()
|
||||
return Number.isNaN(timeValue) ? null : timeValue
|
||||
}
|
||||
|
||||
// Format date for display
|
||||
const formatDate = (date: Date | string | null | undefined): string => {
|
||||
const formatDate = (date: Date | string | number | null | undefined): string => {
|
||||
if (!date) return ''
|
||||
|
||||
const messageDate = new Date(date)
|
||||
@@ -141,21 +114,19 @@ const formatDate = (date: Date | string | null | undefined): string => {
|
||||
})
|
||||
}
|
||||
|
||||
// Truncate text
|
||||
const truncate = (text: string | null | undefined, length: number = 100): string => {
|
||||
if (!text) return ''
|
||||
return text.length > length ? text.substring(0, length) + '...' : text
|
||||
}
|
||||
|
||||
const isSelectionControlClick = (event: MouseEvent | KeyboardEvent): boolean => {
|
||||
return event.target instanceof Element && event.target.closest('.message-selection-checkbox') !== null
|
||||
}
|
||||
|
||||
const handleSelectionToggle = (message: EntityObject) => {
|
||||
emit('toggleSelection', message)
|
||||
const handleSelectionToggleOne = (message: EntityObject) => {
|
||||
emit('selectionToggleOne', message)
|
||||
}
|
||||
|
||||
const handleMessageMouseClick = (event: MouseEvent | KeyboardEvent, message: EntityObject) => {
|
||||
const handleSelectionToggleAll = (value: boolean | null) => {
|
||||
emit('selectionToggleAll', value === true)
|
||||
}
|
||||
|
||||
const handleMouseClick = (event: MouseEvent | KeyboardEvent, message: EntityObject) => {
|
||||
if (isSelectionControlClick(event)) {
|
||||
return
|
||||
}
|
||||
@@ -168,7 +139,7 @@ const handleMessageMouseClick = (event: MouseEvent | KeyboardEvent, message: Ent
|
||||
if (event.shiftKey && !props.selectionMode) {
|
||||
event.preventDefault()
|
||||
event.stopPropagation()
|
||||
emit('activateSelectionMode', message)
|
||||
emit('selectionMode', message)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -178,14 +149,14 @@ const handleMessageMouseClick = (event: MouseEvent | KeyboardEvent, message: Ent
|
||||
}
|
||||
|
||||
if (props.selectionMode) {
|
||||
emit('toggleSelection', message)
|
||||
emit('selectionToggleOne', message)
|
||||
return
|
||||
}
|
||||
|
||||
emit('open', message)
|
||||
}
|
||||
|
||||
const handleMessageMouseDown = (event: MouseEvent, message: EntityObject) => {
|
||||
const handleMouseDown = (event: MouseEvent, message: EntityObject) => {
|
||||
if (isSelectionControlClick(event)) {
|
||||
return
|
||||
}
|
||||
@@ -197,14 +168,7 @@ const handleMessageMouseDown = (event: MouseEvent, message: EntityObject) => {
|
||||
event.preventDefault()
|
||||
event.stopPropagation()
|
||||
suppressNextClick.value = true
|
||||
emit('activateSelectionMode', message)
|
||||
}
|
||||
|
||||
const clearLongPressTimer = () => {
|
||||
if (longPressTimer.value !== null) {
|
||||
window.clearTimeout(longPressTimer.value)
|
||||
longPressTimer.value = null
|
||||
}
|
||||
emit('selectionMode', message)
|
||||
}
|
||||
|
||||
const handleTouchStart = (message: EntityObject) => {
|
||||
@@ -213,9 +177,9 @@ const handleTouchStart = (message: EntityObject) => {
|
||||
|
||||
longPressTimer.value = window.setTimeout(() => {
|
||||
if (!props.selectionMode) {
|
||||
emit('activateSelectionMode', message)
|
||||
emit('selectionMode', message)
|
||||
} else {
|
||||
emit('toggleSelection', message)
|
||||
emit('selectionToggleOne', message)
|
||||
}
|
||||
|
||||
longPressActivated.value = true
|
||||
@@ -231,13 +195,16 @@ const handleTouchMove = () => {
|
||||
clearLongPressTimer()
|
||||
}
|
||||
|
||||
const clearLongPressTimer = () => {
|
||||
if (longPressTimer.value !== null) {
|
||||
window.clearTimeout(longPressTimer.value)
|
||||
longPressTimer.value = null
|
||||
}
|
||||
}
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
clearLongPressTimer()
|
||||
})
|
||||
|
||||
const handleSelectAllToggle = (value: boolean | null) => {
|
||||
emit('toggleSelectAll', value === true)
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
@@ -245,12 +212,12 @@ const handleSelectAllToggle = (value: boolean | null) => {
|
||||
<!-- Header with folder name and counts -->
|
||||
<div v-if="selectedCollection" class="message-list-header">
|
||||
<div class="message-list-heading">
|
||||
<h2 class="text-h6">{{ selectedCollection.properties.label || 'Folder' }}</h2>
|
||||
<h2 class="text-h6">{{ selectedCollection?.properties.label || 'Folder' }}</h2>
|
||||
<div class="folder-counts text-caption text-medium-emphasis">
|
||||
<span v-if="hasCountData">
|
||||
<span class="unread-count">{{ unreadCount }}</span>
|
||||
<span v-if="selectedCollection?.properties.total != null">
|
||||
<span class="unread-count">{{ selectedCollection?.properties.unread ?? 0 }}</span>
|
||||
<span class="mx-1">/</span>
|
||||
<span>{{ totalCount }}</span>
|
||||
<span>{{ selectedCollection?.properties.total ?? 0 }}</span>
|
||||
</span>
|
||||
<span v-else-if="messages.length > 0">
|
||||
{{ messages.length }} loaded
|
||||
@@ -261,11 +228,11 @@ const handleSelectAllToggle = (value: boolean | null) => {
|
||||
<div v-if="selectionMode && messages.length > 0" class="selection-summary">
|
||||
<div class="selection-controls">
|
||||
<v-checkbox-btn
|
||||
:model-value="allCurrentMessagesSelected"
|
||||
:indeterminate="hasSelection && !allCurrentMessagesSelected"
|
||||
:model-value="selectionCount !== 0"
|
||||
:indeterminate="selectionCount > 0 && selectionCount !== messages.length"
|
||||
density="compact"
|
||||
hide-details
|
||||
@update:model-value="handleSelectAllToggle"
|
||||
@update:model-value="handleSelectionToggleAll"
|
||||
/>
|
||||
<span class="text-caption text-medium-emphasis">
|
||||
{{ selectionCount > 0 ? `${selectionCount} selected` : 'Select all loaded' }}
|
||||
@@ -277,8 +244,8 @@ const handleSelectAllToggle = (value: boolean | null) => {
|
||||
size="small"
|
||||
icon="mdi-folder-move-outline"
|
||||
variant="text"
|
||||
:disabled="!hasSelection"
|
||||
@click="emit('moveSelection')"
|
||||
:disabled="selectionCount === 0"
|
||||
@click="emit('selectionMove')"
|
||||
>
|
||||
<v-icon>mdi-folder-move-outline</v-icon>
|
||||
<v-tooltip activator="parent" location="bottom">Move Selected</v-tooltip>
|
||||
@@ -287,8 +254,8 @@ const handleSelectAllToggle = (value: boolean | null) => {
|
||||
size="small"
|
||||
icon="mdi-delete-outline"
|
||||
variant="text"
|
||||
:disabled="!hasSelection"
|
||||
@click="emit('deleteSelection')"
|
||||
:disabled="selectionCount === 0"
|
||||
@click="emit('selectionDelete')"
|
||||
>
|
||||
<v-icon>mdi-delete-outline</v-icon>
|
||||
<v-tooltip activator="parent" location="bottom">Delete Selected</v-tooltip>
|
||||
@@ -297,7 +264,7 @@ const handleSelectAllToggle = (value: boolean | null) => {
|
||||
size="small"
|
||||
icon="mdi-close"
|
||||
variant="text"
|
||||
@click="emit('clearSelection')"
|
||||
@click="emit('selectionClear')"
|
||||
>
|
||||
<v-icon>mdi-close</v-icon>
|
||||
<v-tooltip activator="parent" location="bottom">Clear Selected</v-tooltip>
|
||||
@@ -317,7 +284,7 @@ const handleSelectAllToggle = (value: boolean | null) => {
|
||||
</div>
|
||||
|
||||
<!-- Empty state -->
|
||||
<div v-else-if="currentMessages.length === 0" class="pa-8 text-center">
|
||||
<div v-else-if="messages.length === 0" class="pa-8 text-center">
|
||||
<v-icon size="64" color="grey-lighten-1">mdi-email-outline</v-icon>
|
||||
<div class="text-h6 mt-4 text-medium-emphasis">No messages</div>
|
||||
<div class="text-body-2 text-medium-emphasis">
|
||||
@@ -342,8 +309,8 @@ const handleSelectAllToggle = (value: boolean | null) => {
|
||||
'selection-mode': selectionMode,
|
||||
'unread': !message.properties.isRead
|
||||
}"
|
||||
@mousedown="handleMessageMouseDown($event, message)"
|
||||
@click="handleMessageMouseClick($event, message)"
|
||||
@mousedown="handleMouseDown($event, message)"
|
||||
@click="handleMouseClick($event, message)"
|
||||
@touchstart.passive="handleTouchStart(message)"
|
||||
@touchend="handleTouchEnd"
|
||||
@touchcancel="handleTouchEnd"
|
||||
@@ -358,7 +325,7 @@ const handleSelectAllToggle = (value: boolean | null) => {
|
||||
density="compact"
|
||||
hide-details
|
||||
@click.stop
|
||||
@update:model-value="handleSelectionToggle(message)"
|
||||
@update:model-value="handleSelectionToggleOne(message)"
|
||||
/>
|
||||
|
||||
<v-avatar size="40" color="primary">
|
||||
@@ -374,7 +341,7 @@ const handleSelectAllToggle = (value: boolean | null) => {
|
||||
{{ message.properties.from?.label || message.properties.from?.address || 'Unknown Sender' }}
|
||||
</span>
|
||||
<span class="text-caption text-medium-emphasis ml-2">
|
||||
{{ formatDate(getMessageTimestamp(message)) }}
|
||||
{{ formatDate(timeStamp(message)) }}
|
||||
</span>
|
||||
</v-list-item-title>
|
||||
|
||||
|
||||
@@ -94,53 +94,6 @@ const {
|
||||
|
||||
const handleFolderSelect = (folder: CollectionObject) => mailStore.selectFolder(folder)
|
||||
|
||||
const handleMessageOpen = (message: EntityObject) => {
|
||||
mailStore.selectMessage(message)
|
||||
|
||||
if (isMobile.value) {
|
||||
mailUiStore.closeSidebar()
|
||||
}
|
||||
}
|
||||
|
||||
const handleMessageSelectionToggle = (message: EntityObject) => mailUiStore.toggleMessageSelection(message)
|
||||
|
||||
const handleSelectionModeActivate = (message: EntityObject) => mailUiStore.activateSelectionMode(message)
|
||||
|
||||
const handleSelectAllToggle = (value: boolean) => {
|
||||
if (value) {
|
||||
mailUiStore.selectAllCurrentMessages()
|
||||
return
|
||||
}
|
||||
|
||||
mailUiStore.clearSelection()
|
||||
}
|
||||
|
||||
const handleSelectionClear = () => mailUiStore.deactivateSelectionMode()
|
||||
|
||||
const handleSelectionMove = () => mailUiStore.openMoveMessagesDialog()
|
||||
|
||||
const handleSelectionDelete = () => mailUiStore.deleteSelectedMessages()
|
||||
|
||||
const handleCompose = () => mailUiStore.openCompose()
|
||||
|
||||
const handleComposeReply = (message: EntityObject) => mailUiStore.openCompose(message, 'reply')
|
||||
|
||||
const handleComposeForward = (message: EntityObject) => mailUiStore.openCompose(message, 'forward')
|
||||
|
||||
const handleComposeClose = () => mailUiStore.closeCompose()
|
||||
|
||||
const handleComposeSent = () => mailUiStore.afterSent()
|
||||
|
||||
const handleDelete = (message: EntityObject) => {
|
||||
mailStore.deleteMessages([message.identifier])
|
||||
}
|
||||
|
||||
const handleMove = (message: EntityObject) => mailUiStore.openMoveMessagesDialog(message)
|
||||
|
||||
const handleMoveConfirm = async (target: CollectionObject) => { await mailUiStore.confirmMoveMessages(target) }
|
||||
|
||||
const handleMoveCancel = () => mailUiStore.closeMoveMessagesDialog()
|
||||
|
||||
const handleFolderCreateConfirm = async (folderName: string) => {
|
||||
try {
|
||||
const mutatedFolder = await mailUiStore.confirmCreateFolder(folderName)
|
||||
@@ -153,7 +106,7 @@ const handleFolderCreateConfirm = async (folderName: string) => {
|
||||
}
|
||||
}
|
||||
|
||||
const handleFolderRenameConfirm = async (folderName: string) => {
|
||||
const handleFolderEditConfirm = async (folderName: string) => {
|
||||
try {
|
||||
const mutatedFolder = await mailUiStore.confirmRenameFolder(folderName)
|
||||
|
||||
@@ -165,6 +118,14 @@ const handleFolderRenameConfirm = async (folderName: string) => {
|
||||
}
|
||||
}
|
||||
|
||||
const handleFolderDeleteConfirm = async () => {
|
||||
try {
|
||||
await mailUiStore.confirmDeleteFolder()
|
||||
} catch (error: unknown) {
|
||||
console.error('[MailPage] Failed to delete folder:', error)
|
||||
}
|
||||
}
|
||||
|
||||
const handleFolderMoveConfirm = async (targetFolder: CollectionObject) => {
|
||||
try {
|
||||
await mailUiStore.confirmMoveFolder(targetFolder)
|
||||
@@ -175,14 +136,47 @@ const handleFolderMoveConfirm = async (targetFolder: CollectionObject) => {
|
||||
|
||||
const handleFolderMoveCancel = () => mailUiStore.closeMoveFolderDialog()
|
||||
|
||||
const handleFolderDeleteConfirm = async () => {
|
||||
try {
|
||||
await mailUiStore.confirmDeleteFolder()
|
||||
} catch (error: unknown) {
|
||||
console.error('[MailPage] Failed to delete folder:', error)
|
||||
|
||||
const handleMessageOpen = (message: EntityObject) => {
|
||||
mailStore.selectMessage(message)
|
||||
|
||||
if (isMobile.value) {
|
||||
mailUiStore.closeSidebar()
|
||||
}
|
||||
}
|
||||
|
||||
const handleMessageComposeFresh = () => mailUiStore.openCompose()
|
||||
|
||||
const handleMessageComposeReply = (message: EntityObject) => mailUiStore.openCompose(message, 'reply')
|
||||
|
||||
const handleMessageComposeForward = (message: EntityObject) => mailUiStore.openCompose(message, 'forward')
|
||||
|
||||
const handleMessageComposeClose = () => mailUiStore.closeCompose()
|
||||
|
||||
const handleMessageDelete = (message: EntityObject) => {
|
||||
mailStore.deleteMessages([message.identifier])
|
||||
}
|
||||
|
||||
const handleMessageMove = (message: EntityObject) => mailUiStore.openMoveMessagesDialog(message)
|
||||
|
||||
const handleMessageMoveConfirm = async (target: CollectionObject) => { await mailUiStore.confirmMoveMessages(target) }
|
||||
|
||||
const handleMessageMoveCancel = () => mailUiStore.closeMoveMessagesDialog()
|
||||
|
||||
const handleMessageSelectionMode = (message: EntityObject) => mailUiStore.messageSelectionModeActivate(message)
|
||||
|
||||
const handleMessageSelectionToggleOne = (message: EntityObject) => mailUiStore.messageSelectionToggleOne(message)
|
||||
|
||||
const handleMessageSelectionToggleAll = (value: boolean) => {
|
||||
mailUiStore.messageSelectionToggleAll(value)
|
||||
}
|
||||
|
||||
const handleMessageSelectionClear = () => mailUiStore.messageSelectionModeDeactivate()
|
||||
|
||||
const handleMessageSelectionMove = () => mailUiStore.openMoveMessagesDialog()
|
||||
|
||||
const handleMessageSelectionDelete = () => mailUiStore.deleteSelectedMessages()
|
||||
|
||||
const toggleSidebar = () => mailUiStore.toggleSidebar()
|
||||
|
||||
const handleSettingsOpen = () => mailUiStore.openSettings()
|
||||
@@ -225,7 +219,7 @@ const handleSettingsOpen = () => mailUiStore.openSettings()
|
||||
|
||||
<v-btn
|
||||
icon="mdi-pencil"
|
||||
@click="handleCompose()"
|
||||
@click="handleMessageComposeFresh()"
|
||||
color="primary"
|
||||
variant="text"
|
||||
>
|
||||
@@ -298,12 +292,12 @@ const handleSettingsOpen = () => mailUiStore.openSettings()
|
||||
:selection-mode="selectionMode"
|
||||
:loading="loading"
|
||||
@open="handleMessageOpen"
|
||||
@toggle-selection="handleMessageSelectionToggle"
|
||||
@activate-selection-mode="handleSelectionModeActivate"
|
||||
@toggle-select-all="handleSelectAllToggle"
|
||||
@clear-selection="handleSelectionClear"
|
||||
@move-selection="handleSelectionMove"
|
||||
@delete-selection="handleSelectionDelete"
|
||||
@selection-mode="handleMessageSelectionMode"
|
||||
@selection-toggle-one="handleMessageSelectionToggleOne"
|
||||
@selection-toggle-all="handleMessageSelectionToggleAll"
|
||||
@selection-clear="handleMessageSelectionClear"
|
||||
@selection-move="handleMessageSelectionMove"
|
||||
@selection-delete="handleMessageSelectionDelete"
|
||||
/>
|
||||
</div>
|
||||
|
||||
@@ -314,18 +308,17 @@ const handleSettingsOpen = () => mailUiStore.openSettings()
|
||||
:mode="composeMode"
|
||||
:source="composeSource"
|
||||
:folder="selectedFolder"
|
||||
@close="handleComposeClose"
|
||||
@sent="handleComposeSent"
|
||||
@close="handleMessageComposeClose"
|
||||
/>
|
||||
|
||||
<MessageReader
|
||||
v-else
|
||||
:entity="selectedMessage"
|
||||
@compose="handleCompose"
|
||||
@reply="handleComposeReply"
|
||||
@forward="handleComposeForward"
|
||||
@move="handleMove"
|
||||
@delete="handleDelete"
|
||||
@compose="handleMessageComposeFresh"
|
||||
@reply="handleMessageComposeReply"
|
||||
@forward="handleMessageComposeForward"
|
||||
@move="handleMessageMove"
|
||||
@delete="handleMessageDelete"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
@@ -336,19 +329,19 @@ const handleSettingsOpen = () => mailUiStore.openSettings()
|
||||
<SettingsDialog v-model="settingsDialogVisible" />
|
||||
|
||||
<FolderSelectionDialog
|
||||
v-if="moveMessagesDialogService && moveFolderDialogSource"
|
||||
v-if="moveMessagesDialogService"
|
||||
v-model="moveMessagesDialogVisible"
|
||||
:service="moveMessagesDialogService"
|
||||
:loading="loading"
|
||||
title="Move Messages To"
|
||||
confirm-text="Move"
|
||||
empty-text="No other folders are available in this account."
|
||||
@select="handleMoveConfirm"
|
||||
@cancel="handleMoveCancel"
|
||||
@select="handleMessageMoveConfirm"
|
||||
@cancel="handleMessageMoveCancel"
|
||||
/>
|
||||
|
||||
<FolderSelectionDialog
|
||||
v-if="moveFolderDialogService && moveFolderDialogSource"
|
||||
v-if="moveFolderDialogService"
|
||||
v-model="moveFolderDialogVisible"
|
||||
:service="moveFolderDialogService"
|
||||
:loading="collectionsStore.transceiving"
|
||||
@@ -380,7 +373,7 @@ const handleSettingsOpen = () => mailUiStore.openSettings()
|
||||
:validate-name="validateRenameFolderName"
|
||||
:loading="renameFolderDialogLoading"
|
||||
:error-message="renameFolderDialogError"
|
||||
@confirm="handleFolderRenameConfirm"
|
||||
@confirm="handleFolderEditConfirm"
|
||||
/>
|
||||
|
||||
<DeleteFolderDialog
|
||||
|
||||
@@ -82,7 +82,7 @@ export const useMailStore = defineStore('mailStore', () => {
|
||||
void loadFoldersForService(service,{ selectInbox: true })
|
||||
})
|
||||
} catch (error) {
|
||||
console.error('[Mail] Failed to initialize:', error)
|
||||
console.error('[Mail][Operations] Failed to initialize:', error)
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
@@ -124,10 +124,7 @@ export const useMailStore = defineStore('mailStore', () => {
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : 'Failed to load folders'
|
||||
_setServiceFolderError(service.provider, service.identifier, message)
|
||||
console.error(
|
||||
`[Mail] Failed to load folders for ${service.provider}:${String(service.identifier)}:`,
|
||||
error,
|
||||
)
|
||||
console.error(`[Mail][Operations] Failed to load folders for ${service.provider}:${String(service.identifier)}:`, error)
|
||||
_updateSyncSources()
|
||||
return {}
|
||||
} finally {
|
||||
@@ -313,13 +310,13 @@ export const useMailStore = defineStore('mailStore', () => {
|
||||
try {
|
||||
service = await servicesStore.serviceByIdentifier(identifier, true)
|
||||
} catch (error) {
|
||||
console.error(`[Mail] Failed to retrieve service ${identifier}:`, error)
|
||||
console.error(`[Mail][Operations] Failed to retrieve service ${identifier}:`, error)
|
||||
throw error
|
||||
}
|
||||
|
||||
if (!service) {
|
||||
const message = `Service ${identifier} not found`
|
||||
console.error(`[Mail] ${message}`)
|
||||
console.error(`[Mail][Operations] ${message}`)
|
||||
throw new Error(message)
|
||||
}
|
||||
|
||||
@@ -333,7 +330,7 @@ export const useMailStore = defineStore('mailStore', () => {
|
||||
try {
|
||||
await entitiesStore.list([folder.identifier])
|
||||
} catch (error) {
|
||||
console.error('[Mail] Failed to load messages:', error)
|
||||
console.error('[Mail][Operations] Failed to load messages:', error)
|
||||
}
|
||||
|
||||
_updateSyncSources()
|
||||
@@ -376,7 +373,7 @@ export const useMailStore = defineStore('mailStore', () => {
|
||||
|
||||
return draft
|
||||
} catch (error) {
|
||||
console.error('[Mail] Failed to save draft:', error)
|
||||
console.error('[Mail][Operations] Failed to save draft:', error)
|
||||
throw error
|
||||
} finally {
|
||||
composerSaving.value = false
|
||||
@@ -414,7 +411,7 @@ export const useMailStore = defineStore('mailStore', () => {
|
||||
try {
|
||||
await entitiesStore.delete([composerDraftIdentifier.value])
|
||||
} catch (error) {
|
||||
console.error('[Mail] Failed to delete draft after send:', error)
|
||||
console.error('[Mail][Operations] Failed to delete draft after send:', error)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -423,7 +420,7 @@ export const useMailStore = defineStore('mailStore', () => {
|
||||
return response
|
||||
} catch (error) {
|
||||
const messageText = error instanceof Error ? error.message : 'Failed to send message'
|
||||
console.error('[Mail] Failed to send message:', error)
|
||||
console.error('[Mail][Operations] Failed to send message:', error)
|
||||
notify(messageText, 'error')
|
||||
throw error
|
||||
} finally {
|
||||
@@ -431,11 +428,7 @@ export const useMailStore = defineStore('mailStore', () => {
|
||||
}
|
||||
}
|
||||
|
||||
async function createFolder(
|
||||
service: ServiceObject,
|
||||
label: string,
|
||||
parentFolder: CollectionObject | null = null,
|
||||
): Promise<CollectionObject> {
|
||||
async function createFolder(service: ServiceObject, label: string, parentFolder: CollectionObject | null = null): Promise<CollectionObject> {
|
||||
if (service.identifier === null) {
|
||||
throw new Error('Cannot create folder for a service without an identifier')
|
||||
}
|
||||
@@ -574,7 +567,7 @@ export const useMailStore = defineStore('mailStore', () => {
|
||||
await collectionsStore.fetch(sourceCollections)
|
||||
} catch (error) {
|
||||
const messageText = error instanceof Error ? error.message : 'Failed to move messages'
|
||||
console.error('[Mail] Failed to move messages:', error)
|
||||
console.error('[Mail][Operations] Failed to move messages:', error)
|
||||
notify(messageText, 'error')
|
||||
throw error
|
||||
} finally {
|
||||
@@ -609,7 +602,7 @@ export const useMailStore = defineStore('mailStore', () => {
|
||||
}
|
||||
} catch (error) {
|
||||
const messageText = error instanceof Error ? error.message : 'Failed to delete messages'
|
||||
console.error('[Mail] Failed to delete messages:', error)
|
||||
console.error('[Mail][Operations] Failed to delete messages:', error)
|
||||
notify(messageText, 'error')
|
||||
throw error
|
||||
} finally {
|
||||
|
||||
@@ -106,7 +106,7 @@ export const useMailUiStore = defineStore('mailUiStore', () => {
|
||||
watch(
|
||||
() => mailStore.currentMessages,
|
||||
() => {
|
||||
reconcileSelection()
|
||||
messageSelectionReconcile()
|
||||
},
|
||||
)
|
||||
|
||||
@@ -208,16 +208,11 @@ export const useMailUiStore = defineStore('mailUiStore', () => {
|
||||
composeVisible.value = false
|
||||
}
|
||||
|
||||
async function afterSent() {
|
||||
closeCompose()
|
||||
await mailStore.reloadSelectedFolder()
|
||||
}
|
||||
|
||||
function clearSelection() {
|
||||
function messageSelectionClear() {
|
||||
setSelectionList([])
|
||||
}
|
||||
|
||||
function activateSelectionMode(message?: EntityObject) {
|
||||
function messageSelectionModeActivate(message?: EntityObject) {
|
||||
selectionMode.value = true
|
||||
|
||||
if (!message) {
|
||||
@@ -231,12 +226,12 @@ export const useMailUiStore = defineStore('mailUiStore', () => {
|
||||
}
|
||||
}
|
||||
|
||||
function deactivateSelectionMode() {
|
||||
function messageSelectionModeDeactivate() {
|
||||
selectionMode.value = false
|
||||
clearSelection()
|
||||
messageSelectionClear()
|
||||
}
|
||||
|
||||
function toggleMessageSelection(message: EntityObject) {
|
||||
function messageSelectionToggleOne(message: EntityObject) {
|
||||
const identifier = message.identifier
|
||||
|
||||
selectionMode.value = true
|
||||
@@ -249,14 +244,18 @@ export const useMailUiStore = defineStore('mailUiStore', () => {
|
||||
setSelectionList([...selectionList.value, identifier])
|
||||
}
|
||||
|
||||
function selectAllCurrentMessages() {
|
||||
function messageSelectionToggleAll(value: boolean) {
|
||||
selectionMode.value = true
|
||||
if (value) {
|
||||
setSelectionList(mailStore.currentMessages.map(message => message.identifier))
|
||||
} else {
|
||||
setSelectionList([])
|
||||
}
|
||||
}
|
||||
|
||||
function reconcileSelection() {
|
||||
function messageSelectionReconcile() {
|
||||
if (!mailStore.selectedFolder) {
|
||||
clearSelection()
|
||||
messageSelectionClear()
|
||||
return
|
||||
}
|
||||
|
||||
@@ -318,7 +317,7 @@ export const useMailUiStore = defineStore('mailUiStore', () => {
|
||||
|
||||
async function confirmMoveMessages(targetIdentifier: Parameters<typeof mailStore.moveMessages>[0]) {
|
||||
await mailStore.moveMessages(targetIdentifier, moveMessagesDialogCandidates.value ?? [])
|
||||
deactivateSelectionMode()
|
||||
messageSelectionModeDeactivate()
|
||||
closeMoveMessagesDialog()
|
||||
}
|
||||
|
||||
@@ -507,11 +506,11 @@ export const useMailUiStore = defineStore('mailUiStore', () => {
|
||||
openCompose,
|
||||
closeCompose,
|
||||
afterSent,
|
||||
activateSelectionMode,
|
||||
deactivateSelectionMode,
|
||||
toggleMessageSelection,
|
||||
selectAllCurrentMessages,
|
||||
clearSelection,
|
||||
messageSelectionModeActivate,
|
||||
messageSelectionModeDeactivate,
|
||||
messageSelectionToggleOne,
|
||||
messageSelectionToggleAll,
|
||||
messageSelectionClear,
|
||||
validateCreateFolderName,
|
||||
validateRenameFolderName,
|
||||
openMoveMessagesDialog,
|
||||
|
||||
Reference in New Issue
Block a user