From ab0a46f5e09750d1efb7c21a5218669e97876ff6 Mon Sep 17 00:00:00 2001
From: Sebastian <krupinski01@gmail.com>
Date: Tue, 5 May 2026 23:42:27 -0400
Subject: [PATCH] feat: collection delete

Signed-off-by: Sebastian <krupinski01@gmail.com>
---
 src/components/DeleteFolderDialog.vue | 149 ++++++++++++++++++++++++++
 src/components/FolderPageView.vue     |  21 ++++
 src/components/FolderTree.vue         |  38 +++++++
 src/components/FolderTreeNode.vue     |  42 +++++---
 src/components/FolderTreeView.vue     |   3 +
 src/stores/mailStore.ts               |  12 +++
 6 files changed, 253 insertions(+), 12 deletions(-)
 create mode 100644 src/components/DeleteFolderDialog.vue

diff --git a/src/components/DeleteFolderDialog.vue b/src/components/DeleteFolderDialog.vue
new file mode 100644
index 0000000..5a5c5c5
--- /dev/null
+++ b/src/components/DeleteFolderDialog.vue
@@ -0,0 +1,149 @@
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue'
+import { useCollectionsStore } from '@MailManager/stores/collectionsStore'
+import type { CollectionObject } from '@MailManager/models/collection'
+import type { ServiceObject } from '@MailManager/models'
+
+interface Props {
+  modelValue: boolean
+  service: ServiceObject
+  folder: CollectionObject
+}
+
+const props = defineProps<Props>()
+
+const emit = defineEmits<{
+  'update:modelValue': [value: boolean]
+  deleted: [folder: CollectionObject]
+}>()
+
+const collectionsStore = useCollectionsStore()
+
+const loading = ref(false)
+const errorMessage = ref('')
+
+const dialogValue = computed({
+  get: () => props.modelValue,
+  set: (value: boolean) => emit('update:modelValue', value),
+})
+
+const folderLabel = computed(() => props.folder.properties.label || String(props.folder.identifier))
+
+const hasChildren = computed(() => {
+  return collectionsStore.hasChildrenInCollection(props.folder.provider, props.folder.service, props.folder.identifier)
+})
+
+const resetState = () => {
+  loading.value = false
+  errorMessage.value = ''
+}
+
+watch(dialogValue, isOpen => {
+  if (isOpen) {
+    resetState()
+  }
+})
+
+const handleDelete = async () => {
+  loading.value = true
+  errorMessage.value = ''
+
+  try {
+    await collectionsStore.delete(props.folder.provider, props.folder.service, props.folder.identifier)
+    emit('deleted', props.folder)
+    dialogValue.value = false
+    resetState()
+  } catch (error: any) {
+    console.error('[DeleteFolderDialog] Failed to delete folder:', error)
+    errorMessage.value = error.message || 'Failed to delete folder. Please try again.'
+  } finally {
+    loading.value = false
+  }
+}
+
+const handleCancel = () => {
+  dialogValue.value = false
+  resetState()
+}
+</script>
+
+<template>
+  <v-dialog
+    v-model="dialogValue"
+    max-width="520"
+    persistent
+  >
+    <v-card>
+      <v-card-title class="text-h5">
+        Delete Folder
+      </v-card-title>
+
+      <v-card-text>
+        <div class="mb-4">
+          <div class="text-caption text-medium-emphasis">Account</div>
+          <div class="text-body-2">
+            {{ service.label || service.primaryAddress || 'Mail Account' }}
+          </div>
+        </div>
+
+        <div class="mb-4">
+          <div class="text-caption text-medium-emphasis">Folder</div>
+          <div class="text-body-2">
+            {{ folderLabel }}
+          </div>
+        </div>
+
+        <p class="text-body-2 mb-0">
+          Confirm deletion of this folder.
+        </p>
+
+        <p
+          v-if="hasChildren"
+          class="text-body-2 mt-3 mb-0"
+        >
+          This folder contains subfolders. The delete request may be rejected if the provider does not allow deleting non-empty folders.
+        </p>
+
+        <v-alert
+          v-if="errorMessage"
+          type="error"
+          variant="tonal"
+          density="compact"
+          class="mt-4"
+        >
+          {{ errorMessage }}
+        </v-alert>
+      </v-card-text>
+
+      <v-card-actions>
+        <v-spacer />
+
+        <v-btn
+          variant="text"
+          :disabled="loading"
+          @click="handleCancel"
+        >
+          Cancel
+        </v-btn>
+
+        <v-btn
+          color="error"
+          variant="elevated"
+          :loading="loading"
+          @click="handleDelete"
+        >
+          Delete Folder
+        </v-btn>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
+</template>
+
+<style scoped>
+.text-caption {
+  font-size: 0.75rem;
+  font-weight: 500;
+  text-transform: uppercase;
+  letter-spacing: 0.0333em;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/FolderPageView.vue b/src/components/FolderPageView.vue
index 7e64d9d..03b04bd 100644
--- a/src/components/FolderPageView.vue
+++ b/src/components/FolderPageView.vue
@@ -23,6 +23,7 @@ const emit = defineEmits<{
   select: [folder: CollectionObject]
   createFolder: [service: ServiceObject, parentFolder: CollectionObject | null]
   editFolder: [service: ServiceObject, folder: CollectionObject]
+  deleteFolder: [service: ServiceObject, folder: CollectionObject]
 }>()
 
 // Page-based navigation state per service account
@@ -56,6 +57,10 @@ const getServiceFolders = (service: ServiceObject): CollectionObject[] => {
   return collectionsStore.collectionsForService(service.provider, service.identifier)
 }
 
+const canDeleteFolder = (folder: CollectionObject): boolean => {
+  return !folder.properties.role
+}
+
 // Get icon for folder based on role
 const getFolderIcon = (folder: CollectionObject): string => {
   switch (folder.properties.role) {
@@ -271,6 +276,14 @@ const getCurrentParentFolder = (service: ServiceObject): CollectionObject | null
                 >
                   <v-list-item-title>New Subfolder</v-list-item-title>
                 </v-list-item>
+                <v-list-item
+                  v-if="canDeleteFolder(folder)"
+                  prepend-icon="mdi-delete"
+                  base-color="error"
+                  @click="emit('deleteFolder', group.service, folder)"
+                >
+                  <v-list-item-title>Delete Folder</v-list-item-title>
+                </v-list-item>
               </v-list>
             </v-menu>
           </template>
@@ -420,6 +433,14 @@ const getCurrentParentFolder = (service: ServiceObject): CollectionObject | null
                 >
                   <v-list-item-title>New Subfolder</v-list-item-title>
                 </v-list-item>
+                <v-list-item
+                  v-if="canDeleteFolder(folder)"
+                  prepend-icon="mdi-delete"
+                  base-color="error"
+                  @click="emit('deleteFolder', group.service, folder)"
+                >
+                  <v-list-item-title>Delete Folder</v-list-item-title>
+                </v-list-item>
               </v-list>
             </v-menu>
           </template>
diff --git a/src/components/FolderTree.vue b/src/components/FolderTree.vue
index 3653533..4f06212 100644
--- a/src/components/FolderTree.vue
+++ b/src/components/FolderTree.vue
@@ -7,6 +7,7 @@ import { useUser } from '@KTXC'
 import FolderTreeView from './FolderTreeView.vue'
 import FolderPageView from './FolderPageView.vue'
 import CreateFolderDialog from './CreateFolderDialog.vue'
+import DeleteFolderDialog from './DeleteFolderDialog.vue'
 import RenameFolderDialog from './RenameFolderDialog.vue'
 import type { CollectionObject } from '@MailManager/models/collection'
 import type { ServiceObject } from '@MailManager/models'
@@ -43,6 +44,9 @@ const createDialogParent = ref<CollectionObject | null>(null)
 const renameDialogVisible = ref(false)
 const renameDialogService = ref<ServiceObject | null>(null)
 const renameDialogFolder = ref<CollectionObject | null>(null)
+const deleteDialogVisible = ref(false)
+const deleteDialogService = ref<ServiceObject | null>(null)
+const deleteDialogFolder = ref<CollectionObject | null>(null)
 
 // Handle create folder event from child components
 const handleCreateFolder = (service: ServiceObject, parentFolder: CollectionObject | null = null) => {
@@ -63,10 +67,34 @@ const handleEditFolder = (service: ServiceObject, folder: CollectionObject) => {
   renameDialogVisible.value = true
 }
 
+const handleDeleteFolder = (service: ServiceObject, folder: CollectionObject) => {
+  deleteDialogService.value = service
+  deleteDialogFolder.value = folder
+  deleteDialogVisible.value = true
+}
+
 const handleFolderRenamed = (updatedFolder: CollectionObject) => {
   emit('select', updatedFolder)
 }
 
+const isSameFolder = (left: CollectionObject | null | undefined, right: CollectionObject | null | undefined) => {
+  if (!left || !right) {
+    return false
+  }
+
+  return left.provider === right.provider &&
+    String(left.service) === String(right.service) &&
+    String(left.identifier) === String(right.identifier)
+}
+
+const handleFolderDeleted = (deletedFolder: CollectionObject) => {
+  if (isSameFolder(props.selectedFolder, deletedFolder)) {
+    mailStore.clearSelectedFolder()
+  }
+
+  mailStore.notify(`Folder "${deletedFolder.properties.label || String(deletedFolder.identifier)}" deleted`, 'success')
+}
+
 // Computed: all folders for validation
 const allFolders = computed(() => 
   servicesStore.servicesEnabled.flatMap(service =>
@@ -106,6 +134,7 @@ const serviceGroups = computed(() => {
       @select="emit('select', $event)"
       @create-folder="handleCreateFolder"
       @edit-folder="handleEditFolder"
+      @delete-folder="handleDeleteFolder"
     />
 
     <!-- Page-based View -->
@@ -116,6 +145,7 @@ const serviceGroups = computed(() => {
       @select="emit('select', $event)"
       @create-folder="handleCreateFolder"
       @edit-folder="handleEditFolder"
+      @delete-folder="handleDeleteFolder"
     />
 
     <!-- Empty state -->
@@ -144,6 +174,14 @@ const serviceGroups = computed(() => {
     :all-folders="allFolders"
     @updated="handleFolderRenamed"
   />
+
+  <DeleteFolderDialog
+    v-if="deleteDialogService && deleteDialogFolder"
+    v-model="deleteDialogVisible"
+    :service="deleteDialogService"
+    :folder="deleteDialogFolder"
+    @deleted="handleFolderDeleted"
+  />
 </template>
 
 <style scoped>
diff --git a/src/components/FolderTreeNode.vue b/src/components/FolderTreeNode.vue
index df1bc16..569c8f5 100644
--- a/src/components/FolderTreeNode.vue
+++ b/src/components/FolderTreeNode.vue
@@ -18,6 +18,7 @@ const emit = defineEmits<{
   select: [folder: CollectionObject]
   createSubfolder: [service: ServiceObject, parentFolder: CollectionObject]
   editFolder: [service: ServiceObject, folder: CollectionObject]
+  deleteFolder: [service: ServiceObject, folder: CollectionObject]
 }>()
 
 const childFolders = computed(() => {
@@ -28,6 +29,8 @@ const hasChildren = computed(() => {
   return collectionsStore.hasChildrenInCollection(props.service.provider, props.service.identifier, props.folder.identifier)
 })
 
+const canDeleteFolder = computed(() => !props.folder.properties.role)
+
 const handleExpandableFolderClick = () => {
   expanded.value = !expanded.value
   emit('select', props.folder)
@@ -95,12 +98,12 @@ const isSelected = (folder: CollectionObject): boolean => {
         @click.stop="handleExpandableFolderClick()"
       >
         <template v-slot:prepend>
-          <v-icon 
-            :icon="getFolderIcon(folder)" 
+          <v-icon
+            :icon="getFolderIcon(folder)"
             :color="getFolderColor(folder)"
           />
         </template>
-        
+
         <template v-slot:append>
           <v-badge
             v-if="folder.properties.unread && folder.properties.unread > 0"
@@ -109,8 +112,7 @@ const isSelected = (folder: CollectionObject): boolean => {
             inline
             class="mr-2"
           />
-          
-          <!-- Action menu -->
+
           <v-menu>
             <template v-slot:activator="{ props: menuProps }">
               <v-btn
@@ -124,7 +126,7 @@ const isSelected = (folder: CollectionObject): boolean => {
                 <v-icon size="small">mdi-dots-vertical</v-icon>
               </v-btn>
             </template>
-            
+
             <v-list density="compact">
               <v-list-item
                 prepend-icon="mdi-pencil"
@@ -138,6 +140,14 @@ const isSelected = (folder: CollectionObject): boolean => {
               >
                 <v-list-item-title>New Subfolder</v-list-item-title>
               </v-list-item>
+              <v-list-item
+                v-if="canDeleteFolder"
+                prepend-icon="mdi-delete"
+                base-color="error"
+                @click="emit('deleteFolder', service, folder)"
+              >
+                <v-list-item-title>Delete Folder</v-list-item-title>
+              </v-list-item>
             </v-list>
           </v-menu>
         </template>
@@ -154,6 +164,7 @@ const isSelected = (folder: CollectionObject): boolean => {
         @select="emit('select', $event)"
         @create-subfolder="(service, parentFolder) => emit('createSubfolder', service, parentFolder)"
         @edit-folder="(service, folder) => emit('editFolder', service, folder)"
+        @delete-folder="(service, folder) => emit('deleteFolder', service, folder)"
       />
     </div>
   </v-list-group>
@@ -166,12 +177,12 @@ const isSelected = (folder: CollectionObject): boolean => {
     @click="emit('select', folder)"
   >
     <template v-slot:prepend>
-      <v-icon 
-        :icon="getFolderIcon(folder)" 
+      <v-icon
+        :icon="getFolderIcon(folder)"
         :color="getFolderColor(folder)"
       />
     </template>
-    
+
     <template v-slot:append>
       <v-badge
         v-if="folder.properties.unread && folder.properties.unread > 0"
@@ -180,8 +191,7 @@ const isSelected = (folder: CollectionObject): boolean => {
         inline
         class="mr-2"
       />
-      
-      <!-- Action menu -->
+
       <v-menu>
         <template v-slot:activator="{ props: menuProps }">
           <v-btn
@@ -195,7 +205,7 @@ const isSelected = (folder: CollectionObject): boolean => {
             <v-icon size="small">mdi-dots-vertical</v-icon>
           </v-btn>
         </template>
-        
+
         <v-list density="compact">
           <v-list-item
             prepend-icon="mdi-pencil"
@@ -209,6 +219,14 @@ const isSelected = (folder: CollectionObject): boolean => {
           >
             <v-list-item-title>New Subfolder</v-list-item-title>
           </v-list-item>
+          <v-list-item
+            v-if="canDeleteFolder"
+            prepend-icon="mdi-delete"
+            base-color="error"
+            @click="emit('deleteFolder', service, folder)"
+          >
+            <v-list-item-title>Delete Folder</v-list-item-title>
+          </v-list-item>
         </v-list>
       </v-menu>
     </template>
diff --git a/src/components/FolderTreeView.vue b/src/components/FolderTreeView.vue
index 718b8ff..d8d98fb 100644
--- a/src/components/FolderTreeView.vue
+++ b/src/components/FolderTreeView.vue
@@ -23,6 +23,7 @@ const emit = defineEmits<{
   select: [folder: CollectionObject]
   createFolder: [service: ServiceObject, parentFolder: CollectionObject | null]
   editFolder: [service: ServiceObject, folder: CollectionObject]
+  deleteFolder: [service: ServiceObject, folder: CollectionObject]
 }>()
 
 const getRootFolders = (service: ServiceObject): CollectionObject[] => {
@@ -74,6 +75,7 @@ const getServiceFolders = (service: ServiceObject): CollectionObject[] => {
           @select="emit('select', $event)"
           @create-subfolder="(service, parentFolder) => emit('createFolder', service, parentFolder)"
           @edit-folder="(service, folder) => emit('editFolder', service, folder)"
+          @delete-folder="(service, folder) => emit('deleteFolder', service, folder)"
         />
 
         <v-list-item v-if="group.loading && getServiceFolders(group.service).length === 0" disabled class="folder-status-item">
@@ -155,6 +157,7 @@ const getServiceFolders = (service: ServiceObject): CollectionObject[] => {
           @select="emit('select', $event)"
           @create-subfolder="(service, parentFolder) => emit('createFolder', service, parentFolder)"
           @edit-folder="(service, folder) => emit('editFolder', service, folder)"
+          @delete-folder="(service, folder) => emit('deleteFolder', service, folder)"
         />
 
         <v-list-item v-if="group.loading && getServiceFolders(group.service).length === 0" disabled class="folder-status-item">
diff --git a/src/stores/mailStore.ts b/src/stores/mailStore.ts
index 98c442c..5d092cb 100644
--- a/src/stores/mailStore.ts
+++ b/src/stores/mailStore.ts
@@ -297,6 +297,17 @@ export const useMailStore = defineStore('mailStore', () => {
     _updateSyncSources()
   }
 
+  function clearSelectedFolder() {
+    selectedFolder.value = null
+    selectedMessage.value = null
+    clearSelection()
+    selectionMode.value = false
+    composeMode.value = false
+    composeReplyTo.value = null
+
+    _updateSyncSources()
+  }
+
   function selectMessage(entity: EntityObject, closeSidebar = false) {
     selectedMessage.value = entity
     composeMode.value = false
@@ -555,6 +566,7 @@ export const useMailStore = defineStore('mailStore', () => {
 
     // Actions
     selectFolder,
+    clearSelectedFolder,
     selectMessage,
     isMessageSelected,
     activateSelectionMode,
-- 
2.39.5