Merge pull request #1471 from finos/vieux-config

Refactoring

Author: texodus

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

@@ -91,11 +91,11 @@ export function register(...plugins) {
                         chart.plugin.max_columns = x;
                     }
 
-                    async draw(view, task, end_col, end_row) {
-                        await this.update(view, task, end_col, end_row, true);
+                    async draw(view, end_col, end_row) {
+                        await this.update(view, end_col, end_row, true);
                     }
 
-                    async update(view, task, end_col, end_row, clear = false) {
+                    async update(view, end_col, end_row, clear = false) {
                         if (!this.isConnected) {
                             return;
                         }
@@ -115,10 +115,6 @@ export function register(...plugins) {
                         }
                         metadata = await Promise.all([viewer._table.schema(false), view.expression_schema(false), view.schema(false), jsonp, view.get_config()]);
 
-                        if (task.cancelled) {
-                            return;
-                        }
-
                         let [table_schema, expression_schema, view_schema, json, config] = metadata;
 
                         /**

packages/perspective-viewer/src/html/viewer.html

@@ -19,7 +19,7 @@
         </div>
     </div>
 
-    <div slot="top_panel" id='top_panel'>
+    <div slot="top_panel" id='top_panel' style="visibility: hidden">
         <div class="rrow">
             <div id="row_pivots">
                 <div class="psp-text-field">
@@ -56,13 +56,7 @@
     </div>
 
     <div slot="main_panel" id="pivot_chart_container">
-        <div class="plugin_information plugin_information--warning hidden" id="plugin_information--size">
-            <span class="plugin_information__text" id="plugin_information_count">Estimated rendering</span>
-            <span class="plugin_information__actions">
-                <span class="plugin_information__action">Render all points</span>
-            </span>
-        </div>
-        <div id="pivot_chart">
+        <div id="pivot_chart"> 
             <slot></slot>
         </div>
     </div>

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

@@ -408,15 +408,15 @@ class PerspectiveViewer extends ActionElement {
      */
     set plugin(v) {
         if (v === "null" || v === null || v === undefined) {
-            (this._vieux._instance || this._vieux).set_plugin_default();
+            (this._vieux._instance || this._vieux).set_plugin();
             return;
         }
 
         if (this.hasAttribute("plugin")) {
             let plugin = this.getAttribute("plugin");
             (this._vieux._instance || this._vieux).set_plugin(plugin);
         } else {
-            (this._vieux._instance || this._vieux).set_plugin_default();
+            (this._vieux._instance || this._vieux).set_plugin();
             return;
         }
     }
@@ -747,14 +747,14 @@ class PerspectiveViewer extends ActionElement {
         this.removeAttribute("column-pivots");
         this.removeAttribute("filters");
         this.removeAttribute("sort");
-        this.removeAttribute("expressions");
         this.removeAttribute("aggregates");
         if (this._initial_col_order) {
             this.setAttribute("columns", JSON.stringify(this._initial_col_order));
         } else {
             this.removeAttribute("columns");
         }
 
+        this.removeAttribute("expressions");
         this.removeAttribute("plugin");
         this._vieux.get_plugin().then(plugin => {
             plugin.restore({});

packages/perspective-viewer/src/js/viewer/action_element.js

@@ -254,7 +254,6 @@ export class ActionElement extends DomElement {
             this._setAttributeSafe("plugin", plugin.name);
         }
 
-        this._plugin_information.classList.add("hidden");
         this._active_columns.classList.remove("one_lock", "two_lock");
         const classname = ["one_lock", "two_lock"][plugin.initial?.count - 1];
         if (classname) {
@@ -300,12 +299,5 @@ export class ActionElement extends DomElement {
         this._vieux.addEventListener("perspective-vieux-reset", () => this.reset());
         this._vieux.addEventListener("-perspective-plugin-changed", ({detail}) => this._vis_selector_changed(detail));
         this._vieux.addEventListener("-perspective-add-expression", ({detail}) => this._save_expression(detail));
-
-        this._plugin_information_action.addEventListener("click", async () => {
-            let plugin = await this._vieux.get_plugin();
-            this._debounce_update({ignore_size_check: true, limit_points: false});
-            this._plugin_information.classList.add("hidden");
-            plugin.render_warning = false;
-        });
     }
 }

packages/perspective-viewer/src/js/viewer/cancel_task.js

@@ -456,6 +456,10 @@ export class DomElement extends PerspectiveElement {
         this.shadowRoot.querySelector("#columns_container").style.visibility = "visible";
     }
 
+    _show_top_panel() {
+        this.shadowRoot.querySelector("#top_panel").style.visibility = "visible";
+    }
+
     _show_side_panel_actions() {
         this.shadowRoot.querySelector("#side_panel__actions").style.visibility = "visible";
     }
@@ -560,9 +564,6 @@ export class DomElement extends PerspectiveElement {
         this._top_panel = this.shadowRoot.querySelector("#top_panel");
         this._sort = this.shadowRoot.querySelector("#sort");
         this._transpose_button = this.shadowRoot.querySelector("#transpose_button");
-        this._plugin_information = this.shadowRoot.querySelector(".plugin_information");
-        this._plugin_information_action = this.shadowRoot.querySelector(".plugin_information__action");
-        this._plugin_information_message = this.shadowRoot.querySelector("#plugin_information_count");
         this._columns_container = this.shadowRoot.querySelector("#columns_container");
     }
 

packages/perspective-viewer/src/js/viewer/dom_element.js

@@ -77,7 +77,7 @@ export function drop(ev) {
         if (filtering) {
             this.setAttribute(name, JSON.stringify(columns.concat([data])));
         } else if (name.indexOf("sort") > -1) {
-            this.setAttribute(name, JSON.stringify(columns.concat([[data[0]]])));
+            this.setAttribute(name, JSON.stringify(columns.concat([[data[0], "asc"]])));
         } else {
             this.setAttribute(name, JSON.stringify(columns.concat([data[0]])));
         }