add tui delete file option

Author: Panaetius

coman/src/app/user_events.rs

@@ -18,6 +18,8 @@ pub enum FileEvent {
     List(String, Vec<PathEntry>), // Id, Subpaths
     DownloadCurrentFile,
     DownloadSuccessful,
+    DeleteCurrentFile,
+    DeleteSuccessful(String),
 }
 
 #[derive(Debug, Eq, Clone, PartialEq, PartialOrd, Ord)]

coman/src/components/context_menu.rs

@@ -47,6 +47,8 @@ impl ContextMenu {
             .add_row()
             .add_col(TextSpan::from("Download").fg(Color::Cyan))
             .add_row()
+            .add_col(TextSpan::from("Delete").fg(Color::Cyan))
+            .add_row()
             .add_col(TextSpan::from("Quit").fg(Color::Cyan))
             .add_row()
             .build()
@@ -58,7 +60,8 @@ impl ContextMenu {
             2 => Some(Msg::Menu(MenuMsg::Event(UserEvent::File(
                 FileEvent::DownloadCurrentFile,
             )))),
-            3 => Some(Msg::AppClose),
+            3 => Some(Msg::Menu(MenuMsg::Event(UserEvent::File(FileEvent::DeleteCurrentFile)))),
+            4 => Some(Msg::AppClose),
             _ => Some(Msg::Menu(MenuMsg::Closed)),
         }
     }

coman/src/components/file_tree.rs

@@ -15,6 +15,7 @@ use crate::{
         user_events::{FileEvent, UserEvent},
     },
     cscs::{api_client::types::PathType, ports::BackgroundTask},
+    trace_dbg,
 };
 
 #[derive(Debug, PartialEq, PartialOrd, Ord, Eq, Clone)]
@@ -174,6 +175,27 @@ impl Component<Msg, UserEvent> for FileTree {
                 }
                 CmdResult::None
             }
+            Event::User(UserEvent::File(FileEvent::DeleteCurrentFile)) => {
+                if let State::One(StateValue::String(id)) = self.state() {
+                    let tree_tx = self.file_tree_tx.clone();
+                    let id = trace_dbg!(id);
+                    tokio::spawn(async move {
+                        tree_tx.send(BackgroundTask::DeleteFile(id)).await.unwrap();
+                    });
+                }
+                CmdResult::None
+            }
+            Event::User(UserEvent::File(FileEvent::DeleteSuccessful(id))) => {
+                let mut selected_id = id.clone();
+                let tree = self.component.tree_mut();
+                let parent = tree.root_mut().parent_mut(&id);
+                if let Some(parent) = parent {
+                    parent.remove_child(&id);
+                    selected_id = parent.id().clone();
+                }
+                self.attr(Attribute::Custom(TREE_INITIAL_NODE), AttrValue::String(selected_id));
+                CmdResult::Changed(self.component.state())
+            }
             _ => CmdResult::None,
         };
         Some(Msg::None)

coman/src/cscs/handlers.rs

@@ -700,6 +700,28 @@ pub async fn cscs_file_list(
     }
 }
 
