Add group + group test and revert src/plots

Author: rreusser

src/plots/plots.js

@@ -1053,42 +1053,25 @@ plots.supplyTransformDefaults = function(traceIn, traceOut, layout) {
 };
 
 function applyTransforms(fullTrace, fullData, layout, fullLayout) {
-    var dataOut = [];
+    var container = fullTrace.transforms,
+        dataOut = [fullTrace];
 
-    // Takes single trace, returns list of expanded traces
-    function recurse(trace, transformIndex) {
-        var transformedTraces = [trace];
-        var transform = trace.transforms[transformIndex];
-        var _module = transformsRegistry[transform.type];
+    for(var i = 0; i < container.length; i++) {
+        var transform = container[i],
+            _module = transformsRegistry[transform.type];
 
         if(_module && _module.transform) {
-            transformedTraces = _module.transform([trace], {
+            dataOut = _module.transform(dataOut, {
                 transform: transform,
-                fullTrace: trace,
+                fullTrace: fullTrace,
                 fullData: fullData,
                 layout: layout,
                 fullLayout: fullLayout,
-                transformIndex: transformIndex
+                transformIndex: i
             });
         }
-
-        for(var i = 0; i < transformedTraces.length; i++) {
-            if(transformIndex >= transformedTraces[i].transforms.length - 1) {
-                // If we get here, we've reached the end of the line and this expanded
-                // trace has no more transforms to apply. That is, it's an output trace
-                // so we push it onto dataOut.
-                dataOut.push(transformedTraces[i]);
-            } else {
-                // Otherwise there are more transforms to be performed. We don't need
-                // to worry about the return value since every transform will eventually
-                // reach the end of the line and push its result onto the output.
-                recurse(transformedTraces[i], transformIndex + 1);
-            }
-        }
     }
 
-    recurse(fullTrace, 0);
-
     return dataOut;
 }
 

test/jasmine/tests/transform_multi_test.js

@@ -815,4 +815,28 @@ describe('supplyDefaults with groupby + filter', function() {
         expect(out[1].x).toEqual([4, 5, 6]);
         expect(out[1].y).toEqual([7, 6, 8]);
     });
+
+    it('computes the correct data when groupby + groupby', function() {
+        var out = _transform([{
+            x: [1, 2, 3, 4, 5, 6, 7, 8],
+            y: [4, 6, 5, 7, 6, 8, 9, 10],
+            transforms: [{
+                type: 'groupby',
+                groups: [1, 1, 1, 1, 2, 2, 2, 2]
+            }, {
+                type: 'groupby',
+                groups: [3, 4, 3, 4, 3, 4, 3, 5],
+            }]
+        }]);
+        //               |  |  |  |  |  |  |  |
+        //               v  v  v  v  v  v  v  v
+        // Trace number: 0  1  0  1  2  3  2  4
+
+        expect(out.length).toEqual(5);
+        expect(out[0].x).toEqual([1, 3]);
+        expect(out[1].x).toEqual([2, 4]);
+        expect(out[2].x).toEqual([5, 7]);
+        expect(out[3].x).toEqual([6]);
+        expect(out[4].x).toEqual([8]);
+    });
 });