@cubejs-client/core - npm Package Compare versions

Comparing version 0.30.0 to 0.30.4

CHANGELOG.md

@@ -6,2 +6,13 @@ # Change Log
 
+## [0.30.4](https://github.com/cube-js/cube.js/compare/v0.30.3...v0.30.4) (2022-05-20)
+
+
+### Bug Fixes
+
+* **playground:** Remove all time time dimension without granularity ([#4564](https://github.com/cube-js/cube.js/issues/4564)) ([054f488](https://github.com/cube-js/cube.js/commit/054f488ce6b8bfa103cd435f99178ca1f2fa38c7))
+
+
+
+
+
 # [0.30.0](https://github.com/cube-js/cube.js/compare/v0.29.57...v0.30.0) (2022-05-11)
@@ -8,0 +19,0 @@

index.d.ts

@@ -1216,2 +1216,4 @@ /**
   export function areQueriesEqual(query1: DeeplyReadonly<Query> | null, query2: DeeplyReadonly<Query> | null): boolean;
+  
+  export function validateQuery(query: DeeplyReadonly<Query> | null | undefined): Query;
 
@@ -1218,0 +1220,0 @@ export type ProgressResponse = {

package.json

 {
   "name": "@cubejs-client/core",
-  "version": "0.30.0",
+  "version": "0.30.4",
   "engines": {},
@@ -49,3 +49,3 @@ "repository": {
   },
-  "gitHead": "bc4774e0945cdf0141e344657406115e8a4597f7"
+  "gitHead": "b7df8f6a3cfe104e639e0f7607868afa193ed0a3"
 }

src/index.js

@@ -371,13 +371,2 @@ import { v4 as uuidv4 } from 'uuid';
 export { CubejsApi, HttpTransport, ResultSet };
-export {
-  areQueriesEqual,
-  defaultHeuristics,
-  movePivotItem,
-  isQueryPresent,
-  moveItemInArray,
-  defaultOrder,
-  flattenFilters,
-  getQueryMembers,
-  getOrderMembersFromOrder,
-  GRANULARITIES
-} from './utils';
+export * from './utils';

src/utils.js

@@ -1,2 +0,2 @@
-import { indexBy, prop, clone, equals } from 'ramda';
+import { indexBy, prop, clone, equals, fromPairs, toPairs } from 'ramda';
 
@@ -17,6 +17,48 @@ export const DEFAULT_GRANULARITY = 'day';
 
+export function removeEmptyQueryFields(_query) {
+  const query = _query || {};
+  
+  return fromPairs(
+    toPairs(query)
+      .map(([key, value]) => {
+        if (
+          ['measures', 'dimensions', 'segments', 'timeDimensions', 'filters'].includes(key)
+        ) {
+          if (Array.isArray(value) && value.length === 0) {
+            return null;
+          }
+        }
+        
+        if (key === 'order' && value) {
+          if (Array.isArray(value) && !value.length) {
+            return null;
+          } else if (!Object.keys(value).length) {
+            return null;
+          }
+        }
+
+        return [key, value];
+      })
+      .filter(Boolean)
+  );
+}
+
+export function validateQuery(_query) {
+  const query = _query || {};
+  
+  return removeEmptyQueryFields({
+    ...query,
+    filters: (query.filters || []).filter((f) => f.operator),
+    timeDimensions: (query.timeDimensions || []).filter(
+      (td) => !(!td.dateRange && !td.granularity)
+    ),
+  });
+}
+
 export function areQueriesEqual(query1 = {}, query2 = {}) {
   return (
-    equals(Object.entries((query1 && query1.order) || {}), Object.entries((query2 && query2.order) || {})) &&
-    equals(query1, query2)
+    equals(
+      Object.entries((query1 && query1.order) || {}),
+      Object.entries((query2 && query2.order) || {})
+    ) && equals(query1, query2)
   );
@@ -32,3 +74,6 @@ }
     };
-  } else if ((query.measures || []).length > 0 && (query.dimensions || []).length > 0) {
+  } else if (
+    (query.measures || []).length > 0 &&
+    (query.dimensions || []).length > 0
+  ) {
     return {
@@ -70,3 +115,4 @@ [query.measures[0]]: 'desc',
       newQuery.timeDimensions[0].granularity &&
-      oldQuery.timeDimensions[0].granularity !== newQuery.timeDimensions[0].granularity
+      oldQuery.timeDimensions[0].granularity !==
+        newQuery.timeDimensions[0].granularity
     ) {
@@ -80,3 +126,4 @@ state = {
     if (
-      ((oldQuery.measures || []).length === 0 && (newQuery.measures || []).length > 0) ||
+      ((oldQuery.measures || []).length === 0 &&
+        (newQuery.measures || []).length > 0) ||
       ((oldQuery.measures || []).length === 1 &&
@@ -87,3 +134,5 @@ (newQuery.measures || []).length === 1 &&
       const [td] = newQuery.timeDimensions || [];
-      const defaultTimeDimension = meta.defaultTimeDimensionNameFor(newQuery.measures[0]);
+      const defaultTimeDimension = meta.defaultTimeDimensionNameFor(
+        newQuery.measures[0]
+      );
       newQuery = {
@@ -111,6 +160,12 @@ ...newQuery,
 
-    if ((oldQuery.dimensions || []).length === 0 && (newQuery.dimensions || []).length > 0) {
+    if (
+      (oldQuery.dimensions || []).length === 0 &&
+      (newQuery.dimensions || []).length > 0
+    ) {
       newQuery = {
         ...newQuery,
-        timeDimensions: (newQuery.timeDimensions || []).map((td) => ({ ...td, granularity: undefined })),
+        timeDimensions: (newQuery.timeDimensions || []).map((td) => ({
+          ...td,
+          granularity: undefined,
+        })),
       };
@@ -127,3 +182,6 @@
 
-    if ((oldQuery.dimensions || []).length > 0 && (newQuery.dimensions || []).length === 0) {
+    if (
+      (oldQuery.dimensions || []).length > 0 &&
+      (newQuery.dimensions || []).length === 0
+    ) {
       newQuery = {
@@ -147,3 +205,4 @@ ...newQuery,
     if (
-      ((oldQuery.dimensions || []).length > 0 || (oldQuery.measures || []).length > 0) &&
+      ((oldQuery.dimensions || []).length > 0 ||
+        (oldQuery.measures || []).length > 0) &&
       (newQuery.dimensions || []).length === 0 &&
@@ -188,3 +247,5 @@ (newQuery.measures || []).length === 0
     if (
-      (newChartType === 'pie' || newChartType === 'table' || newChartType === 'number') &&
+      (newChartType === 'pie' ||
+        newChartType === 'table' ||
+        newChartType === 'number') &&
       (oldQuery.timeDimensions || []).length === 1 &&
@@ -221,3 +282,9 @@ oldQuery.timeDimensions[0].granularity
 
-export function movePivotItem(pivotConfig, sourceIndex, destinationIndex, sourceAxis, destinationAxis) {
+export function movePivotItem(
+  pivotConfig,
+  sourceIndex,
+  destinationIndex,
+  sourceAxis,
+  destinationAxis
+) {
   const nextPivotConfig = {
@@ -233,3 +300,6 @@ ...pivotConfig,
     destinationIndex = lastIndex + 1;
-  } else if (destinationIndex >= lastIndex && nextPivotConfig[destinationAxis][lastIndex] === 'measures') {
+  } else if (
+    destinationIndex >= lastIndex &&
+    nextPivotConfig[destinationAxis][lastIndex] === 'measures'
+  ) {
     destinationIndex = lastIndex - 1;
@@ -304,3 +374,7 @@ }
 
-  if (pivotConfig && pivotConfig.aliasSeries && pivotConfig.aliasSeries[index]) {
+  if (
+    pivotConfig &&
+    pivotConfig.aliasSeries &&
+    pivotConfig.aliasSeries[index]
+  ) {
     return [pivotConfig.aliasSeries[index], ...nonNullValues];
@@ -307,0 +381,0 @@ } else if (duplicateMeasures.has(nonNullValues[0])) {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1849443

increased by0.76%

Lines of code

21568

increased by0.9%

No dependency changes