astatin3/unshell
1
0
Fork 0
mirror of https://github.com/Astatin3/unshell.git synced 2026-06-08 22:38:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make config use dropdown

Browse Source
This commit is contained in:
Michael Mikovsky
2025-12-02 08:22:03 -07:00
parent 7f2b145a7a
commit 7fb9aaf534
5 changed files with 205 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unshell-gui/src/config/mod.rs
+91 -54
View File
@@ -1,9 +1,10 @@
use std::sync::{
Arc, Mutex,
atomic::{AtomicBool, Ordering},
use std::{
collections::HashMap,
sync::{Arc, Mutex},
};
use egui::Color32;
use egui::ComboBox;
use egui_extras::{Column, TableBuilder};
use crate::auth::Auth;
@@ -20,7 +21,7 @@ pub struct Config {
#[derive(Default)]
struct ConfigState {
trees: Option<Vec<String>>,
tree_keys: Option<Vec<String>>,
tree_keys: Option<HashMap<String, String>>,
is_requesting: bool,
}
@@ -40,9 +41,9 @@ impl Default for Config {
impl Config {
pub fn update(&mut self, auth: &mut Auth, ui: &mut egui::Ui) {
let mut state_lock = self.state.lock().unwrap();
let tree_list_none = state_lock.trees.is_none();
let key_list_none = state_lock.tree_keys.is_none();
let state_lock = self.state.lock().unwrap();
let mut tree_list_none = state_lock.trees.is_none();
let mut key_list_none = state_lock.tree_keys.is_none();
let is_requesting = state_lock.is_requesting;
if !tree_list_none
@@ -57,12 +58,18 @@ impl Config {
drop(state_lock);
if ui.button("Refresh").clicked() {
self.tree_option.clear();
(*self.state.lock().unwrap()).trees = None;
}
ui.horizontal(|ui| {
if ui.button("Refresh").clicked() {
// self.tree_option.clear();
let mut state_lock = self.state.lock().unwrap();
(*state_lock).trees = None;
(*state_lock).tree_keys = None;
drop(state_lock);
tree_list_none = true;
key_list_none = true;
}
if tree_list_none && !is_requesting {
self.state.lock().unwrap().is_requesting = true;
let state_clone = self.state.clone();
@@ -76,57 +83,42 @@ impl Config {
} else if tree_list_none && is_requesting {
ui.spinner();
}
});
ui.horizontal(|ui| {
let state_lock = self.state.lock().unwrap();
// This might have changed since the above api call
tree_list_none = state_lock.trees.is_none();
if !tree_list_none {
// let tree_len = self.state.lock().unwrap().trees.as_ref().unwrap().len();
// for tree in &state_lock.unwrap() {
// if ui.button(tree).clicked() {
// self.tree_option = tree.to_string();
// (*state_lock).tree_keys.as_mut();
// }
// }
let state_lock = self.state.lock().unwrap();
let trees = state_lock.trees.as_ref().unwrap().clone();
drop(state_lock);
for tree in trees {
// let tree: &&String = self
// .state
// .lock()
// .unwrap()
// .tree_keys
// .unwrap()
// .iter()
// .nth(i)
// .unwrap();
let before = &self.tree_option.clone();
egui::ComboBox::from_id_salt("Select Tree")
.selected_text(&self.tree_option)
.show_ui(ui, |ui| {
for tree in trees {
ui.selectable_value(&mut self.tree_option, tree.clone(), tree);
}
});
// let tree sel
if ui.button(&tree).clicked() {
self.tree_option = tree.to_string();
(*self.state.lock().unwrap()).tree_keys = None;
}
if before.ne(&self.tree_option) {
(*self.state.lock().unwrap()).tree_keys = None;
key_list_none = true;
}
}
});
if !self.tree_option.is_empty() && !tree_list_none {
ui.horizontal(|ui| {
ui.label(&format!("Tree: {}", self.tree_option));
});
if !self.tree_option.is_empty() && !tree_list_none {
// ui.horizontal(|ui| {
// ui.label(&format!("Tree: {}", self.tree_option));
// });
ui.horizontal(|ui| {
if key_list_none && !is_requesting {
self.state.lock().unwrap().is_requesting = true;
let state_clone = self.state.clone();
auth.get(
&format!("/api/keys/{}", self.tree_option),
move |response: Result<Vec<String>, String>| {
&format!("/api/values/{}", self.tree_option),
move |response: Result<HashMap<String, String>, String>| {
let mut state_lock = state_clone.lock().unwrap();
state_lock.tree_keys = Some(response.unwrap());
state_lock.is_requesting = false;
@@ -134,13 +126,58 @@ impl Config {
);
} else if key_list_none && is_requesting {
ui.spinner();
} else {
ui.label(&format!(
"Keys: {:?}",
self.state.lock().unwrap().tree_keys.clone()
));
}
}
});
if !key_list_none {
// let body_text_size = TextStyle::Body.resolve(ui.style()).size;
// use egui_extras::{Size, StripBuilder};
// StripBuilder::new(ui)
// .size(Size::remainder().at_least(100.0)) // for the table
// .size(Size::exact(body_text_size))
// .vertical(|mut strip| {
// strip.cell(|ui| {
egui::ScrollArea::both().show(ui, |ui| {
let table = TableBuilder::new(ui)
.striped(true)
.resizable(true)
.cell_layout(egui::Layout::left_to_right(egui::Align::Center))
.column(Column::auto())
.column(Column::auto())
.min_scrolled_height(0.0)
.sense(egui::Sense::click());
table
.header(20., |mut header| {
header.col(|ui| {
ui.strong("key");
});
header.col(|ui| {
ui.strong("value");
});
})
.body(|mut body| {
let state_lock = self.state.lock().unwrap();
let map = state_lock.tree_keys.as_ref().unwrap();
for (key, value) in (map).iter() {
// // let runtime = self.current_runtimes
body.row(18., |mut row| {
row.col(|ui| {
ui.label(key);
});
row.col(|ui| {
ui.label(value);
});
});
}
});
});
// });
// });
}
}
}