handle focus bettew between file and workload lists

Author: Panaetius

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "coman"
-version = "0.6.0"
+version = "0.7.0"
 edition = "2024"
 description = "Compute Manager for managing HPC compute"
 authors = ["Ralf Grubenmann <ralf.grubenmann@sdsc.ethz.ch>"]

coman/Cargo.toml

@@ -410,6 +410,14 @@ where
     }
     fn change_view(&mut self, view: View) {
         self.current_view = view;
+        match self.current_view {
+            View::Workloads => {
+                assert!(self.app.active(&Id::WorkloadList).is_ok());
+            }
+            View::Files => {
+                assert!(self.app.active(&Id::FileView).is_ok());
+            }
+        }
     }
 }
 

coman/src/app/model.rs

@@ -11,7 +11,7 @@ use tuirealm::{
 use crate::{
     app::{
         messages::{JobMsg, Msg},
-        user_events::{CscsEvent, UserEvent},
+        user_events::{CscsEvent, JobEvent, UserEvent},
     },
     cscs::api_client::types::Job,
 };
@@ -81,7 +81,7 @@ impl Component<Msg, UserEvent> for WorkloadList {
                 }
                 self.perform(Cmd::Change)
             }
-            Event::User(UserEvent::Job(crate::app::user_events::JobEvent::Cancel)) => {
+            Event::User(UserEvent::Job(JobEvent::Cancel)) => {
                 if let State::One(StateValue::Usize(index)) = self.state()
                     && !self.jobs.is_empty()
                 {

coman/src/components/workload_list.rs

@@ -16,7 +16,7 @@ use crate::{
         ids::Id,
         messages::{Msg, View},
         model::Model,
-        user_events::{CscsEvent, FileEvent, StatusEvent, UserEvent},
+        user_events::{CscsEvent, FileEvent, JobEvent, StatusEvent, UserEvent},
     },
     cli::{
         app::{
@@ -233,17 +233,23 @@ fn run_tui(tick_rate: f64) -> Result<()> {
     app.mount(
         Id::WorkloadList,
         Box::new(WorkloadList::default()),
-        vec![Sub::new(
-            SubEventClause::Any,
-            SubClause::AndMany(vec![SubClause::IsMounted(Id::WorkloadList), popup_exclusion_clause()]),
-        )],
+        vec![
+            Sub::new(
+                SubEventClause::Discriminant(UserEvent::Cscs(CscsEvent::LoggedIn)),
+                SubClause::Always,
+            ),
+            Sub::new(
+                SubEventClause::Discriminant(UserEvent::Job(JobEvent::Cancel)),
+                SubClause::Always,
+            ),
+        ],
     )?;
     app.mount(
         Id::FileView,
         Box::new(FileTree::new(background_task_tx.clone())),
         vec![Sub::new(
-            SubEventClause::Any,
-            SubClause::AndMany(vec![SubClause::IsMounted(Id::FileView), popup_exclusion_clause()]),
+            SubEventClause::Discriminant(UserEvent::File(FileEvent::DownloadCurrentFile)),
+            SubClause::Always,
         )],
     )?;
     app.mount(