Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed the on-click behavior of joining a channel to not open the chat, and only open 1 project instead of all projects

Browse source 
Co-authored-by: conrad <conrad.irwin@gmail.com>
Co-authored-by: max <max@zed.dev>
This commit is contained in:
Mikayla 2023-10-04 11:46:08 -07:00
parent e548572f12
commit dd0edcd203
No known key found for this signature in database
2 changed files with 12 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

25
crates/collab_ui/src/collab_panel.rs
View file

@ -3208,27 +3208,16 @@ impl CollabPanel {
.update(&mut cx, |call, cx| call.join_channel(channel_id, cx))
.await?;
let tasks = room.update(&mut cx, |room, cx| {
let Some(workspace) = workspace.upgrade(cx) else {
return vec![];
};
let projects = room.projects_to_join();
if projects.is_empty() {
ChannelView::open(channel_id, workspace, cx).detach();
return vec![];
}
room.projects_to_join()
.into_iter()
.map(|(project_id, user_id)| {
let app_state = workspace.read(cx).app_state().clone();
workspace::join_remote_project(project_id, user_id, app_state, cx)
})
.collect()
let task = room.update(&mut cx, |room, cx| {
let workspace = workspace.upgrade(cx)?;
let (project, host) = room.most_active_project()?;
let app_state = workspace.read(cx).app_state().clone();
Some(workspace::join_remote_project(project, host, app_state, cx))
});
for task in tasks {
if let Some(task) = task {
task.await?;
}
anyhow::Ok(())
})
.detach_and_log_err(cx);