@hpcc-js/marshaller 2.28.7 → 2.28.9

package/src/ddl2/dashboardDockPanel.ts

@@ -1,123 +1,123 @@
-import { Widget } from "@hpcc-js/common";
-import { DockPanel, IClosable, WidgetAdapter } from "@hpcc-js/phosphor";
-import { compare } from "@hpcc-js/util";
-import { select as d3Select } from "d3-selection";
-import { Element, ElementContainer } from "./model/element";
-import { IVizPopupPanelOwner } from "./model/vizChartPanel";
-import { PopupManager } from "./PopupManager";
-
-export class DashboardDockPanel extends DockPanel implements IClosable, IVizPopupPanelOwner {
-
-    constructor(private _ec: ElementContainer) {
-        super();
-
-    }
-
-    tabTitle(element: Element): string {
-        if (this.hideSingleTabs()) {
-            return element.visualization().title ? element.visualization().title() : element.visualization().id();
-        }
-        return element.id();
-    }
-
-    titleClassed(wa: WidgetAdapter, classID: string, include: boolean) {
-        let classes = wa.title.className.split(" ");
-        if (include && classes.indexOf(classID) < 0) {
-            classes.push(classID);
-        } else if (!include && classes.indexOf(classID) > 0) {
-            classes = classes.filter(c => c !== classID);
-        }
-        wa.title.className = classes.join(" ");
-    }
-
-    updateTitle(w: Widget) {
-        const wa: WidgetAdapter = this.getWidgetAdapter(w);
-        const element: Element = this._ec.element(w);
-        const errors = element.validate();
-        wa.title.label = this.tabTitle(element);
-        this.titleClassed(wa, "error", errors.length > 0);
-        wa.title.caption = errors.map(err => `${err.source}:  ${err.msg}`).join("\n");
-    }
-
-    activate(element: Element) {
-        const wa = this.getWidgetAdapter(element.visualization().chartPanel());
-        if (wa) {
-            wa.activate();
-        }
-    }
-
-    syncMinSize(w: any): boolean {
-        if (w.minWidth_exists() || w.minHeight_exists()) {
-            const wa = this.getWidgetAdapter(w);
-            d3Select(wa.node)
-                .style("min-width", `${w.minWidth()}px`)
-                .style("min-height", `${w.minHeight()}px`)
-                ;
-            return true;
-        }
-        return false;
-    }
-
-    syncWidgets() {
-        const prevWidgets = this.widgets();
-        const diffWidgets = compare(prevWidgets, this._ec.elements().filter(e => e.visualization().visibility() === "normal").map(viz => viz.visualization().chartPanel()));
-
-        let refit = false;
-        for (const w of diffWidgets.exit) {
-            this.removeWidget(w);
-        }
-
-        for (const w of diffWidgets.enter) {
-            const element: Element = this._ec.element(w);
-            this.addWidget(w, this.tabTitle(element), "split-bottom", undefined, this.hideSingleTabs() ? undefined : this);
-            refit = this.syncMinSize(w) || refit;  // ensure syncMinSize is called
-        }
-
-        for (const w of diffWidgets.update) {
-            this.updateTitle(w);
-            refit = this.syncMinSize(w) || refit;  // ensure syncMinSize is called
-        }
-
-        if (refit) {
-            this.refit();
-        }
-
-        return this;
-    }
-
-    //  Events  ---
-    childActivation(w: Widget, wa: WidgetAdapter) {
-        super.childActivation(w, wa);
-        this.vizActivation(this._ec.element(w));
-        for (const wa2 of this.widgetAdapters()) {
-            if (wa2 === wa) {
-                wa2.addClass("active");
-                this.titleClassed(wa2, "active", true);
-                wa2.title.iconClass = "active";
-            } else {
-                wa2.removeClass("active");
-                this.titleClassed(wa2, "active", false);
-                wa2.title.iconClass = "";
-            }
-        }
-    }
-
-    vizActivation(viz: Element) {
-    }
-
-    //  IClosable  ---
-    canClose(w: Widget, wa: WidgetAdapter): boolean {
-        const id = this._ec.element(w).id();
-        const retVal = window.confirm(`Remove Widget "${id}"?`);
-        if (retVal) {
-            this._ec.clear(id);
-            this.syncWidgets();
-            this.vizActivation(undefined);
-        }
-        return retVal;
-    }
-
-    syncPopups() { }
-}
-DashboardDockPanel.prototype._class += " marshaller_DashboardDockPanel";
-DashboardDockPanel.prototype.mixin(PopupManager);
+import { Widget } from "@hpcc-js/common";
+import { DockPanel, IClosable, WidgetAdapter } from "@hpcc-js/phosphor";
+import { compare } from "@hpcc-js/util";
+import { select as d3Select } from "d3-selection";
+import { Element, ElementContainer } from "./model/element";
+import { IVizPopupPanelOwner } from "./model/vizChartPanel";
+import { PopupManager } from "./PopupManager";
+
+export class DashboardDockPanel extends DockPanel implements IClosable, IVizPopupPanelOwner {
+
+    constructor(private _ec: ElementContainer) {
+        super();
+
+    }
+
+    tabTitle(element: Element): string {
+        if (this.hideSingleTabs()) {
+            return element.visualization().title ? element.visualization().title() : element.visualization().id();
+        }
+        return element.id();
+    }
+
+    titleClassed(wa: WidgetAdapter, classID: string, include: boolean) {
+        let classes = wa.title.className.split(" ");
+        if (include && classes.indexOf(classID) < 0) {
+            classes.push(classID);
+        } else if (!include && classes.indexOf(classID) > 0) {
+            classes = classes.filter(c => c !== classID);
+        }
+        wa.title.className = classes.join(" ");
+    }
+
+    updateTitle(w: Widget) {
+        const wa: WidgetAdapter = this.getWidgetAdapter(w);
+        const element: Element = this._ec.element(w);
+        const errors = element.validate();
+        wa.title.label = this.tabTitle(element);
+        this.titleClassed(wa, "error", errors.length > 0);
+        wa.title.caption = errors.map(err => `${err.source}:  ${err.msg}`).join("\n");
+    }
+
+    activate(element: Element) {
+        const wa = this.getWidgetAdapter(element.visualization().chartPanel());
+        if (wa) {
+            wa.activate();
+        }
+    }
+
+    syncMinSize(w: any): boolean {
+        if (w.minWidth_exists() || w.minHeight_exists()) {
+            const wa = this.getWidgetAdapter(w);
+            d3Select(wa.node)
+                .style("min-width", `${w.minWidth()}px`)
+                .style("min-height", `${w.minHeight()}px`)
+                ;
+            return true;
+        }
+        return false;
+    }
+
+    syncWidgets() {
+        const prevWidgets = this.widgets();
+        const diffWidgets = compare(prevWidgets, this._ec.elements().filter(e => e.visualization().visibility() === "normal").map(viz => viz.visualization().chartPanel()));
+
+        let refit = false;
+        for (const w of diffWidgets.exit) {
+            this.removeWidget(w);
+        }
+
+        for (const w of diffWidgets.enter) {
+            const element: Element = this._ec.element(w);
+            this.addWidget(w, this.tabTitle(element), "split-bottom", undefined, this.hideSingleTabs() ? undefined : this);
+            refit = this.syncMinSize(w) || refit;  // ensure syncMinSize is called
+        }
+
+        for (const w of diffWidgets.update) {
+            this.updateTitle(w);
+            refit = this.syncMinSize(w) || refit;  // ensure syncMinSize is called
+        }
+
+        if (refit) {
+            this.refit();
+        }
+
+        return this;
+    }
+
+    //  Events  ---
+    childActivation(w: Widget, wa: WidgetAdapter) {
+        super.childActivation(w, wa);
+        this.vizActivation(this._ec.element(w));
+        for (const wa2 of this.widgetAdapters()) {
+            if (wa2 === wa) {
+                wa2.addClass("active");
+                this.titleClassed(wa2, "active", true);
+                wa2.title.iconClass = "active";
+            } else {
+                wa2.removeClass("active");
+                this.titleClassed(wa2, "active", false);
+                wa2.title.iconClass = "";
+            }
+        }
+    }
+
+    vizActivation(viz: Element) {
+    }
+
+    //  IClosable  ---
+    canClose(w: Widget, wa: WidgetAdapter): boolean {
+        const id = this._ec.element(w).id();
+        const retVal = window.confirm(`Remove Widget "${id}"?`);
+        if (retVal) {
+            this._ec.clear(id);
+            this.syncWidgets();
+            this.vizActivation(undefined);
+        }
+        return retVal;
+    }
+
+    syncPopups() { }
+}
+DashboardDockPanel.prototype._class += " marshaller_DashboardDockPanel";
+DashboardDockPanel.prototype.mixin(PopupManager);

