Add tab group collapse controls

crates/ely_browser_core/src/state/commands.rs

@@ -156,6 +156,16 @@ impl BrowserCore {
                 Ok(true)
             }
             "save-split-view" | "save split view" => Ok(self.save_active_split_view()?.is_some()),
+            "toggle-tab-group" | "toggle tab group" => {
+                Ok(self.toggle_active_tab_group_collapsed()?.is_some())
+            }
+            "collapse-tab-group" | "collapse tab group" => {
+                Ok(self.set_active_tab_group_collapsed(true)?.is_some())
+            }
+            "expand-tab-group" | "expand tab group" => {
+                Ok(self.set_active_tab_group_collapsed(false)?.is_some())
+            }
+            "ungroup-tab" | "ungroup tab" => self.ungroup_active_tab(),
             "downloads" | "open-downloads" | "open downloads" => {
                 self.open_tab(downloads_url()?);
                 Ok(true)

crates/ely_browser_core/src/state/tab_groups.rs

@@ -47,6 +47,50 @@ impl BrowserCore {
         Ok(())
     }
 
+    pub fn ungroup_active_tab(&mut self) -> Result<bool, CoreError> {
+        let active_tab_id = self.active_tab_id.clone();
+        let Some(_) = self.active_tab_group_id()? else {
+            return Ok(false);
+        };
+        self.clear_tab_group(&active_tab_id)?;
+        Ok(true)
+    }
+
+    pub fn toggle_active_tab_group_collapsed(&mut self) -> Result<Option<bool>, CoreError> {
+        let Some(group_id) = self.active_tab_group_id()? else {
+            return Ok(None);
+        };
+        self.toggle_tab_group_collapsed(&group_id).map(Some)
+    }
+
+    pub fn set_active_tab_group_collapsed(
+        &mut self,
+        collapsed: bool,
+    ) -> Result<Option<()>, CoreError> {
+        let Some(group_id) = self.active_tab_group_id()? else {
+            return Ok(None);
+        };
+        self.set_tab_group_collapsed(&group_id, collapsed)?;
+        Ok(Some(()))
+    }
+
+    pub fn toggle_tab_group_collapsed(&mut self, group_id: &TabGroupId) -> Result<bool, CoreError> {
+        let group = self.tab_group_mut(group_id)?;
+        let collapsed = !group.collapsed();
+        group.set_collapsed(collapsed);
+        Ok(collapsed)
+    }
+
+    pub fn set_tab_group_collapsed(
+        &mut self,
+        group_id: &TabGroupId,
+        collapsed: bool,
+    ) -> Result<(), CoreError> {
+        let group = self.tab_group_mut(group_id)?;
+        group.set_collapsed(collapsed);
+        Ok(())
+    }
+
     pub(super) fn visible_tab_groups(&self) -> Vec<TabGroup> {
         let mut groups = self
             .tab_groups
@@ -97,4 +141,23 @@ impl BrowserCore {
             .max()
             .map_or(0, |sort_key| sort_key.saturating_add(1))
     }
+
+    fn active_tab_group_id(&self) -> Result<Option<TabGroupId>, CoreError> {
+        let tab = self.active_tab()?;
+        let Some(group_id) = tab.group_id().cloned() else {
+            return Ok(None);
+        };
+        if self.tab_groups.iter().any(|group| group.id() == &group_id) {
+            return Ok(Some(group_id));
+        }
+
+        Err(CoreError::TabGroupNotFound { id: group_id })
+    }
+
+    fn tab_group_mut(&mut self, group_id: &TabGroupId) -> Result<&mut TabGroup, CoreError> {
+        self.tab_groups
+            .iter_mut()
+            .find(|group| group.id() == group_id)
+            .ok_or_else(|| CoreError::TabGroupNotFound { id: group_id.clone() })
+    }
 }

crates/ely_browser_core/tests/tab_groups.rs

@@ -102,3 +102,85 @@ fn group_tab_command_groups_active_tab() -> Result<(), Box<dyn Error>> {
     assert_eq!(snapshot.command_query, "");
     Ok(())
 }
+
+#[test]
+fn tab_group_collapse_commands_update_active_group() -> Result<(), Box<dyn Error>> {
+    let mut core = BrowserCore::new(InitialBrowserConfig::ely_defaults()?)?;
+    let group_id = core.group_active_tab("Research")?;
+
+    core.set_command_query(">collapse-tab-group");
+    let collapse_intent = core.submit_command()?;
+    let collapsed_snapshot = core.snapshot()?;
+
+    assert_eq!(collapse_intent, Some(CommandIntent::Command("collapse-tab-group".to_string())));
+    assert_eq!(
+        collapsed_snapshot
+            .tab_groups
+            .iter()
+            .find(|group| group.id() == &group_id)
+            .map(|group| { group.collapsed() }),
+        Some(true)
+    );
+    assert_eq!(collapsed_snapshot.command_query, "");
+
+    core.set_command_query(">expand-tab-group");
+    let expand_intent = core.submit_command()?;
+    let expanded_snapshot = core.snapshot()?;
+
+    assert_eq!(expand_intent, Some(CommandIntent::Command("expand-tab-group".to_string())));
+    assert_eq!(
+        expanded_snapshot
+            .tab_groups
+            .iter()
+            .find(|group| group.id() == &group_id)
+            .map(|group| { group.collapsed() }),
+        Some(false)
+    );
+    assert_eq!(expanded_snapshot.command_query, "");
+    Ok(())
+}
+
+#[test]
+fn toggle_active_tab_group_collapsed_returns_next_state() -> Result<(), Box<dyn Error>> {
+    let mut core = BrowserCore::new(InitialBrowserConfig::ely_defaults()?)?;
+    core.group_active_tab("Research")?;
+
+    assert_eq!(core.toggle_active_tab_group_collapsed()?, Some(true));
+    assert_eq!(core.toggle_active_tab_group_collapsed()?, Some(false));
+    Ok(())
+}
+
+#[test]
+fn ungroup_tab_command_clears_active_tab_group() -> Result<(), Box<dyn Error>> {
+    let mut core = BrowserCore::new(InitialBrowserConfig::ely_defaults()?)?;
+    core.group_active_tab("Research")?;
+
+    core.set_command_query(">ungroup-tab");
+    let intent = core.submit_command()?;
+    let snapshot = core.snapshot()?;
+    let active_tab = snapshot
+        .tabs
+        .iter()
+        .find(|tab| tab.id() == &snapshot.active_tab_id)
+        .ok_or(CoreError::MissingActiveTab)?;
+
+    assert_eq!(intent, Some(CommandIntent::Command("ungroup-tab".to_string())));
+    assert_eq!(active_tab.group_id(), None);
+    assert_eq!(snapshot.command_query, "");
+    Ok(())
+}
+
+#[test]
+fn tab_group_command_preserves_query_without_active_group() -> Result<(), Box<dyn Error>> {
+    let mut core = BrowserCore::new(InitialBrowserConfig::ely_defaults()?)?;
+    let active_tab_id = core.active_tab()?.id().clone();
+
+    core.set_command_query(">toggle-tab-group");
+    let intent = core.submit_command()?;
+    let snapshot = core.snapshot()?;
+
+    assert_eq!(intent, Some(CommandIntent::Command("toggle-tab-group".to_string())));
+    assert_eq!(snapshot.active_tab_id, active_tab_id);
+    assert_eq!(snapshot.command_query, ">toggle-tab-group");
+    Ok(())
+}