first pass of merging in warp (doesn't build)

This commit is contained in:
Ryan Ward
2026-07-01 16:08:58 -05:00
parent 2f64909469
commit 4770ac06b5
3662 changed files with 414574 additions and 89772 deletions
+29 -27
View File
@@ -1,33 +1,36 @@
use std::collections::HashMap;
use uuid::Uuid;
use galaxyui::elements::{ChildView, Container};
use galaxyui::ui_components::components::{Coords, UiComponentStyles};
use galaxyui::{
elements::{ChildView, Container},
ui_components::components::{Coords, UiComponentStyles},
AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
};
use std::collections::HashMap;
use uuid::Uuid;
use crate::{
ai::mcp::{
gallery::MCPGalleryManager, templatable_installation::VariableValue, FileBasedMCPManager,
TemplatableMCPServer, TemplatableMCPServerInstallation, TemplatableMCPServerManager,
},
appearance::Appearance,
cloud_object::Space,
modal::{Modal, ModalViewState},
server::cloud_objects::update_manager::InitiatedBy,
settings_view::{
mcp_servers::{
edit_page::{MCPServersEditPageView, MCPServersEditPageViewEvent},
installation_modal::{InstallationModalBody, InstallationModalBodyEvent},
list_page::{MCPServersListPageView, MCPServersListPageViewEvent},
style, ServerCardItemId,
},
settings_page::{MatchData, PageType, SettingsPageMeta, SettingsWidget},
SettingsSection,
},
view_components::DismissibleToast,
workspace::ToastStack,
use crate::ai::mcp::gallery::MCPGalleryManager;
use crate::ai::mcp::templatable_installation::VariableValue;
use crate::ai::mcp::{
FileBasedMCPManager, TemplatableMCPServer, TemplatableMCPServerInstallation,
TemplatableMCPServerManager,
};
use crate::appearance::Appearance;
use crate::cloud_object::Space;
use crate::modal::{Modal, ModalViewState};
use crate::server::cloud_objects::update_manager::InitiatedBy;
use crate::settings_view::mcp_servers::edit_page::{
MCPServersEditPageView, MCPServersEditPageViewEvent,
};
use crate::settings_view::mcp_servers::installation_modal::{
InstallationModalBody, InstallationModalBodyEvent,
};
use crate::settings_view::mcp_servers::list_page::{
MCPServersListPageView, MCPServersListPageViewEvent,
};
use crate::settings_view::mcp_servers::{style, ServerCardItemId};
use crate::settings_view::settings_page::{MatchData, PageType, SettingsPageMeta, SettingsWidget};
use crate::settings_view::SettingsSection;
use crate::view_components::DismissibleToast;
use crate::workspace::ToastStack;
/// Describes where an MCP install request originated.
///
@@ -83,8 +86,7 @@ impl MCPServersSettingsPageView {
me.handle_edit_view_event(event, ctx);
});
let installation_modal_body =
ctx.add_typed_action_view(|_ctx| InstallationModalBody::new());
let installation_modal_body = ctx.add_typed_action_view(InstallationModalBody::new);
ctx.subscribe_to_view(&installation_modal_body, |me, _, event, ctx| {
me.handle_installation_modal_body_event(event, ctx);
});