Implement issue browser context on home page

This commit is contained in:
Erik Kundt
2023-08-08 12:34:06 +02:00
parent 2bf3e69d77
commit 46f9acd75e
8 changed files with 87 additions and 20 deletions
+8
View File
@@ -1,3 +1,4 @@
use radicle::cob::issue::{Issue, IssueId};
use radicle::prelude::{Id, Project};
use radicle::Profile;
@@ -8,17 +9,20 @@ pub struct Context {
id: Id,
project: Project,
repository: Repository,
issues: Vec<(IssueId, Issue)>,
}
impl Context {
pub fn new(profile: Profile, id: Id, project: Project) -> Self {
let repository = profile.storage.repository(id).unwrap();
let issues = crate::cob::issue::all(&repository).unwrap_or_default();
Self {
id,
profile,
project,
repository,
issues,
}
}
@@ -37,4 +41,8 @@ impl Context {
pub fn repository(&self) -> &Repository {
&self.repository
}
pub fn issues(&self) -> &Vec<(IssueId, Issue)> {
&self.issues
}
}
+2 -2
View File
@@ -206,9 +206,9 @@ pub fn centered_rect(percent_x: u16, percent_y: u16, r: Rect) -> Rect {
}
pub fn issue_page(area: Rect, shortcuts_h: u16) -> IssuePage {
let content_h = area.height.saturating_sub(shortcuts_h);
let header_h = 3u16;
let content_h = area.height.saturating_sub(header_h).saturating_sub(shortcuts_h);
let root = Layout::default()
.direction(Direction::Vertical)
.horizontal_margin(1)
+16
View File
@@ -9,6 +9,22 @@ use crate::ui::layout;
use crate::ui::theme::Theme;
use crate::ui::widget::{Widget, WidgetComponent};
pub enum Progress {
Percentage(usize),
Step(usize, usize),
None,
}
impl ToString for Progress {
fn to_string(&self) -> std::string::String {
match self {
Progress::Percentage(value) => format!("{value} %"),
Progress::Step(step, total) => format!("{step}/{total}"),
_ => String::new(),
}
}
}
/// A shortcut that consists of a label displaying the "hotkey", a label that displays
/// the action and a spacer between them.
#[derive(Clone)]
+3 -1
View File
@@ -271,7 +271,9 @@ where
}
fn state(&self) -> State {
State::None
let selected = self.state.selected().unwrap_or_default();
let len = self.items.len();
State::Tup2((StateValue::Usize(selected), StateValue::Usize(len)))
}
fn perform(&mut self, _properties: &Props, cmd: Cmd) -> CmdResult {
+3 -5
View File
@@ -67,11 +67,9 @@ impl IssueBrowser {
let repo = context.repository();
let mut items = vec![];
if let Ok(issues) = cob::issue::all(repo) {
for (id, issue) in issues {
if let Ok(item) = IssueItem::try_from((context.profile(), repo, id, issue)) {
items.push(item);
}
for (id, issue) in context.issues() {
if let Ok(item) = IssueItem::try_from((context.profile(), repo, *id, issue.clone())) {
items.push(item);
}
}
+24 -2
View File
@@ -10,6 +10,7 @@ use tuirealm::tui::layout::Layout;
use super::common::container::Container;
use super::common::container::LabeledContainer;
use super::common::context::ContextBar;
use super::common::context::Progress;
use super::common::label::Textarea;
use super::common::list::List;
use super::common::list::Property;
@@ -273,6 +274,27 @@ pub fn details(
Widget::new(discussion)
}
pub fn browse_context(theme: &Theme) -> Widget<ContextBar> {
common::context::bar(theme, "Browse", "", "", "", "")
pub fn browse_context(context: &Context, theme: &Theme, progress: Progress) -> Widget<ContextBar> {
use radicle::cob::issue::State;
let issues = context.issues();
let open = issues
.iter()
.filter(|issue| *issue.1.state() == State::Open)
.collect::<Vec<_>>()
.len();
let closed = issues
.iter()
.filter(|issue| *issue.1.state() != State::Open)
.collect::<Vec<_>>()
.len();
common::context::bar(
theme,
"Browse",
"",
"",
&format!("{open} open | {closed} closed"),
&progress.to_string(),
)
}
+6 -2
View File
@@ -10,7 +10,7 @@ use super::{Widget, WidgetComponent};
use super::common;
use super::common::container::Tabs;
use super::common::context::ContextBar;
use super::common::context::{ContextBar, Progress};
use super::common::label::Label;
use crate::ui::context::Context;
@@ -116,6 +116,10 @@ pub fn context(context: &Context, theme: &Theme, patch: (PatchId, Patch)) -> Wid
common::context::bar(theme, "Patch", &id, title, &author, &comments.to_string())
}
pub fn browse_context(theme: &Theme) -> Widget<ContextBar> {
pub fn browse_context(
_context: &Context,
theme: &Theme,
_progress: Progress,
) -> Widget<ContextBar> {
common::context::bar(theme, "Browse", "", "", "", "")
}