Skip to content

Commit

Permalink
Populate dashboard lazily; add wasm wrapper code
Browse files Browse the repository at this point in the history
  • Loading branch information
@zmerp
zmerp committed Jun 2, 2023
1 parent bffaa44 commit 9561358
Show file tree
Hide file tree
Showing 8 changed files with 299 additions and 175 deletions.
194 changes: 104 additions & 90 deletions alvr/dashboard/src/dashboard/components/connections.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use crate::{
theme::{self, log_colors},
};
use alvr_packets::ClientListAction;
use alvr_session::SessionDesc;
use alvr_session::{ClientConnectionDesc, SessionDesc};
use eframe::{
egui::{Frame, Grid, Layout, RichText, TextEdit, Ui, Window},
emath::{Align, Align2},
Expand All @@ -18,23 +18,38 @@ struct EditPopupState {
}

pub struct ConnectionsTab {
new_clients: Option<Vec<(String, ClientConnectionDesc)>>,
trusted_clients: Option<Vec<(String, ClientConnectionDesc)>>,
edit_popup_state: Option<EditPopupState>,
}

impl ConnectionsTab {
pub fn new() -> Self {
Self {
new_clients: None,
trusted_clients: None,
edit_popup_state: None,
}
}

pub fn ui(
&mut self,
ui: &mut Ui,
session: &SessionDesc,
connected_to_server: bool,
) -> Option<ServerRequest> {
let mut response = None;
pub fn update_client_list(&mut self, session: &SessionDesc) {
let (trusted_clients, untrusted_clients) =
session
.client_connections
.clone()
.into_iter()
.partition::<Vec<_>, _>(|(_, data)| data.trusted);

self.trusted_clients = Some(trusted_clients);
self.new_clients = Some(untrusted_clients);
}

pub fn ui(&mut self, ui: &mut Ui, connected_to_server: bool) -> Vec<ServerRequest> {
let mut requests = vec![];

if self.new_clients.is_none() {
requests.push(ServerRequest::GetSession);
}

if !connected_to_server {
Frame::group(ui.style())
Expand All @@ -61,91 +76,90 @@ impl ConnectionsTab {
});
}

// Get the different types of clients from the session
let (trusted_clients, untrusted_clients) = session
.client_connections
.iter()
.partition::<Vec<_>, _>(|(_, data)| data.trusted);

ui.vertical_centered_justified(|ui| {
Frame::group(ui.style())
.fill(theme::SECTION_BG)
.show(ui, |ui| {
ui.vertical_centered_justified(|ui| {
ui.add_space(5.0);
ui.heading("New clients");
});
if let Some(clients) = &self.new_clients {
Frame::group(ui.style())
.fill(theme::SECTION_BG)
.show(ui, |ui| {
ui.vertical_centered_justified(|ui| {
ui.add_space(5.0);
ui.heading("New clients");
});

Grid::new(1).num_columns(2).show(ui, |ui| {
for (hostname, _) in untrusted_clients {
ui.horizontal(|ui| {
ui.add_space(10.0);
ui.label(hostname);
});
ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
if ui.button("Trust").clicked() {
response = Some(ServerRequest::UpdateClientList {
hostname: hostname.clone(),
action: ClientListAction::Trust,
});
};
});
ui.end_row();
}
})
});
Grid::new(1).num_columns(2).show(ui, |ui| {
for (hostname, _) in clients {
ui.horizontal(|ui| {
ui.add_space(10.0);
ui.label(hostname);
});
ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
if ui.button("Trust").clicked() {
requests.push(ServerRequest::UpdateClientList {
hostname: hostname.clone(),
action: ClientListAction::Trust,
});
};
});
ui.end_row();
}
})
});
}

ui.add_space(10.0);

Frame::group(ui.style())
.fill(theme::SECTION_BG)
.show(ui, |ui| {
ui.vertical_centered_justified(|ui| {
ui.add_space(5.0);
ui.heading("Trusted clients");
});
if let Some(clients) = &self.trusted_clients {
Frame::group(ui.style())
.fill(theme::SECTION_BG)
.show(ui, |ui| {
ui.vertical_centered_justified(|ui| {
ui.add_space(5.0);
ui.heading("Trusted clients");
});

Grid::new(2).num_columns(2).show(ui, |ui| {
for (hostname, data) in trusted_clients {
ui.horizontal(|ui| {
ui.add_space(10.0);
ui.label(format!(
"{hostname}: {} ({})",
data.current_ip.unwrap_or(IpAddr::V4(Ipv4Addr::UNSPECIFIED)),
data.display_name
));
});
ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
if ui.button("Remove").clicked() {
response = Some(ServerRequest::UpdateClientList {
hostname: hostname.clone(),
action: ClientListAction::RemoveEntry,
});
}
if ui.button("Edit").clicked() {
self.edit_popup_state = Some(EditPopupState {
new_client: false,
hostname: hostname.to_owned(),
ips: data
.manual_ips
.iter()
.map(|addr| addr.to_string())
.collect::<Vec<String>>(),
});
}
Grid::new(2).num_columns(2).show(ui, |ui| {
for (hostname, data) in clients {
ui.horizontal(|ui| {
ui.add_space(10.0);
ui.label(format!(
"{hostname}: {} ({})",
data.current_ip
.unwrap_or(IpAddr::V4(Ipv4Addr::UNSPECIFIED)),
data.display_name
));
});
ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
if ui.button("Remove").clicked() {
requests.push(ServerRequest::UpdateClientList {
hostname: hostname.clone(),
action: ClientListAction::RemoveEntry,
});
}
if ui.button("Edit").clicked() {
self.edit_popup_state = Some(EditPopupState {
new_client: false,
hostname: hostname.to_owned(),
ips: data
.manual_ips
.iter()
.map(|addr| addr.to_string())
.collect::<Vec<String>>(),
});
}
});
ui.end_row();
}
});

if ui.button("Add client manually").clicked() {
self.edit_popup_state = Some(EditPopupState {
hostname: "XXXX.client.alvr".into(),
new_client: true,
ips: Vec::new(),
});
ui.end_row();
}
});

if ui.button("Add client manually").clicked() {
self.edit_popup_state = Some(EditPopupState {
hostname: "XXXX.client.alvr".into(),
new_client: true,
ips: Vec::new(),
});
}
});
}
});