+pub async fn cscs_file_delete(
+    remote: PathBuf,
+    system: Option<String>,
+    platform: Option<ComputePlatform>,
+) -> Result<()> {
+    match get_access_token().await {
+        Ok(access_token) => {
+            let api_client = CscsApi::new(access_token.0, platform).unwrap();
+            let config = Config::new().unwrap();
+            let current_system = &system.unwrap_or(config.values.cscs.current_system);
+            let paths = api_client.list_path(current_system, remote.clone()).await?;
+            let path = paths.first().ok_or(eyre!("remote path doesn't exist"))?;
+            if let PathType::Directory = path.path_type {
+                return Err(eyre!("remote path must be a file, not directory"));
+            }
+            api_client.rm_path(current_system, remote).await?;
+            Ok(())
+        }
+        Err(e) => Err(e),
+    }
+}
+
 pub async fn cscs_file_download(
     remote: PathBuf,
     local: PathBuf,

coman/src/cscs/ports.rs

@@ -18,8 +18,8 @@ use crate::{
     cscs::{
         api_client::types::{JobStatus, PathEntry, PathType},
         handlers::{
-            cscs_file_download, cscs_file_list, cscs_job_cancel, cscs_job_details, cscs_job_list, cscs_job_log,
-            cscs_stat_path, cscs_system_list, cscs_user_info,
+            cscs_file_delete, cscs_file_download, cscs_file_list, cscs_job_cancel, cscs_job_details, cscs_job_list,
+            cscs_job_log, cscs_stat_path, cscs_system_list, cscs_user_info,
         },
         oauth2::{ACCESS_TOKEN_SECRET_NAME, REFRESH_TOKEN_SECRET_NAME, finish_cscs_device_login},
     },
@@ -221,9 +221,11 @@ impl PollAsync<UserEvent> for AsyncJobLogPort {
     }
 }
 
+#[derive(Debug)]
 pub enum BackgroundTask {
     ListPaths(PathBuf),
     DownloadFile(PathBuf, PathBuf),
+    DeleteFile(String),
     GetJobDetails(usize),
     CancelJob(usize),
 }
@@ -350,6 +352,16 @@ async fn download_file(
         ))))),
     }
 }
+async fn delete_file(id: String) -> Result<Option<Event<UserEvent>>> {
+    let remote = PathBuf::from(id.clone());
+    match cscs_file_delete(remote, None, None).await {
+        Ok(()) => Ok(Some(Event::User(UserEvent::File(FileEvent::DeleteSuccessful(id))))),
+        Err(e) => Ok(Some(Event::User(UserEvent::Error(format!(
+            "{:?}",
+            Err::<(), Report>(e).wrap_err("couldn't delete path")
+        ))))),
+    }
+}
 #[tuirealm::async_trait]
 impl PollAsync<UserEvent> for AsyncBackgroundTaskPort {
     async fn poll(&mut self) -> ListenerResult<Option<Event<UserEvent>>> {
@@ -373,6 +385,13 @@ impl PollAsync<UserEvent> for AsyncBackgroundTaskPort {
                         Err::<(), Report>(e).wrap_err("couldn't download file")
                     ))))),
                 },
+                BackgroundTask::DeleteFile(remote) => match delete_file(remote).await {
+                    Ok(event) => Ok(event),
+                    Err(e) => Ok(Some(Event::User(UserEvent::Error(format!(
+                        "{:?}",
+                        Err::<(), Report>(e).wrap_err("couldn't delete file")
+                    ))))),
+                },
                 BackgroundTask::GetJobDetails(job_id) => match cscs_job_details(job_id as i64, None, None).await {
                     Ok(Some(details)) => Ok(Some(Event::User(UserEvent::Cscs(CscsEvent::GotJobDetails(details))))),
                     Ok(None) => Ok(Some(Event::None)),

coman/src/main.rs

@@ -220,30 +220,18 @@ 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()]),
-            ),
-            Sub::new(
-                SubEventClause::Discriminant(UserEvent::Job(app::user_events::JobEvent::Cancel)),
-                SubClause::AndMany(vec![SubClause::IsMounted(Id::WorkloadList), popup_exclusion_clause()]),
-            ),
-        ],
+        vec![Sub::new(
+            SubEventClause::Any,
+            SubClause::AndMany(vec![SubClause::IsMounted(Id::WorkloadList), popup_exclusion_clause()]),
+        )],
     )?;
     app.mount(
         Id::FileView,
         Box::new(FileTree::new(background_task_tx.clone())),
-        vec![
-            Sub::new(
-                SubEventClause::Discriminant(UserEvent::File(FileEvent::List("".to_owned(), vec![]))),
-                SubClause::Always,
-            ),
-            Sub::new(
-                SubEventClause::Any,
-                SubClause::AndMany(vec![SubClause::IsMounted(Id::FileView), popup_exclusion_clause()]),
-            ),
-        ],
+        vec![Sub::new(
+            SubEventClause::Any,
+            SubClause::AndMany(vec![SubClause::IsMounted(Id::FileView), popup_exclusion_clause()]),
+        )],
     )?;
     app.mount(
         Id::GlobalListener,