@cubejs-client/react 0.29.53 → 0.30.4

package/index.d.ts

@@ -31,6 +31,7 @@ declare module '@cubejs-client/react' {
     UnaryOperator,
     BinaryOperator,
     DeeplyReadonly,
+    QueryRecordType,
   } from '@cubejs-client/core';
 
   type CubeProviderProps = {
@@ -428,7 +429,16 @@ declare module '@cubejs-client/react' {
    * @order 1
    * @stickyTypes
    */
-  export function useCubeQuery<TData>(query: DeeplyReadonly<Query | Query[]>, options?: UseCubeQueryOptions): UseCubeQueryResult<TData>;
+  export function useCubeQuery<
+    TData,
+    TQuery extends DeeplyReadonly<Query | Query[]> = DeeplyReadonly<Query | Query[]>>(
+    query: TQuery,
+    options?: UseCubeQueryOptions,
+  ): UseCubeQueryResult<
+    unknown extends TData
+      ? QueryRecordType<TQuery>
+      : TData
+  >;
 
   type UseCubeQueryOptions = {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cubejs-client/react",
-  "version": "0.29.53",
+  "version": "0.30.4",
   "author": "Cube Dev, Inc.",
   "license": "MIT",
   "engines": {},
@@ -24,7 +24,7 @@
   ],
   "dependencies": {
     "@babel/runtime": "^7.1.2",
-    "@cubejs-client/core": "^0.29.53",
+    "@cubejs-client/core": "^0.30.4",
     "anser": "^2.0.1",
     "core-js": "^3.6.5",
     "html-entities": "^2.3.2",
@@ -44,5 +44,5 @@
   "peerDependencies": {
     "react": ">=16.10.2"
   },
-  "gitHead": "b2815b43b973199420267695877b57eb6d744978"
+  "gitHead": "b7df8f6a3cfe104e639e0f7607868afa193ed0a3"
 }

package/src/QueryBuilder.jsx

@@ -8,7 +8,9 @@ import {
   isQueryPresent,
   moveItemInArray,
   movePivotItem,
-  ResultSet
+  validateQuery,
+  ResultSet,
+  removeEmptyQueryFields
 } from '@cubejs-client/core';
 
 import QueryRenderer from './QueryRenderer.jsx';
@@ -200,6 +202,7 @@ export default class QueryBuilder extends React.Component {
 
   prepareRenderProps(queryRendererProps) {
     const getName = (member) => member.name;
+    
     const toTimeDimension = (member) => {
       const rangeSelection = member.compareDateRange
         ? { compareDateRange: member.compareDateRange }
@@ -211,6 +214,7 @@ export default class QueryBuilder extends React.Component {
         ...rangeSelection,
       });
     };
+    
     const toFilter = (member) => ({
       member: member.member?.name || member.dimension?.name,
       operator: member.operator,
@@ -420,10 +424,10 @@ export default class QueryBuilder extends React.Component {
     const { query } = this.state;
 
     this.updateVizState({
-      query: {
+      query: removeEmptyQueryFields({
         ...query,
         ...queryUpdate,
-      },
+      }),
     });
   }
 
@@ -525,10 +529,7 @@ export default class QueryBuilder extends React.Component {
   validatedQuery(state) {
     const { query } = state || this.state;
 
-    return {
-      ...query,
-      filters: (query.filters || []).filter((f) => f.operator),
-    };
+    return validateQuery(query);
   }
 
   defaultHeuristics(newState) {