Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Column type icon matches the datatype type of the field in column selectors (where, group by, sortby, filter) #2780

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Column type icon matches the datatype type of the field in column selectors (where, group by, sortby, filter) #2780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3473168
Made the fix for displaying the appropriate column icon type after dr…
tarekquao Sep 30, 2024
7110dd0
minor formatting changes
tarekquao Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions rust/perspective-viewer/src/rust/components/column_selector/config_selector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
5 changes: 4 additions & 1 deletion rust/perspective-viewer/src/rust/components/column_selector/filter_column.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
14 changes: 12 additions & 2 deletions rust/perspective-viewer/src/rust/components/column_selector/pivot_column.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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"
Expand All @@ -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>
Expand Down
12 changes: 10 additions & 2 deletions rust/perspective-viewer/src/rust/components/column_selector/sort_column.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛

use perspective_client::config::*;
use perspective_client::ColumnType;
// use perspective_client::ColumnType;
use web_sys::*;
use yew::prelude::*;

Expand Down Expand Up @@ -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"
Expand All @@ -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)}
Expand Down