Remove Warp cloud features and OpenTelemetry
Settings cleanup: - Remove billing_and_usage, main_page, referrals_page, show_blocks_view, environments_page, handoff_environment_creation_modal, custom_inference_modal, remove_custom_endpoint_confirmation_dialog, transfer_ownership_confirmation_modal, delete_environment_confirmation_dialog - Remove SettingsSection variants: Account, BillingAndUsage, Referrals, SharedBlocks, CloudEnvironments, OzCloudAPIKeys - Remove SettingsPageViewHandle variants: Main, BillingAndUsage, Referrals, CloudEnvironments, OzCloudAPIKeys, SharedBlocks - Add Platform variant for PlatformPageView - Gut custom inference endpoint UI from ai_page.rs - Gut transfer ownership modal from teams_page.rs - Stub environment_management_pane as dead code - Remove create_discount_badge usage - Remove handle_experiment_change call OpenTelemetry removal: - Remove opentelemetry, opentelemetry-http, opentelemetry-otlp, opentelemetry_sdk, tracing-opentelemetry dependencies - Replace tracing module with no-op stub - Delete native.rs and cloud_agent_auth.rs Bug fixes (prior work): - Fix apply_diffs() to use markdown_unescaped(ctx) - Fix notebook executor AIDocumentId handling - Fix margin/corner-radius consistency in requested_command.rs - Add document tool handlers to extract_tool_result_content() - Fix deprecated from_byte_stream in MCP SSE transport - Fix Cargo.toml profile package spec - Upgrade rust-toolchain to 1.94.1
This commit is contained in:
@@ -8047,15 +8047,7 @@ impl View for PaneGroup {
|
||||
.environment_setup_mode_selector_handle()
|
||||
.cloned()
|
||||
})
|
||||
.or_else(|| {
|
||||
self.downcast_pane_by_id::<EnvironmentManagementPane>(pane_id)
|
||||
.and_then(|emp| {
|
||||
emp.environments_page_view(app)
|
||||
.as_ref(app)
|
||||
.environment_setup_mode_selector_handle()
|
||||
.cloned()
|
||||
})
|
||||
});
|
||||
.or_else(|| None);
|
||||
if let Some(handle) = selector_handle {
|
||||
stack.add_child(ChildView::new(&handle).finish());
|
||||
}
|
||||
@@ -8074,18 +8066,7 @@ impl View for PaneGroup {
|
||||
}
|
||||
}
|
||||
// Render agent-assisted environment modal at tab level when open.
|
||||
if let Some(pane_id) = self.pane_with_open_agent_assisted_environment_modal {
|
||||
if let Some(handle) = self
|
||||
.downcast_pane_by_id::<EnvironmentManagementPane>(pane_id)
|
||||
.and_then(|emp| {
|
||||
emp.environments_page_view(app)
|
||||
.as_ref(app)
|
||||
.agent_assisted_environment_modal_handle(app)
|
||||
.cloned()
|
||||
})
|
||||
{
|
||||
stack.add_child(ChildView::new(&handle).finish());
|
||||
}
|
||||
if let Some(_pane_id) = self.pane_with_open_agent_assisted_environment_modal {
|
||||
}
|
||||
|
||||
stack.finish()
|
||||
|
||||
@@ -2,48 +2,26 @@ use galaxyui::{AppContext, ModelHandle, ViewContext, ViewHandle};
|
||||
|
||||
use super::view::PaneView;
|
||||
use super::{
|
||||
DetachType, PaneConfiguration, PaneContent, PaneEvent, PaneGroup, PaneId, ShareableLink,
|
||||
DetachType, PaneConfiguration, PaneContent, PaneGroup, PaneId, ShareableLink,
|
||||
ShareableLinkError,
|
||||
};
|
||||
use crate::ai::ambient_agents::github_auth_url::GithubAuthRedirectTarget;
|
||||
use crate::app_state::{EnvironmentManagementPaneSnapshot, LeafContents};
|
||||
use crate::pane_group::focus_state::PaneFocusHandle;
|
||||
use crate::settings_view::environments_page::{EnvironmentsPage, EnvironmentsPageView};
|
||||
use crate::settings_view::settings_page::{PaneEventWrapper, SettingsPageEvent};
|
||||
use crate::settings_view::{SettingsView, SettingsViewEvent};
|
||||
|
||||
pub struct EnvironmentManagementPane {
|
||||
view: ViewHandle<PaneView<EnvironmentsPageView>>,
|
||||
view: ViewHandle<PaneView<SettingsView>>,
|
||||
pane_configuration: ModelHandle<PaneConfiguration>,
|
||||
}
|
||||
|
||||
impl EnvironmentManagementPane {
|
||||
pub fn new(ctx: &mut ViewContext<PaneGroup>) -> Self {
|
||||
// Create the EnvironmentsPageView
|
||||
let environments_page_view = ctx.add_typed_action_view(|ctx| {
|
||||
let mut view = EnvironmentsPageView::new(ctx);
|
||||
view.set_github_auth_redirect_target(GithubAuthRedirectTarget::FocusCloudMode, ctx);
|
||||
view
|
||||
});
|
||||
let settings_view = ctx.add_typed_action_view(|ctx| SettingsView::new(None, ctx));
|
||||
let pane_configuration = settings_view.as_ref(ctx).pane_configuration();
|
||||
|
||||
Self::from_view(environments_page_view, ctx)
|
||||
}
|
||||
|
||||
pub fn from_view(
|
||||
environments_page_view: ViewHandle<EnvironmentsPageView>,
|
||||
ctx: &mut AppContext,
|
||||
) -> Self {
|
||||
let pane_configuration = environments_page_view.as_ref(ctx).pane_configuration();
|
||||
let window_id = environments_page_view.window_id(ctx);
|
||||
|
||||
let view = ctx.add_typed_action_view(window_id, |ctx| {
|
||||
let view = ctx.add_typed_action_view(|ctx| {
|
||||
let pane_id = PaneId::from_environment_management_pane_ctx(ctx);
|
||||
PaneView::new(
|
||||
pane_id,
|
||||
environments_page_view,
|
||||
(),
|
||||
pane_configuration.clone(),
|
||||
ctx,
|
||||
)
|
||||
PaneView::new(pane_id, settings_view, (), pane_configuration.clone(), ctx)
|
||||
});
|
||||
|
||||
Self {
|
||||
@@ -51,18 +29,6 @@ impl EnvironmentManagementPane {
|
||||
pane_configuration,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn environments_page_view(&self, ctx: &AppContext) -> ViewHandle<EnvironmentsPageView> {
|
||||
self.view.as_ref(ctx).child(ctx)
|
||||
}
|
||||
|
||||
/// Returns the current mode of the environment management pane.
|
||||
pub fn current_mode(&self, ctx: &AppContext) -> EnvironmentsPage {
|
||||
self.environments_page_view(ctx)
|
||||
.as_ref(ctx)
|
||||
.current_page()
|
||||
.clone()
|
||||
}
|
||||
}
|
||||
|
||||
impl PaneContent for EnvironmentManagementPane {
|
||||
@@ -78,34 +44,7 @@ impl PaneContent for EnvironmentManagementPane {
|
||||
) {
|
||||
self.view
|
||||
.update(ctx, |view, ctx| view.set_focus_handle(focus_handle, ctx));
|
||||
|
||||
let pane_id = self.id();
|
||||
|
||||
ctx.subscribe_to_view(
|
||||
&self.environments_page_view(ctx),
|
||||
move |pane_group, _, event, ctx| match event {
|
||||
SettingsPageEvent::Pane(pane_event_wrapper) => {
|
||||
let pane_event = match pane_event_wrapper {
|
||||
PaneEventWrapper::Close => PaneEvent::Close,
|
||||
};
|
||||
pane_group.handle_pane_event(pane_id, &pane_event, ctx);
|
||||
}
|
||||
SettingsPageEvent::EnvironmentSetupModeSelectorToggled { is_open } => {
|
||||
pane_group.pane_with_open_environment_setup_mode_selector =
|
||||
is_open.then_some(pane_id);
|
||||
ctx.notify();
|
||||
}
|
||||
SettingsPageEvent::AgentAssistedEnvironmentModalToggled { is_open } => {
|
||||
pane_group.pane_with_open_agent_assisted_environment_modal =
|
||||
is_open.then_some(pane_id);
|
||||
ctx.notify();
|
||||
}
|
||||
SettingsPageEvent::FocusModal => {
|
||||
// Not applicable when hosted in a pane.
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
ctx.subscribe_to_view(&self.view, move |group, _, event, ctx| {
|
||||
group.handle_pane_view_event(pane_id, event, ctx);
|
||||
});
|
||||
@@ -117,15 +56,11 @@ impl PaneContent for EnvironmentManagementPane {
|
||||
_detach_type: DetachType,
|
||||
ctx: &mut ViewContext<PaneGroup>,
|
||||
) {
|
||||
let environments_page_view = self.environments_page_view(ctx);
|
||||
ctx.unsubscribe_to_view(&environments_page_view);
|
||||
ctx.unsubscribe_to_view(&self.view);
|
||||
}
|
||||
|
||||
fn snapshot(&self, ctx: &AppContext) -> LeafContents {
|
||||
LeafContents::EnvironmentManagement(EnvironmentManagementPaneSnapshot {
|
||||
mode: self.current_mode(ctx),
|
||||
})
|
||||
fn snapshot(&self, _ctx: &AppContext) -> LeafContents {
|
||||
LeafContents::EnvironmentManagement(EnvironmentManagementPaneSnapshot)
|
||||
}
|
||||
|
||||
fn has_application_focus(&self, ctx: &mut ViewContext<PaneGroup>) -> bool {
|
||||
@@ -133,8 +68,7 @@ impl PaneContent for EnvironmentManagementPane {
|
||||
}
|
||||
|
||||
fn focus(&self, ctx: &mut ViewContext<PaneGroup>) {
|
||||
self.environments_page_view(ctx)
|
||||
.update(ctx, |view, ctx| view.focus(ctx));
|
||||
ctx.focus(&self.view);
|
||||
}
|
||||
|
||||
fn shareable_link(
|
||||
|
||||
@@ -61,7 +61,6 @@ use crate::pane_group::pane::get_started_view::GetStartedView;
|
||||
use crate::server::network_log_view::NetworkLogView;
|
||||
use crate::server::telemetry::SharingDialogSource;
|
||||
use crate::settings::PaneSettings;
|
||||
use crate::settings_view::environments_page::EnvironmentsPageView;
|
||||
use crate::settings_view::SettingsView;
|
||||
use crate::terminal::available_shells::AvailableShell;
|
||||
use crate::terminal::TerminalView;
|
||||
@@ -214,9 +213,9 @@ impl PaneId {
|
||||
Self::new_from_ctx(IPaneType::EnvVarCollection, ctx)
|
||||
}
|
||||
|
||||
/// Creates a [`PaneId`] from a [`ViewContext<PaneView<EnvironmentsPageView>>`]
|
||||
/// Creates a [`PaneId`] from a [`ViewContext<PaneView<SettingsView>>`] (environment management stub)
|
||||
pub fn from_environment_management_pane_ctx(
|
||||
ctx: &ViewContext<PaneView<EnvironmentsPageView>>,
|
||||
ctx: &ViewContext<PaneView<SettingsView>>,
|
||||
) -> Self {
|
||||
Self::new_from_ctx(IPaneType::EnvironmentManagement, ctx)
|
||||
}
|
||||
@@ -312,9 +311,9 @@ impl PaneId {
|
||||
Self::new(IPaneType::EnvVarCollection, env_var_collection_view)
|
||||
}
|
||||
|
||||
/// Creates a [`PaneId`] from a [`PaneView<EnvironmentsPageView>`] entity ID.
|
||||
/// Creates a [`PaneId`] from a [`PaneView<SettingsView>`] entity ID (environment management stub).
|
||||
pub fn from_environment_management_pane_view(
|
||||
environment_management_pane_view: &ViewHandle<PaneView<EnvironmentsPageView>>,
|
||||
environment_management_pane_view: &ViewHandle<PaneView<SettingsView>>,
|
||||
) -> Self {
|
||||
Self::new(
|
||||
IPaneType::EnvironmentManagement,
|
||||
@@ -469,7 +468,7 @@ impl PaneId {
|
||||
ChildView::<PaneView<EnvVarCollectionView>>::with_id(self.0.pane_view_id).finish()
|
||||
}
|
||||
IPaneType::EnvironmentManagement => {
|
||||
ChildView::<PaneView<EnvironmentsPageView>>::with_id(self.0.pane_view_id).finish()
|
||||
ChildView::<PaneView<SettingsView>>::with_id(self.0.pane_view_id).finish()
|
||||
}
|
||||
IPaneType::Workflow => {
|
||||
ChildView::<PaneView<WorkflowView>>::with_id(self.0.pane_view_id).finish()
|
||||
|
||||
Reference in New Issue
Block a user