@cubejs-client/react 1.5.10 → 1.5.12

package/dist/cubejs-client-react.cjs.js

@@ -370,36 +370,36 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
     _classCallCheck__default['default'](this, QueryBuilder);
     _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) {
+      var meta, metaError, richMetaError, metaErrorStack, _error$response, _error$response2, _t;
+      return _regeneratorRuntime__default['default'].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (_this.cubeApi()) {
-              _context.next = 2;
+              _context.next = 1;
               break;
             }
             return _context.abrupt("return");
-          case 2:
+          case 1:
             metaError = null;
             richMetaError = null;
             metaErrorStack = null;
-            _context.prev = 5;
+            _context.prev = 2;
             _this.setState({
               isFetchingMeta: true
             });
-            _context.next = 9;
+            _context.next = 3;
             return _this.cubeApi().meta();
-          case 9:
+          case 3:
             meta = _context.sent;
-            _context.next = 17;
+            _context.next = 5;
             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:
+          case 4:
+            _context.prev = 4;
+            _t = _context["catch"](2);
+            metaError = ((_error$response = _t.response) === null || _error$response === void 0 ? void 0 : _error$response.plainError) || _t;
+            richMetaError = _t;
+            metaErrorStack = ((_error$response2 = _t.response) === null || _error$response2 === void 0 || (_error$response2 = _error$response2.stack) === null || _error$response2 === void 0 ? void 0 : _error$response2.replace(_t.message || '', '')) || '';
+          case 5:
             _this.setState({
               meta: meta,
               metaError: metaError ? new Error(metaError.message || metaError.toString()) : null,
@@ -411,11 +411,11 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
               // This will catch any new missing members, and also validate the query against the new meta
               _this.updateQuery({});
             });
-          case 18:
+          case 6:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[5, 12]]);
+      }, _callee, null, [[2, 4]]);
     })));
     _this.state = _objectSpread$4(_objectSpread$4({
       query: props.defaultQuery || props.query,
@@ -436,13 +436,13 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
     key: "componentDidMount",
     value: function () {
       var _componentDidMount = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
-        return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
+        return _regeneratorRuntime__default['default'].wrap(function (_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               this.prevContext = this.context;
-              _context2.next = 3;
+              _context2.next = 1;
               return this.fetchMeta();
-            case 3:
+            case 1:
             case "end":
               return _context2.stop();
           }
@@ -460,40 +460,40 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
         var _this$prevContext,
           _this$context,
           _this2 = this;
-        var _this$props, schemaVersion, onSchemaChange, meta, newMeta;
-        return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
+        var _this$props, schemaVersion, onSchemaChange, meta, newMeta, _t2;
+        return _regeneratorRuntime__default['default'].wrap(function (_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;
+                _context4.next = 1;
                 break;
               }
               this.prevContext = this.context;
-              _context4.next = 6;
+              _context4.next = 1;
               return this.fetchMeta();
-            case 6:
+            case 1:
               if (!(prevProps.schemaVersion !== schemaVersion)) {
-                _context4.next = 17;
+                _context4.next = 5;
                 break;
               }
-              _context4.prev = 7;
-              _context4.next = 10;
+              _context4.prev = 2;
+              _context4.next = 3;
               return this.cubeApi().meta();
-            case 10:
+            case 3:
               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) {
+                      return _regeneratorRuntime__default['default'].wrap(function (_context3) {
                         while (1) switch (_context3.prev = _context3.next) {
                           case 0:
-                            _context3.next = 2;
+                            _context3.next = 1;
                             return _this2.fetchMeta();
-                          case 2:
+                          case 1:
                           case "end":
                             return _context3.stop();
                         }
@@ -506,20 +506,20 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
                   }()
                 });
               }
-              _context4.next = 17;
+              _context4.next = 5;
               break;
-            case 14:
-              _context4.prev = 14;
-              _context4.t0 = _context4["catch"](7);
+            case 4:
+              _context4.prev = 4;
+              _t2 = _context4["catch"](2);
               // eslint-disable-next-line
               this.setState({
-                metaError: _context4.t0
+                metaError: _t2
               });
-            case 17:
+            case 5:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[7, 14]]);
+        }, _callee4, this, [[2, 4]]);
       }));
       function componentDidUpdate(_x) {
         return _componentDidUpdate.apply(this, arguments);
@@ -809,8 +809,8 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
     value: function () {
       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) {
+        var _this$props2, setQuery, setVizState, _this$state2, stateQuery, statePivotConfig, chartType, meta, finalState, vizStateSent, handleVizStateChange, runSetters, shouldFetchDryRun, response, _error$response3, _t3;
+        return _regeneratorRuntime__default['default'].wrap(function (_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               _this$props2 = this.props, setQuery = _this$props2.setQuery, setVizState = _this$props2.setVizState;
@@ -859,15 +859,15 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
               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;
+                _context5.next = 4;
                 break;
               }
-              _context5.prev = 16;
-              _context5.next = 19;
+              _context5.prev = 1;
+              _context5.next = 2;
               return this.cubeApi().dryRun(finalState.query, {
                 mutexObj: this.mutexObj
               });
-            case 19:
+            case 2:
               response = _context5.sent;
               if (finalState.shouldApplyHeuristicOrder) {
                 finalState.query.order = (response.queryOrder || []).reduce(function (memo, current) {
@@ -882,24 +882,24 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
               if (core.isQueryPresent(stateQuery)) {
                 runSetters(_objectSpread$4(_objectSpread$4({}, this.state), finalState));
               }
-              _context5.next = 30;
+              _context5.next = 4;
               break;
-            case 27:
-              _context5.prev = 27;
-              _context5.t0 = _context5["catch"](16);
+            case 3:
+              _context5.prev = 3;
+              _t3 = _context5["catch"](1);
               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())
+                queryError: new Error(((_error$response3 = _t3.response) === null || _error$response3 === void 0 ? void 0 : _error$response3.plainError) || _t3.message),
+                richQueryError: new Error(_t3.message || _t3.toString())
               });
-            case 30:
+            case 4:
               this.setState(finalState, function () {
                 return handleVizStateChange(_this4.state);
               });
-            case 31:
+            case 5:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[16, 27]]);
+        }, _callee5, this, [[1, 3]]);
       }));
       function updateVizState(_x2) {
         return _updateVizState.apply(this, arguments);
@@ -983,9 +983,9 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
     }
   }, {
     key: "resolveMember",
-    value: function resolveMember(type, _ref10) {
-      var meta = _ref10.meta,
-        query = _ref10.query;
+    value: function resolveMember(type, _ref0) {
+      var meta = _ref0.meta,
+        query = _ref0.query;
       if (!meta) {
         return [];
       }
@@ -1087,8 +1087,9 @@ function useCubeFetch(method) {
         coreOptions,
         args,
         _response,
-        _args = arguments;
-      return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+        _args = arguments,
+        _t;
+      return _regeneratorRuntime__default['default'].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             loadOptions = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
@@ -1097,7 +1098,7 @@ function useCubeFetch(method) {
             query = loadOptions.query || options.query;
             queryCondition = method === 'meta' ? true : query && core.isQueryPresent(query);
             if (!(cubeApi && (ignoreSkip || !skip) && queryCondition)) {
-              _context.next = 21;
+              _context.next = 4;
               break;
             }
             setError(null);
@@ -1105,35 +1106,37 @@ function useCubeFetch(method) {
               isLoading: true,
               response: null
             });
-            coreOptions = {
+            coreOptions = _objectSpread$3({
               mutexObj: mutexRef.current,
               mutexKey: method
-            };
+            }, options.baseRequestId ? {
+              baseRequestId: options.baseRequestId
+            } : {});
             args = method === 'meta' ? [coreOptions] : [query, coreOptions];
-            _context.prev = 10;
-            _context.next = 13;
+            _context.prev = 1;
+            _context.next = 2;
             return cubeApi[method].apply(cubeApi, args);
-          case 13:
+          case 2:
             _response = _context.sent;
             setResponse({
               response: _response,
               isLoading: false
             });
-            _context.next = 21;
+            _context.next = 4;
             break;
-          case 17:
-            _context.prev = 17;
-            _context.t0 = _context["catch"](10);
-            setError(_context.t0);
+          case 3:
+            _context.prev = 3;
+            _t = _context["catch"](1);
+            setError(_t);
             setResponse({
               isLoading: false,
               response: null
             });
-          case 21:
+          case 4:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[10, 17]]);
+      }, _callee, null, [[1, 3]]);
     }));
     return _load.apply(this, arguments);
   }
