@cubejs-client/react 0.30.46 → 0.30.69

package/index.d.ts

@@ -240,6 +240,7 @@ declare module '@cubejs-client/react' {
 
     meta: Meta | undefined;
     metaError?: Error | null;
+    richMetaError?: Error | null;
     metaErrorStack?: string | null;
     isFetchingMeta: boolean;
     /**
@@ -655,9 +656,11 @@ declare module '@cubejs-client/react' {
     sourceAxis: TSourceAxis;
     destinationAxis: TSourceAxis;
   };
+  
   type PivotConfigExtraUpdateFields = {
     limit?: number;
   };
+  
   type PivotConfigUpdater = {
     moveItem: (args: PivotConfigUpdaterArgs) => void;
     update: (pivotConfig: PivotConfig & PivotConfigExtraUpdateFields) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cubejs-client/react",
-  "version": "0.30.46",
+  "version": "0.30.69",
   "author": "Cube Dev, Inc.",
   "license": "MIT",
   "engines": {},
@@ -24,10 +24,8 @@
   ],
   "dependencies": {
     "@babel/runtime": "^7.1.2",
-    "@cubejs-client/core": "^0.30.46",
-    "anser": "^2.0.1",
+    "@cubejs-client/core": "^0.30.64",
     "core-js": "^3.6.5",
-    "html-entities": "^2.3.2",
     "ramda": "^0.27.0"
   },
   "devDependencies": {
@@ -44,5 +42,5 @@
   "peerDependencies": {
     "react": ">=16.10.2"
   },
-  "gitHead": "c29f3e26e595a96f140c55049131b764e852876e"
+  "gitHead": "bce06c7562427267389b5f134b1f0c413c6764c0"
 }

package/src/QueryBuilder.jsx

@@ -15,7 +15,7 @@ import {
 
 import QueryRenderer from './QueryRenderer.jsx';
 import CubeContext from './CubeContext';
-import { generateAnsiHTML, removeEmpty } from './utils';
+import { removeEmpty } from './utils';
 
 const granularities = [
   { name: undefined, title: 'w/o grouping' },
@@ -31,6 +31,24 @@ const granularities = [
 
 export default class QueryBuilder extends React.Component {
   static contextType = CubeContext;
+  
+  static defaultProps = {
+    cubejsApi: null,
+    stateChangeHeuristics: null,
+    disableHeuristics: false,
+    render: null,
+    wrapWithQueryRenderer: true,
+    defaultChartType: 'line',
+    defaultQuery: {},
+    initialVizState: null,
+    onVizStateChanged: null,
+    
+    // deprecated
+    query: null,
+    setQuery: null,
+    vizState: null,
+    setVizState: null,
+  };
 
   // This is an anti-pattern, only kept for backward compatibility
   // https://reactjs.org/blog/2018/06/07/you-probably-dont-need-derived-state.html#anti-pattern-unconditionally-copying-props-to-state
@@ -148,20 +166,23 @@ export default class QueryBuilder extends React.Component {
 
     let meta;
     let metaError = null;
+    let richMetaError = null;
     let metaErrorStack = null;
 
     try {
       this.setState({ isFetchingMeta: true });
       meta = await this.cubejsApi().meta();
     } catch (error) {
-      metaError = error;
+      metaError = error.response?.plainError || error;
+      richMetaError = error;
       metaErrorStack = error.response?.stack?.replace(error.message || '', '') || '';
     }
 
     this.setState(
       {
         meta,
-        metaError: metaError ? new Error(generateAnsiHTML(metaError.message || metaError.toString())) : null,
+        metaError: metaError ? new Error(metaError.message || metaError.toString()) : null,
+        richMetaError,
         metaErrorStack,
         isFetchingMeta: false,
       },
@@ -248,6 +269,7 @@ export default class QueryBuilder extends React.Component {
     const {
       meta,
       metaError,
+      richMetaError,
       query,
       queryError,
       chartType,
@@ -339,6 +361,7 @@ export default class QueryBuilder extends React.Component {
     return {
       meta,
       metaError,
+      richMetaError,
       metaErrorStack,
       query,
       error: queryError, // Match same name as QueryRenderer prop
@@ -518,7 +541,8 @@ export default class QueryBuilder extends React.Component {
         }
       } catch (error) {
         this.setState({
-          queryError: new Error(generateAnsiHTML(error.message || error.toString())),
+          queryError: new Error(error.response?.plainError || error.message),
+          richQueryError: new Error(error.message || error.toString())
         });
       }
     }
@@ -575,21 +599,3 @@ export default class QueryBuilder extends React.Component {
     }
   }
 }
-
-QueryBuilder.defaultProps = {
-  cubejsApi: null,
-  stateChangeHeuristics: null,
-  disableHeuristics: false,
-  render: null,
-  wrapWithQueryRenderer: true,
-  defaultChartType: 'line',
-  defaultQuery: {},
-  initialVizState: null,
-  onVizStateChanged: null,
-
-  // deprecated
-  query: null,
-  setQuery: null,
-  vizState: null,
-  setVizState: null,
-};

package/src/QueryRenderer.jsx

@@ -3,9 +3,20 @@ import { equals, toPairs, fromPairs } from 'ramda';
 import { isQueryPresent } from '@cubejs-client/core';
 
 import CubeContext from './CubeContext';
-import { generateAnsiHTML } from './utils';
 
 export default class QueryRenderer extends React.Component {
+  static contextType = CubeContext;
+  
+  static defaultProps = {
+    cubejsApi: null,
+    query: null,
+    render: null,
+    queries: null,
+    loadSql: null,
+    updateOnlyOnStateChange: false,
+    resetResultSetOnChange: true
+  };
+  
   // @deprected use `isQueryPresent` from `@cubejs-client/core`
   static isQueryPresent(query) {
     return isQueryPresent(query);
@@ -136,7 +147,7 @@ export default class QueryRenderer extends React.Component {
     const { render } = this.props;
 
     const loadState = {
-      error: error ? new Error(generateAnsiHTML(error.message || error.toString())) : null,
+      error: error ? new Error(error.response?.plainError || error.message || error.toString()) : null,
       resultSet: queries ? (resultSet || {}) : resultSet,
       loadingState: { isLoading },
       sqlQuery
@@ -149,15 +160,3 @@ export default class QueryRenderer extends React.Component {
     return null;
   }
 }
-
-QueryRenderer.contextType = CubeContext;
-
-QueryRenderer.defaultProps = {
-  cubejsApi: null,
-  query: null,
-  render: null,
-  queries: null,
-  loadSql: null,
-  updateOnlyOnStateChange: false,
-  resetResultSetOnChange: true
-};

package/src/QueryRendererWithTotals.jsx

@@ -17,11 +17,4 @@ const QueryRendererWithTotals = ({ query, ...restProps }) => (
   />
 );
 
-QueryRendererWithTotals.defaultProps = {
-  query: null,
-  render: null,
-  queries: null,
-  loadSql: null
-};
-
 export default QueryRendererWithTotals;

package/src/utils.js

@@ -1,81 +1,3 @@
-import Anser from 'anser';
-import { encode } from 'html-entities';
-
-const colors = {
-  reset: 'orange',
-  black: 'black',
-  red: 'red',
-  green: 'green',
-  yellow: 'orange',
-  blue: 'blue',
-  magenta: 'magenta',
-  cyan: 'cyan',
-  gray: 'gray',
-  lightgrey: 'lightgrey',
-  darkgrey: 'darkgrey',
-};
-
-const 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',
-};
-
-export function generateAnsiHTML(txt) {
-  const arr = new Anser().ansiToJson(encode(txt), {
-    use_classes: true,
-  });
-
-  let result = '';
-  let open = false;
-  for (let index = 0; index < arr.length; ++index) {
-    const c = arr[index];
-    const { content } = c;
-    const { fg } = c;
-
-    const contentParts = content.split('\n');
-    for (let j = 0; j < contentParts.length; ++j) {
-      if (!open) {
-        result += '<span data-ansi-line="true">';
-        open = true;
-      }
-      const part = contentParts[j].replace('\r', '');
-      const color = colors[anserMap[fg]];
-
-      if (color != null) {
-        result += `<span style="color: ${color};">${part}</span>`;
-      } else {
-        if (fg != null) {
-          console.log('Missing color mapping: ', fg);
-        }
-
-        result += `<span>${part}</span>`;
-      }
-
-      if (j < contentParts.length - 1) {
-        result += '</span>';
-        open = false;
-        result += '<br/>';
-      }
-    }
-  }
-
-  if (open) {
-    result += '</span>';
-  }
-
-  return result;
-}
-
 export function removeEmpty(obj) {
   if (typeof obj !== 'object') {
     return obj;