ce1d29a issue/list: Dissolve common module — radicle-tui

rad:z39mP9rQAaGmERfUMPULfPUi473tY

Radicle terminal user interface

issue/list: Dissolve common module

Erik Kundt committed 3 months ago

commit ce1d29aefbafc65b491a20d5f3559bc89c287d96
parent ae40ca2

3 files changed +34 -39

modified bin/commands/issue.rs

@@ -1,5 +1,3 @@

 #[path = "issue/common.rs"]
 mod common;
 #[path = "issue/list.rs"]
 mod list;

@@ -21,7 +19,7 @@ use cli::terminal::Context;

 use cli::terminal::{Args, Error, Help};
 use crate::cob;
 use crate::commands::tui_issue::common::IssueOperation;
 use crate::commands::tui_issue::list::IssueOperation;
 use crate::terminal;
 use crate::ui::TerminalInfo;

deleted bin/commands/issue/common.rs

@@ -1,34 +0,0 @@

 use serde::Serialize;
 use radicle::{cob::thread::CommentId, issue::IssueId};
 /// The selected issue operation returned by the operation
 /// selection widget.
 #[derive(Clone, Debug, Eq, PartialEq, Serialize)]
 pub enum IssueOperation {
     Edit {
         id: IssueId,
         comment_id: Option<CommentId>,
         search: String,
     },
     Show {
         id: IssueId,
     },
     Close {
         id: IssueId,
         search: String,
     },
     Solve {
         id: IssueId,
         search: String,
     },
     Reopen {
         id: IssueId,
         search: String,
     },
     Comment {
         id: IssueId,
         reply_to: Option<CommentId>,
         search: String,
     },
 }

modified bin/commands/issue/list.rs

@@ -2,6 +2,8 @@ use std::collections::{HashMap, HashSet};

 use std::str::FromStr;
 use std::sync::{Arc, Mutex};
 use serde::Serialize;
 use anyhow::{bail, Result};
 use ratatui::layout::{Alignment, Constraint, Layout, Position};

@@ -35,10 +37,39 @@ use crate::ui::items::issue::{Issue, IssueFilter};

 use crate::ui::items::HasId;
 use crate::ui::{format, TerminalInfo};
 use crate::tui_issue::common::IssueOperation;
 type Selection = tui::Selection<IssueOperation>;
 /// The selected issue operation returned by the operation
 /// selection widget.
 #[derive(Clone, Debug, Eq, PartialEq, Serialize)]
 pub enum IssueOperation {
     Edit {
         id: IssueId,
         comment_id: Option<CommentId>,
         search: String,
     },
     Show {
         id: IssueId,
     },
     Close {
         id: IssueId,
         search: String,
     },
     Solve {
         id: IssueId,
         search: String,
     },
     Reopen {
         id: IssueId,
         search: String,
     },
     Comment {
         id: IssueId,
         reply_to: Option<CommentId>,
         search: String,
     },
 }
 const HELP: &str = r#"# Generic keybindings
 `↑,k`:      move cursor one line up