@cubejs-client/react 1.3.4 → 1.3.6

package/dist/cubejs-client-react.js

@@ -2,31 +2,32 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-require('core-js/modules/es.reflect.construct.js');
-require('core-js/modules/es.object.keys.js');
 require('core-js/modules/es.symbol.js');
 require('core-js/modules/es.array.filter.js');
-require('core-js/modules/es.object.get-own-property-descriptor.js');
 require('core-js/modules/es.array.for-each.js');
-require('core-js/modules/web.dom-collections.for-each.js');
-require('core-js/modules/es.object.get-own-property-descriptors.js');
 require('core-js/modules/es.object.define-properties.js');
 require('core-js/modules/es.object.define-property.js');
+require('core-js/modules/es.object.get-own-property-descriptor.js');
+require('core-js/modules/es.object.get-own-property-descriptors.js');
+require('core-js/modules/es.object.keys.js');
+require('core-js/modules/es.reflect.construct.js');
+require('core-js/modules/web.dom-collections.for-each.js');
+require('@babel/runtime/helpers/readOnlyError');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
-var _inherits = require('@babel/runtime/helpers/inherits');
 var _possibleConstructorReturn = require('@babel/runtime/helpers/possibleConstructorReturn');
 var _getPrototypeOf = require('@babel/runtime/helpers/getPrototypeOf');
+var _inherits = require('@babel/runtime/helpers/inherits');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 require('core-js/modules/es.array.iterator.js');
+require('core-js/modules/es.array.map.js');
+require('core-js/modules/es.date.to-string.js');
 require('core-js/modules/es.object.to-string.js');
 require('core-js/modules/es.promise.js');
+require('core-js/modules/es.regexp.to-string.js');
 require('core-js/modules/es.string.iterator.js');
 require('core-js/modules/web.dom-collections.iterator.js');
-require('core-js/modules/es.array.map.js');
-require('core-js/modules/es.date.to-string.js');
-require('core-js/modules/es.regexp.to-string.js');
 var React = require('react');
 var ramda = require('ramda');
 var core = require('@cubejs-client/core');
@@ -34,19 +35,18 @@ var _extends = require('@babel/runtime/helpers/extends');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var _asyncToGenerator = require('@babel/runtime/helpers/asyncToGenerator');
-var _assertThisInitialized = require('@babel/runtime/helpers/assertThisInitialized');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-require('core-js/modules/es.regexp.exec.js');
-require('core-js/modules/es.string.replace.js');
-require('core-js/modules/es.function.name.js');
-require('core-js/modules/es.array.includes.js');
 require('core-js/modules/es.array.concat.js');
-require('core-js/modules/es.array.splice.js');
-require('core-js/modules/es.array.sort.js');
-require('core-js/modules/es.array.is-array.js');
-require('core-js/modules/es.object.from-entries.js');
 require('core-js/modules/es.array.find.js');
+require('core-js/modules/es.array.includes.js');
+require('core-js/modules/es.array.is-array.js');
 require('core-js/modules/es.array.reduce.js');
+require('core-js/modules/es.array.sort.js');
+require('core-js/modules/es.array.splice.js');
+require('core-js/modules/es.function.name.js');
+require('core-js/modules/es.object.from-entries.js');
+require('core-js/modules/es.regexp.exec.js');
+require('core-js/modules/es.string.replace.js');
 var _typeof = require('@babel/runtime/helpers/typeof');
 require('core-js/modules/es.object.entries.js');
 
@@ -55,16 +55,15 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var _slicedToArray__default = /*#__PURE__*/_interopDefaultLegacy(_slicedToArray);
 var _classCallCheck__default = /*#__PURE__*/_interopDefaultLegacy(_classCallCheck);
 var _createClass__default = /*#__PURE__*/_interopDefaultLegacy(_createClass);
-var _inherits__default = /*#__PURE__*/_interopDefaultLegacy(_inherits);
 var _possibleConstructorReturn__default = /*#__PURE__*/_interopDefaultLegacy(_possibleConstructorReturn);
 var _getPrototypeOf__default = /*#__PURE__*/_interopDefaultLegacy(_getPrototypeOf);
+var _inherits__default = /*#__PURE__*/_interopDefaultLegacy(_inherits);
 var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var _extends__default = /*#__PURE__*/_interopDefaultLegacy(_extends);
 var _objectWithoutProperties__default = /*#__PURE__*/_interopDefaultLegacy(_objectWithoutProperties);
 var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
 var _asyncToGenerator__default = /*#__PURE__*/_interopDefaultLegacy(_asyncToGenerator);
