@cubejs-client/react 0.34.46 → 0.35.0

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

@@ -10200,8 +10200,10 @@
 
 	  if (id === 'measures') {
 	    destinationIndex = lastIndex + 1;
-	  } else if (destinationIndex >= lastIndex && nextPivotConfig[destinationAxis][lastIndex] === 'measures') {
+	  } else if (sourceAxis === destinationAxis && destinationIndex >= lastIndex && nextPivotConfig[destinationAxis][lastIndex] === 'measures') {
 	    destinationIndex = lastIndex - 1;
+	  } else if (sourceAxis !== destinationAxis && destinationIndex > lastIndex && nextPivotConfig[destinationAxis][lastIndex] === 'measures') {
+	    destinationIndex = lastIndex;
 	  }
 
 	  nextPivotConfig[sourceAxis].splice(sourceIndex, 1);
@@ -11238,7 +11240,7 @@
 	          query = _this$props2.query,
 	          queries = _this$props2.queries,
 	          render = _this$props2.render,
-	          cubejsApi = _this$props2.cubejsApi,
+	          cubeApi = _this$props2.cubeApi,
 	          loadSql = _this$props2.loadSql,
 	          updateOnlyOnStateChange = _this$props2.updateOnlyOnStateChange;
 
@@ -11246,7 +11248,7 @@
 	        return true;
 	      }
 
-	      return !equals(nextProps.query, query) || !equals(nextProps.queries, queries) || (nextProps.render == null || render == null) && nextProps.render !== render || nextProps.cubejsApi !== cubejsApi || nextProps.loadSql !== loadSql || !equals(nextState, this.state) || nextProps.updateOnlyOnStateChange !== updateOnlyOnStateChange;
+	      return !equals(nextProps.query, query) || !equals(nextProps.queries, queries) || (nextProps.render == null || render == null) && nextProps.render !== render || nextProps.cubeApi !== cubeApi || nextProps.loadSql !== loadSql || !equals(nextState, this.state) || nextProps.updateOnlyOnStateChange !== updateOnlyOnStateChange;
 	    }
 	  }, {
 	    key: "componentDidUpdate",
@@ -11264,10 +11266,10 @@
 	      }
 	    }
 	  }, {
-	    key: "cubejsApi",
-	    value: function cubejsApi() {
+	    key: "cubeApi",
+	    value: function cubeApi() {
 	      // eslint-disable-next-line react/destructuring-assignment
-	      return this.props.cubejsApi || this.context && this.context.cubejsApi;
+	      return this.props.cubeApi || this.context && this.context.cubeApi;
 	    }
 	  }, {
 	    key: "load",
@@ -11283,11 +11285,11 @@
 	        resultSet: null
 	      } : {}));
 	      var loadSql = this.props.loadSql;
