Merge pull request #2780 from tarekquao/master

Column type icon matches the datatype type of the field in column selectors (where, group by, sortby, filter)
finos · Oct 17, 2024 · cf12bce · cf12bce
2 parents 788e11c + 7110dd0
commit cf12bce
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 5 deletions.
diff --git a/rust/perspective-viewer/src/rust/components/column_selector/config_selector.rs b/rust/perspective-viewer/src/rust/components/column_selector/config_selector.rs
@@ -514,6 +514,7 @@ impl Component for ConfigSelector {
  html_nested! {
  <PivotColumn
  dragdrop={ &ctx.props().dragdrop }
+ session={ &ctx.props().session }
  action={ DragTarget::GroupBy }
  column={ group_by.clone() }>
  </PivotColumn>
@@ -540,6 +541,7 @@ impl Component for ConfigSelector {
  html_nested! {
  <PivotColumn
  dragdrop={ &ctx.props().dragdrop }
+ session={ &ctx.props().session }
  action={ DragTarget::SplitBy }
  column={ split_by.clone() }>
  </PivotColumn>

diff --git a/rust/perspective-viewer/src/rust/components/column_selector/filter_column.rs b/rust/perspective-viewer/src/rust/components/column_selector/filter_column.rs
@@ -458,6 +458,8 @@ impl Component for FilterColumn {
  }
  .unwrap_or_default();
 
+ let final_col_type = col_type.expect("Unknown column");
+
  html! {
  <div
  class="pivot-column-draggable"
@@ -467,7 +469,8 @@ impl Component for FilterColumn {
  >
  <LocalStyle href={css!("filter-item")} />
  <div class="pivot-column-border">
- <TypeIcon ty={ColumnType::String} />
+ // <TypeIcon ty={ColumnType::String} />
+ <TypeIcon ty={final_col_type} />
  <span class="column_name">{ filter.column().to_owned() }</span>
  <FilterOpSelector
  class="filterop-selector"

diff --git a/rust/perspective-viewer/src/rust/components/column_selector/pivot_column.rs b/rust/perspective-viewer/src/rust/components/column_selector/pivot_column.rs
@@ -10,18 +10,20 @@
 // ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
-use perspective_client::ColumnType;
+// use perspective_client::ColumnType;
 use web_sys::*;
 use yew::prelude::*;
 
 use crate::components::containers::dragdrop_list::*;
 use crate::components::type_icon::TypeIcon;
 use crate::dragdrop::*;
+use crate::session::*;
 
 pub struct PivotColumn {}
 
 #[derive(Properties)]
 pub struct PivotColumnProps {
+ pub session: Session,
  pub column: String,
  pub dragdrop: DragDrop,
  pub action: DragTarget,
@@ -61,6 +63,13 @@ impl Component for PivotColumn {
  move |_event| dragdrop.notify_drag_end()
  });
 
+ let col_type = ctx
+ .props()
+ .session
+ .metadata()
+ .get_column_table_type(&ctx.props().column)
+ .expect("Unknown column");
+
  html! {
  <div
  class="pivot-column-draggable"
@@ -69,7 +78,8 @@ impl Component for PivotColumn {
  ondragend={dragend}
  >
  <div class="pivot-column-border">
- <TypeIcon ty={ColumnType::String} />
+ <TypeIcon ty={col_type} />
+ // <TypeIcon ty={ColumnType::String} />
  <span class="column_name">{ ctx.props().column.clone() }</span>
  </div>
  </div>

diff --git a/rust/perspective-viewer/src/rust/components/column_selector/sort_column.rs b/rust/perspective-viewer/src/rust/components/column_selector/sort_column.rs
@@ -11,7 +11,7 @@
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
 use perspective_client::config::*;
-use perspective_client::ColumnType;
+// use perspective_client::ColumnType;
 use web_sys::*;
 use yew::prelude::*;
 
@@ -101,6 +101,13 @@ impl Component for SortColumn {
  move |_event| dragdrop.notify_drag_end()
  });
 
+ let col_type = ctx
+ .props()
+ .session
+ .metadata()
+ .get_column_table_type(&ctx.props().sort.0.to_owned())
+ .expect("Unknown column");
+
  html! {
  <div
  class="pivot-column-draggable"
@@ -109,7 +116,8 @@ impl Component for SortColumn {
  ondragend={dragend}
  >
  <div class="pivot-column-border">
- <TypeIcon ty={ColumnType::String} />
+ <TypeIcon ty={col_type} />
+ // <TypeIcon ty={ColumnType::String} />
  <span class="column_name">{ ctx.props().sort.0.to_owned() }</span>
  <span
  class={format!("sort-icon {}", ctx.props().sort.1)}