wip: native home-screen

Author: kruss

application/apps/indexer/gui/application/Cargo.toml

@@ -40,6 +40,7 @@ chrono-tz.workspace = true
 dirs.workspace = true
 serialport.workspace = true
 dlt-core.workspace = true
+blake3.workspace = true
 rustc-hash = "2.1"
 
 #TODO: Replace env logger with log4rs

application/apps/indexer/gui/application/src/host/command.rs

@@ -1,3 +1,6 @@
+use serde::Deserialize;
+use serde::ser::{Serialize, SerializeStruct, Serializer};
+
 use std::{path::PathBuf, sync::mpsc::Sender as StdSender};
 
 use stypes::FileFormat;
@@ -50,9 +53,38 @@ pub struct DltStatisticsParam {
     pub source_paths: Vec<PathBuf>,
 }
 
-#[derive(Debug, Clone)]
+/// The serialization of StartSessionParam is used for the recent files of home-screen.
+///
+/// Note: Only properties needed to recreate a session should be serialized.
+#[derive(Deserialize, Debug, Clone)]
 pub struct StartSessionParam {
     pub parser: ParserConfig,
     pub source: ByteSourceConfig,
+
+    #[serde(skip)]
     pub session_setup_id: Option<Uuid>,
 }
+
+impl Serialize for StartSessionParam {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        if matches!(self.parser, ParserConfig::Plugins) {
+            return Err(serde::ser::Error::custom(
+                "Plugin parser cannot be serialized",
+            ));
+        }
+
+        if matches!(self.source, ByteSourceConfig::Stream(_)) {
+            return Err(serde::ser::Error::custom(
+                "Stream source cannot be serialized",
+            ));
+        }
+
+        let mut state = serializer.serialize_struct("StartSessionParam", 2)?;
+        state.serialize_field("parser", &self.parser)?;
+        state.serialize_field("source", &self.source)?;
+        state.end()
+    }
+}

application/apps/indexer/gui/application/src/host/service/mod.rs

