Merge branch 'master' into marker-size-multivalue

Author: nicolaskruchten

package.json

@@ -15,7 +15,7 @@
     "fast-isnumeric": "^1.1.1",
     "immutability-helper": "^2.6.4",
     "plotly-icons": "latest",
-    "plotly.js": "1.39.1",
+    "plotly.js": "1.39.2",
     "prop-types": "^15.5.10",
     "raf": "^3.4.0",
     "react-color": "^2.13.8",

src/components/containers/TransformAccordion.js

@@ -23,6 +23,7 @@ class TransformAccordion extends Component {
       {label: _('Filter'), type: 'filter'},
       {label: _('Split'), type: 'groupby'},
       {label: _('Aggregate'), type: 'aggregate'},
+      {label: _('Sort'), type: 'sort'},
     ];
 
     const transformableCharts = [

src/default_panels/GraphTransformsPanel.js

@@ -80,6 +80,14 @@ const GraphTransformsPanel = (props, {localize: _}) => {
         <FilterOperation label={_('Operator')} attr="operation" />
         <FilterValue label={_('Value')} attr="value" />
 
+        <Radio
+          attr="order"
+          options={[
+            {label: _('Ascending'), value: 'ascending'},
+            {label: _('Descending'), value: 'descending'},
+          ]}
+        />
+
         <PlotlySection name={_('Aggregations')} attr="aggregations">
           <Aggregations />
         </PlotlySection>