fix(explore): bump superset-ui to 0.16.3 and fix DeckGL bug (#12242)

apache · Jan 5, 2021 · 8afc4c4 · 8afc4c4
1 parent b349ede
commit 8afc4c4
Show file tree

Hide file tree

Showing 7 changed files with 176 additions and 175 deletions.
diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json
diff --git a/superset-frontend/package.json b/superset-frontend/package.json
@@ -65,35 +65,35 @@
     "@babel/runtime-corejs3": "^7.8.4",
     "@data-ui/sparkline": "^0.0.84",
     "@emotion/core": "^10.0.35",
-    "@superset-ui/chart-controls": "^0.16.1",
-    "@superset-ui/core": "^0.16.1",
-    "@superset-ui/legacy-plugin-chart-calendar": "^0.16.2",
-    "@superset-ui/legacy-plugin-chart-chord": "^0.16.2",
-    "@superset-ui/legacy-plugin-chart-country-map": "^0.16.1",
-    "@superset-ui/legacy-plugin-chart-event-flow": "^0.16.1",
-    "@superset-ui/legacy-plugin-chart-force-directed": "^0.16.2",
-    "@superset-ui/legacy-plugin-chart-heatmap": "^0.16.2",
-    "@superset-ui/legacy-plugin-chart-histogram": "^0.16.2",
-    "@superset-ui/legacy-plugin-chart-horizon": "^0.16.2",
-    "@superset-ui/legacy-plugin-chart-map-box": "^0.16.2",
-    "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.16.1",
-    "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.16.1",
-    "@superset-ui/legacy-plugin-chart-partition": "^0.16.2",
-    "@superset-ui/legacy-plugin-chart-pivot-table": "^0.16.2",
-    "@superset-ui/legacy-plugin-chart-rose": "^0.16.2",
-    "@superset-ui/legacy-plugin-chart-sankey": "^0.16.1",
-    "@superset-ui/legacy-plugin-chart-sankey-loop": "^0.16.2",
-    "@superset-ui/legacy-plugin-chart-sunburst": "^0.16.1",
-    "@superset-ui/legacy-plugin-chart-treemap": "^0.16.2",
-    "@superset-ui/legacy-plugin-chart-world-map": "^0.16.2",
-    "@superset-ui/legacy-preset-chart-big-number": "^0.16.1",
-    "@superset-ui/legacy-preset-chart-deckgl": "^0.3.2",
-    "@superset-ui/legacy-preset-chart-nvd3": "^0.16.1",
-    "@superset-ui/plugin-chart-echarts": "^0.16.1",
-    "@superset-ui/plugin-chart-table": "^0.16.1",
-    "@superset-ui/plugin-chart-word-cloud": "^0.16.1",
-    "@superset-ui/plugin-filter-antd": "^0.16.1",
-    "@superset-ui/preset-chart-xy": "^0.16.1",
+    "@superset-ui/chart-controls": "^0.16.3",
+    "@superset-ui/core": "^0.16.3",
+    "@superset-ui/legacy-plugin-chart-calendar": "^0.16.3",
+    "@superset-ui/legacy-plugin-chart-chord": "^0.16.3",
+    "@superset-ui/legacy-plugin-chart-country-map": "^0.16.3",
+    "@superset-ui/legacy-plugin-chart-event-flow": "^0.16.3",
+    "@superset-ui/legacy-plugin-chart-force-directed": "^0.16.3",
+    "@superset-ui/legacy-plugin-chart-heatmap": "^0.16.3",
+    "@superset-ui/legacy-plugin-chart-histogram": "^0.16.3",
+    "@superset-ui/legacy-plugin-chart-horizon": "^0.16.3",
+    "@superset-ui/legacy-plugin-chart-map-box": "^0.16.3",
+    "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.16.3",
+    "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.16.3",
+    "@superset-ui/legacy-plugin-chart-partition": "^0.16.3",
+    "@superset-ui/legacy-plugin-chart-pivot-table": "^0.16.3",
+    "@superset-ui/legacy-plugin-chart-rose": "^0.16.3",
+    "@superset-ui/legacy-plugin-chart-sankey": "^0.16.3",
+    "@superset-ui/legacy-plugin-chart-sankey-loop": "^0.16.3",
+    "@superset-ui/legacy-plugin-chart-sunburst": "^0.16.3",
+    "@superset-ui/legacy-plugin-chart-treemap": "^0.16.3",
+    "@superset-ui/legacy-plugin-chart-world-map": "^0.16.3",
+    "@superset-ui/legacy-preset-chart-big-number": "^0.16.3",
+    "@superset-ui/legacy-preset-chart-deckgl": "^0.4.0",
+    "@superset-ui/legacy-preset-chart-nvd3": "^0.16.3",
+    "@superset-ui/plugin-chart-echarts": "^0.16.3",
+    "@superset-ui/plugin-chart-table": "^0.16.3",
+    "@superset-ui/plugin-chart-word-cloud": "^0.16.3",
+    "@superset-ui/plugin-filter-antd": "^0.16.3",
+    "@superset-ui/preset-chart-xy": "^0.16.3",
     "@vx/responsive": "^0.0.195",
     "abortcontroller-polyfill": "^1.1.9",
     "antd": "^4.9.4",

diff --git a/superset-frontend/src/chart/ChartRenderer.jsx b/superset-frontend/src/chart/ChartRenderer.jsx
@@ -218,7 +218,6 @@ class ChartRenderer extends React.Component {
         initialValues={initialValues}
         formData={formData}
         hooks={this.hooks}
-        queryData={queriesResponse?.[0]} // deprecated
         queriesData={queriesResponse}
         onRenderSuccess={this.handleRenderSuccess}
         onRenderFailure={this.handleRenderFailure}

diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar.tsx
@@ -276,7 +276,7 @@ const FilterValue: React.FC<FilterProps> = ({
           height={20}
           width={220}
           formData={getFormData()}
-          queryData={state}
+          queriesData={[state]}
           chartType="filter_select"
           hooks={{ setExtraFormData }}
         />

diff --git a/superset-frontend/src/visualizations/FilterBox/transformProps.js b/superset-frontend/src/visualizations/FilterBox/transformProps.js
@@ -24,7 +24,7 @@ export default function transformProps(chartProps) {
     formData,
     hooks,
     initialValues,
-    queryData,
+    queriesData,
     rawDatasource,
     rawFormData,
   } = chartProps;
@@ -54,7 +54,7 @@ export default function transformProps(chartProps) {
   return {
     chartId: sliceId,
     datasource: rawDatasource,
-    filtersChoices: queryData.data,
+    filtersChoices: queriesData[0].data,
     filtersFields,
     instantFiltering,
     onChange: onAddFilter,

diff --git a/superset-frontend/src/visualizations/TimeTable/transformProps.js b/superset-frontend/src/visualizations/TimeTable/transformProps.js
@@ -17,9 +17,9 @@
  * under the License.
  */
 export default function transformProps(chartProps) {
-  const { height, datasource, formData, queryData } = chartProps;
+  const { height, datasource, formData, queriesData } = chartProps;
   const { columnCollection = [], groupby, metrics, url } = formData;
-  const { records, columns } = queryData.data;
+  const { records, columns } = queriesData[0].data;
   const isGroupBy = groupby.length > 0;
 
   // When there is a "group by",

diff --git a/superset/viz.py b/superset/viz.py
@@ -2381,6 +2381,8 @@ def query_obj(self) -> QueryObjectDict:
             d["groupby"] = gb
             d["metrics"] = metrics
             d["columns"] = []
+            first_metric = d["metrics"][0]
+            d["orderby"] = [(first_metric, not fd.get("order_desc", True))]
         else:
             d["columns"] = gb
         return d