From dae897f8cc7b4aa4c4a313d1e67b6bc79af05070 Mon Sep 17 00:00:00 2001 From: Erik Kundt Date: Thu, 10 Aug 2023 21:12:11 +0200 Subject: [PATCH] Refresh issue and patch browser on page leave --- src/app.rs | 21 ++++-------- src/app/event.rs | 12 +++++-- src/app/page.rs | 66 +++++++++++++++++++++++++----------- src/ui/cob.rs | 6 ++++ src/ui/widget/common/list.rs | 14 +++++--- src/ui/widget/home.rs | 41 ++++++++++++++-------- 6 files changed, 105 insertions(+), 55 deletions(-) diff --git a/src/app.rs b/src/app.rs index 4039dc8f..30ebdecd 100644 --- a/src/app.rs +++ b/src/app.rs @@ -64,7 +64,9 @@ pub enum Cid { /// Messages handled by this application. #[derive(Clone, Debug, Eq, PartialEq)] -pub enum HomeMessage {} +pub enum HomeMessage { + RefreshIssues(Option), +} #[derive(Clone, Debug, Eq, PartialEq)] pub enum IssueCobMessage { @@ -85,7 +87,7 @@ pub enum IssueMessage { Cob(IssueCobMessage), OpenForm, HideForm, - Leave, + Leave(Option), } #[derive(Clone, Debug, Eq, PartialEq)] @@ -192,17 +194,6 @@ impl App { Ok(()) } } - - // if let Some(issue) = cob::issue::find(repo, &id)? { - // let view = Box::new(IssuePage::new(&self.context, theme, (id, issue))); - // self.pages.push(view, app, &self.context, theme)?; - - // Ok(()) - // } else { - // Err(anyhow::anyhow!( - // "Could not mount 'page::IssueView'. Issue not found." - // )) - // } } fn process( @@ -250,9 +241,9 @@ impl App { self.view_issue(app, id, &theme)?; Ok(None) } - Message::Issue(IssueMessage::Leave) => { + Message::Issue(IssueMessage::Leave(id)) => { self.pages.pop(app)?; - Ok(None) + Ok(Some(Message::Home(HomeMessage::RefreshIssues(id)))) } Message::Patch(PatchMessage::Show(id)) => { self.view_patch(app, id, &theme)?; diff --git a/src/app/event.rs b/src/app/event.rs index bccd7081..d4e2e568 100644 --- a/src/app/event.rs +++ b/src/app/event.rs @@ -53,9 +53,15 @@ impl tuirealm::Component for Widget { impl tuirealm::Component for Widget { fn on(&mut self, event: Event) -> Option { match event { - Event::Keyboard(KeyEvent { code: Key::Esc, .. }) => { - Some(Message::Issue(IssueMessage::Leave)) - } + Event::Keyboard(KeyEvent { code: Key::Esc, .. }) => match self.state() { + State::Tup2((StateValue::Usize(selected), StateValue::Usize(_))) => { + let item = self.items().get(selected)?; + Some(Message::Issue(IssueMessage::Leave(Some( + item.id().to_owned(), + )))) + } + _ => None, + }, Event::Keyboard(KeyEvent { code: Key::Up, .. }) => { let result = self.perform(Cmd::Move(MoveDirection::Up)); match result { diff --git a/src/app/page.rs b/src/app/page.rs index 0a457d74..2f530b56 100644 --- a/src/app/page.rs +++ b/src/app/page.rs @@ -7,14 +7,16 @@ use radicle::cob::patch::{Patch, PatchId}; use radicle_tui::cob; use radicle_tui::ui::widget::common::context::{Progress, Shortcuts}; -use tuirealm::{Frame, NoUserEvent, StateValue, Sub, SubClause}; +use tuirealm::{AttrValue, Attribute, Frame, NoUserEvent, StateValue, Sub, SubClause}; use radicle_tui::ui::context::Context; use radicle_tui::ui::layout; use radicle_tui::ui::theme::Theme; use radicle_tui::ui::widget::{self, Widget}; -use super::{subscription, Application, Cid, HomeCid, IssueCid, IssueMessage, Message, PatchCid}; +use super::{ + subscription, Application, Cid, HomeCid, HomeMessage, IssueCid, IssueMessage, Message, PatchCid, +}; /// `tuirealm`'s event and prop system is designed to work with flat component hierarchies. /// Building deep nested component hierarchies would need a lot more additional effort to @@ -74,6 +76,19 @@ impl HomeView { } } + fn activate( + &mut self, + app: &mut Application, + cid: HomeCid, + ) -> Result<()> { + self.active_component = cid; + let cid = Cid::Home(self.active_component.clone()); + app.active(&cid)?; + app.attr(&cid, Attribute::Focus, AttrValue::Flag(true))?; + + Ok(()) + } + fn build_shortcuts(theme: &Theme) -> HashMap> { [ ( @@ -182,12 +197,15 @@ impl ViewPage for HomeView { context: &Context, theme: &Theme, ) -> Result<()> { + let issue = context.issues().first().cloned(); + let patch = context.patches().first().cloned(); + let navigation = widget::home::navigation(theme); let header = widget::common::app_header(context, theme, Some(navigation)).to_boxed(); let dashboard = widget::home::dashboard(context, theme).to_boxed(); - let issue_browser = widget::home::issues(context, theme).to_boxed(); - let patch_browser = widget::home::patches(context, theme).to_boxed(); + let issue_browser = widget::home::issues(context, theme, issue).to_boxed(); + let patch_browser = widget::home::patches(context, theme, patch).to_boxed(); app.remount(Cid::Home(HomeCid::Header), header, vec![])?; @@ -220,13 +238,25 @@ impl ViewPage for HomeView { theme: &Theme, message: Message, ) -> Result> { - if let Message::NavigationChanged(index) = message { - self.active_component = HomeCid::from(index as usize); + match message { + Message::NavigationChanged(index) => { + self.activate(app, HomeCid::from(index as usize))?; + self.update_shortcuts(app, self.active_component.clone())?; + } + Message::Home(HomeMessage::RefreshIssues(id)) => { + let selected = match id { + Some(id) => { + cob::issue::find(context.repository(), &id)?.map(|issue| (id, issue)) + } + _ => None, + }; - let active_component = Cid::Home(self.active_component.clone()); - app.active(&active_component)?; + let issue_browser = widget::home::issues(context, theme, selected).to_boxed(); + app.remount(Cid::Home(HomeCid::IssueBrowser), issue_browser, vec![])?; - self.update_shortcuts(app, self.active_component.clone())?; + self.activate(app, HomeCid::IssueBrowser)?; + } + _ => {} } self.update_context(app, context, theme, self.active_component.clone())?; @@ -299,7 +329,9 @@ impl IssuePage { cid: IssueCid, ) -> Result<()> { self.active_component = cid; - app.active(&Cid::Issue(self.active_component.clone()))?; + let cid = Cid::Issue(self.active_component.clone()); + app.active(&cid)?; + app.attr(&cid, Attribute::Focus, AttrValue::Flag(true))?; Ok(()) } @@ -469,8 +501,8 @@ impl ViewPage for IssuePage { let repo = context.repository(); if let Some(issue) = cob::issue::find(repo, &id)? { - let list = - widget::issue::list(context, theme, Some((id, issue.clone()))).to_boxed(); + self.issue = Some((id, issue.clone())); + let list = widget::issue::list(context, theme, self.issue.clone()).to_boxed(); let comments = issue.comments().collect::>(); let details = widget::issue::details( @@ -514,11 +546,9 @@ impl ViewPage for IssuePage { app.unsubscribe(&Cid::GlobalListener, subscription::global_clause())?; - self.activate(app, IssueCid::Form)?; - self.update_shortcuts(app, IssueCid::Form)?; + return Ok(Some(Message::Issue(IssueMessage::Focus(IssueCid::Form)))); } Message::Issue(IssueMessage::HideForm) => { - app.blur()?; app.umount(&Cid::Issue(IssueCid::Form))?; let list = widget::issue::list(context, theme, self.issue.clone()).to_boxed(); @@ -529,12 +559,10 @@ impl ViewPage for IssuePage { Sub::new(subscription::global_clause(), SubClause::Always), )?; - self.activate(app, IssueCid::List)?; - self.update_shortcuts(app, IssueCid::List)?; - if self.issue.is_none() { - return Ok(Some(Message::Issue(IssueMessage::Leave))); + return Ok(Some(Message::Issue(IssueMessage::Leave(None)))); } + return Ok(Some(Message::Issue(IssueMessage::Focus(IssueCid::List)))); } _ => {} } diff --git a/src/ui/cob.rs b/src/ui/cob.rs index 41be51d2..e5e7adfe 100644 --- a/src/ui/cob.rs +++ b/src/ui/cob.rs @@ -103,6 +103,12 @@ impl PatchItem { } } +impl PartialEq for PatchItem { + fn eq(&self, other: &Self) -> bool { + self.id == other.id + } +} + impl TryFrom<(&Profile, &Repository, PatchId, Patch)> for PatchItem { type Error = anyhow::Error; diff --git a/src/ui/widget/common/list.rs b/src/ui/widget/common/list.rs index a704f8f7..0f899cd8 100644 --- a/src/ui/widget/common/list.rs +++ b/src/ui/widget/common/list.rs @@ -182,7 +182,7 @@ impl WidgetComponent for PropertyTable { /// A table component that can display a list of [`TableItem`]s. pub struct Table where - V: TableItem + Clone, + V: TableItem + Clone + PartialEq, { /// Items hold by this model. items: Vec, @@ -198,19 +198,25 @@ where impl Table where - V: TableItem + Clone, + V: TableItem + Clone + PartialEq, { pub fn new( items: &[V], + selected: Option, header: [Widget