Move old-style groupby styles fix to cleanData

rreusser · rreusser · commit f67198b7f777 · 2017-03-10T13:33:59.000-05:00
diff --git a/src/plot_api/helpers.js b/src/plot_api/helpers.js
@@ -215,7 +215,6 @@ function cleanAxRef(container, attr) {
 // Make a few changes to the data right away
 // before it gets used for anything
 exports.cleanData = function(data, existingData) {
-
     // Enforce unique IDs
     var suids = [], // seen uids --- so we can weed out incoming repeats
         uids = data.concat(Array.isArray(existingData) ? existingData : [])
@@ -348,18 +347,35 @@ exports.cleanData = function(data, existingData) {
 
                 if(!Lib.isPlainObject(transform)) continue;
 
-                if(transform.type === 'filter') {
-                    if(transform.filtersrc) {
-                        transform.target = transform.filtersrc;
-                        delete transform.filtersrc;
-                    }
+                switch(transform.type) {
+                    case 'filter':
+                        if(transform.filtersrc) {
+                            transform.target = transform.filtersrc;
+                            delete transform.filtersrc;
+                        }
 
-                    if(transform.calendar) {
-                        if(!transform.valuecalendar) {
-                            transform.valuecalendar = transform.calendar;
+                        if(transform.calendar) {
+                            if(!transform.valuecalendar) {
+                                transform.valuecalendar = transform.calendar;
+                            }
+                            delete transform.calendar;
+                        }
+                        break;
+
+                    case 'groupby':
+                        if(transform.style && !Array.isArray(transform.style)) {
+                            var prevStyles = transform.style;
+                            var styleKeys = Object.keys(prevStyles);
+
+                            transform.style = [];
+                            for(var j = 0; j < styleKeys.length; j++) {
+                                transform.style.push({
+                                    target: styleKeys[j],
+                                    value: prevStyles[styleKeys[j]]
+                                });
+                            }
                         }
-                        delete transform.calendar;
-                    }
+                        break;
                 }
             }
         }
diff --git a/src/transforms/groupby.js b/src/transforms/groupby.js
@@ -85,17 +85,12 @@ exports.supplyDefaults = function(transformIn) {
     var styleIn = transformIn.style;
     var styleOut = transformOut.style = [];
 
-    if(Array.isArray(styleIn)) {
-        // If styles are an array, then sanitize them against the schema:
+    if(styleIn) {
         for(var i = 0; i < styleIn.length; i++) {
             styleOut[i] = {};
             Lib.coerce(styleIn[i], styleOut[i], exports.attributes.style, 'target');
             Lib.coerce(styleIn[i], styleOut[i], exports.attributes.style, 'value');
         }
-    } else {
-        // Otherwise, this is deprecated keyed-object-style styles and we
-        // just pass the object through as the index itself:
-        transformOut.style = transformIn.style;
     }
 
     return transformOut;
@@ -156,16 +151,9 @@ function transformOne(trace, state) {
     var arrayAttrs = PlotSchema.findArrayAttributes(trace);
 
     var style = opts.style || [];
-    var styleIndex = style;
-
-    // If the styles are an array, then translate it into an index keyed on the
-    // target. Otherwise just use the object provided for the sake of backward
-    // compatibility.
-    if(Array.isArray(style)) {
-        styleIndex = {};
-        for(i = 0; i < style.length; i++) {
-            styleIndex[style[i].target] = style[i].value;
-        }
+    var styleLookup = {};
+    for(i = 0; i < style.length; i++) {
+        styleLookup[style[i].target] = style[i].value;
     }
 
     for(i = 0; i < groupNames.length; i++) {
@@ -183,9 +171,9 @@ function transformOne(trace, state) {
 
         newTrace.name = groupName;
 
-        // there's no need to coerce styleIndex[groupName] here
+        // there's no need to coerce styleLookup[groupName] here
         // as another round of supplyDefaults is done on the transformed traces
-        newTrace = Lib.extendDeepNoArrays(newTrace, styleIndex[groupName] || {});
+        newTrace = Lib.extendDeepNoArrays(newTrace, styleLookup[groupName] || {});
     }
 
     return newData;
diff --git a/test/jasmine/tests/transform_groupby_test.js b/test/jasmine/tests/transform_groupby_test.js
@@ -6,7 +6,6 @@ var destroyGraphDiv = require('../assets/destroy_graph_div');
 var assertDims = require('../assets/assert_dims');
 var assertStyle = require('../assets/assert_style');
 
-
 describe('groupby', function() {
 
     describe('one-to-many transforms:', function() {
@@ -109,22 +108,11 @@ describe('groupby', function() {
 
                 expect(gd._fullData[0].marker.opacity).toEqual(1);
                 expect(gd._fullData[1].marker.opacity).toEqual(1);
+            }).then(done);
 
-                return Plotly.restyle(gd, {
-                    'transforms[0].style': {
-                        a: {marker: {color: 'green'}},
-                        b: {marker: {color: 'red'}}
-                    },
-                    'marker.opacity': 0.4
-                });
-            }).then(function() {
-                assertStyle(dims,
-                    ['rgb(0, 128, 0)', 'rgb(255, 0, 0)'],
-                    [0.4, 0.4]
-                );
-
-                done();
-            });
+            // The final test for restyle updates using deprecated syntax
+            // is ommitted since old style syntax is *only* sanitized on
+            // initial plot, *not* on restyle.
         });
 
         it('Plotly.restyle should work', function(done) {
