WIP

finos · Oct 6, 2021 · 3f713a3 · 3f713a3
1 parent ebced4c
commit 3f713a3
Show file tree

Hide file tree

Showing 4 changed files with 320 additions and 67 deletions.
diff --git a/examples/blocks/src/editable/index.html b/examples/blocks/src/editable/index.html
@@ -9,59 +9,93 @@
 
 <!DOCTYPE html>
 <html>
+  <head>
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no"
+    />
 
-<head>
-
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
-
     <script src="https://cdn.jsdelivr.net/npm/webfontloader"></script>
-    <script>WebFont.load({google:{families:["Roboto Mono:200,400","Material Icons","Open Sans:300,400"]}})</script>
+    <script>
+      WebFont.load({
+        google: {
+          families: [
+            "Roboto Mono:200,400",
+            "Material Icons",
+            "Open Sans:300,400",
+          ],
+        },
+      });
+    </script>
 
     <script src="/node_modules/@finos/perspective/dist/umd/perspective.js"></script>
     <script src="/node_modules/@finos/perspective-viewer/dist/umd/perspective-viewer.js"></script>
     <script src="/node_modules/@finos/perspective-viewer-datagrid/dist/umd/perspective-viewer-datagrid.js"></script>
     <script src="/node_modules/@finos/perspective-viewer-d3fc/dist/umd/perspective-viewer-d3fc.js"></script>
 
-    <link rel='stylesheet' href="/node_modules/@finos/perspective-viewer/dist/umd/material-dense.css" is="custom-style">
-
+    <link
+      rel="stylesheet"
+      href="/node_modules/@finos/perspective-viewer/dist/umd/material-dense.css"
+      is="custom-style"
+    />
+
     <style>
-        perspective-viewer {
-            position: absolute;
-            top: 0;
-            left: 0;
-            right: 0;
-            bottom: 0;
-        }
+      perspective-viewer {
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+      }
     </style>
+  </head>
 
-</head>
-
-<body>
-
-    <perspective-viewer editable>
-
-    </perspective-viewer>
+  <body>
+    <perspective-viewer editable> </perspective-viewer>
 
     <script>
-        const WORKER = window.perspective.worker();
-
-        function on_load() {
-            var el = document.getElementsByTagName('perspective-viewer')[0];
-            WORKER.table(this.response).then(table => {
-                el.load(Promise.resolve(table));
-                el.toggleConfig();
-            });
-        }
+      const WORKER = window.perspective.worker();
 
-        window.addEventListener('DOMContentLoaded', function () {
-            var xhr = new XMLHttpRequest();
-            xhr.open('GET', '/node_modules/superstore-arrow/superstore.arrow', true);
-            xhr.responseType = "arraybuffer"
-            xhr.onload = on_load.bind(xhr);
-            xhr.send(null);
+      function on_load() {
+        var el = document.getElementsByTagName("perspective-viewer")[0];
+        WORKER.table(this.response).then((table) => {
+          el.load(Promise.resolve(table));
+          el.toggleConfig();
         });
-    </script>
+      }
 
-</body>
+      // function on_load() {
+      //   const config = {
+      //     editable: true,
+      //     plugin: "Y Bar",
+      //     columns: ["Profit"],
+      //     "row-pivots": ["Order Date"],
+      //     "column-pivots": ["Profit"],
+      //     selectable: null,
+      //     aggregates: null,
+      //     filters: null,
+      //     sort: null,
+      //     plugin_config: {},
+      //   };
+      //   var el = document.getElementsByTagName("perspective-viewer")[0];
+      //   WORKER.table(this.response, { limit: 10 }).then((table) => {
+      //     el.load(table);
+      //     el.toggleConfig();
+      //     el.restore(config);
+      //   });
+      // }
 
-</html>
+      window.addEventListener("DOMContentLoaded", function() {
+        var xhr = new XMLHttpRequest();
+        xhr.open(
+          "GET",
+          "/node_modules/superstore-arrow/superstore.arrow",
+          true
+        );
+        xhr.responseType = "arraybuffer";
+        xhr.onload = on_load.bind(xhr);
+        xhr.send(null);
+      });
+    </script>
+  </body>
+</html>
diff --git a/packages/perspective-viewer-d3fc/src/js/series/barSeries.js b/packages/perspective-viewer-d3fc/src/js/series/barSeries.js
@@ -7,40 +7,40 @@
  *
  */
 import * as fc from "d3fc";
-import {tooltip} from "../tooltip/tooltip";
+import { tooltip } from "../tooltip/tooltip";
 
 export function barSeries(settings, color) {
-    let series =
-        settings.mainValues.length > 1
-            ? fc.seriesSvgGrouped(fc.seriesSvgBar())
-            : fc.seriesSvgBar();
+  let series =
+    settings.mainValues.length > 1
+      ? fc.seriesSvgGrouped(fc.seriesSvgBar())
+      : fc.seriesSvgBar();
 
-    series = series.decorate((selection) => {
-        tooltip().settings(settings)(selection);
-        selection.style("fill", (d) => color(d.key));
-    });
+  series = series.decorate((selection) => {
+    tooltip().settings(settings)(selection);
+    selection.style("fill", (d) => color(d.key));
+  });
 
-    return fc
-        .autoBandwidth(minBandwidth(series))
-        .crossValue((d) => d.crossValue)
-        .mainValue((d) => d.mainValue)
-        .baseValue((d) => d.baseValue);
+  return fc
+    .autoBandwidth(minBandwidth(series))
+    .crossValue((d) => d.crossValue)
+    .mainValue((d) => (d.mainValue ? d.mainValue : 0))
+    .baseValue((d) => d.baseValue);
 }
 
 const minBandwidth = (adaptee) => {
-    const min = (arg) => {
-        return adaptee(arg);
-    };
+  const min = (arg) => {
+    return adaptee(arg);
+  };
 
-    fc.rebindAll(min, adaptee);
-
-    min.bandwidth = (...args) => {
-        if (!args.length) {
-            return adaptee.bandwidth();
-        }
-        adaptee.bandwidth(Math.max(args[0], 1));
-        return min;
-    };
+  fc.rebindAll(min, adaptee);
 
+  min.bandwidth = (...args) => {
+    if (!args.length) {
+      return adaptee.bandwidth();
+    }
+    adaptee.bandwidth(Math.max(args[0], 1));
     return min;
+  };
+
+  return min;
 };