✨ feat: add support for editing and deleting category groups

Author: KayleeBeyene

src/tui/app.rs

@@ -4,7 +4,7 @@
 
 use crate::config::paths::EnvelopePaths;
 use crate::config::settings::Settings;
-use crate::models::{AccountId, BudgetPeriod, CategoryId, TransactionId};
+use crate::models::{AccountId, BudgetPeriod, CategoryGroupId, CategoryId, TransactionId};
 use crate::storage::Storage;
 
 use super::dialogs::account::AccountFormState;
@@ -125,6 +125,7 @@ pub enum ActiveDialog {
     AddCategory,
     EditCategory(CategoryId),
     AddGroup,
+    EditGroup(CategoryGroupId),
     MoveFunds,
     CommandPalette,
     Help,
@@ -496,6 +497,14 @@ impl<'a> App<'a> {
                 self.group_form = GroupFormState::new();
                 self.input_mode = InputMode::Editing;
             }
+            ActiveDialog::EditGroup(group_id) => {
+                // Load group data into form for editing
+                if let Ok(Some(group)) = self.storage.categories.get_group(*group_id) {
+                    self.group_form = GroupFormState::new();
+                    self.group_form.init_for_edit(&group);
+                }
+                self.input_mode = InputMode::Editing;
+            }
             ActiveDialog::Budget => {
                 // Initialize unified budget dialog for selected category
                 if let Some(category_id) = self.selected_category {

src/tui/commands.rs

@@ -46,6 +46,8 @@ pub enum CommandAction {
     AddGroup,
     EditCategory,
     DeleteCategory,
+    EditGroup,
+    DeleteGroup,
 
     // General
     Help,
@@ -184,6 +186,18 @@ pub static COMMANDS: &[Command] = &[
         shortcut: None,
         action: CommandAction::DeleteCategory,
     },
+    Command {
+        name: "edit-group",
+        description: "Edit selected category group",
+        shortcut: Some("E"),
+        action: CommandAction::EditGroup,
+    },
+    Command {
+        name: "delete-group",
+        description: "Delete selected category group",
+        shortcut: Some("D"),
+        action: CommandAction::DeleteGroup,
+    },
     // General commands
     Command {
         name: "help",

src/tui/dialogs/group.rs

@@ -11,7 +11,7 @@ use ratatui::{
     Frame,
 };
 
-use crate::models::CategoryGroup;
+use crate::models::{CategoryGroup, CategoryGroupId};
 use crate::services::CategoryService;
 use crate::tui::app::App;
 use crate::tui::layout::centered_rect;
@@ -25,6 +25,9 @@ pub struct GroupFormState {
 
     /// Error message to display
     pub error_message: Option<String>,
+
+    /// Group ID being edited (None for new group)
+    pub editing_id: Option<CategoryGroupId>,
 }
 
 impl Default for GroupFormState {
@@ -41,9 +44,20 @@ impl GroupFormState {
                 .label("Name")
                 .placeholder("Group name (e.g., Bills, Savings)"),
             error_message: None,
+            editing_id: None,
         }
     }
 
+    /// Initialize the form for editing an existing group
+    pub fn init_for_edit(&mut self, group: &CategoryGroup) {
+        self.editing_id = Some(group.id);
+        self.name_input = TextInput::new()
+            .label("Name")
+            .placeholder("Group name (e.g., Bills, Savings)")
+            .content(&group.name);
+        self.error_message = None;
+    }
+
     /// Validate the form and return any error
     pub fn validate(&self) -> Result<(), String> {
         let name = self.name_input.value().trim();
@@ -81,8 +95,15 @@ pub fn render(frame: &mut Frame, app: &mut App) {
     // Clear the background
     frame.render_widget(Clear, area);
 
+    // Choose title based on whether we're editing or adding
+    let title = if app.group_form.editing_id.is_some() {
+        " Edit Category Group "
+    } else {
+        " Add Category Group "
+    };
+
     let block = Block::default()
-        .title(" Add Category Group ")
+        .title(title)
         .title_style(
             Style::default()
                 .fg(Color::Cyan)
@@ -270,19 +291,30 @@ fn save_group(app: &mut App) -> Result<(), String> {
     app.group_form.validate()?;
 
     let name = app.group_form.name_input.value().trim().to_string();
-
-    // Use CategoryService to create the group
     let category_service = CategoryService::new(app.storage);
-    category_service
-        .create_group(&name)
-        .map_err(|e| e.to_string())?;
 
-    // Save to disk
-    app.storage.categories.save().map_err(|e| e.to_string())?;
+    if let Some(group_id) = app.group_form.editing_id {
+        // Update existing group
+        category_service
+            .update_group(group_id, Some(&name))
+            .map_err(|e| e.to_string())?;
+
+        // Close dialog
+        app.close_dialog();
+        app.set_status(format!("Category group '{}' updated", name));
+    } else {
+        // Create new group
+        category_service
+            .create_group(&name)
+            .map_err(|e| e.to_string())?;
+
+        // Save to disk
+        app.storage.categories.save().map_err(|e| e.to_string())?;
 
-    // Close dialog
-    app.close_dialog();
-    app.set_status(format!("Category group '{}' created", name));
+        // Close dialog
+        app.close_dialog();
+        app.set_status(format!("Category group '{}' created", name));
+    }
 
     Ok(())
 }

src/tui/handler.rs

@@ -447,6 +447,57 @@ fn handle_budget_view_key(app: &mut App, key: KeyEvent) -> Result<()> {
             app.open_dialog(ActiveDialog::AddGroup);
         }
 
+        // Edit category group (Shift+E)
+        KeyCode::Char('E') => {
+            if let Some(cat) = categories.get(app.selected_category_index) {
+                app.open_dialog(ActiveDialog::EditGroup(cat.group_id));
+            }
+        }
+
+        // Delete category group (Shift+D)
+        KeyCode::Char('D') => {
+            if let Some(cat) = categories.get(app.selected_category_index) {
+                if let Ok(Some(group)) = app.storage.categories.get_group(cat.group_id) {
+                    let group_categories = app
+                        .storage
+                        .categories
+                        .get_categories_in_group(group.id)
+                        .unwrap_or_default();
+                    let warning = if group_categories.is_empty() {
+                        format!("Delete group '{}'?", group.name)
+                    } else {
+                        format!(
+                            "Delete group '{}' and its {} categories?",
+                            group.name,
+                            group_categories.len()
+                        )
+                    };
+                    app.open_dialog(ActiveDialog::Confirm(warning));
+                }
+            }
+        }
+
+        // Edit category
+        KeyCode::Char('e') => {
+            if let Some(cat) = categories.get(app.selected_category_index) {
+                app.selected_category = Some(cat.id);
+                app.open_dialog(ActiveDialog::EditCategory(cat.id));
+            }
+        }
+
+        // Delete category
+        KeyCode::Char('d') => {
+            if let Some(cat) = categories.get(app.selected_category_index) {
+                app.selected_category = Some(cat.id);
+                if let Ok(Some(category)) = app.storage.categories.get_category(cat.id) {
+                    app.open_dialog(ActiveDialog::Confirm(format!(
+                        "Delete category '{}'?",
+                        category.name
+                    )));
+                }
+            }
+        }
+
         // Open unified budget dialog (period budget + target)
         KeyCode::Enter | KeyCode::Char('b') | KeyCode::Char('t') => {
             if let Some(cat) = categories.get(app.selected_category_index) {
@@ -705,6 +756,43 @@ fn execute_command_action(app: &mut App, action: CommandAction) -> Result<()> {
                 app.set_status("No category selected".to_string());
             }
         }
+        CommandAction::EditGroup => {
+            // Edit the group of the currently selected category
+            if let Some(category_id) = app.selected_category {
+                if let Ok(Some(category)) = app.storage.categories.get_category(category_id) {
+                    app.open_dialog(ActiveDialog::EditGroup(category.group_id));
+                }
+            } else {
+                app.set_status("No category selected. Switch to Budget view first.".to_string());
+            }
+        }
+        CommandAction::DeleteGroup => {
+            // Delete the group of the currently selected category with confirmation
+            if let Some(category_id) = app.selected_category {
+                if let Ok(Some(category)) = app.storage.categories.get_category(category_id) {
+                    if let Ok(Some(group)) = app.storage.categories.get_group(category.group_id) {
+                        // Check if group has categories
+                        let categories = app
+                            .storage
+                            .categories
+                            .get_categories_in_group(group.id)
+                            .unwrap_or_default();
+                        let warning = if categories.is_empty() {
+                            format!("Delete group '{}'?", group.name)
+                        } else {
+                            format!(
+                                "Delete group '{}' and its {} categories?",
+                                group.name,
+                                categories.len()
+                            )
+                        };
+                        app.open_dialog(ActiveDialog::Confirm(warning));
+                    }
+                }
+            } else {
+                app.set_status("No category selected".to_string());
+            }
+        }
 
         // General
         CommandAction::Help => {
@@ -844,7 +932,7 @@ fn handle_dialog_key(app: &mut App, key: KeyEvent) -> Result<()> {
         ActiveDialog::AddCategory | ActiveDialog::EditCategory(_) => {
             super::dialogs::category::handle_key(app, key);
         }
-        ActiveDialog::AddGroup => {
+        ActiveDialog::AddGroup | ActiveDialog::EditGroup(_) => {
             super::dialogs::group::handle_key(app, key);
         }
         ActiveDialog::None => {}
@@ -933,6 +1021,27 @@ fn execute_confirmed_action(app: &mut App, message: &str) -> Result<()> {
             }
         }
     }
+    // Delete group
+    else if message.contains("Delete group") {
+        if let Some(category_id) = app.selected_category {
+            use crate::services::CategoryService;
+            if let Ok(Some(category)) = app.storage.categories.get_category(category_id) {
+                let group_id = category.group_id;
+                let category_service = CategoryService::new(app.storage);
+                // force_delete_categories = true since user confirmed
+                match category_service.delete_group(group_id, true) {
+                    Ok(()) => {
+                        app.set_status("Category group deleted".to_string());
+                        app.selected_category = None;
+                        app.selected_category_index = 0;
+                    }
+                    Err(e) => {
+                        app.set_status(format!("Failed to delete: {}", e));
+                    }
+                }
+            }
+        }
+    }
 
     Ok(())
 }

src/tui/views/mod.rs

@@ -91,7 +91,7 @@ fn render_dialog(frame: &mut Frame, app: &mut App) {
         ActiveDialog::AddCategory | ActiveDialog::EditCategory(_) => {
             dialogs::category::render(frame, app);
         }
-        ActiveDialog::AddGroup => {
+        ActiveDialog::AddGroup | ActiveDialog::EditGroup(_) => {
             dialogs::group::render(frame, app);
         }
         ActiveDialog::None => {}