refactor: move row id into display settings

Author: c-git

src/app.rs

@@ -30,9 +30,6 @@ pub struct LogViewerApp {
     track_item_align: Option<Align>,
     shortcuts: Shortcuts,
     should_scroll_to_end_on_load: bool,
-    // TODO 4: Add UI to set / unset row_idx_field_name
-    /// When set adds a field with this name and populates it with the row numbers
-    row_idx_field_name: Option<String>,
     /// Allows the user to dim the warning by clicking on it
     should_highlight_field_warning: bool,
 
@@ -55,7 +52,6 @@ impl Default for LogViewerApp {
             track_item_align: Some(Align::Center),
             shortcuts: Default::default(),
             should_scroll_to_end_on_load: Default::default(),
-            row_idx_field_name: Some("row#".to_string()),
             should_highlight_field_warning: true,
             should_focus_search: Default::default(),
             should_scroll: Default::default(),
@@ -309,7 +305,7 @@ impl LogViewerApp {
             LoadingStatus::Success(data) => {
                 self.loading_status =
                 // TODO 1: Make a copy of the loading type desired and match on it to get the data to load
-                    match Data::try_from((self.row_idx_field_name.as_ref(), &data[..])) {
+                    match Data::try_from((&self.data_display_options, &data[..])) {
                         Ok(mut data) => {
                             if let Some(old_data) = self.data.as_mut() {
                                 // Preserve settings across loads of the data

src/app/data.rs

@@ -9,11 +9,10 @@ use filter::{FieldSpecifier, FilterConfig};
 use log::warn;
 use serde_json::Value;
 
-use super::calculate_hash;
+use super::{calculate_hash, data_display_options::DataDisplayOptions};
 mod data_iter;
 pub mod filter;
 
-type LogRowIdxFieldName<'a> = Option<&'a String>;
 type RowSlice<'a> = &'a [(String, String)];
 
 #[derive(serde::Deserialize, serde::Serialize, Default, Debug, PartialEq, Eq)]
@@ -359,35 +358,34 @@ fn matching_fields(fields_and_values: RowSlice<'_>, filter: &FilterConfig) -> Op
     }
 }
 
-impl TryFrom<(LogRowIdxFieldName<'_>, usize, &str)> for LogRow {
+impl TryFrom<(&DataDisplayOptions, usize, &str)> for LogRow {
     type Error = anyhow::Error;
 
     fn try_from(
-        (log_row_idx_key, row_idx_val, value): (LogRowIdxFieldName<'_>, usize, &str),
+        (data_display_options, row_idx_val, value): (&DataDisplayOptions, usize, &str),
     ) -> Result<Self, Self::Error> {
         let mut result = Self {
             data: serde_json::from_str(value)?,
             cached_display_list: None,
         };
-        if let Some(key) = log_row_idx_key {
+        if let Some(key) = data_display_options.row_idx_field_name.as_ref() {
             result.or_insert(key.to_string(), row_idx_val.into());
         }
         Ok(result)
     }
 }
 
-impl TryFrom<(LogRowIdxFieldName<'_>, &str)> for Data {
+impl TryFrom<(&DataDisplayOptions, &str)> for Data {
     type Error = anyhow::Error;
 
     fn try_from(
-        (log_row_idx_key, value): (LogRowIdxFieldName<'_>, &str),
+        (data_display_options, value): (&DataDisplayOptions, &str),
     ) -> Result<Self, Self::Error> {
         let mut result = Data::default();
         for (i, line) in value.lines().enumerate() {
-            result.rows.push(
-                LogRow::try_from((log_row_idx_key, i, line))
-                    .with_context(|| format!("failed to parse line {}", i + 1))?,
-            );
+            let row = LogRow::try_from((data_display_options, i, line))
+                .with_context(|| format!("failed to parse line {}", i + 1))?;
+            result.rows.push(row);
         }
         Ok(result)
     }

src/app/data_display_options.rs

@@ -1,6 +1,7 @@
 use std::collections::BTreeSet;
 
 #[derive(serde::Deserialize, serde::Serialize, Debug, PartialEq, Eq)]
+#[serde(default)] // if we add new fields, give them default values when deserializing old state
 pub struct DataDisplayOptions {
     main_list_fields: Vec<String>,
 
@@ -11,6 +12,9 @@ pub struct DataDisplayOptions {
     ///
     /// WARNING: This must be a valid index into the list as this is assumed in method implementations
     emphasize_if_matching_field_idx: Option<usize>,
+
+    /// When set adds a field with this name and populates it with the row numbers
+    pub row_idx_field_name: Option<String>,
 }
 
 impl DataDisplayOptions {
@@ -58,6 +62,7 @@ impl Default for DataDisplayOptions {
             .map(String::from)
             .collect(),
             emphasize_if_matching_field_idx: Some(2),
+            row_idx_field_name: Some("row#".to_string()),
         }
     }
 }