oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Broadcast only visible worktree root names

Browse Source
This commit is contained in:
Antonio Scandurra
2022-06-14 15:15:23 +02:00
parent cfbd8b94d1
commit 68093342e7
6 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/collab/src/integration_tests.rs
+14 -6
View File
@@ -608,7 +608,7 @@ async fn test_offline_projects(
store.contacts()[0].projects,
&[ProjectMetadata {
id: project_id,
worktree_root_names: vec!["crate1".into(), "crate2".into()],
visible_worktree_root_names: vec!["crate1".into(), "crate2".into()],
guests: Default::default(),
}]
);
@@ -637,7 +637,7 @@ async fn test_offline_projects(
store.contacts()[0].projects,
&[ProjectMetadata {
id: project_id,
worktree_root_names: vec!["crate1".into(), "crate2".into()],
visible_worktree_root_names: vec!["crate1".into(), "crate2".into()],
guests: Default::default(),
}]
);
@@ -655,7 +655,11 @@ async fn test_offline_projects(
store.contacts()[0].projects,
&[ProjectMetadata {
id: project_id,
worktree_root_names: vec!["crate1".into(), "crate2".into(), "crate3".into()],
visible_worktree_root_names: vec![
"crate1".into(),
"crate2".into(),
"crate3".into()
],
guests: Default::default(),
}]
);
@@ -695,12 +699,16 @@ async fn test_offline_projects(
&[
ProjectMetadata {
id: project_id,
worktree_root_names: vec!["crate1".into(), "crate2".into(), "crate3".into()],
visible_worktree_root_names: vec![
"crate1".into(),
"crate2".into(),
"crate3".into()
],
guests: Default::default(),
},
ProjectMetadata {
id: project2_id,
worktree_root_names: vec!["crate3".into()],
visible_worktree_root_names: vec!["crate3".into()],
guests: Default::default(),
}
]
@@ -3515,7 +3523,7 @@ async fn test_contacts(
.iter()
.map(|p| {
(
p.worktree_root_names[0].as_str(),
p.visible_worktree_root_names[0].as_str(),
p.guests.iter().map(|p| p.github_login.as_str()).collect(),
)
})
crates/collab/src/rpc/store.rs
+2 -1
View File
@@ -277,9 +277,10 @@ impl Store {
if project.host_user_id == user_id {
metadata.push(proto::ProjectMetadata {
id: project_id,
worktree_root_names: project
visible_worktree_root_names: project
.worktrees
.values()
.filter(|worktree| worktree.visible)
.map(|worktree| worktree.root_name.clone())
.collect(),
guests: project