Apply local updates and test/build fixes

This commit is contained in:
Ryan Ward
2026-05-13 15:56:40 -05:00
parent cee61e2af0
commit b61d6bcbce
36 changed files with 567 additions and 327 deletions
+30 -24
View File
@@ -1,25 +1,26 @@
#[cfg(target_family = "wasm")]
use crate::uri::web_intent_parser::open_url_on_desktop;
use crate::{
ObjectActions,
ai::{
document::ai_document_model::AIDocumentId,
facts::{AIFact, AIMemory},
},
appearance::Appearance,
auth::{
AuthStateProvider,
auth_manager::{AuthManager, LoginGatedFeature},
auth_state::AuthState,
auth_view_modal::AuthViewVariant,
AuthStateProvider,
},
cloud_object::{
CloudObject, CloudObjectEventEntrypoint, CloudObjectLocation, CloudObjectSyncStatus,
GenericCloudObject, GenericStringObjectFormat, JsonObjectType, NumInFlightRequests,
ObjectType, Space,
model::{
persistence::{CloudModel, CloudModelEvent},
view::{CloudViewModel, CloudViewModelEvent, UpdateTimestamp},
},
CloudObject, CloudObjectEventEntrypoint, CloudObjectLocation, CloudObjectSyncStatus,
GenericCloudObject, GenericStringObjectFormat, JsonObjectType, NumInFlightRequests,
ObjectType, Space,
},
editor::{EditorView, Event as EditorEvent, SingleLineEditorOptions},
env_vars::CloudEnvVarCollection,
@@ -38,8 +39,8 @@ use crate::{
ui_components::{
blended_colors,
buttons::{highlight, icon_button},
icons::{Icon, ICON_DIMENSIONS},
menu_button::{icon_button_with_context_menu, MenuDirection},
icons::{ICON_DIMENSIONS, Icon},
menu_button::{MenuDirection, icon_button_with_context_menu},
},
util::{color::coloru_with_opacity, sync::Condition},
view_components::{Dropdown, DropdownItem},
@@ -48,10 +49,10 @@ use crate::{
workspaces::{
update_manager::TeamUpdateManager, user_workspaces::UserWorkspaces, workspace::WorkspaceUid,
},
ObjectActions,
};
use super::{
CloudObjectTypeAndId, DriveObjectType, DriveSortOrder,
cloud_object_naming_dialog::CloudObjectNamingDialog,
drive_helpers::{
has_feature_gated_anonymous_user_reached_env_var_limit,
@@ -61,17 +62,16 @@ use super::{
empty_trash_confirmation_dialog::{EmptyTrashConfirmationDialog, EmptyTrashConfirmationEvent},
folders::CloudFolder,
items::{
ai_fact_collection::WarpDriveAIFactCollection,
item::{tools_panel_menu_direction, ItemStates, WarpDriveRow},
mcp_server_collection::WarpDriveMCPServerCollection,
WarpDriveItemId,
ai_fact_collection::WarpDriveAIFactCollection,
item::{ItemStates, WarpDriveRow, tools_panel_menu_direction},
mcp_server_collection::WarpDriveMCPServerCollection,
},
settings::WarpDriveSettings,
sharing::{
dialog::{SharingDialog, SharingDialogEvent},
ContentEditability, ShareableObject,
dialog::{SharingDialog, SharingDialogEvent},
},
CloudObjectTypeAndId, DriveObjectType, DriveSortOrder,
};
use crate::drive::panel::DrivePanelAction;
use crate::server::cloud_objects::update_manager::InitiatedBy;
@@ -80,6 +80,8 @@ use galaxy_core::{
context_flag::ContextFlag, settings::Setting, ui::theme::color::internal_colors,
};
use galaxyui::{
AppContext, BlurContext, Element, Entity, ModelHandle, SingletonEntity, TypedActionView,
UpdateView, View, ViewContext, ViewHandle, WindowId,
clipboard::ClipboardContent,
elements::{
Align, AnchorPair, Border, ChildAnchor, ChildView, ClippedScrollStateHandle,
@@ -98,12 +100,10 @@ use galaxyui::{
components::{Coords, UiComponent, UiComponentStyles},
},
units::IntoPixels,
AppContext, BlurContext, Element, Entity, ModelHandle, SingletonEntity, TypedActionView,
UpdateView, View, ViewContext, ViewHandle, WindowId,
};
use itertools::Itertools;
use pathfinder_color::ColorU;
use pathfinder_geometry::vector::{vec2f, Vector2F};
use pathfinder_geometry::vector::{Vector2F, vec2f};
use std::{any::Any, collections::HashMap, sync::Arc};
use url::Url;
@@ -651,7 +651,7 @@ impl DriveIndex {
.as_ref(ctx)
.num_trashed_cloud_objects_per_space(spaces.iter(), ctx),
};
let mut sections = spaces
let sections = spaces
.iter()
.map(|space| DriveIndexSection::Space(*space))
.collect::<Vec<_>>();
@@ -1254,7 +1254,9 @@ impl DriveIndex {
{
self.expand_section_for_object(&id.uid().clone(), ctx);
} else {
log::warn!("unknown GenericStringObject type found while trying to manually expand drive section. {object_id:?}");
log::warn!(
"unknown GenericStringObject type found while trying to manually expand drive section. {object_id:?}"
);
}
}
};
@@ -4906,12 +4908,14 @@ impl DriveIndex {
space: *space,
offset,
});
let menu_items = vec![MenuItemFields::new("Collapse all")
.with_on_select_action(DriveIndexAction::CollapseAllInLocation(
CloudObjectLocation::Space(*space),
))
.with_icon(Icon::ListCollapsed)
.into_item()];
let menu_items = vec![
MenuItemFields::new("Collapse all")
.with_on_select_action(DriveIndexAction::CollapseAllInLocation(
CloudObjectLocation::Space(*space),
))
.with_icon(Icon::ListCollapsed)
.into_item(),
];
ctx.update_view(&self.menu, |menu, ctx| {
menu.set_items(menu_items, ctx);
@@ -5399,7 +5403,9 @@ impl TypedActionView for DriveIndex {
log::error!("Creation of EnvVarCollections is not yet supported")
}
DriveObjectType::AIFact | DriveObjectType::AIFactCollection => {
log::error!("Use DriveIndexAction::OpenAIFactCollection to open the pane view instead");
log::error!(
"Use DriveIndexAction::OpenAIFactCollection to open the pane view instead"
);
}
DriveObjectType::MCPServer | DriveObjectType::MCPServerCollection => {
log::error!(