Settings cleanup: remove Cloud Platform, Teams, Shared Blocks, Referrals from nav; disable autoupdate; stub Oz settings; rename Warpify to Galaxify
This commit is contained in:
@@ -5824,7 +5824,7 @@ impl SettingsWidget for AgentAttributionWidget {
|
||||
)
|
||||
.with_child(toggle_row)
|
||||
.with_child(render_ai_setting_description(
|
||||
"Oz can add attribution to commit messages and pull requests it creates",
|
||||
"Galaxy can add attribution to commit messages and pull requests it creates",
|
||||
!state.is_disabled,
|
||||
app,
|
||||
))
|
||||
|
||||
@@ -95,6 +95,7 @@ mod privacy;
|
||||
mod privacy_page;
|
||||
mod settings_file_footer;
|
||||
pub(crate) mod settings_page;
|
||||
mod show_blocks_view;
|
||||
mod tab_menu;
|
||||
mod teams_page;
|
||||
mod telemetry;
|
||||
@@ -211,6 +212,17 @@ pub enum SettingsSection {
|
||||
// ── Code umbrella subpages ──
|
||||
CodeIndexing,
|
||||
EditorAndCodeReview,
|
||||
// Dead variants — pages removed from nav but files still reference these
|
||||
#[allow(dead_code)]
|
||||
CloudEnvironments,
|
||||
#[allow(dead_code)]
|
||||
OzCloudAPIKeys,
|
||||
#[allow(dead_code)]
|
||||
Teams,
|
||||
#[allow(dead_code)]
|
||||
SharedBlocks,
|
||||
#[allow(dead_code)]
|
||||
Referrals,
|
||||
}
|
||||
|
||||
use crate::util::bindings::custom_tag_to_keystroke;
|
||||
@@ -229,6 +241,7 @@ impl Display for SettingsSection {
|
||||
SettingsSection::Knowledge => write!(f, "Knowledge"),
|
||||
SettingsSection::ThirdPartyCLIAgents => write!(f, "Third party CLI agents"),
|
||||
SettingsSection::Bedrock => write!(f, "AWS Bedrock"),
|
||||
SettingsSection::Warpify => write!(f, "Galaxify"),
|
||||
SettingsSection::CodeIndexing => write!(f, "Indexing and projects"),
|
||||
SettingsSection::EditorAndCodeReview => write!(f, "Editor and Code Review"),
|
||||
_ => write!(f, "{self:?}"),
|
||||
@@ -307,7 +320,7 @@ impl FromStr for SettingsSection {
|
||||
"Features" => Ok(Self::Features),
|
||||
"Keyboard shortcuts" => Ok(Self::Keybindings),
|
||||
"Privacy" => Ok(Self::Privacy),
|
||||
"Warpify" => Ok(Self::Warpify),
|
||||
"Warpify" | "Galaxify" => Ok(Self::Warpify),
|
||||
"WarpDrive" | "Warp Drive" | "Galaxy Drive" => Ok(Self::WarpDrive),
|
||||
// This page was called "Oz" at one point, keep for backward compatibility.
|
||||
"Oz" | "Warp Agent" | "Galaxy Agent" => Ok(Self::WarpAgent),
|
||||
@@ -318,6 +331,11 @@ impl FromStr for SettingsSection {
|
||||
"AWS Bedrock" | "Bedrock" => Ok(Self::Bedrock),
|
||||
"Indexing and projects" | "CodeIndexing" => Ok(Self::CodeIndexing),
|
||||
"Editor and Code Review" | "EditorAndCodeReview" => Ok(Self::EditorAndCodeReview),
|
||||
"CloudEnvironments" | "Environments" => Ok(Self::CloudEnvironments),
|
||||
"OzCloudAPIKeys" => Ok(Self::OzCloudAPIKeys),
|
||||
"Teams" => Ok(Self::Teams),
|
||||
"SharedBlocks" | "Shared Blocks" => Ok(Self::SharedBlocks),
|
||||
"Referrals" => Ok(Self::Referrals),
|
||||
_ => Err(()),
|
||||
}
|
||||
}
|
||||
@@ -938,6 +956,10 @@ macro_rules! update_page {
|
||||
SettingsPageViewHandle::BillingAndUsage(handle) => $ctx.update_view(handle, $update),
|
||||
SettingsPageViewHandle::MCPServers(handle) => $ctx.update_view(handle, $update),
|
||||
SettingsPageViewHandle::WarpDrive(handle) => $ctx.update_view(handle, $update),
|
||||
SettingsPageViewHandle::CloudEnvironments(handle) => $ctx.update_view(handle, $update),
|
||||
SettingsPageViewHandle::OzCloudAPIKeys(handle) => $ctx.update_view(handle, $update),
|
||||
SettingsPageViewHandle::Teams(handle) => $ctx.update_view(handle, $update),
|
||||
SettingsPageViewHandle::SharedBlocks(handle) => $ctx.update_view(handle, $update),
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -1826,6 +1848,7 @@ impl SettingsView {
|
||||
SettingsPageViewHandle::MCPServers(v) => v.as_ref(app).should_render(app),
|
||||
SettingsPageViewHandle::Code(v) => v.as_ref(app).should_render(app),
|
||||
SettingsPageViewHandle::WarpDrive(v) => v.as_ref(app).should_render(app),
|
||||
_ => true,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -11,11 +11,13 @@ use super::{
|
||||
appearance_page::AppearanceSettingsPageView,
|
||||
billing_and_usage_page::BillingAndUsagePageView,
|
||||
code_page::CodeSettingsPageView,
|
||||
environments_page::EnvironmentsPageView,
|
||||
features_page::FeaturesPageView,
|
||||
keybindings::KeybindingsView,
|
||||
main_page::MainSettingsPageView,
|
||||
mcp_servers_page::MCPServersSettingsPageView,
|
||||
privacy_page::PrivacyPageView,
|
||||
show_blocks_view::ShowBlocksView,
|
||||
warp_drive_page::WarpDriveSettingsPageView,
|
||||
warpify_page::WarpifyPageView,
|
||||
SettingsSection,
|
||||
@@ -111,6 +113,10 @@ pub enum SettingsPageViewHandle {
|
||||
BillingAndUsage(ViewHandle<BillingAndUsagePageView>),
|
||||
MCPServers(ViewHandle<MCPServersSettingsPageView>),
|
||||
WarpDrive(ViewHandle<WarpDriveSettingsPageView>),
|
||||
CloudEnvironments(ViewHandle<EnvironmentsPageView>),
|
||||
OzCloudAPIKeys(ViewHandle<super::platform_page::PlatformPageView>),
|
||||
Teams(ViewHandle<super::teams_page::TeamsPageView>),
|
||||
SharedBlocks(ViewHandle<ShowBlocksView>),
|
||||
}
|
||||
|
||||
impl SettingsPageViewHandle {
|
||||
@@ -129,6 +135,10 @@ impl SettingsPageViewHandle {
|
||||
BillingAndUsage(view_handle) => ChildView::new(view_handle).finish(),
|
||||
MCPServers(view_handle) => ChildView::new(view_handle).finish(),
|
||||
WarpDrive(view_handle) => ChildView::new(view_handle).finish(),
|
||||
CloudEnvironments(view_handle) => ChildView::new(view_handle).finish(),
|
||||
OzCloudAPIKeys(view_handle) => ChildView::new(view_handle).finish(),
|
||||
Teams(view_handle) => ChildView::new(view_handle).finish(),
|
||||
SharedBlocks(view_handle) => ChildView::new(view_handle).finish(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user