fix: collapse recently merged tray section into submenu

Author: ibetitsmike

src-tauri/src/menu.rs

@@ -1,5 +1,5 @@
 use tauri::AppHandle;
-use tauri::menu::{CheckMenuItem, IconMenuItem, Menu, MenuItem, PredefinedMenuItem};
+use tauri::menu::{CheckMenuItem, IconMenuItem, Menu, MenuItem, PredefinedMenuItem, Submenu};
 use tauri_plugin_autostart::ManagerExt;
 
 use crate::avatars::AvatarCache;
@@ -8,6 +8,7 @@ use crate::models::{CheckStatus, PrState, PullRequest};
 struct PrSection {
     title: String,
     prs: Vec<PullRequest>,
+    default_collapsed: bool,
 }
 
 /// Port of src/lib/stores.ts groupPrs() with tray-specific section ordering.
@@ -42,6 +43,7 @@ fn group_prs(all_prs: &[PullRequest]) -> Vec<PrSection> {
                 .filter(|pr| pr.state == PrState::Open && pr.check_status == CheckStatus::Success)
                 .cloned()
                 .collect(),
+            default_collapsed: false,
         },
         PrSection {
             title: "In Merge Queue".into(),
@@ -50,6 +52,7 @@ fn group_prs(all_prs: &[PullRequest]) -> Vec<PrSection> {
                 .filter(|pr| pr.merge_queue_info.is_some())
                 .cloned()
                 .collect(),
+            default_collapsed: false,
         },
         PrSection {
             title: "Checks Failing".into(),
@@ -62,6 +65,7 @@ fn group_prs(all_prs: &[PullRequest]) -> Vec<PrSection> {
                 })
                 .cloned()
                 .collect(),
+            default_collapsed: false,
         },
         PrSection {
             title: "Changes Requested".into(),
@@ -75,6 +79,7 @@ fn group_prs(all_prs: &[PullRequest]) -> Vec<PrSection> {
                 })
                 .cloned()
                 .collect(),
+            default_collapsed: false,
         },
         PrSection {
             title: "Waiting for Review".into(),
@@ -89,6 +94,7 @@ fn group_prs(all_prs: &[PullRequest]) -> Vec<PrSection> {
                 })
                 .cloned()
                 .collect(),
+            default_collapsed: false,
         },
         PrSection {
             title: "Approved".into(),
@@ -102,10 +108,12 @@ fn group_prs(all_prs: &[PullRequest]) -> Vec<PrSection> {
                 })
                 .cloned()
                 .collect(),
+            default_collapsed: false,
         },
         PrSection {
             title: "Draft".into(),
             prs: drafts,
+            default_collapsed: false,
         },
         PrSection {
             title: "Recently Merged".into(),
@@ -114,6 +122,7 @@ fn group_prs(all_prs: &[PullRequest]) -> Vec<PrSection> {
                 .filter(|pr| pr.state == PrState::Merged)
                 .cloned()
                 .collect(),
+            default_collapsed: true,
         },
     ]
 }
@@ -139,42 +148,80 @@ pub fn build_pr_menu(
         }
         first = false;
 
-        // Section header (disabled)
-        let header_text = format!("{} ({})", section.title, section.prs.len());
-        let header = MenuItem::with_id(
-            app,
-            &format!("header_{}", section.title),
-            &header_text,
-            false,
-            None::<&str>,
-        )?;
-        menu.append(&header)?;
+        if section.default_collapsed {
+            let sub_title = format!("{} ({})", section.title, section.prs.len());
+            let submenu = Submenu::with_id(
+                app,
+                &format!("section_{}", section.title),
+                &sub_title,
+                true,
+            )?;
+
+            let show_count = section.prs.len().min(5);
+            for pr in &section.prs[..show_count] {
+                let age = time_ago(&pr.created_at);
+                let mut label = format!(
+                    "  {} #{} — {}",
+                    pr.repository,
+                    pr.number,
+                    truncate(&pr.title, 32),
+                );
+                if pr.comment_count > 0 {
+                    label.push_str(&format!("  💬{}", pr.comment_count));
+                }
+                label.push_str(&format!("  {}", age));
 
-        // PR items (max 5 per section)
-        let show_count = section.prs.len().min(5);
-        for pr in &section.prs[..show_count] {
-            let age = time_ago(&pr.created_at);
-            let mut label = format!(
-                "  {} #{} — {}",
-                pr.repository,
-                pr.number,
-                truncate(&pr.title, 32),
-            );
-            if pr.comment_count > 0 {
-                label.push_str(&format!("  💬{}", pr.comment_count));
+                let icon = avatar_cache.get_image(&pr.author_login);
+                let item = IconMenuItem::with_id(
+                    app,
+                    &format!("pr_{}", pr.id),
+                    &label,
+                    true,
+                    icon,
+                    None::<&str>,
+                )?;
+                submenu.append(&item)?;
             }
-            label.push_str(&format!("  {}", age));
 
-            let icon = avatar_cache.get_image(&pr.author_login);
-            let item = IconMenuItem::with_id(
+            menu.append(&submenu)?;
+        } else {
+            // Section header (disabled)
+            let header_text = format!("{} ({})", section.title, section.prs.len());
+            let header = MenuItem::with_id(
                 app,
-                &format!("pr_{}", pr.id),
-                &label,
-                true,
-                icon,
+                &format!("header_{}", section.title),
+                &header_text,
+                false,
                 None::<&str>,
             )?;
-            menu.append(&item)?;
+            menu.append(&header)?;
+
+            // PR items (max 5 per section)
+            let show_count = section.prs.len().min(5);
+            for pr in &section.prs[..show_count] {
+                let age = time_ago(&pr.created_at);
+                let mut label = format!(
+                    "  {} #{} — {}",
+                    pr.repository,
+                    pr.number,
+                    truncate(&pr.title, 32),
+                );
+                if pr.comment_count > 0 {
+                    label.push_str(&format!("  💬{}", pr.comment_count));
+                }
+                label.push_str(&format!("  {}", age));
+
+                let icon = avatar_cache.get_image(&pr.author_login);
+                let item = IconMenuItem::with_id(
+                    app,
+                    &format!("pr_{}", pr.id),
+                    &label,
+                    true,
+                    icon,
+                    None::<&str>,
+                )?;
+                menu.append(&item)?;
+            }
         }
 
     }