@@ -25,6 +25,7 @@ use crate::{
         message::HostMessage,
         notification::AppNotification,
         ui::{
+            home::settings::SessionConfig,
             multi_setup::state::MultiFileState,
             session_setup::state::{
                 SessionSetupState,
@@ -122,13 +123,16 @@ impl HostService {
             }
 
             HostCommand::StartSession(start_params) => {
+                let json = serde_json::to_string_pretty(&start_params).ok();
+
                 let StartSessionParam {
                     parser,
                     source,
                     session_setup_id,
                 } = *start_params;
 
-                self.start_session(source, parser, session_setup_id).await?;
+                self.start_session(source, parser, json, session_setup_id)
+                    .await?;
             }
             HostCommand::CloseSessionSetup(id) => {
                 // NOTE: We need to checks here for cleaning up session setups (Like cancelling
@@ -467,8 +471,11 @@ impl HostService {
         &self,
         source: ByteSourceConfig,
         parser: ParserConfig,
+        json: Option<String>,
         session_setup_id: Option<Uuid>,
     ) -> Result<(), HostError> {
+        let description = format!("{}", parser);
+
         let origin = match source {
             ByteSourceConfig::File(source_file_info) => ObserveOrigin::File(
                 Uuid::new_v4().to_string(),
@@ -568,9 +575,17 @@ impl HostService {
 
         let origin = ObserveOptions { origin, parser };
 
-        let session_params =
+        let mut session_params =
             SessionService::spawn(self.communication.senders.get_shared_senders(), origin).await?;
 
+        if let Some(json) = json {
+            session_params.session_info.config = Some(SessionConfig {
+                id: blake3::hash(json.as_bytes()).to_hex().to_string(),
+                description,
+                json,
+            });
+        }
+
         self.communication
             .senders
             .send_message(HostMessage::SessionCreated {

application/apps/indexer/gui/application/src/host/ui/home/mod.rs

@@ -2,7 +2,9 @@ use crate::common::phosphor::icons;
 use crate::host::command::HostCommand;
 use crate::host::common::parsers::ParserNames;
 use crate::host::common::sources::StreamNames;
+use crate::host::notification::AppNotification;
 use crate::host::ui::APP_SETTINGS;
+use crate::host::ui::StartSessionParam;
 use crate::host::ui::UiActions;
 use crate::host::ui::home::settings::FavoriteFolder;
 use crate::host::ui::home::settings::HomeSettings;
@@ -61,7 +63,7 @@ pub fn home_screen(
         .resizable(true)
         .show_inside(ui, |ui| {
             ui.with_layout(Layout::top_down_justified(Align::LEFT), |ui| {
-                draw_quick_actions(ui, actions, state, cmd_tx);
+                draw_quick_actions(ui, actions, cmd_tx);
             });
         });
 
@@ -80,15 +82,14 @@ pub fn home_screen(
     CentralPanel::default().show_inside(ui, |ui| {
         ui.with_layout(Layout::top_down_justified(Align::LEFT), |ui| {
             ui.heading("Recently opened");
-            draw_recent_files(ui, state);
+            draw_recent_files(ui, actions, state, cmd_tx);
         });
     });
 }
 
 pub fn draw_quick_actions(
     ui: &mut egui::Ui,
     actions: &mut UiActions,
-    state: &mut HomeSettings,
     cmd_tx: &Sender<HostCommand>,
 ) {
     if let Some(paths) = actions.file_dialog.take_output(ACTION_FILES_ID)
@@ -175,15 +176,22 @@ fn action_button(
     });
 }
 
-fn draw_recent_files(ui: &mut egui::Ui, state: &mut HomeSettings) {
+fn draw_recent_files(
+    ui: &mut egui::Ui,
+    actions: &mut UiActions,
+    state: &mut HomeSettings,
+    cmd_tx: &Sender<HostCommand>,
+) {
     egui::ScrollArea::vertical()
         .id_salt("recent_files_scroll")
         .show(ui, |ui| {
             ui.label("List of recently opened sources.");
             ui.add_space(5.0);
 
+            let mut remove_file: Option<String> = None;
+
             for file in &mut state.recent_files {
-                ui.collapsing(file.path.display().to_string(), |ui| {
+                ui.collapsing(file.title.clone(), |ui| {
                     ui.horizontal(|ui| {
                         if ui
                             .add(
@@ -193,7 +201,7 @@ fn draw_recent_files(ui: &mut egui::Ui, state: &mut HomeSettings) {
                             .on_hover_text("Remove entry")
                             .clicked()
                         {
-                            print!("remove recent entry...");
+                            remove_file = Some(file.title.clone());
                         }
 
                         if ui
@@ -207,6 +215,8 @@ fn draw_recent_files(ui: &mut egui::Ui, state: &mut HomeSettings) {
                         }
                     });
 
+                    let mut remove_cfg: Option<String> = None;
+
                     for cfg in &file.configurations {
                         ui.horizontal(|ui| {
                             if ui
@@ -219,7 +229,7 @@ fn draw_recent_files(ui: &mut egui::Ui, state: &mut HomeSettings) {
                                 .on_hover_text("Open configuration")
                                 .clicked()
                             {
-                                print!("open configuration...");
+                                open_configuration(actions, cmd_tx, &cfg.json);
                             }
 
                             if ui
@@ -232,18 +242,37 @@ fn draw_recent_files(ui: &mut egui::Ui, state: &mut HomeSettings) {
                                 .on_hover_text("Remove configuration")
                                 .clicked()
                             {
-                                print!("remove configuration...");
+                                remove_cfg = Some(cfg.id.clone());
                             }
 
-                            ui.label(&cfg.name);
-                            ui.label(&cfg.info());
+                            ui.label(&cfg.description);
                         });
                     }
+
+                    if let Some(id) = remove_cfg {
+                        file.configurations.retain(|c| c.id != id);
+                    }
                 });
             }
+
+            if let Some(title) = remove_file {
+                state.recent_files.retain(|f| f.title != title);
+            }
         });
 }
 
+fn open_configuration(actions: &mut UiActions, cmd_tx: &Sender<HostCommand>, json: &String) {
+    match serde_json::from_str::<StartSessionParam>(json) {
+        Ok(param) => {
+            let cmd = HostCommand::StartSession(Box::new(param));
+            actions.try_send_command(cmd_tx, cmd);
+        }
+        Err(err) => {
+            actions.add_notification(AppNotification::Error(err.to_string()));
+        }
+    }
+}
+
 fn draw_favorite_folders(
     ui: &mut egui::Ui,
     actions: &mut UiActions,

application/apps/indexer/gui/application/src/host/ui/home/settings.rs

@@ -34,69 +34,23 @@ impl HomeSettings {
             folder.scan_files();
         }
     }
-
-    pub fn with_test_data(mut self) -> HomeSettings {
-        self.recent_files = vec![
-            RecentFile {
-                path: PathBuf::from("C:/Users/Example/Documents/file1.json"),
-                last_opened: 1680000000,
-                configurations: vec![
-                    FileConfiguration {
-                        name: "Default".to_string(),
-                        model: "Model A".to_string(),
-                        filter: "Filter X".to_string(),
-                    },
-                    FileConfiguration {
-                        name: "Custom".to_string(),
-                        model: "Model B".to_string(),
-                        filter: "Filter Y".to_string(),
-                    },
-                ],
-            },
-            RecentFile {
-                path: PathBuf::from("C:/Users/Example/Documents/file2.json"),
-                last_opened: 1685000000,
-                configurations: vec![FileConfiguration {
-                    name: "Default".to_string(),
-                    model: "Model C".to_string(),
-                    filter: "Filter Z".to_string(),
-                }],
-            },
-        ];
-
-        self.favorite_folders = vec![
-            FavoriteFolder {
-                path: PathBuf::from("/Users/kevin.russ/EDF/_dlt"),
-                files: vec![],
-            },
-            FavoriteFolder {
-                path: PathBuf::from("/Users/kevin.russ/EDF/_mdf"),
-                files: vec![],
-            },
-        ];
-
-        self
-    }
 }
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct RecentFile {
-    pub path: PathBuf,
+    pub title: String,
     pub last_opened: u64,
-    pub configurations: Vec<FileConfiguration>,
+    pub configurations: Vec<SessionConfig>,
 }
 
-#[derive(Serialize, Deserialize, Debug)]
-pub struct FileConfiguration {
-    pub name: String,
-    pub model: String,
-    pub filter: String,
-}
-
-impl FileConfiguration {
-    pub fn info(&self) -> String {
-        format!("{} - {}", self.model, self.filter) // TODO
-    }
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct SessionConfig {
+    /// Hash representing an unique config.
+    pub id: String,
+    /// Description of the config shown in UI.
+    pub description: String,
+    /// Serialized [StartSessionParam] of the config.
+    pub json: String,
 }
 
 #[derive(Serialize, Deserialize, Debug)]

application/apps/indexer/gui/application/src/host/ui/mod.rs

@@ -32,7 +32,7 @@ use state::HostState;
 pub use actions::{HostAction, UiActions};
 
 pub mod actions;
-mod home;
+pub mod home;
 mod menu;
 pub mod multi_setup;
 mod notification;

application/apps/indexer/gui/application/src/host/ui/session_setup/state/parsers/dlt.rs

@@ -1,4 +1,5 @@
 use rustc_hash::{FxHashMap, FxHashSet};
+use serde::{Deserialize, Serialize};
 use std::{fmt::Display, path::PathBuf};
 use stypes::{DltParserSettings, ObserveOrigin};
 
@@ -10,16 +11,20 @@ use super::FibexFileInfo;
 use crate::host::common::dlt_stats::{DltStatistics, LevelDistribution};
 
 /// DLT Configurations to be used in front-end
-#[derive(Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct DltParserConfig {
     pub with_storage_header: bool,
     pub log_level: DltLogLevel,
     pub source_paths: Option<Vec<PathBuf>>,
     pub fibex_files: Vec<FibexFileInfo>,
     pub timezone: Option<String>,
+    #[serde(skip)]
     pub timezone_filter: String,
+    #[serde(skip)]
     pub timezone_list: Vec<(String, i32)>,
+    #[serde(skip)]
     pub dlt_statistics: Option<Box<DltStatistics>>,
+    #[serde(skip)]
     pub dlt_summary: Box<DltSummary>,
     pub dlt_tables: Box<DltTables>,
 }
@@ -106,7 +111,7 @@ impl DltParserConfig {
     }
 }
 
-#[derive(Debug, Clone, Default)]
+#[derive(Serialize, Deserialize, Debug, Clone, Default)]
 pub struct DltTables {
     pub app_table: TableConfig,
     pub ctx_table: TableConfig,
@@ -127,11 +132,14 @@ impl DltTables {
     }
 }
 
-#[derive(Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct TableConfig {
     pub selected_ids: FxHashSet<String>,
+    #[serde(skip)]
     pub column_sort: Option<(usize, bool)>,
+    #[serde(skip)]
     pub is_changed: bool,
+    #[serde(skip)]
     pub is_collapsed: bool,
 }
 
@@ -157,7 +165,7 @@ impl TableConfig {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, PartialOrd, Ord, Eq)]
+#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, PartialOrd, Ord, Eq)]
 pub enum DltLogLevel {
     Fatal = 1,
     Error = 2,