package/src/ddl2/dashboardGrid.ts

@@ -1,202 +1,202 @@
-import { Widget } from "@hpcc-js/common";
-import { Cell, Grid } from "@hpcc-js/layout";
-import { IClosable, WidgetAdapter } from "@hpcc-js/phosphor";
-import { compare } from "@hpcc-js/util";
-import { IDockPanel } from "./dashboard";
-import { Element, ElementContainer } from "./model/element";
-import { IVizPopupPanelOwner } from "./model/vizChartPanel";
-import { PopupManager } from "./PopupManager";
-
-export class DashboardGrid extends Grid implements IClosable, IVizPopupPanelOwner, IDockPanel {
-    private _layoutCache = [];
-    constructor(private _ec: ElementContainer) {
-        super();
-
-        this.designMode(false);
-        this.surfacePadding("0");
-        this.surfaceBorderWidth(0);
-    }
-    updateGrid(resize, transitionDuration: number = 0, _noRender: boolean = false) {
-        super.updateGrid(resize, transitionDuration, _noRender);
-        this._layoutCache = this.content().map(cellWidget => {
-            return {
-                id: cellWidget.widget().id(),
-                position: [
-                    cellWidget.gridCol(),
-                    cellWidget.gridRow(),
-                    cellWidget.gridColSpan(),
-                    cellWidget.gridRowSpan()
-                ]
-            };
-        });
-    }
-    layoutObj(_: object | null): this {
-        if (_) {
-            if ((_ as any).main) {
-                const convertedLayout = ddl2_layout(_, 10, 10);
-                this._layoutCache = convertedLayout;
-            } else if (_ instanceof Array) {
-                this._layoutCache = _;
-            }
-        }
-        return this;
-
-        function ddl2_layout(layoutObject, rows, cols) {
-            const ret = [];
-            dive(layoutObject.main, 0, 0, rows, cols);
-            return ret;
-            function dive(o, x, y, w, h) {
-                if (o.children) {
-                    if (o.type === "split-area") {
-                        if (o.orientation === "horizontal") {
-                            o.children.forEach((child, i) => {
-                                const _w = o.sizes[i] * w;
-                                const _h = h;
-                                const _x = i === 0 ? x : x + o.sizes[0] * w;
-                                const _y = y;
-                                dive(o.children[i], _x, _y, _w, _h);
-                            });
-                        } else if (o.orientation === "vertical") {
-                            o.children.forEach((child, i) => {
-                                const _w = w;
-                                const _h = o.sizes[i] * h;
-                                const _x = x;
-                                const _y = i === 0 ? y : y + o.sizes[0] * h;
-                                dive(o.children[i], _x, _y, _w, _h);
-                            });
-                        } else {
-                            console.error("wtf");
-                        }
-                    } else if (o.type === "tab-area") {
-                        o.children.forEach((child, i) => {
-                            const _w = w;
-                            const _h = o.sizes[i] * h;
-                            const _x = x;
-                            const _y = i === 0 ? y : y + o.sizes[0] * h;
-                            dive(o.children[i], _x, _y, _w, _h);
-                        });
-                    }
-                } else {
-                    ret.push([x, y, w, h].map(Math.round));
-                }
-            }
-        }
-    }
-    layout() {
-        return this._layoutCache;
-    }
-    widgets() {
-        return this.content().map(c => c.widget());
-    }
-    hideSingleTabs() {
-        return true;
-    }
-    getWidgetAdapter() {
-    }
-
-    tabTitle(element: Element): string {
-        if (this.hideSingleTabs()) {
-            return element.visualization().title ? element.visualization().title() : element.visualization().id();
-        }
-        return element.id();
-    }
-
-    updateTitle(w: Widget) {
-        const cell: Cell = this.getWidgetCell(w.id());
-        const element: Element = this._ec.element(w);
-        const tabTitle = this.tabTitle(element);
-        (cell.widget() as any)
-            .title(tabTitle)
-            ;
-    }
-
-    activate(element: Element) {
-    }
-
-    removeWidget(w: Widget) {
-        const cell = this.getWidgetCell(w.id());
-        this.clearContent(cell);
-    }
-
-    syncMinSize(w: any): boolean {
-        if (w.minWidth_exists() || w.minHeight_exists()) {
-            const cell: Cell = this.getWidgetCell(w.id());
-            cell.element()
-                .style("min-width", `${w.minWidth()}px`)
-                .style("min-height", `${w.minHeight()}px`)
-                ;
-            return true;
-        }
-        return false;
-    }
-
-    syncWidgets() {
-        const prevWidgets = this.widgets();
-        const diffWidgets = compare(prevWidgets, this._ec.elements().filter(e => e.visualization().visibility() === "normal").map(viz => viz.visualization().chartPanel()));
-
-        for (const w of diffWidgets.exit) {
-            this.removeWidget(w);
-        }
-        let maxX = 0;
-        let maxY = 0;
-        const no_layout_added = [];
-        for (const widget of diffWidgets.enter) {
-            const element: Element = this._ec.element(widget);
-            const i = this.content().length;
-            if (this._layoutCache && this._layoutCache[i]) {
-                const layout = (this._layoutCache as any).find(n => n.id === widget.id());
-                if (layout) {
-                    const [x, y, w, h] = layout.position;
-                    this.setContent(y, x, element.visualization().chartPanel(), "", h, w);
-                    if (x + w > maxX) maxX = x + w;
-                    if (y + h > maxY) maxY = y + h;
-                } else {
-                    no_layout_added.push(element.visualization().chartPanel());
-                }
-            } else {
-                no_layout_added.push(element.visualization().chartPanel());
-            }
-        }
-        let freeRow = this.content().reduce((prev, curr) => Math.max(prev, curr.gridRow() + curr.gridRowSpan()), 0);
-        no_layout_added.forEach(cp => {
-            this.setContent(freeRow, 0, cp, "", 3, 3);
-            freeRow += 3;
-        });
-        for (const w of diffWidgets.update) {
-            this.updateTitle(w);
-        }
-        return this;
-    }
-
-    //  Events  ---
-    childActivation(w: Widget, wa?: WidgetAdapter) {
-        this.vizActivation(this._ec.element(w));
-    }
-
-    postSelectionChange() {
-        super.postSelectionChange();
-        const selected = this._selectionBag.get();
-        if (selected.length > 0) {
-            this.childActivation(selected[0].widget.widget());
-        }
-    }
-
-    vizActivation(viz: Element) {
-    }
-
-    //  IClosable  ---
-    canClose(w: Widget, wa: WidgetAdapter): boolean {
-        const id = this._ec.element(w).id();
-        const retVal = window.confirm(`Remove Widget "${id}"?`);
-        if (retVal) {
-            this._ec.clear(id);
-            this.syncWidgets();
-            this.vizActivation(undefined);
-        }
-        return retVal;
-    }
-
-    syncPopups() { }
-}
-DashboardGrid.prototype._class += " marshaller_DashboardGrid";
-DashboardGrid.prototype.mixin(PopupManager);
+import { Widget } from "@hpcc-js/common";
+import { Cell, Grid } from "@hpcc-js/layout";
+import { IClosable, WidgetAdapter } from "@hpcc-js/phosphor";
+import { compare } from "@hpcc-js/util";
+import { IDockPanel } from "./dashboard";
+import { Element, ElementContainer } from "./model/element";
+import { IVizPopupPanelOwner } from "./model/vizChartPanel";
+import { PopupManager } from "./PopupManager";
+
+export class DashboardGrid extends Grid implements IClosable, IVizPopupPanelOwner, IDockPanel {
+    private _layoutCache = [];
+    constructor(private _ec: ElementContainer) {
+        super();
+
+        this.designMode(false);
+        this.surfacePadding("0");
+        this.surfaceBorderWidth(0);
+    }
+    updateGrid(resize, transitionDuration: number = 0, _noRender: boolean = false) {
+        super.updateGrid(resize, transitionDuration, _noRender);
+        this._layoutCache = this.content().map(cellWidget => {
+            return {
+                id: cellWidget.widget().id(),
+                position: [
+                    cellWidget.gridCol(),
+                    cellWidget.gridRow(),
+                    cellWidget.gridColSpan(),
+                    cellWidget.gridRowSpan()
+                ]
+            };
+        });
+    }
+    layoutObj(_: object | null): this {
+        if (_) {
+            if ((_ as any).main) {
+                const convertedLayout = ddl2_layout(_, 10, 10);
+                this._layoutCache = convertedLayout;
+            } else if (_ instanceof Array) {
+                this._layoutCache = _;
+            }
+        }
+        return this;
+
+        function ddl2_layout(layoutObject, rows, cols) {
+            const ret = [];
+            dive(layoutObject.main, 0, 0, rows, cols);
+            return ret;
+            function dive(o, x, y, w, h) {
+                if (o.children) {
+                    if (o.type === "split-area") {
+                        if (o.orientation === "horizontal") {
+                            o.children.forEach((child, i) => {
+                                const _w = o.sizes[i] * w;
+                                const _h = h;
+                                const _x = i === 0 ? x : x + o.sizes[0] * w;
+                                const _y = y;
+                                dive(o.children[i], _x, _y, _w, _h);
+                            });
+                        } else if (o.orientation === "vertical") {
+                            o.children.forEach((child, i) => {
+                                const _w = w;
+                                const _h = o.sizes[i] * h;
+                                const _x = x;
+                                const _y = i === 0 ? y : y + o.sizes[0] * h;
+                                dive(o.children[i], _x, _y, _w, _h);
+                            });
+                        } else {
+                            console.error("wtf");
+                        }
+                    } else if (o.type === "tab-area") {
+                        o.children.forEach((child, i) => {
+                            const _w = w;
+                            const _h = o.sizes[i] * h;
+                            const _x = x;
+                            const _y = i === 0 ? y : y + o.sizes[0] * h;
+                            dive(o.children[i], _x, _y, _w, _h);
+                        });
+                    }
+                } else {
+                    ret.push([x, y, w, h].map(Math.round));
+                }
+            }
+        }
+    }
+    layout() {
+        return this._layoutCache;
+    }
+    widgets() {
+        return this.content().map(c => c.widget());
+    }
+    hideSingleTabs() {
+        return true;
+    }
+    getWidgetAdapter() {
+    }
+
+    tabTitle(element: Element): string {
+        if (this.hideSingleTabs()) {
+            return element.visualization().title ? element.visualization().title() : element.visualization().id();
+        }
+        return element.id();
+    }
+
+    updateTitle(w: Widget) {
+        const cell: Cell = this.getWidgetCell(w.id());
+        const element: Element = this._ec.element(w);
+        const tabTitle = this.tabTitle(element);
+        (cell.widget() as any)
+            .title(tabTitle)
+            ;
+    }
+
+    activate(element: Element) {
+    }
+
+    removeWidget(w: Widget) {
+        const cell = this.getWidgetCell(w.id());
+        this.clearContent(cell);
+    }
+
+    syncMinSize(w: any): boolean {
+        if (w.minWidth_exists() || w.minHeight_exists()) {
+            const cell: Cell = this.getWidgetCell(w.id());
+            cell.element()
+                .style("min-width", `${w.minWidth()}px`)
+                .style("min-height", `${w.minHeight()}px`)
+                ;
+            return true;
+        }
+        return false;
+    }
+
+    syncWidgets() {
+        const prevWidgets = this.widgets();
+        const diffWidgets = compare(prevWidgets, this._ec.elements().filter(e => e.visualization().visibility() === "normal").map(viz => viz.visualization().chartPanel()));
+
+        for (const w of diffWidgets.exit) {
+            this.removeWidget(w);
+        }
+        let maxX = 0;
+        let maxY = 0;
+        const no_layout_added = [];
+        for (const widget of diffWidgets.enter) {
+            const element: Element = this._ec.element(widget);
+            const i = this.content().length;
+            if (this._layoutCache && this._layoutCache[i]) {
+                const layout = (this._layoutCache as any).find(n => n.id === widget.id());
+                if (layout) {
+                    const [x, y, w, h] = layout.position;
+                    this.setContent(y, x, element.visualization().chartPanel(), "", h, w);
+                    if (x + w > maxX) maxX = x + w;
+                    if (y + h > maxY) maxY = y + h;
+                } else {
+                    no_layout_added.push(element.visualization().chartPanel());
+                }
+            } else {
+                no_layout_added.push(element.visualization().chartPanel());
+            }
+        }
+        let freeRow = this.content().reduce((prev, curr) => Math.max(prev, curr.gridRow() + curr.gridRowSpan()), 0);
+        no_layout_added.forEach(cp => {
+            this.setContent(freeRow, 0, cp, "", 3, 3);
+            freeRow += 3;
+        });
+        for (const w of diffWidgets.update) {
+            this.updateTitle(w);
+        }
+        return this;
+    }
+
+    //  Events  ---
+    childActivation(w: Widget, wa?: WidgetAdapter) {
+        this.vizActivation(this._ec.element(w));
+    }
+
+    postSelectionChange() {
+        super.postSelectionChange();
+        const selected = this._selectionBag.get();
+        if (selected.length > 0) {
+            this.childActivation(selected[0].widget.widget());
+        }
+    }
+
+    vizActivation(viz: Element) {
+    }
+
+    //  IClosable  ---
+    canClose(w: Widget, wa: WidgetAdapter): boolean {
+        const id = this._ec.element(w).id();
+        const retVal = window.confirm(`Remove Widget "${id}"?`);
+        if (retVal) {
+            this._ec.clear(id);
+            this.syncWidgets();
+            this.vizActivation(undefined);
+        }
+        return retVal;
+    }
+
+    syncPopups() { }
+}
+DashboardGrid.prototype._class += " marshaller_DashboardGrid";
+DashboardGrid.prototype.mixin(PopupManager);