diff --git a/crates/lantern-app/src/application.rs b/crates/lantern-app/src/application.rs index e7fdf046..54d94ae8 100644 --- a/crates/lantern-app/src/application.rs +++ b/crates/lantern-app/src/application.rs @@ -4,11 +4,10 @@ use lantern_domain::{DriveState, ProfileId, SessionId}; use crate::{ AuditHealth, Authorization, BackupCaptureRequest, BackupRestoreAction, BackupRestoreEffect, - BackupRestoreState, ConnectionAction, ConnectionAttemptKind, ConnectionEffect, - ConnectionFailure, ConnectionStep, ConnectionWizardState, Connectivity, CsvLoggingFaultSummary, - CsvLoggingStateView, FaultAction, FaultEffect, FaultTracker, MAX_PARAMETER_BROWSER_VISIBLE, - MonitoringAction, MonitoringEffect, OperationState, ParameterAction, ParameterIntentContext, - ProfileRegistry, RestoreConfirmation, SessionEffect, SessionInput, SessionState, + BackupRestoreState, ConnectionAttemptKind, ConnectionEffect, ConnectionFailure, ConnectionStep, + ConnectionWizardState, Connectivity, CsvLoggingFaultSummary, CsvLoggingStateView, FaultTracker, + MAX_PARAMETER_BROWSER_VISIBLE, MonitoringEffect, OperationState, ParameterAction, + ParameterIntentContext, ProfileRegistry, RestoreConfirmation, SessionEffect, SessionState, SessionStateMachine, WriteConfirmation, WriteConfirmationModel, WriteEffect, WriteSessionSnapshot, prepare_parameter_intent, }; @@ -20,7 +19,9 @@ mod runtime; mod state; mod view; -pub use runtime::{ApplicationEffectError, ApplicationRuntime, EffectRunner}; +pub use runtime::{ + ApplicationAction, ApplicationEffect, ApplicationEffectError, ApplicationRuntime, EffectRunner, +}; use state::{ApplicationMonitoringState, ApplicationParameterState}; use view::port_label; pub use view::{ @@ -537,28 +538,6 @@ impl ApplicationState { } } -#[derive(Clone, Debug)] -pub enum ApplicationAction { - ReplaceRegistry(Arc), - SelectProfile(ProfileId), - Connection(ConnectionAction), - Monitoring(MonitoringAction), - Parameters(ParameterAction), - Faults(FaultAction), - BackupRestore(BackupRestoreAction), - Session(SessionInput), -} - -#[derive(Clone, Debug)] -pub enum ApplicationEffect { - Connection(ConnectionEffect), - Monitoring(MonitoringEffect), - Faults(FaultEffect), - BackupRestore(BackupRestoreEffect), - Write(WriteEffect), - Session(SessionEffect), -} - #[cfg(test)] mod tests { use std::{path::PathBuf, sync::Arc}; diff --git a/crates/lantern-app/src/application/runtime.rs b/crates/lantern-app/src/application/runtime.rs index 2796041b..2c4a9147 100644 --- a/crates/lantern-app/src/application/runtime.rs +++ b/crates/lantern-app/src/application/runtime.rs @@ -1,6 +1,37 @@ +use std::sync::Arc; + +use lantern_domain::ProfileId; use thiserror::Error; -use super::{ApplicationAction, ApplicationEffect, ApplicationState}; +use crate::{ + BackupRestoreAction, BackupRestoreEffect, ConnectionAction, ConnectionEffect, FaultAction, + FaultEffect, MonitoringAction, MonitoringEffect, ParameterAction, ProfileRegistry, + SessionEffect, SessionInput, WriteEffect, +}; + +use super::ApplicationState; + +#[derive(Clone, Debug)] +pub enum ApplicationAction { + ReplaceRegistry(Arc), + SelectProfile(ProfileId), + Connection(ConnectionAction), + Monitoring(MonitoringAction), + Parameters(ParameterAction), + Faults(FaultAction), + BackupRestore(BackupRestoreAction), + Session(SessionInput), +} + +#[derive(Clone, Debug)] +pub enum ApplicationEffect { + Connection(ConnectionEffect), + Monitoring(MonitoringEffect), + Faults(FaultEffect), + BackupRestore(BackupRestoreEffect), + Write(WriteEffect), + Session(SessionEffect), +} #[derive(Debug, Error)] #[error("application effect failed: {0}")]