@perspective-dev/viewer 4.5.2 → 5.0.0

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/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);
                     }
                 }
 
@@ -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,11 +361,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);
                     }
                 }
 
@@ -416,11 +386,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 +405,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 +426,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 +447,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 +476,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 +499,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/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)]
@@ -231,13 +231,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);
         }
     }
 }

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

@@ -11,7 +11,6 @@
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
 use perspective_client::config::*;
-use perspective_js::utils::ApiFuture;
 use web_sys::*;
 use yew::prelude::*;
 
@@ -20,6 +19,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(Properties)]
@@ -86,11 +86,8 @@ impl Component for SortColumn {
 
                 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("sort-column", task);
                 }
 
                 false

package/src/rust/components/column_selector.rs

@@ -28,7 +28,6 @@ use std::rc::Rc;
 pub use empty_column::*;
 pub use invalid_column::*;
 use perspective_client::config::ViewConfig;
-use perspective_js::utils::ApiFuture;
 pub use pivot_column::*;
 use web_sys::*;
 use yew::prelude::*;
@@ -46,6 +45,7 @@ use crate::queries::{ActiveColumnState, ActiveColumnStateData, ColumnsIteratorSe
 use crate::renderer::*;
 use crate::session::drag_drop_update::*;
 use crate::session::*;
+use crate::tasks::apply_and_render;
 use crate::utils::*;
 
 #[derive(Properties)]
@@ -218,11 +218,8 @@ impl Component for ColumnSelector {
 
                     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("column-selector", task);
                     }
                 }
 
@@ -246,11 +243,8 @@ impl Component for ColumnSelector {
 
                 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("column-selector", task);
                 }
 
                 true