radicle/radicle-tui
1
0
Fork 0
mirror of https://seed.radicle.dev/rad:z39mP9rQAaGmERfUMPULfPUi473tY.git synced 2026-11-11 14:10:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

lib: Show aliases

Browse Source
This commit is contained in:
Erik Kundt
2024-01-08 11:02:00 +01:00
parent 67b8435d19
commit fded6f2ebf
4 changed files with 52 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/commands/issue/suite/ui.rs
+8 -3
View File
@@ -1,3 +1,5 @@
use radicle::node::AliasStore;
use radicle::cob::thread::Comment;
use radicle::cob::thread::CommentId;
@@ -164,7 +166,10 @@ impl IssueHeader {
let repo = context.repository();
let (id, issue) = issue;
let by_you = *issue.author().id() == context.profile().did();
let author = issue.author();
let author = author.id();
let alias = context.profile().aliases().alias(author);
let by_you = *author == context.profile().did();
let item = IssueItem::from((context.profile(), repo, id, issue.clone()));
let title = Property::new(
@@ -174,7 +179,7 @@ impl IssueHeader {
let author = Property::new(
tui::ui::label("Author").foreground(theme.colors.property_name_fg),
tui::ui::label(&cob::format_author(issue.author().id(), by_you))
tui::ui::label(&cob::format_author(issue.author().id(), &alias, by_you))
.foreground(theme.colors.browser_list_author),
);
@@ -195,7 +200,7 @@ impl IssueHeader {
&item
.assignees()
.iter()
.map(|item| (item.did(), item.is_you()))
.map(|item| (item.did(), item.alias(), item.is_you()))
.collect::<Vec<_>>(),
))
.foreground(theme.colors.browser_list_author),
bin/commands/patch/suite/ui.rs
+4 -1
View File
@@ -1,4 +1,5 @@
use radicle::cob::patch::{Patch, PatchId};
use radicle::node::AliasStore;
use tuirealm::command::{Cmd, CmdResult};
use tuirealm::tui::layout::Rect;
@@ -205,7 +206,9 @@ pub fn context(context: &Context, theme: &Theme, patch: (PatchId, Patch)) -> Wid
let id = cob::format::cob(&id);
let title = patch.title();
let author = cob::format_author(patch.author().id(), is_you);
let author = patch.author().id();
let alias = context.profile().aliases().alias(author);
let author = cob::format_author(author, &alias, is_you);
let comments = rev.discussion().len();
tui::ui::widget::context::bar(theme, "Patch", &id, title, &author, &comments.to_string())
src/ui/cob.rs
+39 -13
View File
@@ -6,6 +6,8 @@ use tuirealm::props::{Color, Style};
use tuirealm::tui::text::{Span, Spans};
use tuirealm::tui::widgets::Cell;
use radicle::node::{Alias, AliasStore};
use radicle::prelude::Did;
use radicle::storage::git::Repository;
use radicle::storage::{Oid, ReadRepository};
@@ -26,6 +28,8 @@ use crate::ui::widget::list::{ListItem, TableItem};
pub struct AuthorItem {
/// The author's DID.
did: Did,
/// The author's alias
alias: Option<Alias>,
/// True if the author is the current user.
is_you: bool,
}
@@ -38,6 +42,10 @@ impl AuthorItem {
pub fn is_you(&self) -> bool {
self.is_you
}
pub fn alias(&self) -> Option<Alias> {
self.alias.clone()
}
}
/// A patch item that can be used in tables, list or trees.
@@ -114,13 +122,15 @@ impl TryFrom<(&Profile, &Repository, PatchId, Patch)> for PatchItem {
let base = repo.commit(rev.base())?;
let head = repo.commit(rev.head())?;
let diff = repo.diff(base.id, head.id)?;
let author = patch.author().id;
Ok(PatchItem {
id,
state: patch.state().clone(),
title: patch.title().into(),
author: AuthorItem {
did: patch.author().id,
did: author,
alias: profile.aliases().alias(&author),
is_you: *patch.author().id == *profile.did(),
},
head: rev.head(),
@@ -142,8 +152,12 @@ impl TableItem<8> for PatchItem {
let title = Cell::from(self.title.clone())
.style(Style::default().fg(theme.colors.browser_list_title));
let author = Cell::from(format_author(&self.author.did, self.author.is_you))
.style(Style::default().fg(theme.colors.browser_list_author));
let author = Cell::from(format_author(
&self.author.did,
&self.author.alias,
self.author.is_you,
))
.style(Style::default().fg(theme.colors.browser_list_author));
let head = Cell::from(format::oid(self.head))
.style(Style::default().fg(theme.colors.browser_patch_list_head));
@@ -216,6 +230,7 @@ impl IssueItem {
impl From<(&Profile, &Repository, IssueId, Issue)> for IssueItem {
fn from(value: (&Profile, &Repository, IssueId, Issue)) -> Self {
let (profile, _, id, issue) = value;
let author = issue.author().id;
IssueItem {
id,
@@ -223,6 +238,7 @@ impl From<(&Profile, &Repository, IssueId, Issue)> for IssueItem {
title: issue.title().into(),
author: AuthorItem {
did: issue.author().id,
alias: profile.aliases().alias(&author),
is_you: *issue.author().id == *profile.did(),
},
labels: issue.labels().cloned().collect(),
@@ -230,6 +246,7 @@ impl From<(&Profile, &Repository, IssueId, Issue)> for IssueItem {
.assignees()
.map(|did| AuthorItem {
did: *did,
alias: profile.aliases().alias(did),
is_you: *did == profile.did(),
})
.collect::<Vec<_>>(),
@@ -249,8 +266,12 @@ impl TableItem<7> for IssueItem {
let title = Cell::from(self.title.clone())
.style(Style::default().fg(theme.colors.browser_list_title));
let author = Cell::from(format_author(&self.author.did, self.author.is_you))
.style(Style::default().fg(theme.colors.browser_list_author));
let author = Cell::from(format_author(
&self.author.did,
&self.author.alias,
self.author.is_you,
))
.style(Style::default().fg(theme.colors.browser_list_author));
let labels = Cell::from(format_labels(&self.labels))
.style(Style::default().fg(theme.colors.browser_list_labels));
@@ -258,7 +279,7 @@ impl TableItem<7> for IssueItem {
let assignees = self
.assignees
.iter()
.map(|author| (author.did, author.is_you))
.map(|author| (author.did, author.alias.clone(), author.is_you))
.collect::<Vec<_>>();
let assignees = Cell::from(format_assignees(&assignees))
.style(Style::default().fg(theme.colors.browser_list_author));
@@ -284,7 +305,7 @@ impl ListItem for IssueItem {
Spans::from(vec![
Span::raw(String::from(" ")),
Span::styled(
format_author(&self.author.did, self.author.is_you),
format_author(&self.author.did, &self.author.alias, self.author.is_you),
Style::default().fg(theme.colors.browser_list_author),
),
Span::styled(
@@ -319,11 +340,16 @@ pub fn format_patch_state(state: &PatchState) -> (String, Color) {
}
}
pub fn format_author(did: &Did, is_you: bool) -> String {
pub fn format_author(did: &Did, alias: &Option<Alias>, is_you: bool) -> String {
let author = match alias {
Some(alias) => format!("{alias}"),
None => format::did(did),
};
if is_you {
format!("{} (you)", format::did(did))
format!("{} (you)", author)
} else {
format::did(did)
author
}
}
@@ -348,12 +374,12 @@ pub fn format_labels(labels: &[Label]) -> String {
output
}
pub fn format_assignees(assignees: &[(Did, bool)]) -> String {
pub fn format_assignees(assignees: &[(Did, Option<Alias>, bool)]) -> String {
let mut output = String::new();
let mut assignees = assignees.iter().peekable();
while let Some((assignee, is_you)) = assignees.next() {
output.push_str(&format_author(assignee, *is_you));
while let Some((assignee, alias, is_you)) = assignees.next() {
output.push_str(&format_author(assignee, alias, *is_you));
if assignees.peek().is_some() {
output.push(',');
src/ui/theme.rs
+1 -1
View File
@@ -95,7 +95,7 @@ pub fn default_dark() -> Theme {
browser_list_id: Color::Cyan,
browser_list_title: COLOR_DEFAULT_FG,
browser_list_description: COLOR_DEFAULT_DARK,
browser_list_author: Color::Gray,
browser_list_author: Color::Magenta,
browser_list_labels: Color::LightBlue,
browser_list_comments: COLOR_DEFAULT_DARK_FG,
browser_list_timestamp: COLOR_DEFAULT_DARK,