@cubejs-client/react 0.30.30 → 0.30.60

package/dist/cubejs-client-react.js

@@ -30,27 +30,24 @@ require('core-js/modules/es.regexp.to-string.js');
 var React = require('react');
 var ramda = require('ramda');
 var core = require('@cubejs-client/core');
-var _typeof = require('@babel/runtime/helpers/typeof');
-require('core-js/modules/es.regexp.exec.js');
-require('core-js/modules/es.string.split.js');
-require('core-js/modules/es.string.replace.js');
-require('core-js/modules/es.array.concat.js');
-require('core-js/modules/es.object.from-entries.js');
-require('core-js/modules/es.object.entries.js');
-require('core-js/modules/es.array.is-array.js');
-var Anser = require('anser');
-var htmlEntities = require('html-entities');
 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.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.reduce.js');
+var _typeof = require('@babel/runtime/helpers/typeof');
+require('core-js/modules/es.object.entries.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -62,113 +59,16 @@ var _inherits__default = /*#__PURE__*/_interopDefaultLegacy(_inherits);
 var _possibleConstructorReturn__default = /*#__PURE__*/_interopDefaultLegacy(_possibleConstructorReturn);
 var _getPrototypeOf__default = /*#__PURE__*/_interopDefaultLegacy(_getPrototypeOf);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var _typeof__default = /*#__PURE__*/_interopDefaultLegacy(_typeof);
-var Anser__default = /*#__PURE__*/_interopDefaultLegacy(Anser);
 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);
 
 var CubeContext = /*#__PURE__*/React.createContext(null);
 
