Merge pull request #1531 from finos/fix-missing-apis

Re-add `getEditPort()` and `restyleElement()` methods

packages/perspective-viewer-d3fc/src/js/plugin/plugin.js

@@ -232,7 +232,7 @@ export function register(...plugins) {
                         }
                     }
 
-                    async restyleElement(...args) {
+                    async restyle(...args) {
                         let settings = this._settings;
                         if (settings) {
                             delete settings["colorStyles"];

packages/perspective-viewer-datagrid/src/js/plugin.js

@@ -130,6 +130,8 @@ customElements.define(
             datagrid[PLUGIN_SYMBOL] = token;
         }
 
+        async restyle() {}
+
         delete() {
             if (this.datagrid.table_model) {
                 this.datagrid._resetAutoSize();

rust/perspective-viewer/src/rust/custom_elements/viewer.rs

@@ -21,6 +21,7 @@ use flate2::read::ZlibDecoder;
 use flate2::write::ZlibEncoder;
 use flate2::Compression;
 use futures::channel::oneshot::*;
+use futures::future::join_all;
 use js_intern::*;
 use js_sys::*;
 use std::cell::RefCell;
@@ -326,6 +327,34 @@ impl PerspectiveViewerElement {
         promisify_ignore_view_delete(async move { renderer.resize().await })
     }
 
+    /// Get this viewer's edit port for the currently loaded `Table`.
+    pub fn js_get_edit_port(&self) -> Result<f64, JsValue> {
+        self.session
+            .metadata()
+            .get_edit_port()
+            .ok_or_else(|| "No `Table` loaded".into())
+    }
+
+    /// Restyle all plugins from current document.
+    pub fn js_restyle_element(&self) -> js_sys::Promise {
+        let renderer = self.renderer.clone();
+        let session = self.session.clone();
+        promisify_ignore_view_delete(async move {
+            let view = session.get_view().into_jserror()?;
+            let plugins = renderer.get_all_plugins();
+            let tasks = plugins.iter().map(|plugin| {
+                let view = &view;
+                async move { plugin.restyle(view).await }
+            });
+
+            join_all(tasks)
+                .await
+                .into_iter()
+                .collect::<Result<Vec<_>, _>>()
+                .map(|_| JsValue::UNDEFINED)
+        })
+    }
+
     /// Determines the render throttling behavior. Can be an integer, for
     /// millisecond window to throttle render event; or, if `None`, adaptive throttling
     /// will be calculated from the measured render time of the last 5 frames.

rust/perspective-viewer/src/rust/js/perspective.rs

@@ -64,6 +64,9 @@ extern "C" {
     #[wasm_bindgen(method, catch, js_name = delete)]
     pub async fn _delete(this: &JsPerspectiveTable) -> Result<JsValue, JsValue>;
 
+    #[wasm_bindgen(method, catch, js_name = make_port)]
+    pub async fn _make_port(this: &JsPerspectiveTable) -> Result<JsValue, JsValue>;
+
     #[wasm_bindgen(method, catch, js_name = schema)]
     pub async fn _schema(this: &JsPerspectiveTable) -> Result<JsValue, JsValue>;
 
@@ -140,6 +143,7 @@ impl JsPerspectiveWorker {
 impl JsPerspectiveTable {
     async_typed!(_columns, columns(&self) -> js_sys::Array);
     async_typed!(_delete, delete(self) -> ());
+    async_typed!(_make_port, make_port(&self) -> f64);
     async_typed!(_validate_expressions, validate_expressions(&self, exprs: Array) -> JsPerspectiveValidatedExpressions);
     async_typed!(_schema, schema(&self) -> JsPerspectiveTableSchema);
     async_typed!(_view, view(&self, config: &JsPerspectiveViewConfig) -> JsPerspectiveView);

rust/perspective-viewer/src/rust/js/plugin.rs

@@ -55,6 +55,8 @@ use super::perspective::JsPerspectiveView;
 
         async resize() {}
 
+        async restyle() {}
+
         save() {}
 
         restore() {}
@@ -114,6 +116,12 @@ extern "C" {
     #[wasm_bindgen(method)]
     pub fn delete(this: &JsPerspectiveViewerPlugin);
 
+    #[wasm_bindgen(method, catch)]
+    pub async fn restyle(
+        this: &JsPerspectiveViewerPlugin, 
+        view: &JsPerspectiveView
+    ) -> Result<JsValue, JsValue>;
+
     #[wasm_bindgen(method, catch)]
     pub async fn draw(
         this: &JsPerspectiveViewerPlugin,

rust/perspective-viewer/src/rust/session/metadata.rs

@@ -27,6 +27,7 @@ pub struct SessionMetadata(Option<SessionMetadataState>);
 pub struct SessionMetadataState {
     column_names: Vec<String>,
     table_schema: HashMap<String, Type>,
+    edit_port: f64,
     view_schema: Option<HashMap<String, Type>>,
     view_expression_schema: Option<HashMap<String, Type>>,
     view_expression_alias: Option<HashMap<String, String>>,
@@ -54,9 +55,12 @@ impl SessionMetadata {
             .into_serde::<HashMap<String, Type>>()
             .into_jserror()?;
 
+        let edit_port = table.make_port().await?;
+
         Ok(SessionMetadata(Some(SessionMetadataState {
             column_names,
             table_schema,
+            edit_port,
             ..SessionMetadataState::default()
         })))
     }
@@ -168,6 +172,10 @@ impl SessionMetadata {
             .unwrap_or(false)
     }
 
+    pub fn get_edit_port(&self) -> Option<f64> {
+        self.0.as_ref().map(|meta| meta.edit_port)
+    }
+
     /// Returns the type of a column name relative to the `Table`.  Despite the name,
     /// `get_column_table_type()` also returns the `Table` type for Expressions,
     /// which despite living on the `View` still have a `table` type associated with

rust/perspective-viewer/src/ts/index.ts

@@ -369,7 +369,8 @@ export class PerspectiveViewerElement extends HTMLElement {
      * @category Util
      */
     async restyleElement(): Promise<void> {
-        console.error("Not Implemented");
+        await this.load_wasm();
+        await this.instance.js_restyle_element();
     }
 
     /**
@@ -395,8 +396,9 @@ export class PerspectiveViewerElement extends HTMLElement {
      * ```
      */
     async getEditPort(): Promise<number> {
-        console.error("Not Implemented");
-        return -1;
+        await this.load_wasm();
+        const port = await this.instance.js_get_edit_port();
+        return port;
     }
 
     /**