Add domain history clear confirmation
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
use std::time::SystemTime;
|
||||
|
||||
use ely_domain::{BrowserTab, HistoryEntry, ProfileId, ProfileKind, UrlText};
|
||||
use ely_domain::{BrowserTab, HistoryEntry, ProfileId, ProfileKind, SpaceId, UrlText};
|
||||
|
||||
use crate::navigation::records_history;
|
||||
|
||||
@@ -12,6 +12,15 @@ impl BrowserCore {
|
||||
self.clear_profile_history(&profile_id)
|
||||
}
|
||||
|
||||
pub fn clear_active_space_history_for_host(
|
||||
&mut self,
|
||||
host: &str,
|
||||
) -> Result<usize, crate::CoreError> {
|
||||
let profile_id = self.active_profile_id.clone();
|
||||
let space_id = self.active_space_id.clone();
|
||||
self.clear_space_profile_history_for_host(&profile_id, &space_id, host)
|
||||
}
|
||||
|
||||
pub(super) fn record_history_entry(&mut self, tab: &BrowserTab) {
|
||||
if !self.history_recording_policy.records_history()
|
||||
|| !records_history(tab.url())
|
||||
@@ -72,6 +81,33 @@ impl BrowserCore {
|
||||
Ok(original_count - self.history_entries.len())
|
||||
}
|
||||
|
||||
fn clear_space_profile_history_for_host(
|
||||
&mut self,
|
||||
profile_id: &ProfileId,
|
||||
space_id: &SpaceId,
|
||||
host: &str,
|
||||
) -> Result<usize, crate::CoreError> {
|
||||
if !self.profiles.iter().any(|profile| profile.id() == profile_id) {
|
||||
return Err(crate::CoreError::ProfileNotFound { id: profile_id.clone() });
|
||||
}
|
||||
if !self.spaces.iter().any(|space| space.id() == space_id) {
|
||||
return Err(crate::CoreError::SpaceNotFound { id: space_id.clone() });
|
||||
}
|
||||
|
||||
let normalized_host = host.trim().to_ascii_lowercase();
|
||||
if normalized_host.is_empty() {
|
||||
return Ok(0);
|
||||
}
|
||||
|
||||
let original_count = self.history_entries.len();
|
||||
self.history_entries.retain(|entry| {
|
||||
entry.profile_id() != profile_id
|
||||
|| entry.space_id() != space_id
|
||||
|| entry.url().host().as_deref() != Some(normalized_host.as_str())
|
||||
});
|
||||
Ok(original_count - self.history_entries.len())
|
||||
}
|
||||
|
||||
fn profile_records_history(&self, profile_id: &ProfileId) -> bool {
|
||||
match self.profiles.iter().find(|profile| profile.id() == profile_id) {
|
||||
Some(profile) => profile.kind() == &ProfileKind::Standard,
|
||||
|
||||
@@ -85,6 +85,58 @@ fn clear_active_profile_history_without_entries_is_empty_change() -> Result<(),
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn clear_active_space_history_for_host_stays_in_space_and_profile() -> Result<(), Box<dyn Error>> {
|
||||
let mut core = BrowserCore::new(InitialBrowserConfig::ely_defaults()?)?;
|
||||
let work_space_id = core.snapshot()?.active_space_id;
|
||||
let default_profile_id = core.snapshot()?.active_profile_id;
|
||||
|
||||
core.open_tab(UrlText::parse("https://example.com/work-one")?);
|
||||
core.open_tab(UrlText::parse("https://example.com/work-two")?);
|
||||
core.open_tab(UrlText::parse("https://example.org/work")?);
|
||||
|
||||
let research_space_id = core.create_space("Research", "R", 0xf54e00)?;
|
||||
core.open_tab(UrlText::parse("https://example.com/research")?);
|
||||
|
||||
core.select_space(&work_space_id)?;
|
||||
let personal_profile_id = core.create_profile("Personal", 0x26251e, ProfileKind::Standard)?;
|
||||
core.open_tab(UrlText::parse("https://example.com/personal")?);
|
||||
core.select_profile(&default_profile_id)?;
|
||||
|
||||
let removed_count = core.clear_active_space_history_for_host("EXAMPLE.com")?;
|
||||
let work_snapshot = core.snapshot()?;
|
||||
assert_eq!(removed_count, 2);
|
||||
assert_eq!(work_snapshot.history_entries.len(), 1);
|
||||
assert_eq!(work_snapshot.history_entries[0].url().as_str(), "https://example.org/work");
|
||||
assert_eq!(work_snapshot.active_profile_history_entry_count, 2);
|
||||
|
||||
core.select_space(&research_space_id)?;
|
||||
let research_snapshot = core.snapshot()?;
|
||||
assert_eq!(research_snapshot.history_entries.len(), 1);
|
||||
assert_eq!(research_snapshot.history_entries[0].url().as_str(), "https://example.com/research");
|
||||
|
||||
core.select_space(&work_space_id)?;
|
||||
core.select_profile(&personal_profile_id)?;
|
||||
let personal_snapshot = core.snapshot()?;
|
||||
assert_eq!(personal_snapshot.history_entries.len(), 1);
|
||||
assert_eq!(personal_snapshot.history_entries[0].url().as_str(), "https://example.com/personal");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn clear_active_space_history_for_absent_host_is_empty_change() -> Result<(), Box<dyn Error>> {
|
||||
let mut core = BrowserCore::new(InitialBrowserConfig::ely_defaults()?)?;
|
||||
core.open_tab(UrlText::parse("https://example.com/work")?);
|
||||
|
||||
let removed_count = core.clear_active_space_history_for_host("absent.example")?;
|
||||
let snapshot = core.snapshot()?;
|
||||
|
||||
assert_eq!(removed_count, 0);
|
||||
assert_eq!(snapshot.history_entries.len(), 1);
|
||||
assert_eq!(snapshot.active_profile_history_entry_count, 1);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn history_scoped_search_opens_recent_matching_entry() -> Result<(), Box<dyn Error>> {
|
||||
let mut core = BrowserCore::new(InitialBrowserConfig::ely_defaults()?)?;
|
||||
|
||||
Reference in New Issue
Block a user