Skip to content

Commit

Permalink
Inline autoalloc fragment into its screen
Browse files Browse the repository at this point in the history
  • Loading branch information
Kobzol committed Oct 21, 2024
1 parent 6d00a74 commit 4fb10e4
Show file tree
Hide file tree
Showing 2 changed files with 149 additions and 177 deletions.
169 changes: 0 additions & 169 deletions crates/hyperqueue/src/dashboard/ui/screens/autoalloc/fragment.rs

This file was deleted.

157 changes: 149 additions & 8 deletions crates/hyperqueue/src/dashboard/ui/screens/autoalloc/mod.rs
Original file line number Diff line number Diff line change
@@ -1,31 +1,172 @@
use crate::dashboard::data::timelines::alloc_timeline::AllocationQueueInfo;
use crate::dashboard::data::DashboardData;
use crate::dashboard::ui::screen::Screen;
use crate::dashboard::ui::screens::autoalloc::alloc_timeline_chart::AllocationsChart;
use crate::dashboard::ui::screens::autoalloc::allocations_info_table::AllocationInfoTable;
use crate::dashboard::ui::screens::autoalloc::queue_info_table::AllocationQueueInfoTable;
use crate::dashboard::ui::screens::autoalloc::queue_params_display::QueueParamsTable;
use crate::dashboard::ui::styles::{
style_footer, style_header_text, table_style_deselected, table_style_selected,
};
use crate::dashboard::ui::terminal::DashboardFrame;
use crossterm::event::KeyEvent;
use fragment::AutoAllocatorFragment;
use ratatui::layout::Rect;
use crate::dashboard::ui::widgets::text::draw_text;
use crate::server::autoalloc::QueueId;
use crossterm::event::{KeyCode, KeyEvent};
use ratatui::layout::{Constraint, Direction, Layout, Rect};
use std::time::SystemTime;

mod alloc_timeline_chart;
mod allocations_info_table;
mod fragment;
mod queue_info_table;
mod queue_params_display;

#[derive(Default)]
pub struct AutoAllocScreen {
auto_allocator_fragment: AutoAllocatorFragment,
queue_info_table: AllocationQueueInfoTable,
queue_params_table: QueueParamsTable,
allocations_info_table: AllocationInfoTable,
allocations_chart: AllocationsChart,

component_in_focus: FocusedComponent,
}

#[derive(Default)]
enum FocusedComponent {
#[default]
QueueParamsTable,
AllocationInfoTable,
}

impl Screen for AutoAllocScreen {
fn draw(&mut self, in_area: Rect, frame: &mut DashboardFrame) {
self.auto_allocator_fragment.draw(in_area, frame);
let layout = AutoAllocFragmentLayout::new(&in_area);
draw_text(
"AutoAlloc Info",
layout.header_chunk,
frame,
style_header_text(),
);

let (queues_table_style, allocations_table_style) = match self.component_in_focus {
FocusedComponent::QueueParamsTable => {
(table_style_selected(), table_style_deselected())
}
FocusedComponent::AllocationInfoTable => {
(table_style_deselected(), table_style_selected())
}
};

self.allocations_chart.draw(layout.chart_chunk, frame);
self.queue_info_table
.draw(layout.queue_info_chunk, frame, queues_table_style);
self.allocations_info_table.draw(
layout.allocation_info_chunk,
frame,
allocations_table_style,
);
self.queue_params_table
.draw(layout.allocation_queue_params_chunk, frame);

draw_text(
"<1>: Allocation Queues, <2>: Allocations",
layout.footer_chunk,
frame,
style_footer(),
);
}

fn update(&mut self, data: &DashboardData) {
self.auto_allocator_fragment.update(data);
let queue_infos: Vec<(&QueueId, &AllocationQueueInfo)> =
data.query_allocation_queues_at(SystemTime::now()).collect();
self.queue_info_table.update(queue_infos);

if let Some(descriptor) = self.queue_info_table.get_selected_queue_descriptor() {
self.allocations_chart.update(data, descriptor);
}

if let Some(queue_params) = self
.queue_info_table
.get_selected_queue_descriptor()
.and_then(|queue_id| data.query_allocation_params(queue_id))
{
self.queue_params_table.update(queue_params)
}

if let Some(allocations_map) = self
.queue_info_table
.get_selected_queue_descriptor()
.and_then(|queue_id| data.query_allocations_info_at(queue_id, SystemTime::now()))
{
self.allocations_info_table.update(allocations_map);
}
}

fn handle_key(&mut self, key: KeyEvent) {
self.auto_allocator_fragment.handle_key(key);
match self.component_in_focus {
FocusedComponent::QueueParamsTable => self.queue_info_table.handle_key(key),
FocusedComponent::AllocationInfoTable => self.allocations_info_table.handle_key(key),
};

match key.code {
KeyCode::Char('1') => {
self.component_in_focus = FocusedComponent::QueueParamsTable;
self.allocations_info_table.clear_selection();
}
KeyCode::Char('2') => self.component_in_focus = FocusedComponent::AllocationInfoTable,
_ => {}
}
}
}

/**
* __________________________
|--------Header---------|
| Chart |
|-----------------------|
| queues | |
|----------| alloc_info |
| q_params | |
|________Footer_________|
**/
struct AutoAllocFragmentLayout {
chart_chunk: Rect,
allocation_queue_params_chunk: Rect,
header_chunk: Rect,
queue_info_chunk: Rect,
allocation_info_chunk: Rect,
footer_chunk: Rect,
}

impl AutoAllocFragmentLayout {
fn new(rect: &Rect) -> Self {
let auto_alloc_screen_chunks = ratatui::layout::Layout::default()
.constraints(vec![
Constraint::Percentage(5),
Constraint::Percentage(40),
Constraint::Percentage(50),
Constraint::Percentage(5),
])
.direction(Direction::Vertical)
.split(*rect);

let component_area = Layout::default()
.constraints(vec![Constraint::Percentage(50), Constraint::Percentage(50)])
.direction(Direction::Horizontal)
.margin(0)
.split(auto_alloc_screen_chunks[2]);

let queue_info_area = Layout::default()
.constraints(vec![Constraint::Percentage(50), Constraint::Percentage(50)])
.direction(Direction::Vertical)
.split(component_area[0]);

Self {
chart_chunk: auto_alloc_screen_chunks[1],
header_chunk: auto_alloc_screen_chunks[0],
queue_info_chunk: queue_info_area[0],
allocation_queue_params_chunk: queue_info_area[1],
allocation_info_chunk: component_area[1],
footer_chunk: auto_alloc_screen_chunks[3],
}
}
}

0 comments on commit 4fb10e4

Please sign in to comment.