sync up filter and groupby; fix combined test case which used to pass incorrectly

Author: monfera

src/plots/plots.js

@@ -819,7 +819,8 @@ function applyTransforms(fullTrace, fullData, layout) {
                 fullTrace: fullTrace,
                 fullData: fullData,
                 attributeSets: attributeSets,
-                layout: layout
+                layout: layout,
+                transformIndex: i
             });
         }
     }

src/transforms/filter.js

@@ -34,7 +34,7 @@ exports.attributes = {
     },
     filtersrc: {
         valType: 'enumerated',
-        values: ['x', 'y'],
+        values: ['x', 'y', 'ids'],
         dflt: 'x',
         ids: {
             valType: 'data_array',

src/transforms/groupby.js

@@ -101,7 +101,7 @@ exports.transform = function(data, state) {
 function transformOne(trace, state, attributeSet) {
 
     var opts = state.transform;
-    var groups = opts.groups;
+    var groups = trace.transforms[state.transformIndex].groups;
 
     var groupNames = groups.filter(function(g, i, self) {
         return self.indexOf(g) === i;

test/jasmine/tests/transform_multi_test.js

@@ -71,7 +71,7 @@ describe('multiple transforms:', function() {
     it('Plotly.plot should plot the transform traces (reverse case)', function(done) {
         var data = Lib.extendDeep([], mockData0);
 
-        data[0].transforms.reverse();
+        data[0].transforms.slice().reverse();
 
         var gd = createGraphDiv();
 
@@ -81,12 +81,12 @@ describe('multiple transforms:', function() {
             expect(gd.data[0].y).toEqual([1, 2, 3, 1, 2, 3, 1]);
 
             expect(gd._fullData.length).toEqual(2);
-            expect(gd._fullData[0].x).toEqual([1, 1, 3]);
-            expect(gd._fullData[0].y).toEqual([1, 2, 1]);
-            expect(gd._fullData[1].x).toEqual([2]);
-            expect(gd._fullData[1].y).toEqual([3]);
+            expect(gd._fullData[0].x).toEqual([1, 3]);
+            expect(gd._fullData[0].y).toEqual([1, 1]);
+            expect(gd._fullData[1].x).toEqual([1, 2]);
+            expect(gd._fullData[1].y).toEqual([2, 3]);
 
-            assertDims([3, 1]);
+            assertDims([2, 2]);
 
             done();
         });