Improve local collaboration script to accept a zed impersonate

Gate channels UI behind a flag

co-authored-by: max <max@zed.dev>
This commit is contained in:
Mikayla 2023-08-07 16:45:13 -07:00
parent 8980a9f1c1
commit bedf60b6b2
No known key found for this signature in database
4 changed files with 80 additions and 74 deletions

1
Cargo.lock generated
View File

@ -1568,6 +1568,7 @@ dependencies = [
"serde",
"serde_derive",
"settings",
"staff_mode",
"theme",
"theme_selector",
"util",

View File

@ -38,6 +38,7 @@ picker = { path = "../picker" }
project = { path = "../project" }
recent_projects = {path = "../recent_projects"}
settings = { path = "../settings" }
staff_mode = {path = "../staff_mode"}
theme = { path = "../theme" }
theme_selector = { path = "../theme_selector" }
vcs_menu = { path = "../vcs_menu" }
@ -45,7 +46,6 @@ util = { path = "../util" }
workspace = { path = "../workspace" }
zed-actions = {path = "../zed-actions"}
anyhow.workspace = true
futures.workspace = true
log.workspace = true

View File

@ -31,6 +31,7 @@ use panel_settings::{CollaborationPanelDockPosition, CollaborationPanelSettings}
use project::{Fs, Project};
use serde_derive::{Deserialize, Serialize};
use settings::SettingsStore;
use staff_mode::StaffMode;
use std::{mem, sync::Arc};
use theme::IconButton;
use util::{ResultExt, TryFutureExt};
@ -347,6 +348,8 @@ impl CollabPanel {
.push(cx.observe(&this.channel_store, |this, _, cx| this.update_entries(cx)));
this.subscriptions
.push(cx.observe(&active_call, |this, _, cx| this.update_entries(cx)));
this.subscriptions
.push(cx.observe_global::<StaffMode, _>(move |this, cx| this.update_entries(cx)));
this
})
@ -516,22 +519,21 @@ impl CollabPanel {
}
}
let mut request_entries = Vec::new();
if self.include_channels_section(cx) {
self.entries.push(ListEntry::Header(Section::Channels, 0));
let channels = channel_store.channels();
if !(channels.is_empty() && self.channel_editing_state.is_none()) {
self.match_candidates.clear();
self.match_candidates
.extend(
channels
.iter()
.enumerate()
.map(|(ix, channel)| StringMatchCandidate {
.extend(channels.iter().enumerate().map(|(ix, channel)| {
StringMatchCandidate {
id: ix,
string: channel.name.clone(),
char_bag: channel.name.chars().collect(),
}),
);
}
}));
let matches = executor.block(match_strings(
&self.match_candidates,
&query,
@ -558,7 +560,6 @@ impl CollabPanel {
}
}
let mut request_entries = Vec::new();
let channel_invites = channel_store.channel_invitations();
if !channel_invites.is_empty() {
self.match_candidates.clear();
@ -578,11 +579,9 @@ impl CollabPanel {
&Default::default(),
executor.clone(),
));
request_entries.extend(
matches
.iter()
.map(|mat| ListEntry::ChannelInvite(channel_invites[mat.candidate_id].clone())),
);
request_entries.extend(matches.iter().map(|mat| {
ListEntry::ChannelInvite(channel_invites[mat.candidate_id].clone())
}));
if !request_entries.is_empty() {
self.entries
@ -592,6 +591,7 @@ impl CollabPanel {
}
}
}
}
self.entries.push(ListEntry::Header(Section::Contacts, 0));
@ -686,16 +686,9 @@ impl CollabPanel {
executor.clone(),
));
let (mut online_contacts, offline_contacts) = matches
let (online_contacts, offline_contacts) = matches
.iter()
.partition::<Vec<_>, _>(|mat| contacts[mat.candidate_id].online);
if let Some(room) = ActiveCall::global(cx).read(cx).room() {
let room = room.read(cx);
online_contacts.retain(|contact| {
let contact = &contacts[contact.candidate_id];
!room.contains_participant(contact.user.id)
});
}
for (matches, section) in [
(online_contacts, Section::Online),
@ -1534,6 +1527,14 @@ impl CollabPanel {
.into_any()
}
fn include_channels_section(&self, cx: &AppContext) -> bool {
if cx.has_global::<StaffMode>() {
cx.global::<StaffMode>().0
} else {
false
}
}
fn deploy_channel_context_menu(
&mut self,
position: Vector2F,
@ -1878,8 +1879,12 @@ impl View for CollabPanel {
})
.on_click(MouseButton::Left, |_, this, cx| {
let client = this.client.clone();
cx.spawn(|_, cx| async move {
client.authenticate_and_connect(true, &cx).await.log_err()
cx.spawn(|this, mut cx| async move {
client.authenticate_and_connect(true, &cx).await.log_err();
this.update(&mut cx, |_, cx| {
cx.notify();
})
})
.detach();
})

View File

@ -53,6 +53,6 @@ sleep 0.5
# Start the two Zed child processes. Open the given paths with the first instance.
trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT
ZED_IMPERSONATE=${username_1} ZED_WINDOW_POSITION=${position_1} target/debug/Zed $@ &
ZED_IMPERSONATE=${ZED_IMPERSONATE:=${username_1}} ZED_WINDOW_POSITION=${position_1} target/debug/Zed $@ &
SECOND=true ZED_IMPERSONATE=${username_2} ZED_WINDOW_POSITION=${position_2} target/debug/Zed &
wait