Merge pull request #550 from jpmorganchase/misc-cleanup

texodus · web-flow · commit f67b01f265d3 · 2019-04-22T00:17:03.000-04:00
Misc cleanup
diff --git a/packages/perspective-cli/src/html/index.html b/packages/perspective-cli/src/html/index.html
@@ -43,8 +43,9 @@
         }
     </style>
 </head>
+
 <body>
-    <perspective-viewer  id="view1"></perspective-viewer>
+    <perspective-viewer id="view1"></perspective-viewer>
     <script>
         window.addEventListener('WebComponentsReady', function() {
             var elem = document.getElementById('view1');
@@ -53,4 +54,5 @@
         });
     </script>
 </body>
+
 </html>
diff --git a/packages/perspective-cli/src/js/index.js b/packages/perspective-cli/src/js/index.js
@@ -7,7 +7,7 @@
  *
  */
 
-const {WebSocketHost, table} = require("@jpmorganchase/perspective/build/perspective.node.js");
+const {WebSocketHost, table} = require("@jpmorganchase/perspective");
 const {read_stdin, open_browser} = require("./utils.js");
 const fs = require("fs");
 const path = require("path");
@@ -66,8 +66,11 @@ async function convert(filename, options) {
  * @param {*} options
  */
 async function host(filename, options) {
-    const files = path.join(__dirname, "html");
-    const server = new WebSocketHost({assets: [files], port: options.port});
+    let files = [path.join(__dirname, "html")];
+    if (options.assets) {
+        files = [options.assets, ...files];
+    }
+    const server = new WebSocketHost({assets: files, port: options.port});
     let file;
     if (filename) {
         file = fs.readFileSync(filename).toString();
@@ -96,6 +99,7 @@ program
     .command("host [filename]")
     .description("Host a file on a local Websocket/HTTP server using a server-side Perspective.  Reads from STDIN if no filename is provided")
     .option("-p, --port <port>", "Which port to bind to.", x => parseInt(x), 8080)
+    .option("-a, --assets <path>", "Host from a working directory")
     .option("-o, --open", "Open a browser automagically.")
     .action(host);
 
diff --git a/packages/perspective-jupyterlab/src/less/index.less b/packages/perspective-jupyterlab/src/less/index.less
@@ -11,4 +11,4 @@ div.PSPContainer perspective-viewer,
 div.PSPContainer-dark perspective-viewer {
     display: block;
     height: 95%;
-}
+}
diff --git a/packages/perspective-viewer-d3fc/src/html/d3fc-chart.html b/packages/perspective-viewer-d3fc/src/html/d3fc-chart.html
@@ -1,4 +1,4 @@
 <template id="perspective-d3fc-chart">
-  <div id="container" class="chart">
-  </div>
+    <div id="container" class="chart">
+    </div>
 </template>
diff --git a/packages/perspective-viewer-d3fc/src/html/d3fc.html b/packages/perspective-viewer-d3fc/src/html/d3fc.html
@@ -1,5 +1,5 @@
 <template id="perspective-d3fc">
     <div id="container">
-      
+
     </div>
 </template>
diff --git a/packages/perspective-viewer/src/js/viewer.js b/packages/perspective-viewer/src/js/viewer.js
@@ -28,7 +28,7 @@ import {ActionElement} from "./viewer/action_element.js";
 polyfill({});
 
 /**
- * Module for `<perspective-viewer` custom element.  There are no exports from
+ * Module for `<perspective-viewer>` custom element.  There are no exports from
  * this module, however importing it has a side effect:  the
  * {@link module:perspective_viewer~PerspectiveViewer} class is registered as a
  * custom element, after which it can be used as a standard DOM element.  The
@@ -64,7 +64,6 @@ class PerspectiveViewer extends ActionElement {
     constructor() {
         super();
         this._register_debounce_instance();
-        this._slaves = [];
         this._show_config = true;
         this._show_warnings = true;
         this._resize_handler = _.debounce(this.notifyResize, 250).bind(this);
@@ -307,29 +306,6 @@ class PerspectiveViewer extends ActionElement {
         this._debounce_update();
     }
 
-    /**
-     * When set, hide the data visualization and display the message.  Setting
-     * `message` does not clear the internal `perspective.table`, but it does
-     * render it hidden until the message is removed.
-     *
-     * @param {string} msg The message. This can be HTML - it is not sanitized.
-     * @example
-     * let elem = document.getElementById('my_viewer');
-     * elem.setAttribute('message', '<h1>Loading</h1>');
-     */
-    message(msg) {
-        if (this.getAttribute("message") !== msg) {
-            this.setAttribute("message", msg);
-            return;
-        }
-        if (!this._inner_drop_target) return;
-        this.shadowRoot.querySelector("#app").classList.remove("hide_message");
-        this._inner_drop_target.innerHTML = msg;
-        for (let slave of this._slaves) {
-            slave.setAttribute("message", msg);
-        }
-    }
-
     /**
      * This element's `perspective` worker instance.  This property is not
      * reflected as an HTML attribute, and is readonly;  it can be effectively
@@ -346,6 +322,15 @@ class PerspectiveViewer extends ActionElement {
         return this._get_worker();
     }
 
+    /**
+     * This element's `perspective.table` instance.
+     *
+     * @readonly
+     */
+    get table() {
+        return this._table;
+    }
+
     /**
      * This element's `perspective.table.view` instance.  The instance itself
      * will change after every `PerspectiveViewer#perspective-config-update` event.
@@ -390,12 +375,7 @@ class PerspectiveViewer extends ActionElement {
             table = this.worker.table(data, options);
             table._owner_viewer = this;
         }
-        let _promises = [this._load_table(table)];
-        for (let slave of this._slaves) {
-            _promises.push(this._load_table.call(slave, table));
-        }
-        this._slaves = [];
-        return Promise.all(_promises);
+        return this._load_table(table);
     }
 
     /**
@@ -445,11 +425,8 @@ class PerspectiveViewer extends ActionElement {
             this._inner_drop_target.innerHTML = widget._inner_drop_target.innerHTML;
         }
 
-        if (widget._table) {
-            this._load_table(widget._table);
-        } else {
-            widget._slaves.push(this);
-        }
+        this._load_table(widget.table);
+        this.restore(widget.save());
     }
 
     /**
diff --git a/packages/perspective-viewer/src/js/viewer/perspective_element.js b/packages/perspective-viewer/src/js/viewer/perspective_element.js
@@ -303,6 +303,7 @@ export class PerspectiveElement extends StateElement {
             task.cancel();
             if (this._render_count === 0) {
                 this.removeAttribute("updating");
+                this.dispatchEvent(new Event("perspective-update-complete"));
             }
         }
     }
diff --git a/packages/perspective-viewer/src/less/viewer.less b/packages/perspective-viewer/src/less/viewer.less
@@ -75,7 +75,7 @@
     --hypergrid-row-hover--color: #666;
     --hypergrid-cell-hover--background: #eeeeee;
     --hypergrid-cell-hover--color: #666;
-    
+
     --d3fc-series: rgba(31, 119, 180, 0.5);
     --d3fc-series-1: #0366d6;
     --d3fc-series-2: #ff7f0e;
@@ -88,25 +88,25 @@
     --d3fc-series-9: #bcbd22;
     --d3fc-series-10: #17becf;
     --d3fc-gradient-full: linear-gradient(
-          #4d342f 0%,
-          #e4521b 22.5%,
-          #feeb65 42.5%,
-          #f0f0f0 50%,
-          #dcedc8 57.5%,
-          #42b3d5 67.5%,
-          #1a237e 100%
-      );
+        #4d342f 0%,
+        #e4521b 22.5%,
+        #feeb65 42.5%,
+        #f0f0f0 50%,
+        #dcedc8 57.5%,
+        #42b3d5 67.5%,
+        #1a237e 100%
+    );
     --d3fc-gradient-positive: linear-gradient(
-      #dcedc8 0%,
-      #42b3d5 35%,
-      #1a237e 100%
+        #dcedc8 0%,
+        #42b3d5 35%,
+        #1a237e 100%
     );
     --d3fc-gradient-negative: linear-gradient(
-      #feeb65 100%,
-      #e4521b 70%,
-      #4d342f 0%
+        #feeb65 100%,
+        #e4521b 70%,
+        #4d342f 0%
     );
-  
+
     #pivot_chart {
         position: absolute;
         width: 100%;
diff --git a/packages/perspective-viewer/src/themes/material.less b/packages/perspective-viewer/src/themes/material.less
@@ -42,7 +42,7 @@ perspective-viewer {
 
     --sort-order-asc--before: "arrow_upward";
     --sort-order-desc--before: "arrow_downward";
-    --sort-order-none--before: "-";
+    --sort-order-none--before: "remove";
     --sort-order-col-asc--before: "arrow_back";
     --sort-order-col-desc--before: "arrow_forward";
     --sort_order-padding: 0 0 0 0px;

Original file line number	Diff line number	Diff line change
`@@ -303,6 +303,7 @@ export class PerspectiveElement extends StateElement {`
`303`	`303`	`task.cancel();`
`304`	`304`	`if (this._render_count === 0) {`
`305`	`305`	`this.removeAttribute("updating");`
	`306`	`+ this.dispatchEvent(new Event("perspective-update-complete"));`
`306`	`307`	`}`
`307`	`308`	`}`
`308`	`309`	`}`