fix: filter out falsy members

cube-js · Jul 15, 2020 · 65b19c9 · 65b19c9
1 parent 6ea7e2d
commit 65b19c9
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 28 deletions.
diff --git a/packages/cubejs-client-vue/dist/cubejs-client-vue.esm.js b/packages/cubejs-client-vue/dist/cubejs-client-vue.esm.js
@@ -711,7 +711,7 @@ var QueryBuilder = {
       var name = element.charAt(0).toUpperCase() + element.slice(1);
       var mem;
       var elements = [];
-      members.forEach(function (m) {
+      members.filter(Boolean).forEach(function (m) {
         if (element === 'timeDimensions') {
           mem = _this5["available".concat(name)].find(function (x) {
             return x.name === m.dimension;
@@ -768,15 +768,18 @@ var QueryBuilder = {
     }
   },
   watch: {
-    query: function query() {
-      if (!this.meta) {
-        // this is ok as if meta has not been loaded by the time query prop has changed,
-        // then the promise for loading meta (found in mounted()) will call
-        // copyQueryFromProps and will therefore update anyway.
-        return;
-      }
+    query: {
+      deep: true,
+      handler: function handler() {
+        if (!this.meta) {
+          // this is ok as if meta has not been loaded by the time query prop has changed,
+          // then the promise for loading meta (found in mounted()) will call
+          // copyQueryFromProps and will therefore update anyway.
+          return;
+        }
 
-      this.copyQueryFromProps();
+        this.copyQueryFromProps();
+      }
     }
   }
 };

diff --git a/packages/cubejs-client-vue/dist/cubejs-client-vue.js b/packages/cubejs-client-vue/dist/cubejs-client-vue.js
@@ -717,7 +717,7 @@ var QueryBuilder = {
       var name = element.charAt(0).toUpperCase() + element.slice(1);
       var mem;
       var elements = [];
-      members.forEach(function (m) {
+      members.filter(Boolean).forEach(function (m) {
         if (element === 'timeDimensions') {
           mem = _this5["available".concat(name)].find(function (x) {
             return x.name === m.dimension;
@@ -774,15 +774,18 @@ var QueryBuilder = {
     }
   },
   watch: {
-    query: function query() {
-      if (!this.meta) {
-        // this is ok as if meta has not been loaded by the time query prop has changed,
-        // then the promise for loading meta (found in mounted()) will call
-        // copyQueryFromProps and will therefore update anyway.
-        return;
-      }
+    query: {
+      deep: true,
+      handler: function handler() {
+        if (!this.meta) {
+          // this is ok as if meta has not been loaded by the time query prop has changed,
+          // then the promise for loading meta (found in mounted()) will call
+          // copyQueryFromProps and will therefore update anyway.
+          return;
+        }
 
-      this.copyQueryFromProps();
+        this.copyQueryFromProps();
+      }
     }
   }
 };

diff --git a/packages/cubejs-client-vue/dist/cubejs-client-vue.umd.js b/packages/cubejs-client-vue/dist/cubejs-client-vue.umd.js
@@ -9469,7 +9469,7 @@
         var name = element.charAt(0).toUpperCase() + element.slice(1);
         var mem;
         var elements = [];
-        members.forEach(function (m) {
+        members.filter(Boolean).forEach(function (m) {
           if (element === 'timeDimensions') {
             mem = _this5["available".concat(name)].find(function (x) {
               return x.name === m.dimension;
@@ -9526,15 +9526,18 @@
       }
     },
     watch: {
-      query: function query() {
-        if (!this.meta) {
-          // this is ok as if meta has not been loaded by the time query prop has changed,
-          // then the promise for loading meta (found in mounted()) will call
-          // copyQueryFromProps and will therefore update anyway.
-          return;
-        }
+      query: {
+        deep: true,
+        handler: function handler() {
+          if (!this.meta) {
+            // this is ok as if meta has not been loaded by the time query prop has changed,
+            // then the promise for loading meta (found in mounted()) will call
+            // copyQueryFromProps and will therefore update anyway.
+            return;
+          }
 
-        this.copyQueryFromProps();
+          this.copyQueryFromProps();
+        }
       }
     }
   };

diff --git a/packages/cubejs-client-vue/src/QueryBuilder.js b/packages/cubejs-client-vue/src/QueryBuilder.js
@@ -335,7 +335,7 @@ export default {
       let mem;
       const elements = [];
 
-      members.forEach((m) => {
+      members.filter(Boolean).forEach((m) => {
         if (element === 'timeDimensions') {
           mem = this[`available${name}`].find(x => x.name === m.dimension);
           if (mem) {