-var colors = {
-  reset: 'orange',
-  black: 'black',
-  red: 'red',
-  green: 'green',
-  yellow: 'orange',
-  blue: 'blue',
-  magenta: 'magenta',
-  cyan: 'cyan',
-  gray: 'gray',
-  lightgrey: 'lightgrey',
-  darkgrey: 'darkgrey'
-};
-var anserMap = {
-  'ansi-bright-black': 'black',
-  'ansi-bright-yellow': 'yellow',
-  'ansi-yellow': 'yellow',
-  'ansi-bright-green': 'green',
-  'ansi-green': 'green',
-  'ansi-bright-cyan': 'cyan',
-  'ansi-cyan': 'cyan',
-  'ansi-bright-red': 'red',
-  'ansi-red': 'red',
-  'ansi-bright-magenta': 'magenta',
-  'ansi-magenta': 'magenta',
-  'ansi-white': 'darkgrey'
-};
-function generateAnsiHTML(txt) {
-  var arr = new Anser__default['default']().ansiToJson(htmlEntities.encode(txt), {
-    use_classes: true
-  });
-  var result = '';
-  var open = false;
-
-  for (var index = 0; index < arr.length; ++index) {
-    var c = arr[index];
-    var content = c.content;
-    var fg = c.fg;
-    var contentParts = content.split('\n');
-
-    for (var j = 0; j < contentParts.length; ++j) {
-      if (!open) {
-        result += '<span data-ansi-line="true">';
-        open = true;
-      }
-
-      var part = contentParts[j].replace('\r', '');
-      var color = colors[anserMap[fg]];
-
-      if (color != null) {
-        result += "<span style=\"color: ".concat(color, ";\">").concat(part, "</span>");
-      } else {
-        if (fg != null) {
-          console.log('Missing color mapping: ', fg);
-        }
-
-        result += "<span>".concat(part, "</span>");
-      }
-
-      if (j < contentParts.length - 1) {
-        result += '</span>';
-        open = false;
-        result += '<br/>';
-      }
-    }
-  }
-
-  if (open) {
-    result += '</span>';
-  }
-
-  return result;
-}
-function removeEmpty(obj) {
-  if (_typeof__default['default'](obj) !== 'object') {
-    return obj;
-  }
-
-  return Object.fromEntries(Object.entries(obj).filter(function (_ref) {
-    var _ref2 = _slicedToArray__default['default'](_ref, 2),
-        v = _ref2[1];
-
-    return v != null;
-  }).map(function (_ref3) {
-    var _ref4 = _slicedToArray__default['default'](_ref3, 2),
-        k = _ref4[0],
-        v = _ref4[1];
-
-    if (Array.isArray(v)) {
-      return [k, v.map(removeEmpty)];
-    }
-
-    return [k, _typeof__default['default'](v) === 'object' ? removeEmpty(v) : v];
-  }));
-}
-
 function ownKeys$6(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread$6(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$6(Object(source), !0).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$6(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -372,6 +272,8 @@ var QueryRenderer = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
+      var _error$response;
+
       var _this$state = this.state,
           error = _this$state.error,
           queries = _this$state.queries,
@@ -380,7 +282,7 @@ var QueryRenderer = /*#__PURE__*/function (_React$Component) {
           sqlQuery = _this$state.sqlQuery;
       var render = this.props.render;
       var loadState = {
-        error: error ? new Error(generateAnsiHTML(error.message || error.toString())) : null,
+        error: error ? new Error(((_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.plainError) || error.message || error.toString()) : null,
         resultSet: queries ? resultSet || {} : resultSet,
         loadingState: {
           isLoading: isLoading
@@ -447,6 +349,29 @@ QueryRendererWithTotals.defaultProps = {
   loadSql: null
 };
 
+function removeEmpty(obj) {
+  if (_typeof__default['default'](obj) !== 'object') {
+    return obj;
+  }
+
+  return Object.fromEntries(Object.entries(obj).filter(function (_ref) {
+    var _ref2 = _slicedToArray__default['default'](_ref, 2),
+        v = _ref2[1];
+
+    return v != null;
+  }).map(function (_ref3) {
+    var _ref4 = _slicedToArray__default['default'](_ref3, 2),
+        k = _ref4[0],
+        v = _ref4[1];
+
+    if (Array.isArray(v)) {
+      return [k, v.map(removeEmpty)];
+    }
+
+    return [k, _typeof__default['default'](v) === 'object' ? removeEmpty(v) : v];
+  }));
+}
+
 function ownKeys$4(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread$4(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$4(Object(source), !0).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$4(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -496,7 +421,7 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
     _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, metaErrorStack, _error$response, _error$response$stack;
+      var meta, metaError, richMetaError, metaErrorStack, _error$response, _error$response2, _error$response2$stac;
 
       return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
         while (1) {
@@ -511,31 +436,34 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
 
             case 2:
               metaError = null;
+              richMetaError = null;
               metaErrorStack = null;
-              _context.prev = 4;
+              _context.prev = 5;
 
               _this.setState({
                 isFetchingMeta: true
               });
 
-              _context.next = 8;
+              _context.next = 9;
               return _this.cubejsApi().meta();
 
-            case 8:
+            case 9:
               meta = _context.sent;
-              _context.next = 15;
+              _context.next = 17;
               break;
 
-            case 11:
-              _context.prev = 11;
-              _context.t0 = _context["catch"](4);
-              metaError = _context.t0;
-              metaErrorStack = ((_error$response = _context.t0.response) === null || _error$response === void 0 ? void 0 : (_error$response$stack = _error$response.stack) === null || _error$response$stack === void 0 ? void 0 : _error$response$stack.replace(_context.t0.message || '', '')) || '';
+            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 15:
+            case 17:
               _this.setState({
                 meta: meta,
-                metaError: metaError ? new Error(generateAnsiHTML(metaError.message || metaError.toString())) : null,
+                metaError: metaError ? new Error(metaError.message || metaError.toString()) : null,
+                richMetaError: richMetaError,
                 metaErrorStack: metaErrorStack,
                 isFetchingMeta: false
               }, function () {
@@ -544,12 +472,12 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
                 _this.updateQuery({});
               });
 
-            case 16:
+            case 18:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[4, 11]]);
+      }, _callee, null, [[5, 12]]);
     })));
 
     _this.state = _objectSpread$4(_objectSpread$4({
@@ -773,6 +701,7 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
       var _this$state = this.state,
           meta = _this$state.meta,
           metaError = _this$state.metaError,
+          richMetaError = _this$state.richMetaError,
           query = _this$state.query,
           queryError = _this$state.queryError,
           chartType = _this$state.chartType,
@@ -869,6 +798,7 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
       return _objectSpread$4({
         meta: meta,
         metaError: metaError,
+        richMetaError: richMetaError,
         metaErrorStack: metaErrorStack,
         query: query,
         error: queryError,
@@ -988,7 +918,7 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
       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;
+        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) {
@@ -1082,7 +1012,8 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
                 _context5.prev = 27;
                 _context5.t0 = _context5["catch"](16);
                 this.setState({
-                  queryError: new Error(generateAnsiHTML(_context5.t0.message || _context5.t0.toString()))
+                  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:
@@ -1439,7 +1370,7 @@ function useLazyDryRun(query) {
 function useCubeQuery(query) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var mutexRef = React.useRef({});
-  var isMounted = React.useRef(true);
+  var isMounted = useIsMounted();
 
   var _useState = React.useState(null),
       _useState2 = _slicedToArray__default['default'](_useState, 2),
@@ -1513,7 +1444,7 @@ function useCubeQuery(query) {
             case 10:
               response = _context2.sent;
 
-              if (isMounted.current) {
+              if (isMounted()) {
                 setResultSet(response);
                 setProgress(null);
               }
@@ -1525,14 +1456,14 @@ function useCubeQuery(query) {
               _context2.prev = 14;
               _context2.t0 = _context2["catch"](7);
 
-              if (isMounted.current) {
+              if (isMounted()) {
                 setError(_context2.t0);
                 setResultSet(null);
                 setProgress(null);
               }
 
             case 17:
-              if (isMounted.current) {
+              if (isMounted()) {
                 setLoading(false);
               }
 
@@ -1546,11 +1477,6 @@ function useCubeQuery(query) {
     return _fetch.apply(this, arguments);
   }
 
-  React.useEffect(function () {
-    return function () {
-      isMounted.current = false;
-    };
-  }, []);
   React.useEffect(function () {
     var _options$skip = options.skip,
         skip = _options$skip === void 0 ? false : _options$skip,
@@ -1610,7 +1536,7 @@ function useCubeQuery(query) {
                   mutexKey: 'query',
                   progressCallback: progressCallback
                 }, function (e, result) {
-                  if (isMounted.current) {
+                  if (isMounted()) {
                     if (e) {
                       setError(e);
                     } else {
@@ -1636,7 +1562,7 @@ function useCubeQuery(query) {
                 _context.prev = 17;
                 _context.t0 = _context["catch"](4);
 
-                if (isMounted.current) {
+                if (isMounted()) {
                   setError(_context.t0);
                   setResultSet(null);
                   setLoading(false);