fix(client-core): Table pivot incorrectly behaves with multiple measures

cube-js · Apr 24, 2019 · adb2270 · adb2270
1 parent d7be090
commit adb2270
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/packages/cubejs-client-core/dist/cubejs-client-core.esm.js b/packages/cubejs-client-core/dist/cubejs-client-core.esm.js
@@ -331,7 +331,7 @@ function () {
         };
       };
 
-      return this.pivot(pivotConfig).map(function (_ref19) {
+      return this.pivot(normalizedPivotConfig).map(function (_ref19) {
         var xValues = _ref19.xValues,
             yValuesArray = _ref19.yValuesArray;
         return yValuesArray.map(function (_ref20) {
@@ -342,9 +342,9 @@ function () {
           return normalizedPivotConfig.x.map(valueToObject(xValues, m)).concat(normalizedPivotConfig.y.map(valueToObject(yValues, m))).reduce(function (a, b) {
             return Object.assign(a, b);
           }, {});
-        });
-      }).reduce(function (a, b) {
-        return a.concat(b);
+        }).reduce(function (a, b) {
+          return Object.assign(a, b);
+        }, {});
       });
     }
   }, {

diff --git a/packages/cubejs-client-core/dist/cubejs-client-core.js b/packages/cubejs-client-core/dist/cubejs-client-core.js
@@ -335,7 +335,7 @@ function () {
         };
       };
 
-      return this.pivot(pivotConfig).map(function (_ref19) {
+      return this.pivot(normalizedPivotConfig).map(function (_ref19) {
         var xValues = _ref19.xValues,
             yValuesArray = _ref19.yValuesArray;
         return yValuesArray.map(function (_ref20) {
@@ -346,9 +346,9 @@ function () {
           return normalizedPivotConfig.x.map(valueToObject(xValues, m)).concat(normalizedPivotConfig.y.map(valueToObject(yValues, m))).reduce(function (a, b) {
             return Object.assign(a, b);
           }, {});
-        });
-      }).reduce(function (a, b) {
-        return a.concat(b);
+        }).reduce(function (a, b) {
+          return Object.assign(a, b);
+        }, {});
       });
     }
   }, {

diff --git a/packages/cubejs-client-core/dist/cubejs-client-core.umd.js b/packages/cubejs-client-core/dist/cubejs-client-core.umd.js
@@ -14304,7 +14304,7 @@
 	        };
 	      };
 
-	      return this.pivot(pivotConfig).map(function (_ref19) {
+	      return this.pivot(normalizedPivotConfig).map(function (_ref19) {
 	        var xValues = _ref19.xValues,
 	            yValuesArray = _ref19.yValuesArray;
 	        return yValuesArray.map(function (_ref20) {
@@ -14315,9 +14315,9 @@
 	          return normalizedPivotConfig.x.map(valueToObject(xValues, m)).concat(normalizedPivotConfig.y.map(valueToObject(yValues, m))).reduce(function (a, b) {
 	            return Object.assign(a, b);
 	          }, {});
-	        });
-	      }).reduce(function (a, b) {
-	        return a.concat(b);
+	        }).reduce(function (a, b) {
+	          return Object.assign(a, b);
+	        }, {});
 	      });
 	    }
 	  }, {

diff --git a/packages/cubejs-client-core/src/ResultSet.js b/packages/cubejs-client-core/src/ResultSet.js
@@ -200,13 +200,13 @@ export default class ResultSet {
         })
       );
 
-    return this.pivot(pivotConfig).map(({ xValues, yValuesArray }) => (
+    return this.pivot(normalizedPivotConfig).map(({ xValues, yValuesArray }) => (
       yValuesArray.map(([yValues, m]) => (
         normalizedPivotConfig.x.map(valueToObject(xValues, m))
           .concat(normalizedPivotConfig.y.map(valueToObject(yValues, m)))
           .reduce((a, b) => Object.assign(a, b), {})
-      ))
-    )).reduce((a, b) => a.concat(b));
+      )).reduce((a, b) => Object.assign(a, b), {})
+    ));
   }
 
   tableColumns(pivotConfig) {

diff --git a/packages/cubejs-react/dist/cubejs-react.umd.js b/packages/cubejs-react/dist/cubejs-react.umd.js
@@ -267,7 +267,7 @@
 	  return store[key] || (store[key] = value !== undefined ? value : {});
 	})('versions', []).push({
 	  version: _core.version,
-	  mode: _library ? 'pure' : 'global',
+	  mode: 'global',
 	  copyright: '© 2018 Denis Pushkarev (zloirock.ru)'
 	});
 	});
@@ -1434,7 +1434,7 @@
 	      // Set @@toStringTag to native iterators
 	      _setToStringTag(IteratorPrototype, TAG, true);
 	      // fix for some old engines
-	      if (typeof IteratorPrototype[ITERATOR$3] != 'function') _hide(IteratorPrototype, ITERATOR$3, returnThis);
+	      if (!_library && typeof IteratorPrototype[ITERATOR$3] != 'function') _hide(IteratorPrototype, ITERATOR$3, returnThis);
 	    }
 	  }
 	  // fix Array#{values, @@iterator}.name in V8 / FF
@@ -1443,7 +1443,7 @@
 	    $default = function values() { return $native.call(this); };
 	  }
 	  // Define iterator
-	  if (BUGGY || VALUES_BUG || !proto[ITERATOR$3]) {
+	  if ((!_library || FORCED) && (BUGGY || VALUES_BUG || !proto[ITERATOR$3])) {
 	    _hide(proto, ITERATOR$3, $default);
 	  }
 	  // Plug for library