@@ -1200,9 +1203,9 @@ function useCubeQuery(query) {
     progress = _useState8[0],
     setProgress = _useState8[1];
   var _useState9 = React.useState(null),
-    _useState10 = _slicedToArray__default['default'](_useState9, 2),
-    error = _useState10[0],
-    setError = _useState10[1];
+    _useState0 = _slicedToArray__default['default'](_useState9, 2),
+    error = _useState0[0],
+    setError = _useState0[1];
   var context = React.useContext(CubeContext);
   var subscribeRequest = null;
   var progressCallback = function progressCallback(_ref) {
@@ -1214,50 +1217,50 @@ function useCubeQuery(query) {
   }
   function _fetch() {
     _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) {
+      var resetResultSetOnChange, cubeApi, _context$options, response, _t2;
+      return _regeneratorRuntime__default['default'].wrap(function (_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;
+              _context2.next = 1;
               break;
             }
             throw new Error('Cube API client is not provided');
-          case 4:
+          case 1:
             if (resetResultSetOnChange) {
               setResultSet(null);
             }
             setError(null);
             setLoading(true);
-            _context2.prev = 7;
-            _context2.next = 10;
+            _context2.prev = 2;
+            _context2.next = 3;
             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:
+          case 3:
             response = _context2.sent;
             setResultSet(response);
             setProgress(null);
-            _context2.next = 20;
+            _context2.next = 5;
             break;
-          case 15:
-            _context2.prev = 15;
-            _context2.t0 = _context2["catch"](7);
-            setError(_context2.t0);
+          case 4:
+            _context2.prev = 4;
+            _t2 = _context2["catch"](2);
+            setError(_t2);
             setResultSet(null);
             setProgress(null);
-          case 20:
+          case 5:
             setLoading(false);
-          case 21:
+          case 6:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[7, 15]]);
+      }, _callee2, null, [[2, 4]]);
     }));
     return _fetch.apply(this, arguments);
   }
