@cubejs-client/vue3 0.30.4 → 0.30.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cubejs-client/vue3",
-  "version": "0.30.4",
+  "version": "0.30.54",
   "engines": {},
   "repository": {
     "type": "git",
@@ -28,7 +28,7 @@
     "src"
   ],
   "dependencies": {
-    "@cubejs-client/core": "^0.30.4",
+    "@cubejs-client/core": "^0.30.46",
     "@vue/compiler-sfc": "^3.0.11",
     "core-js": "^3.6.5",
     "flush-promises": "^1.0.2",
@@ -80,5 +80,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b7df8f6a3cfe104e639e0f7607868afa193ed0a3"
+  "gitHead": "4c315d2607acc24bd730033880922fc0af0e6af0"
 }

package/src/QueryBuilder.js

@@ -24,6 +24,50 @@ const toOrderMember = (member) => ({
 const reduceOrderMembers = (array) =>
   array.reduce((acc, { id, order }) => (order !== 'none' ? [...acc, [id, order]] : acc), []);
 
+const operators = [ 'and', 'or' ]
+
+const validateFilters = (filters) =>
+  filters.reduce((acc, raw) => {
+    if (raw.operator) {
+      return [...acc, raw];
+    }
+
+    const validBooleanFilter = operators.reduce((acc, operator) => {
+      const filters = raw[operator];
+
+      const booleanFilters = validateFilters(filters || []);
+
+      if (booleanFilters.length) {
+        return { ...acc, [operator]: booleanFilters };
+      }
+
+      return acc;
+    }, {});
+
+    if (operators.some((operator) => validBooleanFilter[operator])) {
+      return [...acc, validBooleanFilter];
+    }
+
+    return acc;
+  }, []);
+
+const getDimensionOrMeasure = (meta, m) => {
+  const memberName = m.member || m.dimension;
+  return memberName && meta.resolveMember(memberName, ['dimensions', 'measures']);
+};
+
+const resolveMembers = (meta, arr) =>
+  arr &&
+  arr.map((e, index) => {
+    return {
+      ...e,
+      member: getDimensionOrMeasure(meta, e),
+      index,
+      and: resolveMembers(meta, e.and),
+      or: resolveMembers(meta, e.or),
+    };
+  });
+
 export default {
   components: {
     QueryRenderer,
@@ -140,7 +184,6 @@ export default {
         order,
         orderMembers,
         setOrder: this.setOrder,
-        setQuery: this.setQuery,
         pivotConfig: this.pivotConfig,
         updateOrder: {
           set: (memberId, newOrder) => {
@@ -268,9 +311,11 @@ export default {
           });
         } else if (element === 'filters') {
           toQuery = (member) => ({
-            member: member.member.name,
+            member: member.member && member.member.name,
             operator: member.operator,
             values: member.values,
+            and: member.and && member.and.map(toQuery),
+            or: member.or && member.or.map(toQuery),
           });
         }
 
@@ -282,7 +327,7 @@ export default {
       });
 
       if (validatedQuery.filters) {
-        validatedQuery.filters = validatedQuery.filters.filter((f) => f.operator);
+        validatedQuery.filters = validateFilters(validatedQuery.filters)
       }
 
       // only set limit and offset if there are elements otherwise an invalid request with just limit/offset
@@ -396,15 +441,19 @@ export default {
         },
         index,
       }));
-      this.filters = filters.map((m, index) => ({
-        ...m,
-        member: this.meta.resolveMember(m.member || m.dimension, ['dimensions', 'measures']),
-        operators: this.meta.filterOperatorsForMember(m.member || m.dimension, [
-          'dimensions',
-          'measures',
-        ]),
-        index,
-      }));
+
+      const memberTypes = ['dimensions', 'measures'];
+      this.filters = filters.map((m, index) => {
+        const memberName = m.member || m.dimension;
+        return {
+          ...m,
+          member: memberName && this.meta.resolveMember(memberName, memberTypes),
+          operators: memberName && this.meta.filterOperatorsForMember(memberName, memberTypes),
+          and: resolveMembers(this.meta, m.and),
+          or: resolveMembers(this.meta, m.or),
+          index,
+        };
+      });
 
       this.availableMeasures = this.meta.membersForQuery({}, 'measures') || [];
       this.availableDimensions = this.meta.membersForQuery({}, 'dimensions') || [];
@@ -438,14 +487,12 @@ export default {
           };
         }
       } else if (element === 'filters') {
-        const filterMember = {
-          ...this.meta.resolveMember(member.member || member.dimension, ['dimensions', 'measures']),
-        };
-
         mem = {
           ...member,
-          member: filterMember,
-        };
+          and: resolveMembers(this.meta, member.and),
+          or: resolveMembers(this.meta, member.or),
+          member: getDimensionOrMeasure(this.meta, member),
+        }
       } else {
         mem = this[`available${name}`].find((m) => m.name === member);
       }
@@ -495,13 +542,11 @@ export default {
         }
       } else if (element === 'filters') {
         index = this[element].findIndex((x) => x.dimension === old);
-        const filterMember = {
-          ...this.meta.resolveMember(member.member || member.dimension, ['dimensions', 'measures']),
-        };
-
         mem = {
           ...member,
-          member: filterMember,
+          and: resolveMembers(this.meta, member.and),
+          or: resolveMembers(this.meta, member.or),
+          member: getDimensionOrMeasure(this.meta, member),
         };
       } else {
         index = this[element].findIndex((x) => x.name === old);
@@ -535,13 +580,11 @@ export default {
             };
           }
         } else if (element === 'filters') {
-          const member = {
-            ...this.meta.resolveMember(m.member || m.dimension, ['dimensions', 'measures']),
-          };
-
           mem = {
             ...m,
-            member,
+            and: resolveMembers(this.meta, m.and),
+            or: resolveMembers(this.meta, m.or),
+            member: getDimensionOrMeasure(this.meta, m),
           };
         } else {
           mem = this[`available${name}`].find((x) => x.name === m);
@@ -563,6 +606,9 @@ export default {
     setOffset(offset) {
       this.offset = offset;
     },
+    removeOffset() {
+      this.offset = null;
+    },
     updateChart(chartType) {
       this.chartType = chartType;
     },