Radish alpha
r
radicle-tui
rad:z39mP9rQAaGmERfUMPULfPUi473tY
Radicle terminal user interface
Radicle
Git
Commits › 8ade256
issue/list: Support closing & re-opening
Erik Kundt committed 4 months ago
commit 8ade256e246d17057208622196f61056c28a5e5f
parent a0e9939
3 files changed +69 -12
modified bin/commands/issue.rs
@@ -244,7 +244,28 @@ pub async fn run(options: Options, ctx: impl Context) -> anyhow::Result<()> {
                            IssueOperation::Edit { id } => {

                                terminal::run_rad(

                                    Some("issue"),
- 
                                    &["edit".into(), id.to_string().into(), "--quiet".into()],
+ 
                                    &["edit".into(), id.to_string().into()],
+ 
                                    Quiet::No,
+ 
                                )?;
+ 
                            }
+ 
                            IssueOperation::Solve { id } => {
+ 
                                terminal::run_rad(
+ 
                                    Some("issue"),
+ 
                                    &["state".into(), id.to_string().into(), "--solved".into()],
+ 
                                    Quiet::No,
+ 
                                )?;
+ 
                            }
+ 
                            IssueOperation::Close { id } => {
+ 
                                terminal::run_rad(
+ 
                                    Some("issue"),
+ 
                                    &["state".into(), id.to_string().into(), "--closed".into()],
+ 
                                    Quiet::No,
+ 
                                )?;
+ 
                            }
+ 
                            IssueOperation::Reopen { id } => {
+ 
                                terminal::run_rad(
+ 
                                    Some("issue"),
+ 
                                    &["state".into(), id.to_string().into(), "--open".into()],

                                    Quiet::No,

                                )?;

                            }
modified bin/commands/issue/common.rs
@@ -12,6 +12,15 @@ pub enum IssueOperation {
    Show {

        id: IssueId,

    },
+ 
    Close {
+ 
        id: IssueId,
+ 
    },
+ 
    Solve {
+ 
        id: IssueId,
+ 
    },
+ 
    Reopen {
+ 
        id: IssueId,
+ 
    },

    Comment {

        id: IssueId,

        reply_to: Option<CommentId>,
modified bin/commands/issue/list.rs
@@ -249,6 +249,9 @@ pub enum RequestedIssueOperation {
    Edit,

    Show,

    Reply,
+ 
    Solve,
+ 
    Close,
+ 
    Reopen,

}



#[derive(Clone, Debug)]
@@ -299,6 +302,15 @@ impl store::Update<Message> for State {
                    Some(RequestedIssueOperation::Edit) => {

                        issue.map(|issue| IssueOperation::Edit { id: issue.id })

                    }
+ 
                    Some(RequestedIssueOperation::Solve) => {
+ 
                        issue.map(|issue| IssueOperation::Solve { id: issue.id })
+ 
                    }
+ 
                    Some(RequestedIssueOperation::Close) => {
+ 
                        issue.map(|issue| IssueOperation::Close { id: issue.id })
+ 
                    }
+ 
                    Some(RequestedIssueOperation::Reopen) => {
+ 
                        issue.map(|issue| IssueOperation::Reopen { id: issue.id })
+ 
                    }

                    Some(RequestedIssueOperation::Reply) => {

                        issue.map(|issue| IssueOperation::Comment {

                            id: issue.id,
@@ -429,22 +441,28 @@ fn browser_page(channel: &Channel<Message>) -> Widget<State, Message> {
            let shortcuts = if state.browser.is_search_shown() {

                vec![("esc", "cancel"), ("enter", "apply")]

            } else {
- 
                let mut shortcuts = vec![];
- 
                if state.section == Some(Section::Browser) {
- 
                    shortcuts = [
- 
                        shortcuts,
- 
                        [("enter", "show"), ("e", "edit"), ("/", "search")].to_vec(),
- 
                    ]
- 
                    .concat()
- 
                }
- 
                if state.section != Some(Section::Browser) {
- 
                    shortcuts = [shortcuts, [("c", "reply")].to_vec()].concat()
+ 
                match state.section {
+ 
                    Some(Section::Browser) => {
+ 
                        let mut shortcuts =
+ 
                            [("/", "search"), ("enter", "show"), ("e", "edit")].to_vec();
+ 
                        if let Some(issue) = state.browser.selected_item() {
+ 
                            use radicle::issue::State;
+ 
                            let actions = match issue.state {
+ 
                                State::Open => [("s", "solve"), ("l", "close")].to_vec(),
+ 
                                State::Closed { .. } => [("o", "re-open")].to_vec(),
+ 
                            };
+ 
                            shortcuts = [shortcuts, actions.to_vec()].concat();
+ 
                        }
+ 
                        shortcuts
+ 
                    }
+ 
                    _ => [("c", "reply")].to_vec(),

                }
- 
                [shortcuts, [("p", "toggle preview"), ("?", "help")].to_vec()].concat()

            };
+ 
            let global_shortcuts = vec![("p", "toggle preview"), ("?", "help")];



            ShortcutsProps::default()

                .shortcuts(&shortcuts)
+ 
                .global_shortcuts(&global_shortcuts)

                .shortcuts_keys_style(state.theme.shortcuts_keys_style)

                .shortcuts_action_style(state.theme.shortcuts_action_style)

                .to_boxed_any()
@@ -528,6 +546,15 @@ fn browser(channel: &Channel<Message>) -> Widget<State, Message> {
                        Key::Char('e') => Some(Message::Exit {

                            operation: Some(RequestedIssueOperation::Edit),

                        }),
+ 
                        Key::Char('s') => Some(Message::Exit {
+ 
                            operation: Some(RequestedIssueOperation::Solve),
+ 
                        }),
+ 
                        Key::Char('l') => Some(Message::Exit {
+ 
                            operation: Some(RequestedIssueOperation::Close),
+ 
                        }),
+ 
                        Key::Char('o') => Some(Message::Exit {
+ 
                            operation: Some(RequestedIssueOperation::Reopen),
+ 
                        }),

                        _ => None,

                    }

                } else {