if let Some(mut state) = self.edit_popup_state.take() {
Expand All @@ -165,7 +179,7 @@ impl ConnectionsTab {
ui[1].text_edit_singleline(address);
}
if ui[1].button("Add new").clicked() {
state.ips.push("192.168.1.2".to_string());
state.ips.push("192.168.X.X".to_string());
}
});
ui.columns(2, |ui| {
Expand All @@ -174,16 +188,16 @@ impl ConnectionsTab {
state.ips.iter().filter_map(|s| s.parse().ok()).collect();

if state.new_client {
response = Some(ServerRequest::UpdateClientList {
hostname: state.hostname.clone(),
requests.push(ServerRequest::UpdateClientList {
hostname: state.hostname,
action: ClientListAction::AddIfMissing {
trusted: true,
manual_ips,
},
});
} else {
response = Some(ServerRequest::UpdateClientList {
hostname: state.hostname.clone(),
requests.push(ServerRequest::UpdateClientList {
hostname: state.hostname,
action: ClientListAction::SetManualIps(manual_ips),
});
}
Expand All @@ -194,6 +208,6 @@ impl ConnectionsTab {
});
}

response
requests
}
}
23 changes: 21 additions & 2 deletions alvr/dashboard/src/dashboard/components/installation.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@ use eframe::{
egui::{Frame, Grid, Layout, RichText, Ui},
emath::Align,
};
use std::path::PathBuf;
use std::{
path::PathBuf,
time::{Duration, Instant},
};

const DRIVER_UPDATE_INTERVAL: Duration = Duration::from_secs(1);

pub enum InstallationTabRequest {
OpenSetupWizard,
Expand All @@ -13,11 +18,15 @@ pub enum InstallationTabRequest {

pub struct InstallationTab {
drivers: Vec<PathBuf>,
last_update_instant: Instant,
}

impl InstallationTab {
pub fn new() -> Self {
Self { drivers: vec![] }
Self {
drivers: vec![],
last_update_instant: Instant::now(),
}
}

pub fn update_drivers(&mut self, list: Vec<PathBuf>) {
Expand All @@ -26,6 +35,16 @@ impl InstallationTab {

pub fn ui(&mut self, ui: &mut Ui) -> Vec<InstallationTabRequest> {
let mut requests = vec![];

let now = Instant::now();
if now > self.last_update_instant + DRIVER_UPDATE_INTERVAL {
requests.push(InstallationTabRequest::ServerRequest(
ServerRequest::GetDriverList,
));

self.last_update_instant = now;
}

ui.vertical_centered_justified(|ui| {
if ui.button("Run setup wizard").clicked() {
requests.push(InstallationTabRequest::OpenSetupWizard);
Expand Down
8 changes: 6 additions & 2 deletions alvr/dashboard/src/dashboard/components/mod.rs
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
mod about;
mod connections;
mod debug;
mod installation;
mod logs;
mod notifications;
mod settings;
mod settings_controls;
mod setup_wizard;
mod statistics;

#[cfg(not(target_arch = "wasm32"))]
mod installation;

pub use about::*;
pub use connections::*;
pub use debug::*;
pub use installation::*;
pub use logs::*;
pub use notifications::*;
pub use settings::*;
pub use settings_controls::*;
pub use setup_wizard::*;
pub use statistics::*;

#[cfg(not(target_arch = "wasm32"))]
pub use installation::*;
Loading

0 comments on commit 9561358

Please sign in to comment.