@perspective-dev/viewer 4.5.2 → 5.1.0

package/src/rust/components/column_selector/active_column.rs

@@ -13,21 +13,21 @@
 use std::collections::HashSet;
 
 use perspective_client::config::*;
-use perspective_js::utils::ApiFuture;
 use web_sys::*;
 use yew::prelude::*;
 
 use super::InPlaceColumn;
 use super::aggregate_selector::*;
+use super::column_selector_column_row::ColumnSelectorColumnRow;
 use super::expr_edit_button::*;
 use crate::components::column_dropdown::ColumnDropDownElement;
 use crate::components::column_selector::{EmptyColumn, InvalidColumn};
-use crate::components::type_icon::TypeIcon;
 use crate::config::ColumnSelectMode;
 use crate::presentation::{ColumnLocator, Presentation};
 use crate::queries::*;
 use crate::renderer::*;
 use crate::session::*;
+use crate::tasks::apply_and_render;
 use crate::utils::*;
 
 #[derive(Clone, Properties)]
@@ -66,6 +66,10 @@ pub struct ActiveColumnProps {
     #[prop_or_default]
     pub is_expression: bool,
 
+    /// Whether this column is a window column.
+    #[prop_or_default]
+    pub is_window: bool,
+
     /// Whether the expression/config edit button should be shown.  Computed
     /// by the parent (`is_expression || can_render_column_styles`).
     #[prop_or_default]
@@ -95,6 +99,7 @@ impl PartialEq for ActiveColumnProps {
             && self.is_aggregated == rhs.is_aggregated
             && self.is_editing == rhs.is_editing
             && self.is_expression == rhs.is_expression
+            && self.is_window == rhs.is_window
             && self.show_edit_btn == rhs.show_edit_btn
             && self.col_type == rhs.col_type
             && self.metadata == rhs.metadata
@@ -162,11 +167,8 @@ impl Component for ActiveColumn {
                 {
                     let session = ctx.props().session.clone();
                     let renderer = ctx.props().renderer.clone();
-                    if session.update_view_config(update).is_ok() {
-                        ApiFuture::spawn(async move {
-                            renderer.apply_pending_plugin()?;
-                            renderer.draw(session.validate().await?.create_view()).await
-                        });
+                    if let Ok(task) = apply_and_render(&session, &renderer, update) {
+                        spawn_owned("active-column", task);
                     }
                 }
 
@@ -190,11 +192,8 @@ impl Component for ActiveColumn {
                 {
                     let session = ctx.props().session.clone();
                     let renderer = ctx.props().renderer.clone();
-                    if session.update_view_config(update).is_ok() {
-                        ApiFuture::spawn(async move {
-                            renderer.apply_pending_plugin()?;
-                            renderer.draw(session.validate().await?.create_view()).await
-                        });
+                    if let Ok(task) = apply_and_render(&session, &renderer, update) {
+                        spawn_owned("active-column", task);
                     }
                 }
 
@@ -210,10 +209,7 @@ impl Component for ActiveColumn {
             Named(String),
         }
 
-        let mut classes = classes!["column-selector-draggable"];
-        if ctx.props().is_aggregated {
-            classes.push("show-aggregate");
-        };
+        let mut classes = classes![];
 
         let mut outer_classes = classes!["column-selector-column"];
         if self.mouseover {
@@ -350,6 +346,7 @@ impl Component for ActiveColumn {
                     .callback(|event: MouseEvent| MouseEnter(event.which() == 0));
 
                 let is_expression = ctx.props().is_expression;
+                let is_window = ctx.props().is_window;
                 let show_edit_btn = ctx.props().show_edit_btn;
                 let mut class = ctx.props().renderer.metadata().select_mode.css();
                 if is_required {
@@ -369,17 +366,14 @@ impl Component for ActiveColumn {
                         ondragenter={ondragenter.clone()}
                     >
                         <span {class} onmousedown={remove_column} />
-                        <div
-                            class={classes}
-                            ref={&self.add_expression_ref}
-                            draggable="true"
-                            {ondragstart}
-                            {ondragend}
-                        >
-                            <div class="column-selector-column-border">
-                                <span class="drag-handle icon" />
-                                <TypeIcon ty={col_type} />
-                                if ctx.props().is_aggregated {
+                        <ColumnSelectorColumnRow
+                            name={name.clone()}
+                            col_type={Some(col_type)}
+                            wrapper_class={classes}
+                            wrapper_ref={&self.add_expression_ref}
+                            ondragstart={Some(ondragstart)}
+                            ondragend={Some(ondragend.clone())}
+                            aggregate={ctx.props().is_aggregated.then(|| html! {
                                     <AggregateSelector
                                         column={name.clone()}
                                         aggregate={ctx.props().get_aggregate(&name)}
@@ -388,24 +382,18 @@ impl Component for ActiveColumn {
                                         renderer={&ctx.props().renderer}
                                         session={&ctx.props().session}
                                     />
-                                }
-                                <span
-                                    class="column_name"
-                                >
-                                    { name.clone() }
-                                </span>
-                                if !ctx.props().is_aggregated {
-                                    <span class="column-selector--spacer" />
-                                }
+                                })}
+                            trailing={html! {
                                 <ExprEditButton
+                                    {is_window}
                                     name={name.clone()}
                                     on_open_expr_panel={&ctx.props().on_open_expr_panel}
                                     {is_expression}
                                     is_disabled={!show_edit_btn}
                                     is_editing={ctx.props().is_editing}
                                 />
-                            </div>
-                        </div>
+                            }}
+                        />
                     </div>
                 }
             },
@@ -477,13 +465,8 @@ impl ActiveColumnProps {
             ..ViewConfigUpdate::default()
         };
 
-        if self.session.update_view_config(config).is_ok() {
-            let session = self.session.clone();
-            let renderer = self.renderer.clone();
-            ApiFuture::spawn(async move {
-                renderer.apply_pending_plugin()?;
-                renderer.draw(session.validate().await?.create_view()).await
-            });
+        if let Ok(task) = apply_and_render(&self.session, &self.renderer, config) {
+            spawn_owned("active-column", task);
         }
     }
 }

package/src/rust/components/column_selector/aggregate_selector.rs

@@ -14,13 +14,13 @@ use std::collections::HashSet;
 use std::rc::Rc;
 
 use perspective_client::config::*;
-use perspective_js::utils::ApiFuture;
 use yew::prelude::*;
 
 use crate::components::containers::select::*;
 use crate::renderer::*;
 use crate::session::*;
-use crate::utils::PtrEqRc;
+use crate::tasks::apply_and_render;
+use crate::utils::{PtrEqRc, spawn_owned};
 
 #[derive(Properties)]
 pub struct AggregateSelectorProps {
@@ -143,11 +143,8 @@ impl AggregateSelector {
 
         let session = ctx.props().session.clone();
         let renderer = ctx.props().renderer.clone();
-        if session.update_view_config(config).is_ok() {
-            ApiFuture::spawn(async move {
-                renderer.apply_pending_plugin()?;
-                renderer.draw(session.validate().await?.create_view()).await
-            });
+        if let Ok(task) = apply_and_render(&session, &renderer, config) {
+            spawn_owned("aggregate-selector", task);
         }
     }
 

package/src/rust/components/column_selector/column_selector_column_row.rs

@@ -0,0 +1,73 @@
+// ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+// ┃ ██████ ██████ ██████       █      █      █      █      █ █▄  ▀███ █       ┃
+// ┃ ▄▄▄▄▄█ █▄▄▄▄▄ ▄▄▄▄▄█  ▀▀▀▀▀█▀▀▀▀▀ █ ▀▀▀▀▀█ ████████▌▐███ ███▄  ▀█ █ ▀▀▀▀▀ ┃
+// ┃ █▀▀▀▀▀ █▀▀▀▀▀ █▀██▀▀ ▄▄▄▄▄ █ ▄▄▄▄▄█ ▄▄▄▄▄█ ████████▌▐███ █████▄   █ ▄▄▄▄▄ ┃
+// ┃ █      ██████ █  ▀█▄       █ ██████      █      ███▌▐███ ███████▄ █       ┃
+// ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫
+// ┃ Copyright (c) 2017, the Perspective Authors.                              ┃
+// ┃ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ ┃
+// ┃ This file is part of the Perspective library, distributed under the terms ┃
+// ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
+// ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
+
+use perspective_client::config::ColumnType;
+use web_sys::DragEvent;
+use yew::prelude::*;
+
+use crate::components::type_icon::TypeIcon;
+
+/// The draggable row of a `column-selector-column`
+#[derive(Clone, PartialEq, Properties)]
+pub struct ColumnSelectorColumnRowProps {
+    pub name: String,
+
+    #[prop_or_default]
+    pub col_type: Option<ColumnType>,
+
+    #[prop_or_default]
+    pub aggregate: Option<Html>,
+
+    /// Trailing affordance (e.g. the edit button in the active list).
+    #[prop_or_default]
+    pub trailing: Html,
+
+    #[prop_or_default]
+    pub wrapper_class: Classes,
+
+    #[prop_or_default]
+    pub wrapper_ref: NodeRef,
+
+    #[prop_or_default]
+    pub ondragstart: Option<Callback<DragEvent>>,
+
+    #[prop_or_default]
+    pub ondragend: Option<Callback<DragEvent>>,
+}
+
+#[function_component]
+pub fn ColumnSelectorColumnRow(p: &ColumnSelectorColumnRowProps) -> Html {
+    let mut classes = classes!["column-selector-draggable"];
+    if p.aggregate.is_some() {
+        classes.push("show-aggregate");
+    }
+
+    classes.extend(p.wrapper_class.clone());
+    html! {
+        <div
+            class={classes}
+            ref={&p.wrapper_ref}
+            draggable={p.ondragstart.is_some().then_some("true")}
+            ondragstart={p.ondragstart.clone()}
+            ondragend={p.ondragend.clone()}
+        >
+            <div class="column-selector-column-border">
+                <span class="drag-handle icon" />
+                <TypeIcon ty={p.col_type.unwrap_or(ColumnType::String)} />
+                if let Some(aggregate) = &p.aggregate { { aggregate.clone() } }
+                <span class="column_name">{ p.name.clone() }</span>
+                if p.aggregate.is_none() { <span class="column-selector--spacer" /> }
+                { p.trailing.clone() }
+            </div>
+        </div>
+    }
+}

package/src/rust/components/column_selector/config_selector.rs

@@ -14,7 +14,6 @@ use std::collections::HashSet;
 use std::rc::Rc;
 
 use perspective_client::config::{ViewConfig, *};
-use perspective_js::utils::ApiFuture;
 use yew::prelude::*;
 
 use super::InPlaceColumn;
@@ -29,6 +28,7 @@ use crate::presentation::Presentation;
 use crate::renderer::*;
 use crate::session::drag_drop_update::*;
 use crate::session::*;
+use crate::tasks::apply_and_render;
 use crate::utils::*;
 
 #[derive(Clone, Properties)]
@@ -132,11 +132,8 @@ impl Component for ConfigSelector {
                 {
                     let session = ctx.props().session.clone();
                     let renderer = ctx.props().renderer.clone();
-                    if session.update_view_config(config).is_ok() {
-                        ApiFuture::spawn(async move {
-                            renderer.apply_pending_plugin()?;
-                            renderer.draw(session.validate().await?.create_view()).await
-                        });
+                    if let Ok(task) = apply_and_render(&session, &renderer, config) {
+                        spawn_owned("config-selector", task);
                     }
                 }
 
@@ -152,11 +149,8 @@ impl Component for ConfigSelector {
                 {
                     let session = ctx.props().session.clone();
                     let renderer = ctx.props().renderer.clone();
-                    if session.update_view_config(config).is_ok() {
-                        ApiFuture::spawn(async move {
-                            renderer.apply_pending_plugin()?;
-                            renderer.draw(session.validate().await?.create_view()).await
-                        });
+                    if let Ok(task) = apply_and_render(&session, &renderer, config) {
+                        spawn_owned("config-selector", task);
                     }
                 }
 
@@ -191,11 +185,8 @@ impl Component for ConfigSelector {
                     {
                         let session = ctx.props().session.clone();
                         let renderer = ctx.props().renderer.clone();
-                        if session.update_view_config(config).is_ok() {
-                            ApiFuture::spawn(async move {
-                                renderer.apply_pending_plugin()?;
-                                renderer.draw(session.validate().await?.create_view()).await
-                            });
+                        if let Ok(task) = apply_and_render(&session, &renderer, config) {
+                            spawn_owned("config-selector", task);
                         }
                     }
 
@@ -214,11 +205,8 @@ impl Component for ConfigSelector {
                 {
                     let session = ctx.props().session.clone();
                     let renderer = ctx.props().renderer.clone();
-                    if session.update_view_config(config).is_ok() {
-                        ApiFuture::spawn(async move {
-                            renderer.apply_pending_plugin()?;
-                            renderer.draw(session.validate().await?.create_view()).await
-                        });
+                    if let Ok(task) = apply_and_render(&session, &renderer, config) {
+                        spawn_owned("config-selector", task);
                     }
                 }
 
@@ -237,11 +225,8 @@ impl Component for ConfigSelector {
                 {
                     let session = ctx.props().session.clone();
                     let renderer = ctx.props().renderer.clone();
-                    if session.update_view_config(config).is_ok() {
-                        ApiFuture::spawn(async move {
-                            renderer.apply_pending_plugin()?;
-                            renderer.draw(session.validate().await?.create_view()).await
-                        });
+                    if let Ok(task) = apply_and_render(&session, &renderer, config) {
+                        spawn_owned("config-selector", task);
                     }
                 }
 
@@ -250,7 +235,7 @@ impl Component for ConfigSelector {
             },
             ConfigSelectorMsg::Close(..) => false,
             ConfigSelectorMsg::Drop(column, action, effect, index)
-                if action != DragTarget::Active =>
+                if action != DragTarget::Active && !action.is_staged() =>
             {
                 let col_type = ctx
                     .props()
@@ -270,11 +255,8 @@ impl Component for ConfigSelector {
                 {
                     let session = ctx.props().session.clone();
                     let renderer = ctx.props().renderer.clone();
-                    if session.update_view_config(update).is_ok() {
-                        ApiFuture::spawn(async move {
-                            renderer.apply_pending_plugin()?;
-                            renderer.draw(session.validate().await?.create_view()).await
-                        });
+                    if let Ok(task) = apply_and_render(&session, &renderer, update) {
+                        spawn_owned("config-selector", task);
                     }
                 }
 
@@ -300,11 +282,8 @@ impl Component for ConfigSelector {
                 {
                     let session = ctx.props().session.clone();
                     let renderer = ctx.props().renderer.clone();
-                    if session.update_view_config(update).is_ok() {
-                        ApiFuture::spawn(async move {
-                            renderer.apply_pending_plugin()?;
-                            renderer.draw(session.validate().await?.create_view()).await
-                        });
+                    if let Ok(task) = apply_and_render(&session, &renderer, update) {
+                        spawn_owned("config-selector", task);
                     }
                 }
                 ctx.props().onselect.emit(());
@@ -345,11 +324,8 @@ impl Component for ConfigSelector {
                 {
                     let session = ctx.props().session.clone();
                     let renderer = ctx.props().renderer.clone();
-                    if session.update_view_config(update).is_ok() {
-                        ApiFuture::spawn(async move {
-                            renderer.apply_pending_plugin()?;
-                            renderer.draw(session.validate().await?.create_view()).await
-                        });
+                    if let Ok(task) = apply_and_render(&session, &renderer, update) {
+                        spawn_owned("config-selector", task);
                     }
                 }
 
@@ -366,11 +342,8 @@ impl Component for ConfigSelector {
                 {
                     let session = ctx.props().session.clone();
                     let renderer = ctx.props().renderer.clone();
-                    if session.update_view_config(update).is_ok() {
-                        ApiFuture::spawn(async move {
-                            renderer.apply_pending_plugin()?;
-                            renderer.draw(session.validate().await?.create_view()).await
-                        });
+                    if let Ok(task) = apply_and_render(&session, &renderer, update) {
+                        spawn_owned("config-selector", task);
                     }
                 }
 
@@ -388,17 +361,20 @@ impl Component for ConfigSelector {
                 {
                     let session = ctx.props().session.clone();
                     let renderer = ctx.props().renderer.clone();
-                    if session.update_view_config(update).is_ok() {
-                        ApiFuture::spawn(async move {
-                            renderer.apply_pending_plugin()?;
-                            renderer.draw(session.validate().await?.create_view()).await
-                        });
+                    if let Ok(task) = apply_and_render(&session, &renderer, update) {
+                        spawn_owned("config-selector", task);
                     }
                 }
 
                 ctx.props().onselect.emit(());
                 false
             },
+            ConfigSelectorMsg::New(
+                DragTarget::WindowSource
+                | DragTarget::WindowOrderBy
+                | DragTarget::WindowPartitionBy,
+                _,
+            ) => false,
             ConfigSelectorMsg::New(DragTarget::Filter, InPlaceColumn::Column(column)) => {
                 let mut view_config = (*ctx.props().view_config).clone();
                 let op = ctx.props().default_op(column.as_str()).unwrap_or_default();
@@ -416,11 +392,8 @@ impl Component for ConfigSelector {
                 {
                     let session = ctx.props().session.clone();
                     let renderer = ctx.props().renderer.clone();
-                    if session.update_view_config(update).is_ok() {
-                        ApiFuture::spawn(async move {
-                            renderer.apply_pending_plugin()?;
-                            renderer.draw(session.validate().await?.create_view()).await
-                        });
+                    if let Ok(task) = apply_and_render(&session, &renderer, update) {
+                        spawn_owned("config-selector", task);
                     }
                 }
 
@@ -438,11 +411,8 @@ impl Component for ConfigSelector {
                 {
                     let session = ctx.props().session.clone();
                     let renderer = ctx.props().renderer.clone();
-                    if session.update_view_config(update).is_ok() {
-                        ApiFuture::spawn(async move {
-                            renderer.apply_pending_plugin()?;
-                            renderer.draw(session.validate().await?.create_view()).await
-                        });
+                    if let Ok(task) = apply_and_render(&session, &renderer, update) {
+                        spawn_owned("config-selector", task);
                     }
                 }
 
@@ -462,11 +432,8 @@ impl Component for ConfigSelector {
                 {
                     let session = ctx.props().session.clone();
                     let renderer = ctx.props().renderer.clone();
-                    if session.update_view_config(update).is_ok() {
-                        ApiFuture::spawn(async move {
-                            renderer.apply_pending_plugin()?;
-                            renderer.draw(session.validate().await?.create_view()).await
-                        });
+                    if let Ok(task) = apply_and_render(&session, &renderer, update) {
+                        spawn_owned("config-selector", task);
                     }
                 }
 
@@ -486,11 +453,8 @@ impl Component for ConfigSelector {
                 {
                     let session = ctx.props().session.clone();
                     let renderer = ctx.props().renderer.clone();
-                    if session.update_view_config(update).is_ok() {
-                        ApiFuture::spawn(async move {
-                            renderer.apply_pending_plugin()?;
-                            renderer.draw(session.validate().await?.create_view()).await
-                        });
+                    if let Ok(task) = apply_and_render(&session, &renderer, update) {
+                        spawn_owned("config-selector", task);
                     }
                 }
 
@@ -518,11 +482,8 @@ impl Component for ConfigSelector {
                 {
                     let session = ctx.props().session.clone();
                     let renderer = ctx.props().renderer.clone();
-                    if session.update_view_config(update).is_ok() {
-                        ApiFuture::spawn(async move {
-                            renderer.apply_pending_plugin()?;
-                            renderer.draw(session.validate().await?.create_view()).await
-                        });
+                    if let Ok(task) = apply_and_render(&session, &renderer, update) {
+                        spawn_owned("config-selector", task);
                     }
                 }
 
@@ -544,11 +505,8 @@ impl Component for ConfigSelector {
                 {
                     let session = ctx.props().session.clone();
                     let renderer = ctx.props().renderer.clone();
-                    if session.update_view_config(update).is_ok() {
-                        ApiFuture::spawn(async move {
-                            renderer.apply_pending_plugin()?;
-                            renderer.draw(session.validate().await?.create_view()).await
-                        });
+                    if let Ok(task) = apply_and_render(&session, &renderer, update) {
+                        spawn_owned("config-selector", task);
                     }
                 }
 

package/src/rust/components/column_selector/expr_edit_button.rs

@@ -22,6 +22,10 @@ pub struct ExprEditButtonProps {
     /// Is this an expression column?
     pub is_expression: bool,
 
+    /// Is this a window column?
+    #[prop_or_default]
+    pub is_window: bool,
+
     /// Fires when the config/expresison button is clicked.
     pub on_open_expr_panel: Callback<ColumnLocator>,
 
@@ -38,7 +42,9 @@ pub struct ExprEditButtonProps {
 #[function_component]
 pub fn ExprEditButton(p: &ExprEditButtonProps) -> Html {
     let onmousedown = yew::use_callback(p.clone(), |_, p| {
-        let name = if p.is_expression {
+        let name = if p.is_window {
+            ColumnLocator::Window(p.name.clone())
+        } else if p.is_expression {
             ColumnLocator::Expression(p.name.clone())
         } else {
             ColumnLocator::Table(p.name.clone())

package/src/rust/components/column_selector/filter_column.rs

@@ -15,7 +15,6 @@ use std::rc::Rc;
 
 use chrono::{Datelike, NaiveDate, TimeZone, Utc};
 use perspective_client::config::*;
-use perspective_js::utils::ApiFuture;
 use wasm_bindgen::JsCast;
 use web_sys::*;
 use yew::prelude::*;
@@ -27,6 +26,7 @@ use crate::components::type_icon::TypeIcon;
 use crate::presentation::Presentation;
 use crate::renderer::*;
 use crate::session::*;
+use crate::tasks::apply_and_render;
 use crate::utils::*;
 
 #[derive(Clone, Properties)]
@@ -448,13 +448,8 @@ impl FilterColumnProps {
             ..ViewConfigUpdate::default()
         };
 
-        if self.session.update_view_config(update).is_ok() {
-            let session = self.session.clone();
-            let renderer = self.renderer.clone();
-            ApiFuture::spawn(async move {
-                renderer.apply_pending_plugin()?;
-                renderer.draw(session.validate().await?.create_view()).await
-            });
+        if let Ok(task) = apply_and_render(&self.session, &self.renderer, update) {
+            spawn_owned("filter-column", task);
         }
     }
 
@@ -526,13 +521,8 @@ impl FilterColumnProps {
                 ..ViewConfigUpdate::default()
             };
 
-            if self.session.update_view_config(update).is_ok() {
-                let session = self.session.clone();
-                let renderer = self.renderer.clone();
-                ApiFuture::spawn(async move {
-                    renderer.apply_pending_plugin()?;
-                    renderer.draw(session.validate().await?.create_view()).await
-                });
+            if let Ok(task) = apply_and_render(&self.session, &self.renderer, update) {
+                spawn_owned("filter-column", task);
             }
         }
     }

package/src/rust/components/column_selector/inactive_column.rs

@@ -12,7 +12,6 @@
 
 use itertools::Itertools;
 use perspective_client::config::*;
-use perspective_js::utils::ApiFuture;
 use web_sys::*;
 use yew::prelude::*;
 
@@ -22,6 +21,7 @@ use crate::config::ColumnSelectMode;
 use crate::presentation::{ColumnLocator, Presentation};
 use crate::renderer::*;
 use crate::session::*;
+use crate::tasks::apply_and_render;
 use crate::utils::*;
 
 #[derive(Clone, Properties)]
@@ -43,6 +43,10 @@ pub struct InactiveColumnProps {
     #[prop_or_default]
     pub is_expression: bool,
 
+    /// Whether this column is a window column.
+    #[prop_or_default]
+    pub is_window: bool,
+
     /// Session metadata snapshot — threaded from `SessionProps`.
     pub metadata: SessionMetadataRc,
 
@@ -72,6 +76,7 @@ impl PartialEq for InactiveColumnProps {
             && self.name == rhs.name
             && self.is_editing == rhs.is_editing
             && self.is_expression == rhs.is_expression
+            && self.is_window == rhs.is_window
             && self.metadata == rhs.metadata
             && self.view_config == rhs.view_config
     }
@@ -148,6 +153,7 @@ impl Component for InactiveColumn {
             .callback(|event: MouseEvent| MouseEnter(event.which() == 0));
 
         let is_expression = ctx.props().is_expression;
+        let is_window = ctx.props().is_window;
 
         let mut is_active_class = ctx.props().renderer.metadata().select_mode.css();
         is_active_class.push("shift-alt-icon");
@@ -179,7 +185,8 @@ impl Component for InactiveColumn {
                             name={ctx.props().name.clone()}
                             on_open_expr_panel={&ctx.props().on_open_expr_panel}
                             {is_expression}
-                            is_disabled={!is_expression}
+                            {is_window}
+                            is_disabled={!(is_expression || is_window)}
                             is_editing={ctx.props().is_editing}
                         />
                     </div>
@@ -231,13 +238,8 @@ impl InactiveColumnProps {
             ..ViewConfigUpdate::default()
         };
 
-        if self.session.update_view_config(config).is_ok() {
-            let session = self.session.clone();
-            let renderer = self.renderer.clone();
-            ApiFuture::spawn(async move {
-                renderer.apply_pending_plugin()?;
-                renderer.draw(session.validate().await?.create_view()).await
-            });
+        if let Ok(task) = apply_and_render(&self.session, &self.renderer, config) {
+            spawn_owned("inactive-column", task);
         }
     }
 }