@deephaven/dashboard-core-plugins 0.5.2-matplotlib.3 → 0.6.1-demo.10

package/dist/panels/ChartPanel.js

@@ -1,41 +1,7 @@
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _iterableToArrayLimit(arr, i) { if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return; var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
-
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 import React, { Component } from 'react';
@@ -51,67 +17,61 @@ import { IrisGridUtils } from '@deephaven/iris-grid';
 import dh, { PropTypes as APIPropTypes } from '@deephaven/jsapi-shim';
 import { ThemeExport } from '@deephaven/components';
 import Log from '@deephaven/log';
-import { getActiveTool, setActiveTool as setActiveToolAction } from '@deephaven/redux';
+import { getActiveTool, getSettings, setActiveTool as setActiveToolAction } from '@deephaven/redux';
 import { Pending, PromiseUtils, TextUtils } from '@deephaven/utils';
-import WidgetPanel from './WidgetPanel';
-import ToolType from '../linker/ToolType';
-import { UIPropTypes } from '../prop-types';
-import { InputFilterEvent, ChartEvent } from '../events';
-import { getColumnSelectionValidatorForDashboard, getInputFiltersForDashboard, getIsolatedLinkerPanelIdForDashboard, getLinksForDashboard, getTableMapForDashboard, setDashboardIsolatedLinkerPanelId as setDashboardIsolatedLinkerPanelIdAction } from '../redux';
-import ChartFilterOverlay from './ChartFilterOverlay';
-import ChartColumnSelectorOverlay from './ChartColumnSelectorOverlay';
+import WidgetPanel from "./WidgetPanel.js";
+import ToolType from "../linker/ToolType.js";
+import { UIPropTypes } from "../prop-types/index.js";
+import { InputFilterEvent, ChartEvent } from "../events/index.js";
+import { getColumnSelectionValidatorForDashboard, getInputFiltersForDashboard, getIsolatedLinkerPanelIdForDashboard, getLinksForDashboard, getTableMapForDashboard, setDashboardIsolatedLinkerPanelId as setDashboardIsolatedLinkerPanelIdAction } from "../redux/index.js";
+import ChartFilterOverlay from "./ChartFilterOverlay.js";
+import ChartColumnSelectorOverlay from "./ChartColumnSelectorOverlay.js";
 import "./ChartPanel.css";
 var log = Log.module('ChartPanel');
 var UPDATE_MODEL_DEBOUNCE = 150;
-export var ChartPanel = /*#__PURE__*/function (_Component) {
-  _inherits(ChartPanel, _Component);
-
-  var _super = _createSuper(ChartPanel);
+export class ChartPanel extends Component {
+  constructor(props) {
+    super(props);
 
-  function ChartPanel(props) {
-    var _this;
-
-    _classCallCheck(this, ChartPanel);
-
-    _this = _super.call(this, props);
-
-    _defineProperty(_assertThisInitialized(_this), "getWaitingInputMap", memoize(function (isFilterRequired, columnMap, filterMap) {
+    _defineProperty(this, "getWaitingInputMap", memoize((isFilterRequired, columnMap, filterMap) => {
       if (!isFilterRequired) {
         return new Map();
       }
 
       var waitingInputMap = new Map(columnMap);
-      filterMap.forEach(function (filter, name) {
-        waitingInputMap["delete"](name);
+      filterMap.forEach((filter, name) => {
+        waitingInputMap.delete(name);
       });
       return waitingInputMap;
     }));
 
-    _defineProperty(_assertThisInitialized(_this), "getWaitingFilterMap", memoize(function (isFilterRequired, columnMap, filterMap, linkedColumnMap, inputFilterMap) {
+    _defineProperty(this, "getWaitingFilterMap", memoize((isFilterRequired, columnMap, filterMap, linkedColumnMap, inputFilterMap) => {
       if (!isFilterRequired) {
         return new Map();
       }
 
       var waitingFilterMap = new Map(columnMap);
-      filterMap.forEach(function (filter, name) {
-        waitingFilterMap["delete"](name);
+      filterMap.forEach((filter, name) => {
+        waitingFilterMap.delete(name);
       });
-      inputFilterMap.forEach(function (value, name) {
-        waitingFilterMap["delete"](name);
+      inputFilterMap.forEach((value, name) => {
+        waitingFilterMap.delete(name);
       });
-      linkedColumnMap.forEach(function (column, name) {
-        waitingFilterMap["delete"](name);
+      linkedColumnMap.forEach((column, name) => {
+        waitingFilterMap.delete(name);
       });
       return waitingFilterMap;
     }));
 
-    _defineProperty(_assertThisInitialized(_this), "getInputFilterColumnMap", memoize(function (columnMap, inputFilters) {
+    _defineProperty(this, "getInputFilterColumnMap", memoize((columnMap, inputFilters) => {
       var inputFilterMap = new Map();
 
       for (var i = 0; i < inputFilters.length; i += 1) {
         var inputFilter = inputFilters[i];
-        var name = inputFilter.name,
-            type = inputFilter.type;
+        var {
+          name,
+          type
+        } = inputFilter;
         var column = columnMap.get(name);
 
         if (column != null && column.type === type) {
@@ -122,9 +82,9 @@ export var ChartPanel = /*#__PURE__*/function (_Component) {
       return inputFilterMap;
     }));
 
-    _defineProperty(_assertThisInitialized(_this), "getLinkedColumnMap", memoize(function (columnMap, links) {
+    _defineProperty(this, "getLinkedColumnMap", memoize((columnMap, links) => {
       var linkedColumnMap = new Map();
-      var panelId = LayoutUtils.getIdFromPanel(_assertThisInitialized(_this));
+      var panelId = LayoutUtils.getIdFromPanel(this);
 
       for (var i = 0; i < links.length; i += 1) {
         var link = links[i];
@@ -144,54 +104,49 @@ export var ChartPanel = /*#__PURE__*/function (_Component) {
       return linkedColumnMap;
     }));
 
-    _defineProperty(_assertThisInitialized(_this), "getSelectorColumns", memoize(function (columnMap, linkedColumnMap, columnSelectionValidator) {
-      return Array.from(columnMap.values()).map(function (column) {
-        return {
-          name: column.name,
-          type: column.type,
-          isValid: columnSelectionValidator ? columnSelectionValidator(_assertThisInitialized(_this), column) : false,
-          isActive: linkedColumnMap.has(column.name)
-        };
-      });
-    }));
-
-    _this.handleColumnSelected = _this.handleColumnSelected.bind(_assertThisInitialized(_this));
-    _this.handleColumnMouseEnter = _this.handleColumnMouseEnter.bind(_assertThisInitialized(_this));
-    _this.handleColumnMouseLeave = _this.handleColumnMouseLeave.bind(_assertThisInitialized(_this));
-    _this.handleDisconnect = _this.handleDisconnect.bind(_assertThisInitialized(_this));
-    _this.handleReconnect = _this.handleReconnect.bind(_assertThisInitialized(_this));
-    _this.handleFilterAdd = _this.handleFilterAdd.bind(_assertThisInitialized(_this));
-    _this.handleHide = _this.handleHide.bind(_assertThisInitialized(_this));
-    _this.handleError = _this.handleError.bind(_assertThisInitialized(_this));
-    _this.handleLoadError = _this.handleLoadError.bind(_assertThisInitialized(_this));
-    _this.handleLoadSuccess = _this.handleLoadSuccess.bind(_assertThisInitialized(_this));
-    _this.handleResize = _this.handleResize.bind(_assertThisInitialized(_this));
-    _this.handleSettingsChanged = _this.handleSettingsChanged.bind(_assertThisInitialized(_this));
-    _this.handleOpenLinker = _this.handleOpenLinker.bind(_assertThisInitialized(_this));
-    _this.handleShow = _this.handleShow.bind(_assertThisInitialized(_this));
-    _this.handleSourceColumnChange = _this.handleSourceColumnChange.bind(_assertThisInitialized(_this));
-    _this.handleSourceFilterChange = _this.handleSourceFilterChange.bind(_assertThisInitialized(_this));
-    _this.handleSourceSortChange = _this.handleSourceSortChange.bind(_assertThisInitialized(_this));
-    _this.handleTabBlur = _this.handleTabBlur.bind(_assertThisInitialized(_this));
-    _this.handleTabFocus = _this.handleTabFocus.bind(_assertThisInitialized(_this));
-    _this.handleUpdate = _this.handleUpdate.bind(_assertThisInitialized(_this));
-    _this.updateModelFromSource = debounce(_this.updateModelFromSource.bind(_assertThisInitialized(_this)), UPDATE_MODEL_DEBOUNCE);
-    _this.handleClearAllFilters = _this.handleClearAllFilters.bind(_assertThisInitialized(_this));
-    _this.panelContainer = /*#__PURE__*/React.createRef();
-    _this.chart = /*#__PURE__*/React.createRef();
-    _this.pending = new Pending();
-    var metadata = props.metadata,
-        panelState = props.panelState;
-
-    var _ref = panelState !== null && panelState !== void 0 ? panelState : {},
-        _ref$filterValueMap = _ref.filterValueMap,
-        filterValueMap = _ref$filterValueMap === void 0 ? [] : _ref$filterValueMap,
-        _ref$settings = _ref.settings,
-        settings = _ref$settings === void 0 ? {} : _ref$settings;
-
+    _defineProperty(this, "getSelectorColumns", memoize((columnMap, linkedColumnMap, columnSelectionValidator) => Array.from(columnMap.values()).map(column => ({
+      name: column.name,
+      type: column.type,
+      isValid: columnSelectionValidator ? columnSelectionValidator(this, column) : false,
+      isActive: linkedColumnMap.has(column.name)
+    }))));
+
+    this.handleColumnSelected = this.handleColumnSelected.bind(this);
+    this.handleColumnMouseEnter = this.handleColumnMouseEnter.bind(this);
+    this.handleColumnMouseLeave = this.handleColumnMouseLeave.bind(this);
+    this.handleDisconnect = this.handleDisconnect.bind(this);
+    this.handleReconnect = this.handleReconnect.bind(this);
+    this.handleFilterAdd = this.handleFilterAdd.bind(this);
+    this.handleHide = this.handleHide.bind(this);
+    this.handleError = this.handleError.bind(this);
+    this.handleLoadError = this.handleLoadError.bind(this);
+    this.handleLoadSuccess = this.handleLoadSuccess.bind(this);
+    this.handleResize = this.handleResize.bind(this);
+    this.handleSettingsChanged = this.handleSettingsChanged.bind(this);
+    this.handleOpenLinker = this.handleOpenLinker.bind(this);
+    this.handleShow = this.handleShow.bind(this);
+    this.handleSourceColumnChange = this.handleSourceColumnChange.bind(this);
+    this.handleSourceFilterChange = this.handleSourceFilterChange.bind(this);
+    this.handleSourceSortChange = this.handleSourceSortChange.bind(this);
+    this.handleTabBlur = this.handleTabBlur.bind(this);
+    this.handleTabFocus = this.handleTabFocus.bind(this);
+    this.handleUpdate = this.handleUpdate.bind(this);
+    this.updateModelFromSource = debounce(this.updateModelFromSource.bind(this), UPDATE_MODEL_DEBOUNCE);
+    this.handleClearAllFilters = this.handleClearAllFilters.bind(this);
+    this.panelContainer = /*#__PURE__*/React.createRef();
+    this.chart = /*#__PURE__*/React.createRef();
+    this.pending = new Pending();
+    var {
+      metadata,
+      panelState
+    } = props;
+    var {
+      filterValueMap = [],
+      settings = {}
+    } = panelState !== null && panelState !== void 0 ? panelState : {};
     var queryName = metadata.query;
-    _this.state = {
-      settings: settings,
+    this.state = {
+      settings,
       error: null,
       isActive: false,
       isDisconnected: false,
@@ -206,845 +161,850 @@ export var ChartPanel = /*#__PURE__*/function (_Component) {
       filterValueMap: new Map(filterValueMap),
       model: null,
       columnMap: new Map(),
-      queryName: queryName,
+      queryName,
       // eslint-disable-next-line react/no-unused-state
-      panelState: panelState
+      panelState
     };
-    return _this;
   }
 
-  _createClass(ChartPanel, [{
-    key: "componentDidMount",
-    value: function componentDidMount() {
-      if (!this.isHidden()) {
-        this.setState({
-          isActive: true
-        });
-        this.initModel();
-      }
+  componentDidMount() {
+    if (!this.isHidden()) {
+      this.setState({
+        isActive: true
+      });
+      this.initModel();
     }
-  }, {
-    key: "componentDidUpdate",
-    value: function componentDidUpdate(prevProps, prevState) {
-      var _this$props = this.props,
-          inputFilters = _this$props.inputFilters,
-          source = _this$props.source;
-      var _this$state = this.state,
-          columnMap = _this$state.columnMap,
-          model = _this$state.model,
-          filterMap = _this$state.filterMap,
-          filterValueMap = _this$state.filterValueMap,
-          isLinked = _this$state.isLinked,
-          settings = _this$state.settings;
-
-      if (!model) {
-        return;
-      }
+  }
 
-      if (columnMap !== prevState.columnMap) {
-        this.pruneFilterMaps();
-      }
+  componentDidUpdate(prevProps, prevState) {
+    var {
+      inputFilters,
+      source
+    } = this.props;
+    var {
+      columnMap,
+      model,
+      filterMap,
+      filterValueMap,
+      isLinked,
+      settings
+    } = this.state;
+
+    if (!model) {
+      return;
+    }
 
-      if (inputFilters !== prevProps.inputFilters) {
-        this.updateChangedInputFilters(inputFilters, prevProps.inputFilters);
-      }
+    if (columnMap !== prevState.columnMap) {
+      this.pruneFilterMaps();
+    }
 
-      if (filterMap !== prevState.filterMap) {
-        this.updateFilters();
-      } else if (filterValueMap !== prevState.filterValueMap) {
-        this.updatePanelState();
-      }
+    if (inputFilters !== prevProps.inputFilters) {
+      this.updateChangedInputFilters(inputFilters, prevProps.inputFilters);
+    }
 
-      if (settings !== prevState.settings) {
-        model.updateSettings(settings);
-        this.updatePanelState();
-      }
+    if (filterMap !== prevState.filterMap) {
+      this.updateFilters();
+    } else if (filterValueMap !== prevState.filterValueMap) {
+      this.updatePanelState();
+    }
 
-      if (isLinked !== prevState.isLinked) {
-        if (source) {
-          if (isLinked) {
-            this.startListeningToSource(source);
-            this.updateModelFromSource();
-          } else {
-            this.stopListeningToSource(source);
-          }
-        }
-      } else if (isLinked && source !== prevProps.source) {
-        if (prevProps.source) {
-          this.stopListeningToSource(prevProps.source);
-        }
+    if (settings !== prevState.settings) {
+      model.updateSettings(settings);
+      this.updatePanelState();
+    }
 
-        if (source) {
+    if (isLinked !== prevState.isLinked) {
+      if (source) {
+        if (isLinked) {
           this.startListeningToSource(source);
           this.updateModelFromSource();
+        } else {
+          this.stopListeningToSource(source);
         }
       }
-    }
-  }, {
-    key: "componentWillUnmount",
-    value: function componentWillUnmount() {
-      this.pending.cancel();
-      var source = this.props.source;
+    } else if (isLinked && source !== prevProps.source) {
+      if (prevProps.source) {
+        this.stopListeningToSource(prevProps.source);
+      }
 
       if (source) {
-        this.stopListeningToSource(source);
+        this.startListeningToSource(source);
+        this.updateModelFromSource();
       }
     }
-  }, {
-    key: "initModel",
-    value: function initModel() {
-      this.setState({
-        isLoading: true,
-        isLoaded: false,
-        error: null
-      });
-      var makeModel = this.props.makeModel;
-      this.pending.add(makeModel(), function (resolved) {
-        resolved.close();
-      }).then(this.handleLoadSuccess, this.handleLoadError);
-    }
-  }, {
-    key: "startListeningToSource",
-    value: function startListeningToSource(table) {
-      log.debug('startListeningToSource', table);
-      table.addEventListener(dh.Table.EVENT_CUSTOMCOLUMNSCHANGED, this.handleSourceColumnChange);
-      table.addEventListener(dh.Table.EVENT_FILTERCHANGED, this.handleSourceFilterChange);
-      table.addEventListener(dh.Table.EVENT_SORTCHANGED, this.handleSourceSortChange);
+  }
+
+  componentWillUnmount() {
+    this.pending.cancel();
+    var {
+      source
+    } = this.props;
+
+    if (source) {
+      this.stopListeningToSource(source);
     }
-  }, {
-    key: "stopListeningToSource",
-    value: function stopListeningToSource(table) {
-      log.debug('stopListeningToSource', table);
-      table.removeEventListener(dh.Table.EVENT_CUSTOMCOLUMNSCHANGED, this.handleSourceColumnChange);
-      table.removeEventListener(dh.Table.EVENT_FILTERCHANGED, this.handleSourceFilterChange);
-      table.removeEventListener(dh.Table.EVENT_SORTCHANGED, this.handleSourceSortChange);
+  }
+
+  initModel() {
+    this.setState({
+      isLoading: true,
+      isLoaded: false,
+      error: null
+    });
+    var {
+      makeModel
+    } = this.props;
+    this.pending.add(makeModel(), resolved => {
+      resolved.close();
+    }).then(this.handleLoadSuccess, this.handleLoadError);
+  }
+
+  startListeningToSource(table) {
+    log.debug('startListeningToSource', table);
+    table.addEventListener(dh.Table.EVENT_CUSTOMCOLUMNSCHANGED, this.handleSourceColumnChange);
+    table.addEventListener(dh.Table.EVENT_FILTERCHANGED, this.handleSourceFilterChange);
+    table.addEventListener(dh.Table.EVENT_SORTCHANGED, this.handleSourceSortChange);
+  }
+
+  stopListeningToSource(table) {
+    log.debug('stopListeningToSource', table);
+    table.removeEventListener(dh.Table.EVENT_CUSTOMCOLUMNSCHANGED, this.handleSourceColumnChange);
+    table.removeEventListener(dh.Table.EVENT_FILTERCHANGED, this.handleSourceFilterChange);
+    table.removeEventListener(dh.Table.EVENT_SORTCHANGED, this.handleSourceSortChange);
+  }
+
+  loadModelIfNecessary() {
+    var {
+      isActive,
+      isLoaded,
+      isLoading
+    } = this.state;
+
+    if (isActive && !isLoaded && !isLoading) {
+      this.initModel();
     }
-  }, {
-    key: "loadModelIfNecessary",
-    value: function loadModelIfNecessary() {
-      var _this$state2 = this.state,
-          isActive = _this$state2.isActive,
-          isLoaded = _this$state2.isLoaded,
-          isLoading = _this$state2.isLoading;
-
-      if (isActive && !isLoaded && !isLoading) {
-        this.initModel();
-      }
+  }
+
+  isHidden() {
+    var {
+      glContainer
+    } = this.props;
+    var {
+      isHidden
+    } = glContainer;
+    return isHidden;
+  }
+
+  handleColumnSelected(columnName) {
+    var {
+      glEventHub
+    } = this.props;
+    var {
+      columnMap
+    } = this.state;
+    glEventHub.emit(ChartEvent.COLUMN_SELECTED, this, columnMap.get(columnName));
+  }
+
+  handleColumnMouseEnter(_ref) {
+    var {
+      type,
+      name
+    } = _ref;
+    var {
+      columnSelectionValidator
+    } = this.props;
+    log.debug('handleColumnMouseEnter', columnSelectionValidator, type, name);
+
+    if (!columnSelectionValidator) {
+      return;
     }
-  }, {
-    key: "isHidden",
-    value: function isHidden() {
-      var glContainer = this.props.glContainer;
-      var isHidden = glContainer.isHidden;
-      return isHidden;
+
+    columnSelectionValidator(this, {
+      type,
+      name
+    });
+  }
+
+  handleColumnMouseLeave() {
+    var {
+      columnSelectionValidator
+    } = this.props;
+    log.debug('handleColumnMouseLeave', columnSelectionValidator);
+
+    if (!columnSelectionValidator) {
+      return;
     }
-  }, {
-    key: "handleColumnSelected",
-    value: function handleColumnSelected(columnName) {
-      var glEventHub = this.props.glEventHub;
-      var columnMap = this.state.columnMap;
-      glEventHub.emit(ChartEvent.COLUMN_SELECTED, this, columnMap.get(columnName));
+
+    columnSelectionValidator(this, null);
+  }
+
+  handleDisconnect() {
+    this.setState({
+      error: new Error('Figure disconnected'),
+      isDisconnected: true
+    });
+  }
+
+  handleFilterAdd(columns) {
+    for (var i = 0; i < columns.length; i += 1) {
+      this.openInputFilter(columns[i]);
     }
-  }, {
-    key: "handleColumnMouseEnter",
-    value: function handleColumnMouseEnter(_ref2) {
-      var type = _ref2.type,
-          name = _ref2.name;
-      var columnSelectionValidator = this.props.columnSelectionValidator;
-      log.debug('handleColumnMouseEnter', columnSelectionValidator, type, name);
-
-      if (!columnSelectionValidator) {
-        return;
+  }
+
+  handleOpenLinker() {
+    var {
+      localDashboardId,
+      setActiveTool,
+      setDashboardIsolatedLinkerPanelId
+    } = this.props;
+    setDashboardIsolatedLinkerPanelId(localDashboardId, null);
+    setActiveTool(ToolType.LINKER);
+  }
+
+  handleReconnect() {
+    this.setState({
+      isDisconnected: false,
+      error: null
+    });
+    this.sendColumnChange();
+    this.updateColumnFilters();
+  }
+
+  handleLoadSuccess(model) {
+    log.debug('handleLoadSuccess');
+    var {
+      model: prevModel
+    } = this.state;
+    this.setState({
+      model,
+      isLoaded: true
+    }, () => {
+      var {
+        inputFilters,
+        source
+      } = this.props;
+      var {
+        filterMap,
+        isLinked
+      } = this.state;
+
+      if (model !== prevModel) {
+        this.sendColumnChange();
+        this.updateColumnFilters();
+        this.updateInputFilters(inputFilters, filterMap.size > 0 || model.isFilterRequired());
+
+        if (source && isLinked) {
+          this.startListeningToSource(source);
+          this.updateModelFromSource();
+        }
       }
+    });
+  }
 
-      columnSelectionValidator(this, {
-        type: type,
-        name: name
-      });
+  handleLoadError(error) {
+    if (PromiseUtils.isCanceled(error)) {
+      return;
     }
-  }, {
-    key: "handleColumnMouseLeave",
-    value: function handleColumnMouseLeave() {
-      var columnSelectionValidator = this.props.columnSelectionValidator;
-      log.debug('handleColumnMouseLeave', columnSelectionValidator);
-
-      if (!columnSelectionValidator) {
-        return;
+
+    log.error('handleLoadError', error);
+    this.setState({
+      error,
+      isLoading: false
+    });
+  }
+
+  handleSourceColumnChange() {
+    this.updateModelFromSource();
+  }
+
+  handleSourceFilterChange() {
+    this.updateModelFromSource();
+  }
+
+  handleSourceSortChange() {
+    this.updateModelFromSource();
+  }
+
+  updateModelFromSource() {
+    var {
+      metadata,
+      source
+    } = this.props;
+    var {
+      isLinked,
+      model
+    } = this.state;
+    var {
+      settings
+    } = metadata;
+
+    if (!isLinked || !model || !source) {
+      log.debug2('updateModelFromSource ignoring', isLinked, model, source);
+      return;
+    } // By now the model has already been loaded, which is the only other cancelable thing in pending
+
+
+    this.pending.cancel();
+    this.pending.add(dh.plot.Figure.create(ChartUtils.makeFigureSettings(settings, source))).then(figure => {
+      model.setFigure(figure);
+    }).catch(this.handleLoadError);
+    this.updatePanelState();
+  }
+
+  updatePanelState() {
+    var {
+      sourcePanel
+    } = this.props;
+    var {
+      panelState,
+      filterValueMap,
+      settings
+    } = this.state;
+    var {
+      tableSettings
+    } = panelState !== null && panelState !== void 0 ? panelState : {};
+
+    if (sourcePanel) {
+      // Right now just update the panel state from the source
+      // If the source isn't available, just keep the state that's already saved
+      var {
+        inputFilters
+      } = sourcePanel.props;
+      var {
+        panelState: sourcePanelState
+      } = sourcePanel.state;
+
+      if (sourcePanelState) {
+        tableSettings = IrisGridUtils.extractTableSettings(sourcePanelState, inputFilters);
       }
+    } // eslint-disable-next-line react/no-unused-state
 
-      columnSelectionValidator(this, null);
-    }
-  }, {
-    key: "handleDisconnect",
-    value: function handleDisconnect() {
-      this.setState({
-        error: new Error('Figure disconnected'),
-        isDisconnected: true
-      });
-    }
-  }, {
-    key: "handleFilterAdd",
-    value: function handleFilterAdd(columns) {
-      for (var i = 0; i < columns.length; i += 1) {
-        this.openInputFilter(columns[i]);
+
+    this.setState({
+      panelState: {
+        settings,
+        tableSettings,
+        filterValueMap: Array.from(filterValueMap)
       }
-    }
-  }, {
-    key: "handleOpenLinker",
-    value: function handleOpenLinker() {
-      var _this$props2 = this.props,
-          localDashboardId = _this$props2.localDashboardId,
-          setActiveTool = _this$props2.setActiveTool,
-          setDashboardIsolatedLinkerPanelId = _this$props2.setDashboardIsolatedLinkerPanelId;
-      setDashboardIsolatedLinkerPanelId(localDashboardId, null);
-      setActiveTool(ToolType.LINKER);
-    }
-  }, {
-    key: "handleReconnect",
-    value: function handleReconnect() {
-      this.setState({
-        isDisconnected: false,
-        error: null
-      });
-      this.sendColumnChange();
-      this.updateColumnFilters();
-    }
-  }, {
-    key: "handleLoadSuccess",
-    value: function handleLoadSuccess(model) {
-      var _this2 = this;
+    });
+  }
 
-      log.debug('handleLoadSuccess');
-      var prevModel = this.state.model;
-      this.setState({
-        model: model,
-        isLoaded: true
-      }, function () {
-        var _this2$props = _this2.props,
-            inputFilters = _this2$props.inputFilters,
-            source = _this2$props.source;
-        var _this2$state = _this2.state,
-            filterMap = _this2$state.filterMap,
-            isLinked = _this2$state.isLinked;
+  handleError() {
+    // Don't want to set an error state, because the user can fix a chart error within the chart itself.
+    // We're not loading anymore either so stop showing the spinner so the user can actually click those buttons.
+    this.setState({
+      isLoading: false
+    });
+  }
 
-        if (model !== prevModel) {
-          _this2.sendColumnChange();
+  handleResize() {
+    this.updateChart();
+  }
 
-          _this2.updateColumnFilters();
+  handleSettingsChanged(update) {
+    this.setState((_ref2) => {
+      var {
+        settings: prevSettings
+      } = _ref2;
 
-          _this2.updateInputFilters(inputFilters, filterMap.size > 0 || model.isFilterRequired());
+      var settings = _objectSpread(_objectSpread({}, prevSettings), update);
 
-          if (source && isLinked) {
-            _this2.startListeningToSource(source);
+      log.debug('Updated settings', settings);
+      return {
+        settings
+      };
+    });
+  }
 
-            _this2.updateModelFromSource();
-          }
-        }
-      });
-    }
-  }, {
-    key: "handleLoadError",
-    value: function handleLoadError(error) {
-      if (PromiseUtils.isCanceled(error)) {
-        return;
+  handleHide() {
+    this.setActive(false);
+  }
+
+  handleShow() {
+    this.setActive(true);
+  }
+
+  handleTabBlur() {
+    this.setActive(false);
+  }
+
+  handleTabFocus() {
+    var isHidden = this.isHidden();
+    this.setActive(!isHidden);
+  }
+
+  handleUpdate() {
+    this.setState({
+      isLoading: false
+    });
+  }
+
+  handleClearAllFilters() {
+    // nuke link filter and input filter map
+    // input filters only clear themselves if they are not yet empty
+    this.setState({
+      filterValueMap: new Map(),
+      filterMap: new Map()
+    });
+    this.updatePanelState();
+  }
+  /**
+   * Create an input filter panel for the provided column
+   * @param {dh.Column} column The column to create the input filter for
+   */
+
+
+  openInputFilter(column) {
+    var {
+      glEventHub
+    } = this.props;
+    var {
+      name,
+      type
+    } = column;
+    glEventHub.emit(InputFilterEvent.OPEN_INPUT, {
+      title: "".concat(name, " Filter"),
+      panelState: {
+        name,
+        type,
+        isValueShown: true
+      },
+      createNewStack: true,
+      focusElement: 'input'
+    });
+  }
+
+  setActive(isActive) {
+    this.setState({
+      isActive
+    }, () => {
+      if (isActive) {
+        this.loadModelIfNecessary();
+        this.updateChart();
       }
+    });
+  }
 
-      log.error('handleLoadError', error);
-      this.setState({
-        error: error,
-        isLoading: false
-      });
-    }
-  }, {
-    key: "handleSourceColumnChange",
-    value: function handleSourceColumnChange() {
-      this.updateModelFromSource();
-    }
-  }, {
-    key: "handleSourceFilterChange",
-    value: function handleSourceFilterChange() {
-      this.updateModelFromSource();
-    }
-  }, {
-    key: "handleSourceSortChange",
-    value: function handleSourceSortChange() {
-      this.updateModelFromSource();
-    }
-  }, {
-    key: "updateModelFromSource",
-    value: function updateModelFromSource() {
-      var _this$props3 = this.props,
-          metadata = _this$props3.metadata,
-          source = _this$props3.source;
-      var _this$state3 = this.state,
-          isLinked = _this$state3.isLinked,
-          model = _this$state3.model;
-      var settings = metadata.settings;
-
-      if (!isLinked || !model || !source) {
-        log.debug2('updateModelFromSource ignoring', isLinked, model, source);
-        return;
-      } // By now the model has already been loaded, which is the only other cancelable thing in pending
-
-
-      this.pending.cancel();
-      this.pending.add(dh.plot.Figure.create(ChartUtils.makeFigureSettings(settings, source))).then(function (figure) {
-        model.setFigure(figure);
-      })["catch"](this.handleLoadError);
-      this.updatePanelState();
+  sendColumnChange() {
+    var {
+      model
+    } = this.state;
+
+    if (!model) {
+      return;
     }
-  }, {
-    key: "updatePanelState",
-    value: function updatePanelState() {
-      var sourcePanel = this.props.sourcePanel;
-      var _this$state4 = this.state,
-          panelState = _this$state4.panelState,
-          filterValueMap = _this$state4.filterValueMap,
-          settings = _this$state4.settings;
-
-      var _ref3 = panelState !== null && panelState !== void 0 ? panelState : {},
-          tableSettings = _ref3.tableSettings;
-
-      if (sourcePanel) {
-        // Right now just update the panel state from the source
-        // If the source isn't available, just keep the state that's already saved
-        var inputFilters = sourcePanel.props.inputFilters;
-        var sourcePanelState = sourcePanel.state.panelState;
-
-        if (sourcePanelState) {
-          tableSettings = IrisGridUtils.extractTableSettings(sourcePanelState, inputFilters);
-        }
-      } // eslint-disable-next-line react/no-unused-state
 
+    var {
+      glEventHub
+    } = this.props;
+    glEventHub.emit(InputFilterEvent.COLUMNS_CHANGED, this, Array.from(model.getFilterColumnMap().values()));
+  }
 
-      this.setState({
-        panelState: {
-          settings: settings,
-          tableSettings: tableSettings,
-          filterValueMap: Array.from(filterValueMap)
-        }
-      });
-    }
-  }, {
-    key: "handleError",
-    value: function handleError() {
-      // Don't want to set an error state, because the user can fix a chart error within the chart itself.
-      // We're not loading anymore either so stop showing the spinner so the user can actually click those buttons.
-      this.setState({
-        isLoading: false
-      });
-    }
-  }, {
-    key: "handleResize",
-    value: function handleResize() {
-      this.updateChart();
-    }
-  }, {
-    key: "handleSettingsChanged",
-    value: function handleSettingsChanged(update) {
-      this.setState(function (_ref4) {
-        var prevSettings = _ref4.settings;
-
-        var settings = _objectSpread(_objectSpread({}, prevSettings), update);
-
-        log.debug('Updated settings', settings);
-        return {
-          settings: settings
-        };
-      });
-    }
-  }, {
-    key: "handleHide",
-    value: function handleHide() {
-      this.setActive(false);
-    }
-  }, {
-    key: "handleShow",
-    value: function handleShow() {
-      this.setActive(true);
-    }
-  }, {
-    key: "handleTabBlur",
-    value: function handleTabBlur() {
-      this.setActive(false);
-    }
-  }, {
-    key: "handleTabFocus",
-    value: function handleTabFocus() {
-      var isHidden = this.isHidden();
-      this.setActive(!isHidden);
-    }
-  }, {
-    key: "handleUpdate",
-    value: function handleUpdate() {
-      this.setState({
-        isLoading: false
-      });
-    }
-  }, {
-    key: "handleClearAllFilters",
-    value: function handleClearAllFilters() {
-      // nuke link filter and input filter map
-      // input filters only clear themselves if they are not yet empty
-      this.setState({
-        filterValueMap: new Map(),
-        filterMap: new Map()
-      });
-      this.updatePanelState();
-    }
-    /**
-     * Create an input filter panel for the provided column
-     * @param {dh.Column} column The column to create the input filter for
-     */
-
-  }, {
-    key: "openInputFilter",
-    value: function openInputFilter(column) {
-      var glEventHub = this.props.glEventHub;
-      var name = column.name,
-          type = column.type;
-      glEventHub.emit(InputFilterEvent.OPEN_INPUT, {
-        title: "".concat(name, " Filter"),
-        panelState: {
-          name: name,
-          type: type,
-          isValueShown: true
-        },
-        createNewStack: true,
-        focusElement: 'input'
-      });
-    }
-  }, {
-    key: "setActive",
-    value: function setActive(isActive) {
-      var _this3 = this;
+  getCoordinateForColumn(columnName) {
+    var _element$getBoundingC;
 
-      this.setState({
-        isActive: isActive
-      }, function () {
-        if (isActive) {
-          _this3.loadModelIfNecessary();
+    var className = ChartColumnSelectorOverlay.makeButtonClassName(columnName);
 
-          _this3.updateChart();
-        }
-      });
+    if (!this.panelContainer.current) {
+      return null;
     }
-  }, {
-    key: "sendColumnChange",
-    value: function sendColumnChange() {
-      var model = this.state.model;
 
-      if (!model) {
-        return;
-      }
+    var element = this.panelContainer.current.querySelector(".".concat(className));
+    var rect = (_element$getBoundingC = element === null || element === void 0 ? void 0 : element.getBoundingClientRect()) !== null && _element$getBoundingC !== void 0 ? _element$getBoundingC : null;
 
-      var glEventHub = this.props.glEventHub;
-      glEventHub.emit(InputFilterEvent.COLUMNS_CHANGED, this, Array.from(model.getFilterColumnMap().values()));
+    if (rect == null || rect.width <= 0 || rect.height <= 0) {
+      return null;
     }
-  }, {
-    key: "getCoordinateForColumn",
-    value: function getCoordinateForColumn(columnName) {
-      var _element$getBoundingC;
 
-      var className = ChartColumnSelectorOverlay.makeButtonClassName(columnName);
+    var x = rect.left + rect.width / 2;
+    var y = rect.bottom;
+    return [x, y];
+  }
+  /**
+   * Set chart filters based on the filter map
+   * @param {Map<string, Object>} filterMapParam Filter map
+   */
+
+
+  setFilterMap(filterMapParam) {
+    log.debug('setFilterMap', filterMapParam);
+    this.setState(state => {
+      var _updatedFilterMap;
+
+      var {
+        columnMap,
+        filterMap
+      } = state;
+      var updatedFilterMap = null;
+      var filterValueMap = new Map(state.filterValueMap);
+      filterMapParam.forEach((_ref3, columnName) => {
+        var {
+          columnType,
+          value
+        } = _ref3;
+        var column = columnMap.get(columnName);
+
+        if (column == null || column.type !== columnType) {
+          return;
+        }
 
-      if (!this.panelContainer.current) {
-        return null;
-      }
+        filterValueMap.set(columnName, value);
 
-      var element = this.panelContainer.current.querySelector(".".concat(className));
-      var rect = (_element$getBoundingC = element === null || element === void 0 ? void 0 : element.getBoundingClientRect()) !== null && _element$getBoundingC !== void 0 ? _element$getBoundingC : null;
+        if (filterMap.get(columnName) !== value) {
+          if (updatedFilterMap === null) {
+            updatedFilterMap = new Map(filterMap);
+          }
+
+          updatedFilterMap.set(columnName, value);
+        }
+      }); // Don't update filterMap unless the filters actually changed.
+      // Otherwise the chart gets stuck on a spinner
+      // because it never gets an update event for unchanged filters.
+
+      return {
+        filterValueMap,
+        filterMap: (_updatedFilterMap = updatedFilterMap) !== null && _updatedFilterMap !== void 0 ? _updatedFilterMap : filterMap
+      };
+    });
+  }
 
-      if (rect == null || rect.width <= 0 || rect.height <= 0) {
+  unsetFilterValue(columnName) {
+    this.setState(state => {
+      // We want to unset a value unless there's an input filter for it
+      // If there's an input filter, then we want to just set it to that value
+      // This way if the user has an input filter and a link, when they delete the link the input filter value takes effect
+      var {
+        inputFilters
+      } = this.props;
+      var {
+        columnMap
+      } = state;
+      var {
+        filterMap,
+        filterValueMap
+      } = state;
+
+      if (!filterValueMap.has(columnName)) {
         return null;
       }
 
-      var x = rect.left + rect.width / 2;
-      var y = rect.bottom;
-      return [x, y];
-    }
-    /**
-     * Set chart filters based on the filter map
-     * @param {Map<string, Object>} filterMapParam Filter map
-     */
-
-  }, {
-    key: "setFilterMap",
-    value: function setFilterMap(filterMapParam) {
-      log.debug('setFilterMap', filterMapParam);
-      this.setState(function (state) {
-        var _updatedFilterMap;
-
-        var columnMap = state.columnMap,
-            filterMap = state.filterMap;
-        var updatedFilterMap = null;
-        var filterValueMap = new Map(state.filterValueMap);
-        filterMapParam.forEach(function (_ref5, columnName) {
-          var columnType = _ref5.columnType,
-              value = _ref5.value;
-          var column = columnMap.get(columnName);
-
-          if (column == null || column.type !== columnType) {
-            return;
-          }
+      filterValueMap = new Map(state.filterValueMap);
+      filterValueMap.delete(columnName);
+      var inputFilterMap = this.getInputFilterColumnMap(columnMap, inputFilters);
 
-          filterValueMap.set(columnName, value);
+      if (inputFilterMap.has(columnName)) {
+        var filterValue = filterMap.get(columnName);
+        var inputFilterValue = inputFilterMap.get(columnName).value;
 
-          if (filterMap.get(columnName) !== value) {
-            if (updatedFilterMap === null) {
-              updatedFilterMap = new Map(filterMap);
-            }
+        if (inputFilterValue != null && filterValue !== inputFilterValue) {
+          filterMap = new Map(state.filterMap);
 
-            updatedFilterMap.set(columnName, value);
+          if (inputFilterValue.length > 0) {
+            filterMap.set(columnName, inputFilterValue);
+          } else {
+            filterMap.delete(columnName);
           }
-        }); // Don't update filterMap unless the filters actually changed.
-        // Otherwise the chart gets stuck on a spinner
-        // because it never gets an update event for unchanged filters.
-
-        return {
-          filterValueMap: filterValueMap,
-          filterMap: (_updatedFilterMap = updatedFilterMap) !== null && _updatedFilterMap !== void 0 ? _updatedFilterMap : filterMap
-        };
-      });
-    }
-  }, {
-    key: "unsetFilterValue",
-    value: function unsetFilterValue(columnName) {
-      var _this4 = this;
-
-      this.setState(function (state) {
-        // We want to unset a value unless there's an input filter for it
-        // If there's an input filter, then we want to just set it to that value
-        // This way if the user has an input filter and a link, when they delete the link the input filter value takes effect
-        var inputFilters = _this4.props.inputFilters;
-        var columnMap = state.columnMap;
-        var filterMap = state.filterMap,
-            filterValueMap = state.filterValueMap;
-
-        if (!filterValueMap.has(columnName)) {
-          return null;
         }
+      } else {
+        filterMap = new Map(state.filterMap);
+        filterMap.delete(columnName);
+      }
+
+      return {
+        filterMap,
+        filterValueMap
+      };
+    });
+  }
+
+  updateChangedInputFilters(inputFilters, prevInputFilters) {
+    var deletedInputFilters = prevInputFilters.filter(prevInputFilter => !inputFilters.find(inputFilter => inputFilter.name === prevInputFilter.name && inputFilter.type === prevInputFilter.type));
 
-        filterValueMap = new Map(state.filterValueMap);
-        filterValueMap["delete"](columnName);
+    if (deletedInputFilters.length > 0) {
+      this.deleteInputFilters(deletedInputFilters);
+    }
 
-        var inputFilterMap = _this4.getInputFilterColumnMap(columnMap, inputFilters);
+    var changedInputFilters = inputFilters.filter(inputFilter => !prevInputFilters.includes(inputFilter));
 
-        if (inputFilterMap.has(columnName)) {
-          var filterValue = filterMap.get(columnName);
-          var inputFilterValue = inputFilterMap.get(columnName).value;
+    if (changedInputFilters.length > 0) {
+      this.updateInputFilters(changedInputFilters);
+    }
+  }
 
-          if (inputFilterValue != null && filterValue !== inputFilterValue) {
-            filterMap = new Map(state.filterMap);
+  updateInputFilters(inputFilters) {
+    var forceUpdate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    this.setState(state => {
+      var {
+        columnMap
+      } = state;
+      var filterValueMap = new Map(state.filterValueMap);
+      var filterMap = new Map(state.filterMap);
+      var update = forceUpdate ? {
+        filterMap,
+        filterValueMap
+      } : {};
 
-            if (inputFilterValue.length > 0) {
-              filterMap.set(columnName, inputFilterValue);
+      for (var i = 0; i < inputFilters.length; i += 1) {
+        var {
+          name,
+          type,
+          value
+        } = inputFilters[i];
+        var column = columnMap.get(name);
+
+        if (column != null && column.type === type) {
+          if (value != null && filterMap.get(name) !== value) {
+            if (value === '') {
+              filterMap.delete(name);
             } else {
-              filterMap["delete"](columnName);
+              filterMap.set(name, value);
             }
-          }
-        } else {
-          filterMap = new Map(state.filterMap);
-          filterMap["delete"](columnName);
-        }
 
-        return {
-          filterMap: filterMap,
-          filterValueMap: filterValueMap
-        };
-      });
-    }
-  }, {
-    key: "updateChangedInputFilters",
-    value: function updateChangedInputFilters(inputFilters, prevInputFilters) {
-      var deletedInputFilters = prevInputFilters.filter(function (prevInputFilter) {
-        return !inputFilters.find(function (inputFilter) {
-          return inputFilter.name === prevInputFilter.name && inputFilter.type === prevInputFilter.type;
-        });
-      });
+            update.filterMap = filterMap;
+          }
 
-      if (deletedInputFilters.length > 0) {
-        this.deleteInputFilters(deletedInputFilters);
+          if (filterValueMap.has(name)) {
+            // Need to unset whatever the linked value was - if they want that value again, they need to double click the link again
+            filterValueMap.delete(name);
+            update.filterValueMap = filterValueMap;
+          }
+        }
       }
 
-      var changedInputFilters = inputFilters.filter(function (inputFilter) {
-        return !prevInputFilters.includes(inputFilter);
-      });
+      log.debug('updateInputFilters', update);
+      return update;
+    });
+  }
 
-      if (changedInputFilters.length > 0) {
-        this.updateInputFilters(changedInputFilters);
-      }
-    }
-  }, {
-    key: "updateInputFilters",
-    value: function updateInputFilters(inputFilters) {
-      var forceUpdate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-      this.setState(function (state) {
-        var columnMap = state.columnMap;
-        var filterValueMap = new Map(state.filterValueMap);
-        var filterMap = new Map(state.filterMap);
-        var update = forceUpdate ? {
-          filterMap: filterMap,
-          filterValueMap: filterValueMap
-        } : {};
-
-        for (var i = 0; i < inputFilters.length; i += 1) {
-          var _inputFilters$i = inputFilters[i],
-              name = _inputFilters$i.name,
-              type = _inputFilters$i.type,
-              value = _inputFilters$i.value;
-          var column = columnMap.get(name);
-
-          if (column != null && column.type === type) {
-            if (value != null && filterMap.get(name) !== value) {
-              if (value === '') {
-                filterMap["delete"](name);
-              } else {
-                filterMap.set(name, value);
-              }
+  deleteInputFilters(inputFilters) {
+    var forceUpdate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    this.setState(state => {
+      var {
+        columnMap,
+        filterValueMap
+      } = state;
+      var filterMap = new Map(state.filterMap);
+      var needsUpdate = forceUpdate;
 
-              update.filterMap = filterMap;
-            }
+      for (var i = 0; i < inputFilters.length; i += 1) {
+        var {
+          name,
+          type
+        } = inputFilters[i];
+        var column = columnMap.get(name);
+
+        if (column != null && column.type === type) {
+          if (filterMap.has(name)) {
+            var filterValue = filterMap.get(name);
 
             if (filterValueMap.has(name)) {
-              // Need to unset whatever the linked value was - if they want that value again, they need to double click the link again
-              filterValueMap["delete"](name);
-              update.filterValueMap = filterValueMap;
-            }
-          }
-        }
+              var linkValue = filterValueMap.get(name);
 
-        log.debug('updateInputFilters', update);
-        return update;
-      });
-    }
-  }, {
-    key: "deleteInputFilters",
-    value: function deleteInputFilters(inputFilters) {
-      var forceUpdate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-      this.setState(function (state) {
-        var columnMap = state.columnMap,
-            filterValueMap = state.filterValueMap;
-        var filterMap = new Map(state.filterMap);
-        var needsUpdate = forceUpdate;
-
-        for (var i = 0; i < inputFilters.length; i += 1) {
-          var _inputFilters$i2 = inputFilters[i],
-              name = _inputFilters$i2.name,
-              type = _inputFilters$i2.type;
-          var column = columnMap.get(name);
-
-          if (column != null && column.type === type) {
-            if (filterMap.has(name)) {
-              var filterValue = filterMap.get(name);
-
-              if (filterValueMap.has(name)) {
-                var linkValue = filterValueMap.get(name);
-
-                if (linkValue !== filterValue) {
-                  needsUpdate = true;
-                  filterMap.set(name, linkValue);
-                }
-              } else {
+              if (linkValue !== filterValue) {
                 needsUpdate = true;
-                filterMap["delete"](name);
+                filterMap.set(name, linkValue);
               }
+            } else {
+              needsUpdate = true;
+              filterMap.delete(name);
             }
           }
         }
+      }
 
-        log.debug('deleteInputFilters', needsUpdate);
-        return needsUpdate ? {
-          filterMap: filterMap
-        } : null;
-      });
-    }
-  }, {
-    key: "updateColumnFilters",
-    value: function updateColumnFilters() {
-      this.setState(function (_ref6) {
-        var model = _ref6.model;
-
-        if (!model) {
-          return null;
-        }
+      log.debug('deleteInputFilters', needsUpdate);
+      return needsUpdate ? {
+        filterMap
+      } : null;
+    });
+  }
 
-        return {
-          columnMap: model.getFilterColumnMap()
-        };
-      });
-    }
-  }, {
-    key: "updateFilters",
-    value: function updateFilters() {
-      var _this$state5 = this.state,
-          columnMap = _this$state5.columnMap,
-          filterMap = _this$state5.filterMap,
-          model = _this$state5.model;
-      var waitingInputMap = this.getWaitingInputMap(model.isFilterRequired(), columnMap, filterMap);
-      model.setFilter(filterMap);
-
-      if (filterMap.size > 0 && waitingInputMap.size === 0) {
-        var defaultTitle = model.getDefaultTitle();
-        var filterTitle = TextUtils.join(Array.from(filterMap.entries()).map(function (_ref7) {
-          var _ref8 = _slicedToArray(_ref7, 2),
-              name = _ref8[0],
-              value = _ref8[1];
-
-          return "".concat(name, ": ").concat(value);
-        }));
-
-        if (defaultTitle) {
-          model.setTitle("".concat(defaultTitle, "<br><span style=\"font-size: smaller\">").concat(filterTitle, "</span>"));
-        } else {
-          model.setTitle(filterTitle);
-        }
+  updateColumnFilters() {
+    this.setState((_ref4) => {
+      var {
+        model
+      } = _ref4;
 
-        log.debug2('updateFilters filters set', filterMap);
-        this.setState({
-          isLoading: true
-        });
+      if (!model) {
+        return null;
+      }
+
+      return {
+        columnMap: model.getFilterColumnMap()
+      };
+    });
+  }
+
+  updateFilters() {
+    var {
+      columnMap,
+      filterMap,
+      model
+    } = this.state;
+    var waitingInputMap = this.getWaitingInputMap(model.isFilterRequired(), columnMap, filterMap);
+    model.setFilter(filterMap);
+
+    if (filterMap.size > 0 && waitingInputMap.size === 0) {
+      var defaultTitle = model.getDefaultTitle();
+      var filterTitle = TextUtils.join(Array.from(filterMap.entries()).map((_ref5) => {
+        var [name, value] = _ref5;
+        return "".concat(name, ": ").concat(value);
+      }));
+
+      if (defaultTitle) {
+        model.setTitle("".concat(defaultTitle, "<br><span style=\"font-size: smaller\">").concat(filterTitle, "</span>"));
       } else {
-        log.debug2('updateFilters waiting on inputs', waitingInputMap);
-        model.setTitle(model.getDefaultTitle());
-        this.setState({
-          isLoading: false
-        });
+        model.setTitle(filterTitle);
       }
 
-      this.updatePanelState();
-    }
-    /**
-     * Removes any set filter values that are no longer part of the model
-     */
-
-  }, {
-    key: "pruneFilterMaps",
-    value: function pruneFilterMaps() {
-      this.setState(function (state) {
-        var columnMap = state.columnMap;
-        var filterMap = new Map(state.filterMap);
-        var filterValueMap = new Map(state.filterValueMap);
-        var newState = {};
-        state.filterValueMap.forEach(function (value, name) {
-          if (!columnMap.has(name)) {
-            filterValueMap["delete"](name);
-            newState.filterValueMap = filterValueMap;
-          }
-        });
-        state.filterMap.forEach(function (value, name) {
-          if (!columnMap.has(name)) {
-            filterMap["delete"](name);
-            newState.filterMap = filterMap;
-          }
-        });
-        return newState;
+      log.debug2('updateFilters filters set', filterMap);
+      this.setState({
+        isLoading: true
+      });
+    } else {
+      log.debug2('updateFilters waiting on inputs', waitingInputMap);
+      model.setTitle(model.getDefaultTitle());
+      this.setState({
+        isLoading: false
       });
     }
-  }, {
-    key: "updateChart",
-    value: function updateChart() {
-      if (this.chart.current) {
-        this.chart.current.updateDimensions();
-      }
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      var _this$props4 = this.props,
-          columnSelectionValidator = _this$props4.columnSelectionValidator,
-          glContainer = _this$props4.glContainer,
-          glEventHub = _this$props4.glEventHub,
-          inputFilters = _this$props4.inputFilters,
-          isLinkerActive = _this$props4.isLinkerActive,
-          links = _this$props4.links,
-          metadata = _this$props4.metadata;
-      var _this$state6 = this.state,
-          columnMap = _this$state6.columnMap,
-          filterMap = _this$state6.filterMap,
-          error = _this$state6.error,
-          model = _this$state6.model,
-          queryName = _this$state6.queryName,
-          isActive = _this$state6.isActive,
-          isDisconnected = _this$state6.isDisconnected,
-          isLoaded = _this$state6.isLoaded,
-          isLoading = _this$state6.isLoading;
-      var figureName = metadata.figure,
-          querySerial = metadata.querySerial,
-          tableName = metadata.table;
-      var inputFilterMap = this.getInputFilterColumnMap(columnMap, inputFilters);
-      var linkedColumnMap = this.getLinkedColumnMap(columnMap, links);
-      var waitingInputMap = model != null ? this.getWaitingInputMap(model.isFilterRequired(), columnMap, filterMap) : new Map();
-      var waitingFilterMap = model != null ? this.getWaitingFilterMap(model.isFilterRequired(), columnMap, filterMap, linkedColumnMap, inputFilterMap) : new Map();
-      var errorMessage = error ? "Unable to open chart. ".concat(error) : null;
-      var isWaitingForFilter = waitingInputMap.size > 0;
-      var isSelectingColumn = columnMap.size > 0 && isLinkerActive;
-      return /*#__PURE__*/React.createElement(WidgetPanel, {
-        className: classNames('iris-chart-panel', {
-          'input-required': isWaitingForFilter
-        }),
-        componentPanel: this,
-        glContainer: glContainer,
-        glEventHub: glEventHub,
-        onHide: this.handleHide,
-        onClearAllFilters: this.handleClearAllFilters,
-        onResize: this.handleResize,
-        onShow: this.handleShow,
-        onTabBlur: this.handleTabBlur,
-        onTabFocus: this.handleTabFocus,
-        errorMessage: errorMessage,
-        isDisconnected: isDisconnected,
-        isLoading: isLoading,
-        isLoaded: isLoaded,
-        queryName: queryName,
-        querySerial: querySerial,
-        widgetName: figureName || tableName,
-        widgetType: "Chart"
-      }, /*#__PURE__*/React.createElement("div", {
-        ref: this.panelContainer,
-        className: "chart-panel-container h-100 w-100"
-      }, /*#__PURE__*/React.createElement("div", {
-        className: "chart-container h-100 w-100"
-      }, isLoaded && /*#__PURE__*/React.createElement(Chart, {
-        isActive: isActive,
-        model: model,
-        ref: this.chart,
-        onDisconnect: this.handleDisconnect,
-        onReconnect: this.handleReconnect,
-        onUpdate: this.handleUpdate,
-        onError: this.handleError,
-        onSettingsChanged: this.handleSettingsChanged
-      })), /*#__PURE__*/React.createElement(CSSTransition, {
-        "in": isWaitingForFilter && !isSelectingColumn && !isLoading,
-        timeout: ThemeExport.transitionMs,
-        classNames: "fade",
-        mountOnEnter: true,
-        unmountOnExit: true
-      }, /*#__PURE__*/React.createElement(ChartFilterOverlay, {
-        inputFilterMap: inputFilterMap,
-        linkedColumnMap: linkedColumnMap,
-        onAdd: this.handleFilterAdd,
-        onOpenLinker: this.handleOpenLinker,
-        columnMap: columnMap,
-        waitingFilterMap: waitingFilterMap,
-        waitingInputMap: waitingInputMap
-      })), /*#__PURE__*/React.createElement(CSSTransition, {
-        "in": isSelectingColumn,
-        timeout: ThemeExport.transitionMs,
-        classNames: "fade",
-        mountOnEnter: true,
-        unmountOnExit: true
-      }, /*#__PURE__*/React.createElement(ChartColumnSelectorOverlay, {
-        columns: this.getSelectorColumns(columnMap, linkedColumnMap, columnSelectionValidator),
-        onColumnSelected: this.handleColumnSelected,
-        onMouseEnter: this.handleColumnMouseEnter,
-        onMouseLeave: this.handleColumnMouseLeave
-      }))));
+
+    this.updatePanelState();
+  }
+  /**
+   * Removes any set filter values that are no longer part of the model
+   */
+
+
+  pruneFilterMaps() {
+    this.setState(state => {
+      var {
+        columnMap
+      } = state;
+      var filterMap = new Map(state.filterMap);
+      var filterValueMap = new Map(state.filterValueMap);
+      var newState = {};
+      state.filterValueMap.forEach((value, name) => {
+        if (!columnMap.has(name)) {
+          filterValueMap.delete(name);
+          newState.filterValueMap = filterValueMap;
+        }
+      });
+      state.filterMap.forEach((value, name) => {
+        if (!columnMap.has(name)) {
+          filterMap.delete(name);
+          newState.filterMap = filterMap;
+        }
+      });
+      return newState;
+    });
+  }
+
+  updateChart() {
+    if (this.chart.current) {
+      this.chart.current.updateDimensions();
     }
-  }]);
+  }
+
+  render() {
+    var {
+      columnSelectionValidator,
+      glContainer,
+      glEventHub,
+      inputFilters,
+      isLinkerActive,
+      links,
+      metadata,
+      settings
+    } = this.props;
+    var {
+      columnMap,
+      filterMap,
+      error,
+      model,
+      queryName,
+      isActive,
+      isDisconnected,
+      isLoaded,
+      isLoading
+    } = this.state;
+    var {
+      figure: figureName,
+      querySerial,
+      table: tableName
+    } = metadata;
+    var inputFilterMap = this.getInputFilterColumnMap(columnMap, inputFilters);
+    var linkedColumnMap = this.getLinkedColumnMap(columnMap, links);
+    var waitingInputMap = model != null ? this.getWaitingInputMap(model.isFilterRequired(), columnMap, filterMap) : new Map();
+    var waitingFilterMap = model != null ? this.getWaitingFilterMap(model.isFilterRequired(), columnMap, filterMap, linkedColumnMap, inputFilterMap) : new Map();
+    var errorMessage = error ? "Unable to open chart. ".concat(error) : null;
+    var isWaitingForFilter = waitingInputMap.size > 0;
+    var isSelectingColumn = columnMap.size > 0 && isLinkerActive;
+    return /*#__PURE__*/React.createElement(WidgetPanel, {
+      className: classNames('iris-chart-panel', {
+        'input-required': isWaitingForFilter
+      }),
+      componentPanel: this,
+      glContainer: glContainer,
+      glEventHub: glEventHub,
+      onHide: this.handleHide,
+      onClearAllFilters: this.handleClearAllFilters,
+      onResize: this.handleResize,
+      onShow: this.handleShow,
+      onTabBlur: this.handleTabBlur,
+      onTabFocus: this.handleTabFocus,
+      errorMessage: errorMessage,
+      isDisconnected: isDisconnected,
+      isLoading: isLoading,
+      isLoaded: isLoaded,
+      queryName: queryName,
+      querySerial: querySerial,
+      widgetName: figureName || tableName,
+      widgetType: "Chart"
+    }, /*#__PURE__*/React.createElement("div", {
+      ref: this.panelContainer,
+      className: "chart-panel-container h-100 w-100"
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "chart-container h-100 w-100"
+    }, isLoaded && /*#__PURE__*/React.createElement(Chart, {
+      isActive: isActive,
+      model: model,
+      settings: settings,
+      ref: this.chart,
+      onDisconnect: this.handleDisconnect,
+      onReconnect: this.handleReconnect,
+      onUpdate: this.handleUpdate,
+      onError: this.handleError,
+      onSettingsChanged: this.handleSettingsChanged
+    })), /*#__PURE__*/React.createElement(CSSTransition, {
+      in: isWaitingForFilter && !isSelectingColumn && !isLoading,
+      timeout: ThemeExport.transitionMs,
+      classNames: "fade",
+      mountOnEnter: true,
+      unmountOnExit: true
+    }, /*#__PURE__*/React.createElement(ChartFilterOverlay, {
+      inputFilterMap: inputFilterMap,
+      linkedColumnMap: linkedColumnMap,
+      onAdd: this.handleFilterAdd,
+      onOpenLinker: this.handleOpenLinker,
+      columnMap: columnMap,
+      waitingFilterMap: waitingFilterMap,
+      waitingInputMap: waitingInputMap
+    })), /*#__PURE__*/React.createElement(CSSTransition, {
+      in: isSelectingColumn,
+      timeout: ThemeExport.transitionMs,
+      classNames: "fade",
+      mountOnEnter: true,
+      unmountOnExit: true
+    }, /*#__PURE__*/React.createElement(ChartColumnSelectorOverlay, {
+      columns: this.getSelectorColumns(columnMap, linkedColumnMap, columnSelectionValidator),
+      onColumnSelected: this.handleColumnSelected,
+      onMouseEnter: this.handleColumnMouseEnter,
+      onMouseLeave: this.handleColumnMouseLeave
+    }))));
+  }
 
-  return ChartPanel;
-}(Component);
+}
 
 _defineProperty(ChartPanel, "COMPONENT", 'ChartPanel');
 
@@ -1073,22 +1033,27 @@ ChartPanel.propTypes = {
   columnSelectionValidator: PropTypes.func,
   setActiveTool: PropTypes.func.isRequired,
   setDashboardIsolatedLinkerPanelId: PropTypes.func.isRequired,
-  panelState: PropTypes.shape({})
+  panelState: PropTypes.shape({}),
+  settings: PropTypes.shape({})
 };
 ChartPanel.defaultProps = {
   columnSelectionValidator: null,
   isLinkerActive: false,
   source: null,
   sourcePanel: null,
-  panelState: null
+  panelState: null,
+  settings: {}
 };
 ChartPanel.displayName = 'ChartPanel';
 
-var mapStateToProps = function mapStateToProps(state, ownProps) {
-  var localDashboardId = ownProps.localDashboardId,
-      _ownProps$metadata = ownProps.metadata,
-      metadata = _ownProps$metadata === void 0 ? {} : _ownProps$metadata;
-  var sourcePanelId = metadata.sourcePanelId;
+var mapStateToProps = (state, ownProps) => {
+  var {
+    localDashboardId,
+    metadata = {}
+  } = ownProps;
+  var {
+    sourcePanelId
+  } = metadata;
   var panelTableMap = getTableMapForDashboard(state, localDashboardId);
   var openedPanelMap = getOpenedPanelMapForDashboard(state, localDashboardId);
   var activeTool = getActiveTool(state);
@@ -1096,11 +1061,12 @@ var mapStateToProps = function mapStateToProps(state, ownProps) {
   var isLinkerActive = activeTool === ToolType.LINKER && isolatedLinkerPanelId === null;
   return {
     columnSelectionValidator: getColumnSelectionValidatorForDashboard(state, localDashboardId),
-    isLinkerActive: isLinkerActive,
+    isLinkerActive,
     inputFilters: getInputFiltersForDashboard(state, localDashboardId),
     links: getLinksForDashboard(state, localDashboardId),
     source: panelTableMap.get(sourcePanelId),
-    sourcePanel: openedPanelMap.get(sourcePanelId)
+    sourcePanel: openedPanelMap.get(sourcePanelId),
+    settings: getSettings(state)
   };
 };