-var _assertThisInitialized__default = /*#__PURE__*/_interopDefaultLegacy(_assertThisInitialized);
 var _regeneratorRuntime__default = /*#__PURE__*/_interopDefaultLegacy(_regeneratorRuntime);
 var _typeof__default = /*#__PURE__*/_interopDefaultLegacy(_typeof);
 
@@ -72,20 +71,19 @@ var CubeContext = /*#__PURE__*/React.createContext(null);
 
 function ownKeys$6(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$6(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$6(Object(t), !0).forEach(function (r) { _defineProperty__default['default'](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$6(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _createSuper$1(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$1(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
+function _callSuper$1(t, o, e) { return o = _getPrototypeOf__default['default'](o), _possibleConstructorReturn__default['default'](t, _isNativeReflectConstruct$1() ? Reflect.construct(o, e || [], _getPrototypeOf__default['default'](t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct$1() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct$1 = function _isNativeReflectConstruct() { return !!t; })(); }
 var QueryRenderer = /*#__PURE__*/function (_React$Component) {
-  _inherits__default['default'](QueryRenderer, _React$Component);
-  var _super = _createSuper$1(QueryRenderer);
   function QueryRenderer(props) {
     var _this;
     _classCallCheck__default['default'](this, QueryRenderer);
-    _this = _super.call(this, props);
+    _this = _callSuper$1(this, QueryRenderer, [props]);
     _this.state = {};
     _this.mutexObj = {};
     return _this;
   }
-  _createClass__default['default'](QueryRenderer, [{
+  _inherits__default['default'](QueryRenderer, _React$Component);
+  return _createClass__default['default'](QueryRenderer, [{
     key: "componentDidMount",
     value: function componentDidMount() {
       var _this$props = this.props,
@@ -282,7 +280,6 @@ var QueryRenderer = /*#__PURE__*/function (_React$Component) {
       return core.isQueryPresent(query);
     }
   }]);
-  return QueryRenderer;
 }(React__default['default'].Component);
 _defineProperty__default['default'](QueryRenderer, "contextType", CubeContext);
 _defineProperty__default['default'](QueryRenderer, "defaultProps", {
@@ -337,7 +334,7 @@ function removeEmpty(obj) {
 
 function ownKeys$4(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$4(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$4(Object(t), !0).forEach(function (r) { _defineProperty__default['default'](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$4(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
+function _callSuper(t, o, e) { return o = _getPrototypeOf__default['default'](o), _possibleConstructorReturn__default['default'](t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf__default['default'](t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var granularities = [{
   name: undefined,
@@ -368,59 +365,55 @@ var granularities = [{
   title: 'Year'
 }];
 var QueryBuilder = /*#__PURE__*/function (_React$Component) {
-  _inherits__default['default'](QueryBuilder, _React$Component);
-  var _super = _createSuper(QueryBuilder);
   function QueryBuilder(props) {
     var _this;
     _classCallCheck__default['default'](this, QueryBuilder);
-    _this = _super.call(this, props);
-    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "fetchMeta", /*#__PURE__*/_asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
-      var meta, metaError, richMetaError, metaErrorStack, _error$response, _error$response2, _error$response2$stac;
+    _this = _callSuper(this, QueryBuilder, [props]);
+    _defineProperty__default['default'](_this, "fetchMeta", /*#__PURE__*/_asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
+      var meta, metaError, richMetaError, metaErrorStack, _error$response, _error$response2;
       return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              if (_this.cubeApi()) {
-                _context.next = 2;
-                break;
-              }
-              return _context.abrupt("return");
-            case 2:
-              metaError = null;
-              richMetaError = null;
-              metaErrorStack = null;
-              _context.prev = 5;
-              _this.setState({
-                isFetchingMeta: true
-              });
-              _context.next = 9;
-              return _this.cubeApi().meta();
-            case 9:
-              meta = _context.sent;
-              _context.next = 17;
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (_this.cubeApi()) {
+              _context.next = 2;
               break;
-            case 12:
-              _context.prev = 12;
-              _context.t0 = _context["catch"](5);
-              metaError = ((_error$response = _context.t0.response) === null || _error$response === void 0 ? void 0 : _error$response.plainError) || _context.t0;
-              richMetaError = _context.t0;
-              metaErrorStack = ((_error$response2 = _context.t0.response) === null || _error$response2 === void 0 ? void 0 : (_error$response2$stac = _error$response2.stack) === null || _error$response2$stac === void 0 ? void 0 : _error$response2$stac.replace(_context.t0.message || '', '')) || '';
-            case 17:
-              _this.setState({
-                meta: meta,
-                metaError: metaError ? new Error(metaError.message || metaError.toString()) : null,
-                richMetaError: richMetaError,
-                metaErrorStack: metaErrorStack,
-                isFetchingMeta: false
-              }, function () {
-                // Run update query to force viz state update
-                // This will catch any new missing members, and also validate the query against the new meta
-                _this.updateQuery({});
-              });
-            case 18:
-            case "end":
-              return _context.stop();
-          }
+            }
+            return _context.abrupt("return");
+          case 2:
+            metaError = null;
+            richMetaError = null;
+            metaErrorStack = null;
+            _context.prev = 5;
+            _this.setState({
+              isFetchingMeta: true
+            });
+            _context.next = 9;
+            return _this.cubeApi().meta();
+          case 9:
+            meta = _context.sent;
+            _context.next = 17;
+            break;
+          case 12:
+            _context.prev = 12;
+            _context.t0 = _context["catch"](5);
+            metaError = ((_error$response = _context.t0.response) === null || _error$response === void 0 ? void 0 : _error$response.plainError) || _context.t0;
+            richMetaError = _context.t0;
+            metaErrorStack = ((_error$response2 = _context.t0.response) === null || _error$response2 === void 0 || (_error$response2 = _error$response2.stack) === null || _error$response2 === void 0 ? void 0 : _error$response2.replace(_context.t0.message || '', '')) || '';
+          case 17:
+            _this.setState({
+              meta: meta,
+              metaError: metaError ? new Error(metaError.message || metaError.toString()) : null,
+              richMetaError: richMetaError,
+              metaErrorStack: metaErrorStack,
+              isFetchingMeta: false
+            }, function () {
+              // Run update query to force viz state update
+              // This will catch any new missing members, and also validate the query against the new meta
+              _this.updateQuery({});
+            });
+          case 18:
+          case "end":
+            return _context.stop();
         }
       }, _callee, null, [[5, 12]]);
     })));
@@ -438,21 +431,20 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
     _this.orderMembersOrderKeys = [];
     return _this;
   }
-  _createClass__default['default'](QueryBuilder, [{
+  _inherits__default['default'](QueryBuilder, _React$Component);
+  return _createClass__default['default'](QueryBuilder, [{
     key: "componentDidMount",
     value: function () {
-      var _componentDidMount = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
+      var _componentDidMount = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
         return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                this.prevContext = this.context;
-                _context2.next = 3;
-                return this.fetchMeta();
-              case 3:
-              case "end":
-                return _context2.stop();
-            }
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              this.prevContext = this.context;
+              _context2.next = 3;
+              return this.fetchMeta();
+            case 3:
+            case "end":
+              return _context2.stop();
           }
         }, _callee2, this);
       }));
@@ -464,72 +456,68 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "componentDidUpdate",
     value: function () {
-      var _componentDidUpdate = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4(prevProps) {
+      var _componentDidUpdate = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4(prevProps) {
         var _this$prevContext,
           _this$context,
           _this2 = this;
         var _this$props, schemaVersion, onSchemaChange, meta, newMeta;
         return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
-          while (1) {
-            switch (_context4.prev = _context4.next) {
-              case 0:
-                _this$props = this.props, schemaVersion = _this$props.schemaVersion, onSchemaChange = _this$props.onSchemaChange;
-                meta = this.state.meta;
-                if (!(((_this$prevContext = this.prevContext) === null || _this$prevContext === void 0 ? void 0 : _this$prevContext.cubeApi) !== ((_this$context = this.context) === null || _this$context === void 0 ? void 0 : _this$context.cubeApi))) {
-                  _context4.next = 6;
-                  break;
-                }
-                this.prevContext = this.context;
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              _this$props = this.props, schemaVersion = _this$props.schemaVersion, onSchemaChange = _this$props.onSchemaChange;
+              meta = this.state.meta;
+              if (!(((_this$prevContext = this.prevContext) === null || _this$prevContext === void 0 ? void 0 : _this$prevContext.cubeApi) !== ((_this$context = this.context) === null || _this$context === void 0 ? void 0 : _this$context.cubeApi))) {
                 _context4.next = 6;
-                return this.fetchMeta();
-              case 6:
-                if (!(prevProps.schemaVersion !== schemaVersion)) {
-                  _context4.next = 17;
-                  break;
-                }
-                _context4.prev = 7;
-                _context4.next = 10;
-                return this.cubeApi().meta();
-              case 10:
-                newMeta = _context4.sent;
-                if (!ramda.equals(newMeta, meta) && typeof onSchemaChange === 'function') {
-                  onSchemaChange({
-                    schemaVersion: schemaVersion,
-                    refresh: function () {
-                      var _refresh = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3() {
-                        return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
-                          while (1) {
-                            switch (_context3.prev = _context3.next) {
-                              case 0:
-                                _context3.next = 2;
-                                return _this2.fetchMeta();
-                              case 2:
-                              case "end":
-                                return _context3.stop();
-                            }
-                          }
-                        }, _callee3);
-                      }));
-                      function refresh() {
-                        return _refresh.apply(this, arguments);
-                      }
-                      return refresh;
-                    }()
-                  });
-                }
+                break;
+              }
+              this.prevContext = this.context;
+              _context4.next = 6;
+              return this.fetchMeta();
+            case 6:
+              if (!(prevProps.schemaVersion !== schemaVersion)) {
                 _context4.next = 17;
                 break;
-              case 14:
-                _context4.prev = 14;
-                _context4.t0 = _context4["catch"](7);
-                // eslint-disable-next-line
-                this.setState({
-                  metaError: _context4.t0
+              }
+              _context4.prev = 7;
+              _context4.next = 10;
+              return this.cubeApi().meta();
+            case 10:
+              newMeta = _context4.sent;
+              if (!ramda.equals(newMeta, meta) && typeof onSchemaChange === 'function') {
+                onSchemaChange({
+                  schemaVersion: schemaVersion,
+                  refresh: function () {
+                    var _refresh = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3() {
+                      return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
+                        while (1) switch (_context3.prev = _context3.next) {
+                          case 0:
+                            _context3.next = 2;
+                            return _this2.fetchMeta();
+                          case 2:
+                          case "end":
+                            return _context3.stop();
+                        }
+                      }, _callee3);
+                    }));
+                    function refresh() {
+                      return _refresh.apply(this, arguments);
+                    }
+                    return refresh;
+                  }()
                 });
-              case 17:
-              case "end":
-                return _context4.stop();
-            }
+              }
+              _context4.next = 17;
+              break;
+            case 14:
+              _context4.prev = 14;
+              _context4.t0 = _context4["catch"](7);
+              // eslint-disable-next-line
+              this.setState({
+                metaError: _context4.t0
+              });
+            case 17:
+            case "end":
+              return _context4.stop();
           }
         }, _callee4, this, [[7, 14]]);
       }));
@@ -819,99 +807,97 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "updateVizState",
     value: function () {
-      var _updateVizState = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5(state) {
+      var _updateVizState = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5(state) {
         var _this4 = this;
         var _this$props2, setQuery, setVizState, _this$state2, stateQuery, statePivotConfig, chartType, meta, finalState, vizStateSent, handleVizStateChange, runSetters, shouldFetchDryRun, response, _error$response3;
         return _regeneratorRuntime__default['default'].wrap(function _callee5$(_context5) {
-          while (1) {
-            switch (_context5.prev = _context5.next) {
-              case 0:
-                _this$props2 = this.props, setQuery = _this$props2.setQuery, setVizState = _this$props2.setVizState;
-                _this$state2 = this.state, stateQuery = _this$state2.query, statePivotConfig = _this$state2.pivotConfig, chartType = _this$state2.chartType, meta = _this$state2.meta;
-                finalState = this.applyStateChangeHeuristics(state);
-                if (!finalState.query) {
-                  finalState.query = _objectSpread$4({}, stateQuery);
-                }
-                vizStateSent = null;
-                handleVizStateChange = function handleVizStateChange(currentState) {
-                  var onVizStateChanged = _this4.props.onVizStateChanged;
-                  if (onVizStateChanged) {
-                    var newVizState = ramda.pick(['chartType', 'pivotConfig', 'query'], currentState);
-                    // Don't run callbacks more than once unless the viz state has changed since last time
-                    if (!vizStateSent || !ramda.equals(vizStateSent, newVizState)) {
-                      onVizStateChanged(newVizState);
-                      // use clone to make sure we don't save object references
-                      vizStateSent = ramda.clone(newVizState);
-                    }
-                  }
-                }; // deprecated, setters replaced by onVizStateChanged
-                runSetters = function runSetters(currentState) {
-                  if (setVizState) {
-                    setVizState(ramda.pick(['chartType', 'pivotConfig', 'query'], currentState));
-                  }
-                  if (currentState.query && setQuery) {
-                    setQuery(currentState.query);
+          while (1) switch (_context5.prev = _context5.next) {
+            case 0:
+              _this$props2 = this.props, setQuery = _this$props2.setQuery, setVizState = _this$props2.setVizState;
+              _this$state2 = this.state, stateQuery = _this$state2.query, statePivotConfig = _this$state2.pivotConfig, chartType = _this$state2.chartType, meta = _this$state2.meta;
+              finalState = this.applyStateChangeHeuristics(state);
+              if (!finalState.query) {
+                finalState.query = _objectSpread$4({}, stateQuery);
+              }
+              vizStateSent = null;
+              handleVizStateChange = function handleVizStateChange(currentState) {
+                var onVizStateChanged = _this4.props.onVizStateChanged;
+                if (onVizStateChanged) {
+                  var newVizState = ramda.pick(['chartType', 'pivotConfig', 'query'], currentState);
+                  // Don't run callbacks more than once unless the viz state has changed since last time
+                  if (!vizStateSent || !ramda.equals(vizStateSent, newVizState)) {
+                    onVizStateChanged(newVizState);
+                    // use clone to make sure we don't save object references
+                    vizStateSent = ramda.clone(newVizState);
                   }
-                };
-                if (finalState.shouldApplyHeuristicOrder) {
-                  finalState.query.order = core.defaultOrder(finalState.query);
                 }
-                finalState.pivotConfig = core.ResultSet.getNormalizedPivotConfig(finalState.query, finalState.pivotConfig !== undefined ? finalState.pivotConfig : statePivotConfig);
-                finalState.missingMembers = this.getMissingMembers(finalState.query, meta);
-                finalState.chartType = finalState.chartType || state.chartType || chartType;
-
-                // deprecated
-                runSetters(_objectSpread$4(_objectSpread$4({}, state), {}, {
-                  query: finalState.query
-                }));
-
-                // Update optimistically so that UI does not stutter
-                this.setState(_objectSpread$4(_objectSpread$4({}, finalState), {}, {
-                  queryError: null
-                }));
-                handleVizStateChange(finalState);
-                shouldFetchDryRun = !ramda.equals(ramda.pick(['measures', 'dimensions', 'timeDimensions'], stateQuery), ramda.pick(['measures', 'dimensions', 'timeDimensions'], finalState.query));
-                if (!(shouldFetchDryRun && core.isQueryPresent(finalState.query) && finalState.missingMembers.length === 0)) {
-                  _context5.next = 30;
-                  break;
+              }; // deprecated, setters replaced by onVizStateChanged
+              runSetters = function runSetters(currentState) {
+                if (setVizState) {
+                  setVizState(ramda.pick(['chartType', 'pivotConfig', 'query'], currentState));
                 }
-                _context5.prev = 16;
-                _context5.next = 19;
-                return this.cubeApi().dryRun(finalState.query, {
-                  mutexObj: this.mutexObj
-                });
-              case 19:
-                response = _context5.sent;
-                if (finalState.shouldApplyHeuristicOrder) {
-                  finalState.query.order = (response.queryOrder || []).reduce(function (memo, current) {
-                    return _objectSpread$4(_objectSpread$4({}, memo), current);
-                  }, {});
+                if (currentState.query && setQuery) {
+                  setQuery(currentState.query);
                 }
-                finalState.pivotConfig = core.ResultSet.getNormalizedPivotConfig(response.pivotQuery, finalState.pivotConfig);
-                finalState.validatedQuery = this.validatedQuery(finalState);
-                finalState.dryRunResponse = response;
+              };
+              if (finalState.shouldApplyHeuristicOrder) {
+                finalState.query.order = core.defaultOrder(finalState.query);
+              }
+              finalState.pivotConfig = core.ResultSet.getNormalizedPivotConfig(finalState.query, finalState.pivotConfig !== undefined ? finalState.pivotConfig : statePivotConfig);
+              finalState.missingMembers = this.getMissingMembers(finalState.query, meta);
+              finalState.chartType = finalState.chartType || state.chartType || chartType;
 
-                // deprecated
-                if (core.isQueryPresent(stateQuery)) {
-                  runSetters(_objectSpread$4(_objectSpread$4({}, this.state), finalState));
-                }
+              // deprecated
+              runSetters(_objectSpread$4(_objectSpread$4({}, state), {}, {
+                query: finalState.query
+              }));
+
+              // Update optimistically so that UI does not stutter
+              this.setState(_objectSpread$4(_objectSpread$4({}, finalState), {}, {
+                queryError: null
+              }));
+              handleVizStateChange(finalState);
+              shouldFetchDryRun = !ramda.equals(ramda.pick(['measures', 'dimensions', 'timeDimensions'], stateQuery), ramda.pick(['measures', 'dimensions', 'timeDimensions'], finalState.query));
+              if (!(shouldFetchDryRun && core.isQueryPresent(finalState.query) && finalState.missingMembers.length === 0)) {
                 _context5.next = 30;
                 break;
-              case 27:
-                _context5.prev = 27;
-                _context5.t0 = _context5["catch"](16);
-                this.setState({
-                  queryError: new Error(((_error$response3 = _context5.t0.response) === null || _error$response3 === void 0 ? void 0 : _error$response3.plainError) || _context5.t0.message),
-                  richQueryError: new Error(_context5.t0.message || _context5.t0.toString())
-                });
-              case 30:
-                this.setState(finalState, function () {
-                  return handleVizStateChange(_this4.state);
-                });
-              case 31:
-              case "end":
-                return _context5.stop();
-            }
+              }
+              _context5.prev = 16;
+              _context5.next = 19;
+              return this.cubeApi().dryRun(finalState.query, {
+                mutexObj: this.mutexObj
+              });
+            case 19:
+              response = _context5.sent;
+              if (finalState.shouldApplyHeuristicOrder) {
+                finalState.query.order = (response.queryOrder || []).reduce(function (memo, current) {
+                  return _objectSpread$4(_objectSpread$4({}, memo), current);
+                }, {});
+              }
+              finalState.pivotConfig = core.ResultSet.getNormalizedPivotConfig(response.pivotQuery, finalState.pivotConfig);
+              finalState.validatedQuery = this.validatedQuery(finalState);
+              finalState.dryRunResponse = response;
+
+              // deprecated
+              if (core.isQueryPresent(stateQuery)) {
+                runSetters(_objectSpread$4(_objectSpread$4({}, this.state), finalState));
+              }
+              _context5.next = 30;
+              break;
+            case 27:
+              _context5.prev = 27;
+              _context5.t0 = _context5["catch"](16);
+              this.setState({
+                queryError: new Error(((_error$response3 = _context5.t0.response) === null || _error$response3 === void 0 ? void 0 : _error$response3.plainError) || _context5.t0.message),
+                richQueryError: new Error(_context5.t0.message || _context5.t0.toString())
+              });
+            case 30:
+              this.setState(finalState, function () {
+                return handleVizStateChange(_this4.state);
+              });
+            case 31:
+            case "end":
+              return _context5.stop();
           }
         }, _callee5, this, [[16, 27]]);
       }));
@@ -952,7 +938,7 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
     }
   }, {
     key: "render",
-    value: function render() {
+    value: function _render() {
       var _this5 = this;
       var query = this.state.query;
       var _this$props4 = this.props,
@@ -1028,7 +1014,6 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
       });
     }
   }]);
-  return QueryBuilder;
 }(React__default['default'].Component);
 _defineProperty__default['default'](QueryBuilder, "contextType", CubeContext);
 _defineProperty__default['default'](QueryBuilder, "defaultProps", {
@@ -1107,7 +1092,7 @@ function useCubeFetch(method) {
     return _load.apply(this, arguments);
   }
   function _load() {
-    _load = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
+    _load = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
       var loadOptions,
         ignoreSkip,
         cubeApi,
@@ -1118,55 +1103,53 @@ function useCubeFetch(method) {
         _response,
         _args = arguments;
       return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              loadOptions = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
-              ignoreSkip = _args.length > 1 && _args[1] !== undefined ? _args[1] : false;
-              cubeApi = options.cubeApi || (context === null || context === void 0 ? void 0 : context.cubeApi);
-              query = loadOptions.query || options.query;
-              queryCondition = method === 'meta' ? true : query && core.isQueryPresent(query);
-              if (!(cubeApi && (ignoreSkip || !skip) && queryCondition)) {
-                _context.next = 20;
-                break;
-              }
-              setError(null);
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            loadOptions = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
+            ignoreSkip = _args.length > 1 && _args[1] !== undefined ? _args[1] : false;
+            cubeApi = options.cubeApi || (context === null || context === void 0 ? void 0 : context.cubeApi);
+            query = loadOptions.query || options.query;
+            queryCondition = method === 'meta' ? true : query && core.isQueryPresent(query);
+            if (!(cubeApi && (ignoreSkip || !skip) && queryCondition)) {
+              _context.next = 20;
+              break;
+            }
+            setError(null);
+            setResponse({
+              isLoading: true,
+              response: null
+            });
+            coreOptions = {
+              mutexObj: mutexRef.current,
+              mutexKey: method
+            };
+            args = method === 'meta' ? [coreOptions] : [query, coreOptions];
+            _context.prev = 10;
+            _context.next = 13;
+            return cubeApi[method].apply(cubeApi, args);
+          case 13:
+            _response = _context.sent;
+            if (isMounted()) {
               setResponse({
-                isLoading: true,
+                response: _response,
+                isLoading: false
+              });
+            }
+            _context.next = 20;
+            break;
+          case 17:
+            _context.prev = 17;
+            _context.t0 = _context["catch"](10);
+            if (isMounted()) {
+              setError(_context.t0);
+              setResponse({
+                isLoading: false,
                 response: null
               });
-              coreOptions = {
-                mutexObj: mutexRef.current,
-                mutexKey: method
-              };
-              args = method === 'meta' ? [coreOptions] : [query, coreOptions];
-              _context.prev = 10;
-              _context.next = 13;
-              return cubeApi[method].apply(cubeApi, args);
-            case 13:
-              _response = _context.sent;
-              if (isMounted()) {
-                setResponse({
-                  response: _response,
-                  isLoading: false
-                });
-              }
-              _context.next = 20;
-              break;
-            case 17:
-              _context.prev = 17;
-              _context.t0 = _context["catch"](10);
-              if (isMounted()) {
-                setError(_context.t0);
-                setResponse({
-                  isLoading: false,
-                  response: null
-                });
-              }
-            case 20:
-            case "end":
-              return _context.stop();
-          }
+            }
+          case 20:
+          case "end":
+            return _context.stop();
         }
       }, _callee, null, [[10, 17]]);
     }));
@@ -1249,57 +1232,55 @@ function useCubeQuery(query) {
     return _fetch.apply(this, arguments);
   }
   function _fetch() {
-    _fetch = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
+    _fetch = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
       var resetResultSetOnChange, cubeApi, _context$options, response;
       return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              resetResultSetOnChange = options.resetResultSetOnChange;
-              cubeApi = options.cubeApi || (context === null || context === void 0 ? void 0 : context.cubeApi);
-              if (cubeApi) {
-                _context2.next = 4;
-                break;
-              }
-              throw new Error('Cube API client is not provided');
-            case 4:
-              if (resetResultSetOnChange) {
-                setResultSet(null);
-              }
-              setError(null);
-              setLoading(true);
-              _context2.prev = 7;
-              _context2.next = 10;
-              return cubeApi.load(query, {
-                mutexObj: mutexRef.current,
-                mutexKey: 'query',
-                progressCallback: progressCallback,
-                castNumerics: Boolean(typeof options.castNumerics === 'boolean' ? options.castNumerics : context === null || context === void 0 ? void 0 : (_context$options = context.options) === null || _context$options === void 0 ? void 0 : _context$options.castNumerics)
-              });
-            case 10:
-              response = _context2.sent;
-              if (isMounted()) {
-                setResultSet(response);
-                setProgress(null);
-              }
-              _context2.next = 17;
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            resetResultSetOnChange = options.resetResultSetOnChange;
+            cubeApi = options.cubeApi || (context === null || context === void 0 ? void 0 : context.cubeApi);
+            if (cubeApi) {
+              _context2.next = 4;
               break;
-            case 14:
-              _context2.prev = 14;
-              _context2.t0 = _context2["catch"](7);
-              if (isMounted()) {
-                setError(_context2.t0);
-                setResultSet(null);
-                setProgress(null);
-              }
-            case 17:
-              if (isMounted()) {
-                setLoading(false);
-              }
-            case 18:
-            case "end":
-              return _context2.stop();
-          }
+            }
+            throw new Error('Cube API client is not provided');
+          case 4:
+            if (resetResultSetOnChange) {
+              setResultSet(null);
+            }
+            setError(null);
+            setLoading(true);
+            _context2.prev = 7;
+            _context2.next = 10;
+            return cubeApi.load(query, {
+              mutexObj: mutexRef.current,
+              mutexKey: 'query',
+              progressCallback: progressCallback,
+              castNumerics: Boolean(typeof options.castNumerics === 'boolean' ? options.castNumerics : context === null || context === void 0 || (_context$options = context.options) === null || _context$options === void 0 ? void 0 : _context$options.castNumerics)
+            });
+          case 10:
+            response = _context2.sent;
+            if (isMounted()) {
+              setResultSet(response);
+              setProgress(null);
+            }
+            _context2.next = 17;
+            break;
+          case 14:
+            _context2.prev = 14;
+            _context2.t0 = _context2["catch"](7);
+            if (isMounted()) {
+              setError(_context2.t0);
+              setResultSet(null);
+              setProgress(null);
+            }
+          case 17:
+            if (isMounted()) {
+              setLoading(false);
+            }
+          case 18:
+          case "end":
+            return _context2.stop();
         }
       }, _callee2, null, [[7, 14]]);
     }));
@@ -1317,73 +1298,71 @@ function useCubeQuery(query) {
       return _loadQuery.apply(this, arguments);
     }
     function _loadQuery() {
-      _loadQuery = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
+      _loadQuery = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
         return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                if (!(!skip && core.isQueryPresent(query))) {
-                  _context.next = 20;
-                  break;
-                }
-                if (!core.areQueriesEqual(currentQuery, query)) {
-                  if (resetResultSetOnChange == null || resetResultSetOnChange) {
-                    setResultSet(null);
-                  }
-                  setCurrentQuery(query);
-                }
-                setError(null);
-                setLoading(true);
-                _context.prev = 4;
-                if (!subscribeRequest) {
-                  _context.next = 9;
-                  break;
-                }
-                _context.next = 8;
-                return subscribeRequest.unsubscribe();
-              case 8:
-                subscribeRequest = null;
-              case 9:
-                if (!options.subscribe) {
-                  _context.next = 13;
-                  break;
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              if (!(!skip && core.isQueryPresent(query))) {
+                _context.next = 20;
+                break;
+              }
+              if (!core.areQueriesEqual(currentQuery, query)) {
+                if (resetResultSetOnChange == null || resetResultSetOnChange) {
+                  setResultSet(null);
                 }
-                subscribeRequest = cubeApi.subscribe(query, {
-                  mutexObj: mutexRef.current,
-                  mutexKey: 'query',
-                  progressCallback: progressCallback
-                }, function (e, result) {
-                  if (isMounted()) {
-                    if (e) {
-                      setError(e);
-                    } else {
-                      setResultSet(result);
-                    }
-                    setLoading(false);
-                    setProgress(null);
-                  }
-                });
-                _context.next = 15;
+                setCurrentQuery(query);
+              }
+              setError(null);
+              setLoading(true);
+              _context.prev = 4;
+              if (!subscribeRequest) {
+                _context.next = 9;
                 break;
-              case 13:
-                _context.next = 15;
-                return fetch();
-              case 15:
-                _context.next = 20;
+              }
+              _context.next = 8;
+              return subscribeRequest.unsubscribe();
+            case 8:
+              subscribeRequest = null;
+            case 9:
+              if (!options.subscribe) {
+                _context.next = 13;
                 break;
-              case 17:
-                _context.prev = 17;
-                _context.t0 = _context["catch"](4);
+              }
+              subscribeRequest = cubeApi.subscribe(query, {
+                mutexObj: mutexRef.current,
+                mutexKey: 'query',
+                progressCallback: progressCallback
+              }, function (e, result) {
                 if (isMounted()) {
-                  setError(_context.t0);
-                  setResultSet(null);
+                  if (e) {
+                    setError(e);
+                  } else {
+                    setResultSet(result);
+                  }
                   setLoading(false);
                   setProgress(null);
                 }
-              case 20:
-              case "end":
-                return _context.stop();
-            }
+              });
+              _context.next = 15;
+              break;
+            case 13:
+              _context.next = 15;
+              return fetch();
+            case 15:
+              _context.next = 20;
+              break;
+            case 17:
+              _context.prev = 17;
+              _context.t0 = _context["catch"](4);
+              if (isMounted()) {
+                setError(_context.t0);
+                setResultSet(null);
+                setLoading(false);
+                setProgress(null);
+              }
+            case 20:
+            case "end":
+              return _context.stop();
           }
         }, _callee, null, [[4, 17]]);
       }));