From 3473168ca6458b23b085cc7714aa1bde09bdb291 Mon Sep 17 00:00:00 2001
From: Tarek Quao <tarek.quao@turntabl.io>
Date: Mon, 30 Sep 2024 11:40:22 +0000
Subject: [PATCH 1/2] Made the fix for displaying the appropriate column icon
 type after dragging to new column selector

Signed-off-by: Tarek Quao <tarek.quao@turntabl.io>
---
 .../components/column_selector/config_selector.rs  |  2 ++
 .../components/column_selector/filter_column.rs    |  5 ++++-
 .../components/column_selector/pivot_column.rs     | 14 ++++++++++++--
 .../rust/components/column_selector/sort_column.rs | 12 ++++++++++--
 4 files changed, 28 insertions(+), 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
index 57b0b2fc46..485a31b72d 100644
--- 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
index 6ad640ec0a..7199331eb9 100644
--- a/rust/perspective-viewer/src/rust/components/column_selector/filter_column.rs
+++ b/rust/perspective-viewer/src/rust/components/column_selector/filter_column.rs
@@ -456,6 +456,8 @@ impl Component for FilterColumn {
         }
         .unwrap_or_default();
 
+        let final_col_type = col_type.expect("Unknown column");
+
         html! {
             <div
                 class="pivot-column-draggable"
@@ -465,7 +467,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
index 51031aceda..46ccb92b5f 100644
--- 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
index bc30aa04f9..290b8355c9 100644
--- 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)}

From 7110dd0a3b8a708c93e123b069f33288129b9773 Mon Sep 17 00:00:00 2001
From: Tarek Quao <tarek.quao@turntabl.io>
Date: Wed, 2 Oct 2024 10:59:45 +0000
Subject: [PATCH 2/2] minor formatting changes

Signed-off-by: Tarek Quao <tarek.quao@turntabl.io>
---
 .../rust/components/column_selector/filter_column.rs   |  2 +-
 .../rust/components/column_selector/pivot_column.rs    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

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
index 7199331eb9..9c3f032598 100644
--- a/rust/perspective-viewer/src/rust/components/column_selector/filter_column.rs
+++ b/rust/perspective-viewer/src/rust/components/column_selector/filter_column.rs
@@ -468,7 +468,7 @@ impl Component for FilterColumn {
                 <LocalStyle href={css!("filter-item")} />
                 <div class="pivot-column-border">
                     // <TypeIcon ty={ColumnType::String} />
-                    <TypeIcon ty={final_col_type}/>
+                    <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
index 46ccb92b5f..f977e9d4f6 100644
--- a/rust/perspective-viewer/src/rust/components/column_selector/pivot_column.rs
+++ b/rust/perspective-viewer/src/rust/components/column_selector/pivot_column.rs
@@ -64,11 +64,11 @@ impl Component for PivotColumn {
         });
 
         let col_type = ctx
-        .props()
-        .session
-        .metadata()
-        .get_column_table_type(&ctx.props().column)
-        .expect("Unknown column");
+            .props()
+            .session
+            .metadata()
+            .get_column_table_type(&ctx.props().column)
+            .expect("Unknown column");
 
         html! {
             <div