struct Config {
column_threshold: usize,
static_columns: Vec<Option<String>>,
+ hidden_columns: HashSet<String>,
}
impl Config {
fn apply_command(&mut self, line_num: usize, cmd: &str) -> Result<(), std::io::Error> {
format!("line {line_num}: col_threshold must be numeric: {e}"),
)
})?;
+ } else if let Some(col) = cmd.strip_prefix("hide ") {
+ self.hidden_columns.insert(col.to_owned());
} else if let Some(col) = cmd.strip_prefix("col ") {
self.static_columns.push(Some(col.to_owned()));
} else if cmd == "colsep" {
Self {
column_threshold: 2,
static_columns: vec![],
+ hidden_columns: HashSet::new(),
}
}
}
column_counts(rows)
.into_iter()
.filter_map(|(n, col)| {
- (n >= config.column_threshold && !static_columns.contains(col.as_str())).then_some(col)
+ (n >= config.column_threshold
+ && !static_columns.contains(col.as_str())
+ && !config.hidden_columns.contains(&col))
+ .then_some(col)
})
.collect()
}
}
fn render_all_leftovers(config: &Config, row: &Row) -> HTML {
- let mut order: Vec<_> = row.entries.keys().collect();
+ let mut order: Vec<_> = row
+ .entries
+ .keys()
+ .filter(|&col| !config.hidden_columns.contains(col))
+ .collect();
order.sort_unstable();
HTML(
order
.static_columns
.iter()
.map(|ocol| match ocol {
+ Some(col) if config.hidden_columns.contains(col) => HTML::from(""),
Some(col) => render_cell(col, row),
None => HTML::from(r#"<td class="spacer_col"></td>"#),
})
.collect::<HTML>();
let dynamic_cells = columns
.iter()
+ .filter(|&col| !config.hidden_columns.contains(col))
.map(|col| render_cell(col, row))
.collect::<HTML>();
let leftovers = render_all_leftovers(config, row);
}
}
-fn render_column_headers(config: &Config, columns: &[String]) -> HTML {
+fn column_header_order<'a>(
+ config: &'a Config,
+ columns: &'a [String],
+) -> impl Iterator<Item = Option<&'a String>> {
let static_columns = config.static_columns.iter().map(|oc| oc.as_ref());
let dynamic_columns = columns.iter().map(Some);
+ static_columns.chain(dynamic_columns).filter(|ocol| {
+ ocol.map_or(true, |col| !config.hidden_columns.contains(col))
+ })
+}
+
+fn render_column_headers(config: &Config, columns: &[String]) -> HTML {
HTML(
String::from(r#"<tr class="key"><th></th>"#)
- + &static_columns
- .chain(dynamic_columns)
- .fold(String::new(), |mut acc, ocol| {
- match ocol {
- Some(col) => {
- let col_header = HTML::escape(col);
- write!(
- &mut acc,
- r#"<th id="{col_header}"><div><div>{col_header}</div></div></th>"#
- )
- }
- None => write!(&mut acc, r#"<th class="col_spacer"></th>"#),
+ + &column_header_order(config, columns).fold(String::new(), |mut acc, ocol| {
+ match ocol {
+ Some(col) => {
+ let col_header = HTML::escape(col);
+ write!(
+ &mut acc,
+ r#"<th id="{col_header}"><div><div>{col_header}</div></div></th>"#
+ )
}
- .unwrap();
- acc
- })
+ None => write!(&mut acc, r#"<th class="col_spacer"></th>"#),
+ }
+ .unwrap();
+ acc
+ })
+ "</tr>\n",
)
}
);
}
+ #[test]
+ fn test_column_header_order() {
+ let mut cfg = Config::default();
+
+ assert!(column_header_order(&cfg, &["foo".to_owned()]).eq([Some(&"foo".to_owned())]));
+
+ cfg.static_columns.push(Some("bar".to_owned()));
+ assert!(column_header_order(&cfg, &["foo".to_owned()])
+ .eq([Some(&"bar".to_owned()), Some(&"foo".to_owned())]));
+
+ cfg.static_columns.push(None);
+ assert!(column_header_order(&cfg, &["foo".to_owned()]).eq([
+ Some(&"bar".to_owned()),
+ None,
+ Some(&"foo".to_owned())
+ ]));
+
+ cfg.hidden_columns.insert("foo".to_owned());
+ assert!(column_header_order(&cfg, &["foo".to_owned()]).eq([Some(&"bar".to_owned()), None]));
+
+ cfg.hidden_columns.insert("bar".to_owned());
+ assert!(column_header_order(&cfg, &["foo".to_owned()]).eq([None]));
+ }
+
#[test]
fn test_render_cell() {
assert_eq!(
),
HTML::from("bar: 2, foo")
);
+ assert_eq!(
+ render_all_leftovers(
+ &Config {
+ column_threshold: 2,
+ static_columns: vec![],
+ hidden_columns: HashSet::from(["private".to_owned()]),
+ },
+ &Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([("private".to_owned(), vec![None]),]),
+ }
+ ),
+ HTML::from("")
+ );
}
#[test]
&Config {
column_threshold: 0,
static_columns: vec![Some("foo".to_owned()), Some("bar".to_owned())],
+ hidden_columns: HashSet::new(),
},
&["baz".to_owned()],
&mut Rowlike::Row(Row {
&Config {
column_threshold: 0,
static_columns: vec![Some("foo".to_owned()), None, Some("bar".to_owned())],
+ hidden_columns: HashSet::new(),
},
&[],
&mut Rowlike::Row(Row {
),
HTML::from(
r#"<tr><th id="nope">nope</th><td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">f</td><td class="spacer_col"></td><td class="yes" onmouseover="h2('nope','bar')" onmouseout="ch2('nope','bar')">r</td><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')"></td></tr>
+"#
+ )
+ );
+ assert_eq!(
+ render_row(
+ &Config {
+ column_threshold: 0,
+ static_columns: vec![],
+ hidden_columns: HashSet::from(["foo".to_owned()]),
+ },
+ &[],
+ &mut Rowlike::Row(Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([("foo".to_owned(), vec![Some("f".to_owned())]),]),
+ })
+ ),
+ HTML::from(
+ r#"<tr><th id="nope">nope</th><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')"></td></tr>
+"#
+ )
+ );
+ assert_eq!(
+ render_row(
+ &Config {
+ column_threshold: 0,
+ static_columns: vec![Some("foo".to_owned())],
+ hidden_columns: HashSet::from(["foo".to_owned()]),
+ },
+ &[],
+ &mut Rowlike::Row(Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([("foo".to_owned(), vec![Some("f".to_owned())]),]),
+ })
+ ),
+ HTML::from(
+ r#"<tr><th id="nope">nope</th><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')"></td></tr>
"#
)
);
projects / tablify / blobdiff