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

app/src/integration_testing/workflow/assertion.rs

@@ -1,14 +1,11 @@
-use galaxyui::{
-    async_assert, async_assert_eq,
-    integration::{AssertionCallback, AssertionWithDataCallback},
-    App, ViewHandle,
-};
+use galaxyui::integration::{AssertionCallback, AssertionWithDataCallback};
+use galaxyui::{async_assert, async_assert_eq, App, ViewHandle};
 
-use crate::{
-    integration_testing::{cloud_object::assert_metadata_revision, view_getters::workflow_view},
-    server::ids::SyncId,
-    workflows::{workflow_view::WorkflowView, CloudWorkflowModel, WorkflowId},
-};
+use crate::integration_testing::cloud_object::assert_metadata_revision;
+use crate::integration_testing::view_getters::workflow_view;
+use crate::server::ids::SyncId;
+use crate::workflows::workflow_view::WorkflowView;
+use crate::workflows::{CloudWorkflowModel, WorkflowId};
 
 /// Asserts metadata exists for the workflow with the given key and that the revision in that
 /// metadata matches the given expected revision.

app/src/integration_testing/workflow/step.rs

@@ -1,20 +1,18 @@
-use galaxyui::{
-    async_assert, integration::TestStep, windowing::WindowManager, SingletonEntity, WindowId,
-};
-
-use crate::{
-    cloud_object::{model::persistence::CloudModel, CloudObjectEventEntrypoint, Space},
-    drive::OpenGalaxyDriveObjectSettings,
-    integration_testing::view_getters::workspace_view,
-    server::{
-        cloud_objects::update_manager::UpdateManager,
-        ids::{ClientId, SyncId},
-    },
-    workflows::{manager::WorkflowOpenSource, workflow::Workflow, WorkflowViewMode},
-    workspaces::user_workspaces::UserWorkspaces,
-};
+use galaxyui::integration::TestStep;
+use galaxyui::windowing::WindowManager;
+use galaxyui::{async_assert, SingletonEntity, WindowId};
 
 use super::open_workflow_count;
+use crate::cloud_object::model::persistence::CloudModel;
+use crate::cloud_object::{CloudObjectEventEntrypoint, Space};
+use crate::drive::OpenWarpDriveObjectSettings;
+use crate::integration_testing::view_getters::workspace_view;
+use crate::server::cloud_objects::update_manager::UpdateManager;
+use crate::server::ids::{ClientId, SyncId};
+use crate::workflows::manager::WorkflowOpenSource;
+use crate::workflows::workflow::Workflow;
+use crate::workflows::WorkflowViewMode;
+use crate::workspaces::user_workspaces::UserWorkspaces;
 
 /// Create a personal workflow and save its sync ID into the step data.
 pub fn create_a_personal_workflow(key: impl Into<String>) -> TestStep {