@@ -1274,11 +1277,12 @@ function useCubeQuery(query) {
     }
     function _loadQuery() {
       _loadQuery = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
-        return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+        var _t;
+        return _regeneratorRuntime__default['default'].wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               if (!(!skip && core.isQueryPresent(query))) {
-                _context.next = 23;
+                _context.next = 7;
                 break;
               }
               if (!core.areQueriesEqual(currentQuery, query)) {
@@ -1289,18 +1293,18 @@ function useCubeQuery(query) {
               }
               setError(null);
               setLoading(true);
-              _context.prev = 4;
+              _context.prev = 1;
               if (!subscribeRequest) {
-                _context.next = 9;
+                _context.next = 3;
                 break;
               }
-              _context.next = 8;
+              _context.next = 2;
               return subscribeRequest.unsubscribe();
-            case 8:
+            case 2:
               subscribeRequest = null;
-            case 9:
+            case 3:
               if (!options.subscribe) {
-                _context.next = 13;
+                _context.next = 4;
                 break;
               }
               subscribeRequest = cubeApi.subscribe(query, {
@@ -1316,26 +1320,26 @@ function useCubeQuery(query) {
                 setLoading(false);
                 setProgress(null);
               });
-              _context.next = 15;
+              _context.next = 5;
               break;
-            case 13:
-              _context.next = 15;
+            case 4:
+              _context.next = 5;
               return fetch();
-            case 15:
-              _context.next = 23;
+            case 5:
+              _context.next = 7;
               break;
-            case 17:
-              _context.prev = 17;
-              _context.t0 = _context["catch"](4);
-              setError(_context.t0);
+            case 6:
+              _context.prev = 6;
+              _t = _context["catch"](1);
+              setError(_t);
               setResultSet(null);
               setLoading(false);
               setProgress(null);
-            case 23:
+            case 7:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[4, 17]]);
+        }, _callee, null, [[1, 6]]);
       }));
       return _loadQuery.apply(this, arguments);
     }