remoting: Allow Add/Remove remote folder (#14532)

Release Notes:

- remoting (alpha only): Allow add/remove folders to projects

---------

Co-authored-by: Max <max@zed.dev>

crates/collab/src/db/queries/dev_server_projects.rs

@@ -5,7 +5,7 @@ use rpc::{
 };
 use sea_orm::{
     ActiveModelTrait, ActiveValue, ColumnTrait, Condition, DatabaseTransaction, EntityTrait,
-    ModelTrait, QueryFilter,
+    IntoActiveModel, ModelTrait, QueryFilter,
 };
 
 use crate::db::ProjectId;
@@ -56,12 +56,7 @@ impl Database {
             .await?;
         Ok(servers
             .into_iter()
-            .map(|(dev_server_project, project)| proto::DevServerProject {
-                id: dev_server_project.id.to_proto(),
-                project_id: project.map(|p| p.id.to_proto()),
-                dev_server_id: dev_server_project.dev_server_id.to_proto(),
-                path: dev_server_project.path,
-            })
+            .map(|(dev_server_project, project)| dev_server_project.to_proto(project))
             .collect())
     }
 
@@ -134,7 +129,7 @@ impl Database {
             let project = dev_server_project::Entity::insert(dev_server_project::ActiveModel {
                 id: ActiveValue::NotSet,
                 dev_server_id: ActiveValue::Set(dev_server_id),
-                path: ActiveValue::Set(path.to_string()),
+                paths: ActiveValue::Set(dev_server_project::JSONPaths(vec![path.to_string()])),
             })
             .exec_with_returning(&*tx)
             .await?;
@@ -148,6 +143,38 @@ impl Database {
         .await
     }
 
+    pub async fn update_dev_server_project(
+        &self,
+        id: DevServerProjectId,
+        paths: &Vec<String>,
+        user_id: UserId,
+    ) -> crate::Result<(dev_server_project::Model, proto::DevServerProjectsUpdate)> {
+        self.transaction(move |tx| async move {
+            let paths = paths.clone();
+            let Some((project, Some(dev_server))) = dev_server_project::Entity::find_by_id(id)
+                .find_also_related(dev_server::Entity)
+                .one(&*tx)
+                .await?
+            else {
+                return Err(anyhow!("no such dev server project"))?;
+            };
+
+            if dev_server.user_id != user_id {
+                return Err(anyhow!("not your dev server"))?;
+            }
+            let mut project = project.into_active_model();
+            project.paths = ActiveValue::Set(dev_server_project::JSONPaths(paths));
+            let project = project.update(&*tx).await?;
+
+            let status = self
+                .dev_server_projects_update_internal(user_id, &tx)
+                .await?;
+
+            Ok((project, status))
+        })
+        .await
+    }
+
     pub async fn delete_dev_server_project(
         &self,
         dev_server_project_id: DevServerProjectId,
@@ -258,7 +285,6 @@ impl Database {
         dev_server_id: DevServerId,
         connection: ConnectionId,
     ) -> crate::Result<Vec<ResharedProject>> {
-        // todo!() project_transaction? (maybe we can make the lock per-dev-server instead of per-project?)
         self.transaction(|tx| async move {
             let mut ret = Vec::new();
             for reshared_project in reshared_projects {
@@ -322,7 +348,6 @@ impl Database {
         user_id: UserId,
         connection_id: ConnectionId,
     ) -> crate::Result<Vec<RejoinedProject>> {
-        // todo!() project_transaction? (maybe we can make the lock per-dev-server instead of per-project?)
         self.transaction(|tx| async move {
             let mut ret = Vec::new();
             for rejoined_project in rejoined_projects {

crates/collab/src/db/queries/dev_servers.rs

@@ -19,6 +19,28 @@ impl Database {
         .await
     }
 
+    pub async fn get_dev_server_for_user(
+        &self,
+        dev_server_id: DevServerId,
+        user_id: UserId,
+    ) -> crate::Result<dev_server::Model> {
+        self.transaction(|tx| async move {
+            let server = dev_server::Entity::find_by_id(dev_server_id)
+                .one(&*tx)
+                .await?
+                .ok_or_else(|| anyhow::anyhow!("no dev server with id {}", dev_server_id))?;
+            if server.user_id != user_id {
+                return Err(anyhow::anyhow!(
+                    "dev server {} is not owned by user {}",
+                    dev_server_id,
+                    user_id
+                ))?;
+            }
+            Ok(server)
+        })
+        .await
+    }
+
     pub async fn get_dev_servers(&self, user_id: UserId) -> crate::Result<Vec<dev_server::Model>> {
         self.transaction(|tx| async move {
             Ok(dev_server::Entity::find()

crates/collab/src/db/tables/dev_server_project.rs

@@ -1,7 +1,8 @@
 use super::project;
 use crate::db::{DevServerId, DevServerProjectId};
 use rpc::proto;
-use sea_orm::entity::prelude::*;
+use sea_orm::{entity::prelude::*, FromJsonQueryResult};
+use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
 #[sea_orm(table_name = "dev_server_projects")]
@@ -9,9 +10,12 @@ pub struct Model {
     #[sea_orm(primary_key)]
     pub id: DevServerProjectId,
     pub dev_server_id: DevServerId,
-    pub path: String,
+    pub paths: JSONPaths,
 }
 
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, FromJsonQueryResult)]
+pub struct JSONPaths(pub Vec<String>);
+
 impl ActiveModelBehavior for ActiveModel {}
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
@@ -44,7 +48,12 @@ impl Model {
             id: self.id.to_proto(),
             project_id: project.map(|p| p.id.to_proto()),
             dev_server_id: self.dev_server_id.to_proto(),
-            path: self.path.clone(),
+            path: self.paths().get(0).cloned().unwrap_or_default(),
+            paths: self.paths().clone(),
         }
     }
+
+    pub fn paths(&self) -> &Vec<String> {
+        &self.paths.0
+    }
 }