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

app/src/workflows/manager.rs

@@ -1,20 +1,21 @@
-use super::{workflow::Workflow, CloudWorkflowModel};
-use crate::{
-    cloud_object::{model::persistence::CloudModel, GenericCloudObject, Owner},
-    drive::OpenGalaxyDriveObjectSettings,
-    pane_group::{PaneContent, WorkflowPane},
-    safe_warn,
-    server::{
-        cloud_objects::update_manager::{
-            ObjectOperation, OperationSuccessType, UpdateManager, UpdateManagerEvent,
-        },
-        ids::{ClientId, SyncId},
-    },
-    workflows::{workflow_view::WorkflowView, WorkflowViewMode},
-    PaneViewLocator, WindowId,
+use std::collections::hash_map::Entry;
+use std::collections::HashMap;
+
+use galaxyui::{Entity, EntityId, ModelContext, ModelHandle, SingletonEntity};
+
+use super::workflow::Workflow;
+use super::CloudWorkflowModel;
+use crate::cloud_object::model::persistence::CloudModel;
+use crate::cloud_object::{GenericCloudObject, Owner};
+use crate::drive::OpenWarpDriveObjectSettings;
+use crate::pane_group::{PaneContent, WorkflowPane};
+use crate::server::cloud_objects::update_manager::{
+    ObjectOperation, OperationSuccessType, UpdateManager, UpdateManagerEvent,
 };
-use galaxyui::{Entity, EntityId, ModelContext, SingletonEntity};
-use std::collections::{hash_map::Entry, HashMap};
+use crate::server::ids::{ClientId, SyncId};
+use crate::workflows::workflow_view::WorkflowView;
+use crate::workflows::WorkflowViewMode;
+use crate::{safe_warn, PaneViewLocator, WindowId};
 
 pub struct WorkflowManager {
     panes_by_hashed_id: HashMap<String, WorkflowPaneData>,
@@ -178,6 +179,7 @@ impl WorkflowManager {
 
     fn handle_update_manager_event(
         &mut self,
+        _: ModelHandle<UpdateManager>,
         event: &UpdateManagerEvent,
         ctx: &mut ModelContext<Self>,
     ) {