refactor(settings): remove the Updates page until an updater exists
This commit is contained in:
@@ -44,7 +44,6 @@ fn internal_page_title(url: &str) -> Option<&'static str> {
|
||||
"ely://settings/plugins" => Some("Plugin Settings"),
|
||||
"ely://settings/profiles" => Some("Profile Settings"),
|
||||
"ely://settings/sync" => Some("Sync Settings"),
|
||||
"ely://settings/updates" => Some("Update Settings"),
|
||||
"ely://sync/status" => Some("Sync Status"),
|
||||
_ => None,
|
||||
}
|
||||
@@ -412,17 +411,6 @@ const SETTINGS_ROUTE_MATCHES: &[SettingsRouteMatch] = &[
|
||||
exact_terms: &["sync", "sync settings"],
|
||||
search_terms: &["Sync", "Local sync state and object scope.", "sync object scope"],
|
||||
},
|
||||
SettingsRouteMatch {
|
||||
route: "ely://settings/updates",
|
||||
exact_terms: &["update", "updates", "auto update", "auto updates", "release", "releases"],
|
||||
search_terms: &[
|
||||
"Updates",
|
||||
"Build identity and Elydora release manifest contract.",
|
||||
"build identity",
|
||||
"release manifest",
|
||||
"artifact integrity",
|
||||
],
|
||||
},
|
||||
SettingsRouteMatch {
|
||||
route: "ely://settings/profiles",
|
||||
exact_terms: &["profile", "profiles", "profile settings", "profiles settings"],
|
||||
|
||||
@@ -5,7 +5,7 @@ use ely_domain::{
|
||||
DiagnosticsReportingPolicy, DomainError, DownloadEntry, DownloadPolicy, FavoriteLimit,
|
||||
HistoryEntry, HistoryRecordingPolicy, NewTabDestination, NoteEntry, Profile, ProfileId,
|
||||
ProfileKind, ReadingListEntry, SearchEngine, SitePermissionAuditEvent, SitePermissionEntry,
|
||||
Space, SpaceId, SplitLayout, SyncStatus, TabGroup, TabId, UpdatePolicy, UrlText,
|
||||
Space, SpaceId, SplitLayout, SyncStatus, TabGroup, TabId, UrlText,
|
||||
};
|
||||
|
||||
use crate::{CoreError, navigation::tab_title};
|
||||
@@ -138,7 +138,6 @@ pub struct BrowserSnapshot {
|
||||
pub history_recording_policy: HistoryRecordingPolicy,
|
||||
pub diagnostics_reporting_policy: DiagnosticsReportingPolicy,
|
||||
pub favorite_limit: FavoriteLimit,
|
||||
pub update_policy: UpdatePolicy,
|
||||
pub appearance: AppearanceSettings,
|
||||
pub command_query: String,
|
||||
}
|
||||
@@ -180,7 +179,6 @@ pub struct BrowserCore {
|
||||
history_recording_policy: HistoryRecordingPolicy,
|
||||
diagnostics_reporting_policy: DiagnosticsReportingPolicy,
|
||||
favorite_limit: FavoriteLimit,
|
||||
update_policy: UpdatePolicy,
|
||||
appearance: AppearanceSettings,
|
||||
sync_object_policies: SyncObjectPolicies,
|
||||
sync_connection_state: ely_domain::SyncConnectionState,
|
||||
@@ -233,7 +231,6 @@ impl BrowserCore {
|
||||
history_recording_policy: HistoryRecordingPolicy::default(),
|
||||
diagnostics_reporting_policy: DiagnosticsReportingPolicy::default(),
|
||||
favorite_limit: FavoriteLimit::default(),
|
||||
update_policy: UpdatePolicy::default(),
|
||||
appearance: AppearanceSettings::default(),
|
||||
sync_object_policies: SyncObjectPolicies::default(),
|
||||
sync_connection_state: ely_domain::SyncConnectionState::SignedOut,
|
||||
@@ -386,7 +383,6 @@ impl BrowserCore {
|
||||
history_recording_policy: self.history_recording_policy,
|
||||
diagnostics_reporting_policy: self.diagnostics_reporting_policy,
|
||||
favorite_limit: self.favorite_limit,
|
||||
update_policy: self.update_policy,
|
||||
appearance: self.appearance,
|
||||
command_query: self.command_query.clone(),
|
||||
})
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use ely_domain::{
|
||||
AppearanceSettings, ArchivePolicy, DEFAULT_SIDEBAR_WIDTH_PX, FavoriteLimit, NewTabDestination,
|
||||
SearchEngine, ThemeMode, UpdatePolicy, WallpaperTheme,
|
||||
SearchEngine, ThemeMode, WallpaperTheme,
|
||||
};
|
||||
|
||||
use super::BrowserCore;
|
||||
@@ -50,19 +50,6 @@ impl BrowserCore {
|
||||
self.favorite_limit
|
||||
}
|
||||
|
||||
pub fn set_update_policy(&mut self, update_policy: UpdatePolicy) {
|
||||
self.update_policy = update_policy;
|
||||
}
|
||||
|
||||
pub fn reset_update_settings(&mut self) {
|
||||
self.set_update_policy(UpdatePolicy::default());
|
||||
}
|
||||
|
||||
#[must_use]
|
||||
pub fn update_policy(&self) -> UpdatePolicy {
|
||||
self.update_policy
|
||||
}
|
||||
|
||||
#[must_use]
|
||||
pub fn appearance(&self) -> AppearanceSettings {
|
||||
self.appearance
|
||||
|
||||
@@ -4,7 +4,7 @@ use ely_browser_core::{BrowserCore, InitialBrowserConfig};
|
||||
use ely_domain::{
|
||||
ArchivePolicy, DEFAULT_SIDEBAR_WIDTH_PX, DiagnosticsReportingPolicy, DownloadPolicy,
|
||||
FavoriteLimit, HistoryRecordingPolicy, NewTabDestination, ProfileKind, ProfileSyncPolicy,
|
||||
SearchEngine, SyncObjectKind, SyncObjectPolicy, UpdatePolicy,
|
||||
SearchEngine, SyncObjectKind, SyncObjectPolicy,
|
||||
};
|
||||
|
||||
#[test]
|
||||
@@ -51,9 +51,6 @@ fn section_resets_restore_settings_defaults() -> Result<(), Box<dyn Error>> {
|
||||
core.reset_sync_settings();
|
||||
assert_eq!(core.sync_object_policy(SyncObjectKind::Tabs), SyncObjectPolicy::Enabled);
|
||||
|
||||
core.set_update_policy(UpdatePolicy::Manual);
|
||||
core.reset_update_settings();
|
||||
assert_eq!(core.snapshot()?.update_policy, UpdatePolicy::Automatic);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
||||
@@ -213,32 +213,11 @@ fn settings_scoped_search_opens_site_permissions_page() -> Result<(), Box<dyn Er
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn settings_scoped_search_opens_updates_page() -> Result<(), Box<dyn Error>> {
|
||||
let mut core = BrowserCore::new(InitialBrowserConfig::ely_defaults()?)?;
|
||||
|
||||
core.set_command_query("@settings updates");
|
||||
let intent = core.submit_command()?;
|
||||
let active_tab = core.active_tab()?;
|
||||
|
||||
assert_eq!(
|
||||
intent,
|
||||
Some(CommandIntent::ScopedSearch {
|
||||
scope: CommandScope::Settings,
|
||||
query: "updates".to_string(),
|
||||
})
|
||||
);
|
||||
assert_eq!(active_tab.title(), "Update Settings");
|
||||
assert_eq!(active_tab.url().as_str(), "ely://settings/updates");
|
||||
assert_eq!(core.snapshot()?.command_query, "");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn settings_scoped_search_matches_setting_description_terms() -> Result<(), Box<dyn Error>> {
|
||||
let mut core = BrowserCore::new(InitialBrowserConfig::ely_defaults()?)?;
|
||||
|
||||
core.set_command_query("@settings build identity");
|
||||
core.set_command_query("@settings sync object scope");
|
||||
let intent = core.submit_command()?;
|
||||
let active_tab = core.active_tab()?;
|
||||
|
||||
@@ -246,11 +225,11 @@ fn settings_scoped_search_matches_setting_description_terms() -> Result<(), Box<
|
||||
intent,
|
||||
Some(CommandIntent::ScopedSearch {
|
||||
scope: CommandScope::Settings,
|
||||
query: "build identity".to_string(),
|
||||
query: "sync object scope".to_string(),
|
||||
})
|
||||
);
|
||||
assert_eq!(active_tab.title(), "Update Settings");
|
||||
assert_eq!(active_tab.url().as_str(), "ely://settings/updates");
|
||||
assert_eq!(active_tab.title(), "Sync Settings");
|
||||
assert_eq!(active_tab.url().as_str(), "ely://settings/sync");
|
||||
assert_eq!(core.snapshot()?.command_query, "");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user