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

app/src/env_vars/manager.rs

@@ -1,18 +1,17 @@
-use crate::{
-    cloud_object::{model::persistence::CloudModel, Owner},
-    env_vars::view::env_var_collection::EnvVarCollectionView,
-    pane_group::{EnvVarCollectionPane, PaneContent},
-    safe_warn,
-    server::{
-        cloud_objects::update_manager::{
-            ObjectOperation, OperationSuccessType, UpdateManager, UpdateManagerEvent,
-        },
-        ids::SyncId,
-    },
-    PaneViewLocator, WindowId,
+use std::collections::hash_map::Entry;
+use std::collections::HashMap;
+
+use warpui::{Entity, EntityId, ModelContext, ModelHandle, SingletonEntity, WeakViewHandle};
+
+use crate::cloud_object::model::persistence::CloudModel;
+use crate::cloud_object::Owner;
+use crate::env_vars::view::env_var_collection::EnvVarCollectionView;
+use crate::pane_group::{EnvVarCollectionPane, PaneContent};
+use crate::server::cloud_objects::update_manager::{
+    ObjectOperation, OperationSuccessType, UpdateManager, UpdateManagerEvent,
 };
-use galaxyui::{Entity, EntityId, ModelContext, SingletonEntity, WeakViewHandle};
-use std::collections::{hash_map::Entry, HashMap};
+use crate::server::ids::SyncId;
+use crate::{safe_warn, PaneViewLocator, WindowId};
 
 pub struct EnvVarCollectionManager {
     panes_by_hashed_id: HashMap<String, EnvVarCollectionPaneData>,
@@ -175,6 +174,7 @@ impl EnvVarCollectionManager {
 
     fn handle_update_manager_event(
         &mut self,
+        _: ModelHandle<UpdateManager>,
         event: &UpdateManagerEvent,
         ctx: &mut ModelContext<Self>,
     ) {