Bookmark reconstruction (#666)

.gitignore

@@ -11,6 +11,7 @@ __pycache__
 *.ear
 
 target/
+bookmark/*.json
 
 # Idea files
 # see https://intellij-support.jetbrains.com/hc/en-us/articles/206544839-How-to-manage-projects-under-Version-Control-Systems

bookmark/README.md

@@ -0,0 +1 @@
+This directory will contain views which are bookmarked when running on the local machine.

uiconfig.json

@@ -3,5 +3,6 @@
     "localDbMenu": true,
     "showTestMenu": true,
     "enableManagement": true,
-    "privateIsCsv": true
+    "privateIsCsv": true,
+    "hideSuggestions": true
 }

web/src/main/webapp/dataViews/axisData.ts

@@ -26,7 +26,7 @@ import {
     RowValue
 } from "../javaBridge";
 import {
-    assert,
+    assert, assertNever,
     binarySearch,
     Converters,
     formatDate,
@@ -157,15 +157,16 @@ export class AxisDescription {
 }
 
 // This value indicates that some data does not fall within a bucket.
-export const NoBucketIndex: number = null;
+export const NoBucketIndex: number | null = null;
 
 /**
  * Contains all information required to build an axis and a d3 scale associated to it.
  */
 export class AxisData {
-    public scale: AnyScale;
-    public axis: AxisDescription;
-    public displayRange: BucketsInfo; // the range used to draw the data; may be adjusted from this.dataRange
+    // The following are set only when the resolution is set.
+    public scale: AnyScale | null;
+    public axis: AxisDescription | null;
+    public displayRange: BucketsInfo | null; // the range used to draw the data; may be adjusted from this.dataRange
 
     public constructor(public description: IColumnDescription | null, // may be null for e.g., the Y col in a histogram
                        // dataRange is the original range of the data
@@ -174,10 +175,10 @@ export class AxisData {
         this.displayRange = dataRange;
         const kind = description == null ? null : description.kind;
         if (dataRange != null) {
-            if (kindIsString(kind)) {
+            if (kindIsString(kind!)) {
                 this.displayRange = {
                     min: -.5,
-                    max: dataRange.stringQuantiles.length - .5,
+                    max: dataRange.stringQuantiles!.length - .5,
                     presentCount: dataRange.presentCount,
                     missingCount: dataRange.missingCount,
                     allStringsKnown: dataRange.allStringsKnown,
@@ -186,8 +187,8 @@ export class AxisData {
                 };
             } else if (kind === "Integer") {
                 this.displayRange = {
-                    min: dataRange.min - .5,
-                    max: dataRange.max + .5,
+                    min: dataRange.min! - .5,
+                    max: dataRange.max! + .5,
                     presentCount: dataRange.presentCount,
                     missingCount: dataRange.missingCount
                 };
@@ -198,7 +199,9 @@ export class AxisData {
         this.axis = null;
     }
 
-    public getDisplayNameString(schema: SchemaClass): string {
+    public getDisplayNameString(schema: SchemaClass): string | null {
+        if (this.description == null)
+            return null;
         return schema.displayName(this.description.name).displayName;
     }
 
@@ -333,10 +336,12 @@ export class AxisData {
                 this.axis = new AxisDescription(axisCreator(this.scale), 1, false, null);
                 break;
             }
-            default: {
-                console.log("Unexpected data kind for axis" + this.description.kind);
+            case "Duration": {
+                // TODO
                 break;
             }
+            default:
+                assertNever(this.description.kind);
         }
     }
 
@@ -461,13 +466,18 @@ export class AxisData {
             case "Double":
             case "Date":
             case "Time":
+            case "Duration":
             case "LocalDate":
                 return new BucketBoundaries(
                      new BucketBoundary(start, valueKind, true),
                      new BucketBoundary(end, valueKind, inclusive)
                  );
+            case "String":
+            case "Json":
+                // handled above
+                return null;
             default:
-                assert(false, "Unhandled data type " + valueKind);
+                assertNever(valueKind);
         }
     }
 

web/src/main/webapp/dataViews/chartView.ts

@@ -28,6 +28,7 @@ import {event as d3event, mouse as d3mouse} from "d3-selection";
 import {AxisData} from "./axisData";
 import {Dialog} from "../ui/dialog";
 import {NextKReceiver, TableView} from "../modules";
+import { assert } from "../util";
 
 /**
  * A ChartView is a common base class for many views that
@@ -45,20 +46,20 @@ export abstract class ChartView<D> extends BigTableView {
     /**
      * Coordinates of mouse within canvas.
      */
-    protected selectionOrigin: Point;
+    protected selectionOrigin: Point | null;
     /**
      * Rectangle in canvas used to display the current selection.
      */
     protected selectionRectangle: D3SvgElement;
     /**
      * Describes the data currently pointed by the mouse.
      */
-    protected pointDescription: TextOverlay;
+    protected pointDescription: TextOverlay | null;
     /**
      * The main surface on top of which the image is drawn.
      * There may exist other surfaces as well besides this one.
      */
-    protected surface: PlottingSurface;
+    protected surface: PlottingSurface | null;
     /**
      * Top-level menu.
      */
@@ -97,7 +98,7 @@ export abstract class ChartView<D> extends BigTableView {
 
         const order =  new RecordOrder(
             columns.map(c => { return { columnDescription: c, isAscending: true }}));
-        const rr = table.createNextKRequest(order, null, Resolution.tableRowsOnScreen);
+        const rr = table.createNextKRequest(order, null, Resolution.tableRowsOnScreen, null, null);
         rr.invoke(new NextKReceiver(newPage, table, rr, false, order, null));
     }
 
@@ -109,7 +110,7 @@ export abstract class ChartView<D> extends BigTableView {
             .on("drag", () => this.dragMove())
             .on("end", () => this.dragEnd());
 
-        const canvas = this.surface.getCanvas();
+        const canvas = this.surface!.getCanvas();
         canvas.call(drag)
             .on("mousemove", () => this.onMouseMove())
             .on("mouseenter", () => this.onMouseEnter())
@@ -149,7 +150,7 @@ export abstract class ChartView<D> extends BigTableView {
      * Converts a point coordinate in canvas to a point coordinate in the chart surface.
      */
     public canvasToChart(point: Point): Point {
-        return { x: point.x - this.surface.leftMargin, y: point.y - this.surface.topMargin };
+        return { x: point.x - this.surface!.leftMargin, y: point.y - this.surface!.topMargin };
     }
 
     protected abstract onMouseMove(): void;
@@ -162,7 +163,7 @@ export abstract class ChartView<D> extends BigTableView {
     protected dragStartRectangle(): void {
         this.dragging = true;
         this.moved = false;
-        const position = d3mouse(this.surface.getCanvas().node());
+        const position = d3mouse(this.surface!.getCanvas().node());
         this.selectionOrigin = {
             x: position[0],
             y: position[1] };
@@ -250,9 +251,9 @@ export abstract class ChartView<D> extends BigTableView {
             return false;
         }
         this.moved = true;
-        let ox = this.selectionOrigin.x;
-        let oy = this.selectionOrigin.y;
-        const position = d3mouse(this.surface.getCanvas().node());
+        let ox = this.selectionOrigin!.x;
+        let oy = this.selectionOrigin!.y;
+        const position = d3mouse(this.surface!.getCanvas().node());
         const x = position[0];
         const y = position[1];
         let width = x - ox;
@@ -308,16 +309,16 @@ export abstract class ChartView<D> extends BigTableView {
      */
     protected filterSelectionRectangle(xl: number, xr: number, yl: number, yr: number,
                                        xAxisData: AxisData, yAxisData: AxisData):
-        RangeFilterArrayDescription {
+        RangeFilterArrayDescription | null{
         if (xAxisData.axis == null ||
             yAxisData.axis == null) {
             return null;
         }
 
-        xl -= this.surface.leftMargin;
-        xr -= this.surface.leftMargin;
-        yl -= this.surface.topMargin;
-        yr -= this.surface.topMargin;
+        xl -= this.surface!.leftMargin;
+        xr -= this.surface!.leftMargin;
+        yl -= this.surface!.topMargin;
+        yr -= this.surface!.topMargin;
         const xRange = xAxisData.getFilter(xl, xr);
         const yRange = yAxisData.getFilter(yl, yr);
         return {