-	      var cubejsApi = this.cubejsApi();
+	      var cubeApi = this.cubeApi();
 
 	      if (query && isQueryPresent(query)) {
 	        if (loadSql === 'only') {
-	          cubejsApi.sql(query, {
+	          cubeApi.sql(query, {
 	            mutexObj: this.mutexObj,
 	            mutexKey: 'sql'
 	          }).then(function (sqlQuery) {
@@ -11305,10 +11307,10 @@
 	            }));
 	          });
 	        } else if (loadSql) {
-	          Promise.all([cubejsApi.sql(query, {
+	          Promise.all([cubeApi.sql(query, {
 	            mutexObj: this.mutexObj,
 	            mutexKey: 'sql'
-	          }), cubejsApi.load(query, {
+	          }), cubeApi.load(query, {
 	            mutexObj: this.mutexObj,
 	            mutexKey: 'query'
 	          })]).then(function (_ref) {
@@ -11331,7 +11333,7 @@
 	            }));
 	          });
 	        } else {
-	          cubejsApi.load(query, {
+	          cubeApi.load(query, {
 	            mutexObj: this.mutexObj,
 	            mutexKey: 'query'
 	          }).then(function (resultSet) {
@@ -11356,7 +11358,7 @@
 	    value: function loadQueries(queries) {
 	      var _this3 = this;
 
-	      var cubejsApi = this.cubejsApi();
+	      var cubeApi = this.cubeApi();
 	      var resetResultSetOnChange = this.props.resetResultSetOnChange;
 	      this.setState(_objectSpread$6(_objectSpread$6({
 	        isLoading: true
@@ -11370,7 +11372,7 @@
 	            name = _ref4[0],
 	            query = _ref4[1];
 
-	        return cubejsApi.load(query, {
+	        return cubeApi.load(query, {
 	          mutexObj: _this3.mutexObj,
 	          mutexKey: name
 	        }).then(function (r) {
@@ -11433,7 +11435,7 @@
 	_defineProperty(QueryRenderer, "contextType", CubeContext);
 
 	_defineProperty(QueryRenderer, "defaultProps", {
-	  cubejsApi: null,
+	  cubeApi: null,
 	  query: null,
 	  render: null,
 	  queries: null,
@@ -11742,7 +11744,7 @@
 	        while (1) {
 	          switch (_context.prev = _context.next) {
 	            case 0:
-	              if (_this.cubejsApi()) {
+	              if (_this.cubeApi()) {
 	                _context.next = 2;
 	                break;
 	              }
@@ -11760,7 +11762,7 @@
 	              });
 
 	              _context.next = 9;
-	              return _this.cubejsApi().meta();
+	              return _this.cubeApi().meta();
 
 	            case 9:
 	              meta = _context.sent;
@@ -11853,7 +11855,7 @@
 	                _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.cubejsApi) !== ((_this$context = this.context) === null || _this$context === void 0 ? void 0 : _this$context.cubejsApi))) {
+	                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;
 	                }
@@ -11870,7 +11872,7 @@
 
 	                _context4.prev = 7;
 	                _context4.next = 10;
-	                return this.cubejsApi().meta();
+	                return this.cubeApi().meta();
 
 	              case 10:
 	                newMeta = _context4.sent;
@@ -11930,11 +11932,11 @@
 	      return componentDidUpdate;
 	    }()
 	  }, {
-	    key: "cubejsApi",
-	    value: function cubejsApi() {
-	      var cubejsApi = this.props.cubejsApi; // eslint-disable-next-line react/destructuring-assignment
+	    key: "cubeApi",
+	    value: function cubeApi() {
+	      var cubeApi = this.props.cubeApi; // eslint-disable-next-line react/destructuring-assignment
 
-	      return cubejsApi || this.context && this.context.cubejsApi;
+	      return cubeApi || this.context && this.context.cubeApi;
 	    }
 	  }, {
 	    key: "getMissingMembers",
@@ -12300,7 +12302,7 @@
 
 	                _context5.prev = 16;
 	                _context5.next = 19;
-	                return this.cubejsApi().dryRun(finalState.query, {
+	                return this.cubeApi().dryRun(finalState.query, {
 	                  mutexObj: this.mutexObj
 	                });
 
@@ -12391,14 +12393,14 @@
 
 	      var query = this.state.query;
 	      var _this$props4 = this.props,
-	          cubejsApi = _this$props4.cubejsApi,
+	          cubeApi = _this$props4.cubeApi,
 	          _render = _this$props4.render,
 	          wrapWithQueryRenderer = _this$props4.wrapWithQueryRenderer;
 
 	      if (wrapWithQueryRenderer) {
 	        return /*#__PURE__*/React__default['default'].createElement(QueryRenderer, {
 	          query: query,
-	          cubejsApi: cubejsApi,
+	          cubeApi: cubeApi,
 	          resetResultSetOnChange: false,
 	          render: function render(queryRendererProps) {
 	            if (_render) {
@@ -12479,7 +12481,7 @@
 	_defineProperty(QueryBuilder, "contextType", CubeContext);
 
 	_defineProperty(QueryBuilder, "defaultProps", {
-	  cubejsApi: null,
+	  cubeApi: null,
 	  stateChangeHeuristics: null,
 	  disableHeuristics: false,
 	  render: null,
@@ -12497,18 +12499,11 @@
 
 	function CubeProvider(_ref) {
 	  var cubeApi = _ref.cubeApi,
-	      cubejsApi = _ref.cubejsApi,
 	      children = _ref.children,
 	      _ref$options = _ref.options,
 	      options = _ref$options === void 0 ? {} : _ref$options;
-	  React.useEffect(function () {
-	    if (cubejsApi && !cubeApi) {
-	      console.warn('"cubejsApi" is deprecated and will be removed in the following version. Use "cubeApi" instead.');
-	    }
-	  }, [cubeApi, cubejsApi]);
 	  return /*#__PURE__*/React__default['default'].createElement(CubeContext.Provider, {
 	    value: {
-	      cubejsApi: cubejsApi,
 	      cubeApi: cubeApi,
 	      options: options
 	    }
@@ -12587,7 +12582,7 @@
 	            case 0:
 	              loadOptions = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
 	              ignoreSkip = _args.length > 1 && _args[1] !== undefined ? _args[1] : false;
-	              cubeApi = options.cubeApi || options.cubejsApi || (context === null || context === void 0 ? void 0 : context.cubeApi) || (context === null || context === void 0 ? void 0 : context.cubejsApi);
+	              cubeApi = options.cubeApi || (context === null || context === void 0 ? void 0 : context.cubeApi);
 	              query = loadOptions.query || options.query;
 	              queryCondition = method === 'meta' ? true : query && isQueryPresent(query);
 
@@ -12732,12 +12727,6 @@
 	    return setProgress(progressResponse);
 	  };
 
-	  React.useEffect(function () {
-	    if (options.cubejsApi && !options.cubeApi) {
-	      console.warn('"cubejsApi" is deprecated and will be removed in the following version. Use "cubeApi" instead.');
-	    }
-	  }, [options.cubeApi, options.cubejsApi]);
-
 	  function fetch() {
 	    return _fetch.apply(this, arguments);
 	  }
@@ -12751,7 +12740,7 @@
 	          switch (_context2.prev = _context2.next) {
 	            case 0:
 	              resetResultSetOnChange = options.resetResultSetOnChange;
-	              cubeApi = options.cubeApi || options.cubejsApi || (context === null || context === void 0 ? void 0 : context.cubeApi) || (context === null || context === void 0 ? void 0 : context.cubejsApi);
+	              cubeApi = options.cubeApi || (context === null || context === void 0 ? void 0 : context.cubeApi);
 
 	              if (cubeApi) {
 	                _context2.next = 4;
@@ -12816,7 +12805,7 @@
 	    var _options$skip = options.skip,
 	        skip = _options$skip === void 0 ? false : _options$skip,
 	        resetResultSetOnChange = options.resetResultSetOnChange;
-	    var cubeApi = options.cubeApi || options.cubejsApi || (context === null || context === void 0 ? void 0 : context.cubeApi) || (context === null || context === void 0 ? void 0 : context.cubejsApi);
+	    var cubeApi = options.cubeApi || (context === null || context === void 0 ? void 0 : context.cubeApi);
 
 	    if (!cubeApi) {
 	      throw new Error('Cube API client is not provided');