diff --git a/bin/commands/inbox.rs b/bin/commands/inbox.rs index 968e127d..e7f14bc6 100644 --- a/bin/commands/inbox.rs +++ b/bin/commands/inbox.rs @@ -1,5 +1,3 @@ -#[path = "inbox/common.rs"] -mod common; #[path = "inbox/list.rs"] mod list; @@ -11,11 +9,10 @@ use radicle::storage::{HasRepoId, ReadRepository}; use radicle_cli::terminal::{Args, Error, Help}; -use crate::commands::tui_inbox::common::InboxOperation; use crate::terminal; use crate::ui::items::notification::filter::{NotificationFilter, SortBy}; -use self::common::RepositoryMode; +use self::list::{InboxOperation, RepositoryMode}; pub const HELP: Help = Help { name: "inbox", diff --git a/bin/commands/inbox/common.rs b/bin/commands/inbox/common.rs deleted file mode 100644 index 157f669c..00000000 --- a/bin/commands/inbox/common.rs +++ /dev/null @@ -1,19 +0,0 @@ -use serde::Serialize; - -use radicle::{identity::RepoId, node::notifications::NotificationId}; - -#[derive(Clone, Default, Debug, PartialEq, Eq)] -pub enum RepositoryMode { - #[default] - Contextual, - All, - ByRepo((RepoId, Option)), -} - -/// The selected issue operation returned by the operation -/// selection widget. -#[derive(Clone, Debug, Eq, PartialEq, Serialize)] -pub enum InboxOperation { - Show { id: NotificationId }, - Clear { id: NotificationId }, -} diff --git a/bin/commands/inbox/list.rs b/bin/commands/inbox/list.rs index 66514e76..5a34bc10 100644 --- a/bin/commands/inbox/list.rs +++ b/bin/commands/inbox/list.rs @@ -6,6 +6,9 @@ use std::vec; use anyhow::Result; +use serde::Serialize; + +use radicle::node::notifications::NotificationId; use ratatui::layout::{Constraint, Layout}; use ratatui::prelude::*; use ratatui::text::Span; @@ -29,12 +32,26 @@ use tui::ui::widget::{ use tui::ui::{BufferedValue, Show, Ui}; use tui::{Channel, Exit}; -use super::common::RepositoryMode; -use crate::commands::tui_inbox::common::InboxOperation; use crate::ui::items::filter::Filter; use crate::ui::items::notification::filter::{NotificationFilter, SortBy}; use crate::ui::items::notification::{Notification, NotificationKind}; +#[derive(Clone, Default, Debug, PartialEq, Eq)] +pub enum RepositoryMode { + #[default] + Contextual, + All, + ByRepo((RepoId, Option)), +} + +/// The selected issue operation returned by the operation +/// selection widget. +#[derive(Clone, Debug, Eq, PartialEq, Serialize)] +pub enum InboxOperation { + Show { id: NotificationId }, + Clear { id: NotificationId }, +} + type Selection = tui::Selection; const HELP: &str = r#"# Generic keybindings