From bb39ee76cca13f76a2a55a8630103ec591bce349 Mon Sep 17 00:00:00 2001 From: Krist Wongsuphasawat Date: Sat, 24 Aug 2019 21:44:01 -0700 Subject: [PATCH 01/10] build: update dependencies --- package.json | 19 ++++++++++--------- .../package.json | 10 +++++----- .../package.json | 8 ++++---- .../package.json | 8 ++++---- .../package.json | 4 ++-- .../package.json | 4 ++-- .../package.json | 8 ++++---- .../package.json | 6 +++--- .../package.json | 4 ++-- .../package.json | 4 ++-- .../package.json | 4 ++-- .../package.json | 4 ++-- .../package.json | 4 ++-- .../package.json | 6 +++--- .../package.json | 10 +++++----- .../package.json | 6 +++--- .../package.json | 10 +++++----- .../package.json | 8 ++++---- .../package.json | 8 ++++---- .../package.json | 8 ++++---- .../package.json | 8 ++++---- .../package.json | 8 ++++---- .../package.json | 6 +++--- .../package.json | 6 +++--- .../package.json | 14 +++++++------- .../package.json | 14 +++++++------- .../package.json | 8 ++++---- .../package.json | 8 ++++---- .../package.json | 6 +++--- .../superset-ui-plugins-demo/package.json | 12 ++++++------ .../superset-ui-preset-chart-xy/package.json | 17 +++++++++-------- 31 files changed, 126 insertions(+), 124 deletions(-) diff --git a/package.json b/package.json index 841e99cbc..81cfc6b26 100644 --- a/package.json +++ b/package.json @@ -41,15 +41,16 @@ "devDependencies": { "@superset-ui/build-config": "^0.1.0", "@superset-ui/commit-config": "^0.0.9", - "@superset-ui/chart": "^0.11.14", - "@superset-ui/chart-composition": "^0.11.9", - "@superset-ui/color": "^0.11.9", - "@superset-ui/connection": "^0.11.10", - "@superset-ui/core": "^0.11.10", - "@superset-ui/dimension": "^0.11.10", - "@superset-ui/number-format": "^0.11.5", - "@superset-ui/time-format": "^0.11.5", - "@superset-ui/translation": "^0.11.9", + "@superset-ui/chart": "^0.12.0", + "@superset-ui/chart-composition": "^0.12.0", + "@superset-ui/color": "^0.12.0", + "@superset-ui/connection": "^0.12.0", + "@superset-ui/core": "^0.12.0", + "@superset-ui/dimension": "^0.12.0", + "@superset-ui/number-format": "^0.12.0", + "@superset-ui/query": "^0.12.0", + "@superset-ui/time-format":"^0.12.0", + "@superset-ui/translation": "^0.12.0", "@types/react": "^16.8.8", "core-js": "^3.0.1", "csstype": "^2.6.3", diff --git a/packages/superset-ui-legacy-plugin-chart-calendar/package.json b/packages/superset-ui-legacy-plugin-chart-calendar/package.json index 85f8e0fc2..5171dcfb8 100644 --- a/packages/superset-ui-legacy-plugin-chart-calendar/package.json +++ b/packages/superset-ui-legacy-plugin-chart-calendar/package.json @@ -33,10 +33,10 @@ "prop-types": "^15.6.2" }, "peerDependencies": { - "@superset-ui/chart": "^0.10.0 || ^0.11.0", - "@superset-ui/color": "^0.10.0 || ^0.11.0", - "@superset-ui/number-format": "^0.10.0 || ^0.11.0", - "@superset-ui/time-format": "^0.10.0 || ^0.11.0", - "@superset-ui/translation": "^0.10.0 || ^0.11.0" + "@superset-ui/chart": "^0.12.0", + "@superset-ui/color": "^0.12.0", + "@superset-ui/number-format": "^0.12.0", + "@superset-ui/time-format": "^0.12.0", + "@superset-ui/translation": "^0.12.0" } } diff --git a/packages/superset-ui-legacy-plugin-chart-chord/package.json b/packages/superset-ui-legacy-plugin-chart-chord/package.json index 95bdc17e9..f0afef938 100644 --- a/packages/superset-ui-legacy-plugin-chart-chord/package.json +++ b/packages/superset-ui-legacy-plugin-chart-chord/package.json @@ -32,9 +32,9 @@ "prop-types": "^15.6.2" }, "peerDependencies": { - "@superset-ui/chart": "^0.10.0 || ^0.11.0", - "@superset-ui/color": "^0.10.0 || ^0.11.0", - "@superset-ui/number-format": "^0.10.0 || ^0.11.0", - "@superset-ui/translation": "^0.10.0 || ^0.11.0" + "@superset-ui/chart": "^0.12.0", + "@superset-ui/color": "^0.12.0", + "@superset-ui/number-format": "^0.12.0", + "@superset-ui/translation": "^0.12.0" } } diff --git a/packages/superset-ui-legacy-plugin-chart-country-map/package.json b/packages/superset-ui-legacy-plugin-chart-country-map/package.json index cafc79677..076b2be96 100644 --- a/packages/superset-ui-legacy-plugin-chart-country-map/package.json +++ b/packages/superset-ui-legacy-plugin-chart-country-map/package.json @@ -33,9 +33,9 @@ "prop-types": "^15.6.2" }, "peerDependencies": { - "@superset-ui/chart": "^0.10.0 || ^0.11.0", - "@superset-ui/color": "^0.10.0 || ^0.11.0", - "@superset-ui/number-format": "^0.10.0 || ^0.11.0", - "@superset-ui/translation": "^0.10.0 || ^0.11.0" + "@superset-ui/chart": "^0.12.0", + "@superset-ui/color": "^0.12.0", + "@superset-ui/number-format": "^0.12.0", + "@superset-ui/translation": "^0.12.0" } } diff --git a/packages/superset-ui-legacy-plugin-chart-event-flow/package.json b/packages/superset-ui-legacy-plugin-chart-event-flow/package.json index 515743f41..23adaedee 100644 --- a/packages/superset-ui-legacy-plugin-chart-event-flow/package.json +++ b/packages/superset-ui-legacy-plugin-chart-event-flow/package.json @@ -32,8 +32,8 @@ "prop-types": "^15.6.2" }, "peerDependencies": { - "@superset-ui/chart": "^0.10.0 || ^0.11.0", - "@superset-ui/translation": "^0.10.0 || ^0.11.0", + "@superset-ui/chart": "^0.12.0", + "@superset-ui/translation": "^0.12.0", "react": "^15 || ^16" } } diff --git a/packages/superset-ui-legacy-plugin-chart-force-directed/package.json b/packages/superset-ui-legacy-plugin-chart-force-directed/package.json index db1284797..9b3e359c1 100644 --- a/packages/superset-ui-legacy-plugin-chart-force-directed/package.json +++ b/packages/superset-ui-legacy-plugin-chart-force-directed/package.json @@ -32,7 +32,7 @@ "prop-types": "^15.6.2" }, "peerDependencies": { - "@superset-ui/chart": "^0.10.0 || ^0.11.0", - "@superset-ui/translation": "^0.10.0 || ^0.11.0" + "@superset-ui/chart": "^0.12.0", + "@superset-ui/translation": "^0.12.0" } } diff --git a/packages/superset-ui-legacy-plugin-chart-heatmap/package.json b/packages/superset-ui-legacy-plugin-chart-heatmap/package.json index 94c1abf79..2a082624b 100644 --- a/packages/superset-ui-legacy-plugin-chart-heatmap/package.json +++ b/packages/superset-ui-legacy-plugin-chart-heatmap/package.json @@ -34,9 +34,9 @@ "prop-types": "^15.6.2" }, "peerDependencies": { - "@superset-ui/chart": "^0.10.0 || ^0.11.0", - "@superset-ui/color": "^0.10.0 || ^0.11.0", - "@superset-ui/number-format": "^0.10.0 || ^0.11.0", - "@superset-ui/translation": "^0.10.0 || ^0.11.0" + "@superset-ui/chart": "^0.12.0", + "@superset-ui/color": "^0.12.0", + "@superset-ui/number-format": "^0.12.0", + "@superset-ui/translation": "^0.12.0" } } diff --git a/packages/superset-ui-legacy-plugin-chart-histogram/package.json b/packages/superset-ui-legacy-plugin-chart-histogram/package.json index a6eccb08b..9fcbcd750 100644 --- a/packages/superset-ui-legacy-plugin-chart-histogram/package.json +++ b/packages/superset-ui-legacy-plugin-chart-histogram/package.json @@ -36,9 +36,9 @@ "prop-types": "^15.6.2" }, "peerDependencies": { - "@superset-ui/chart": "^0.10.0 || ^0.11.0", - "@superset-ui/color": "^0.10.0 || ^0.11.0", - "@superset-ui/translation": "^0.10.0 || ^0.11.0", + "@superset-ui/chart": "^0.12.0", + "@superset-ui/color": "^0.12.0", + "@superset-ui/translation": "^0.12.0", "react": "^15 || ^16" } } diff --git a/packages/superset-ui-legacy-plugin-chart-horizon/package.json b/packages/superset-ui-legacy-plugin-chart-horizon/package.json index 4e2c90459..1b283fb17 100644 --- a/packages/superset-ui-legacy-plugin-chart-horizon/package.json +++ b/packages/superset-ui-legacy-plugin-chart-horizon/package.json @@ -33,8 +33,8 @@ "prop-types": "^15.6.2" }, "peerDependencies": { - "@superset-ui/chart": "^0.10.0 || ^0.11.0", - "@superset-ui/translation": "^0.10.0 || ^0.11.0", + "@superset-ui/chart": "^0.12.0", + "@superset-ui/translation": "^0.12.0", "react": "^15 || ^16" } } diff --git a/packages/superset-ui-legacy-plugin-chart-iframe/package.json b/packages/superset-ui-legacy-plugin-chart-iframe/package.json index 5ed508f27..f6a89a288 100644 --- a/packages/superset-ui-legacy-plugin-chart-iframe/package.json +++ b/packages/superset-ui-legacy-plugin-chart-iframe/package.json @@ -32,8 +32,8 @@ "prop-types": "^15.6.2" }, "peerDependencies": { - "@superset-ui/chart": "^0.10.0 || ^0.11.0", - "@superset-ui/translation": "^0.10.0 || ^0.11.0", + "@superset-ui/chart": "^0.12.0", + "@superset-ui/translation": "^0.12.0", "react": "^15 || ^16" } } diff --git a/packages/superset-ui-legacy-plugin-chart-map-box/package.json b/packages/superset-ui-legacy-plugin-chart-map-box/package.json index ddea0ee62..582628533 100644 --- a/packages/superset-ui-legacy-plugin-chart-map-box/package.json +++ b/packages/superset-ui-legacy-plugin-chart-map-box/package.json @@ -36,8 +36,8 @@ "viewport-mercator-project": "^6.1.1" }, "peerDependencies": { - "@superset-ui/chart": "^0.10.0 || ^0.11.0", - "@superset-ui/translation": "^0.10.0 || ^0.11.0", + "@superset-ui/chart": "^0.12.0", + "@superset-ui/translation": "^0.12.0", "react": "^15 || ^16" } } diff --git a/packages/superset-ui-legacy-plugin-chart-markup/package.json b/packages/superset-ui-legacy-plugin-chart-markup/package.json index 948d59793..39f49d419 100644 --- a/packages/superset-ui-legacy-plugin-chart-markup/package.json +++ b/packages/superset-ui-legacy-plugin-chart-markup/package.json @@ -31,8 +31,8 @@ "prop-types": "^15.6.2" }, "peerDependencies": { - "@superset-ui/chart": "^0.10.0 || ^0.11.0", - "@superset-ui/translation": "^0.10.0 || ^0.11.0", + "@superset-ui/chart": "^0.12.0", + "@superset-ui/translation": "^0.12.0", "react": "^15 || ^16" } } diff --git a/packages/superset-ui-legacy-plugin-chart-paired-t-test/package.json b/packages/superset-ui-legacy-plugin-chart-paired-t-test/package.json index 9018357b8..1ef2b2f16 100644 --- a/packages/superset-ui-legacy-plugin-chart-paired-t-test/package.json +++ b/packages/superset-ui-legacy-plugin-chart-paired-t-test/package.json @@ -33,8 +33,8 @@ "reactable-arc": "0.15.0" }, "peerDependencies": { - "@superset-ui/chart": "^0.10.0 || ^0.11.0", - "@superset-ui/translation": "^0.10.0 || ^0.11.0", + "@superset-ui/chart": "^0.12.0", + "@superset-ui/translation": "^0.12.0", "react": "^15 || ^16" } } diff --git a/packages/superset-ui-legacy-plugin-chart-parallel-coordinates/package.json b/packages/superset-ui-legacy-plugin-chart-parallel-coordinates/package.json index c7dfcc4a5..95a13d2d5 100644 --- a/packages/superset-ui-legacy-plugin-chart-parallel-coordinates/package.json +++ b/packages/superset-ui-legacy-plugin-chart-parallel-coordinates/package.json @@ -32,8 +32,8 @@ "prop-types": "^15.6.2" }, "peerDependencies": { - "@superset-ui/chart": "^0.10.0 || ^0.11.0", - "@superset-ui/color": "^0.10.0 || ^0.11.0", - "@superset-ui/translation": "^0.10.0 || ^0.11.0" + "@superset-ui/chart": "^0.12.0", + "@superset-ui/color": "^0.12.0", + "@superset-ui/translation": "^0.12.0" } } diff --git a/packages/superset-ui-legacy-plugin-chart-partition/package.json b/packages/superset-ui-legacy-plugin-chart-partition/package.json index 5399d96b5..96f4b158a 100644 --- a/packages/superset-ui-legacy-plugin-chart-partition/package.json +++ b/packages/superset-ui-legacy-plugin-chart-partition/package.json @@ -33,10 +33,10 @@ "prop-types": "^15.6.2" }, "peerDependencies": { - "@superset-ui/chart": "^0.10.0 || ^0.11.0", - "@superset-ui/color": "^0.10.0 || ^0.11.0", - "@superset-ui/number-format": "^0.10.0 || ^0.11.0", - "@superset-ui/time-format": "^0.10.0 || ^0.11.0", - "@superset-ui/translation": "^0.10.0 || ^0.11.0" + "@superset-ui/chart": "^0.12.0", + "@superset-ui/color": "^0.12.0", + "@superset-ui/number-format": "^0.12.0", + "@superset-ui/time-format": "^0.12.0", + "@superset-ui/translation": "^0.12.0" } } diff --git a/packages/superset-ui-legacy-plugin-chart-pivot-table/package.json b/packages/superset-ui-legacy-plugin-chart-pivot-table/package.json index 7ffb5ca9c..7af895339 100644 --- a/packages/superset-ui-legacy-plugin-chart-pivot-table/package.json +++ b/packages/superset-ui-legacy-plugin-chart-pivot-table/package.json @@ -33,8 +33,8 @@ "prop-types": "^15.6.2" }, "peerDependencies": { - "@superset-ui/chart": "^0.10.0 || ^0.11.0", - "@superset-ui/number-format": "^0.10.0 || ^0.11.0", - "@superset-ui/translation": "^0.10.0 || ^0.11.0" + "@superset-ui/chart": "^0.12.0", + "@superset-ui/number-format": "^0.12.0", + "@superset-ui/translation": "^0.12.0" } } diff --git a/packages/superset-ui-legacy-plugin-chart-rose/package.json b/packages/superset-ui-legacy-plugin-chart-rose/package.json index ca17750cc..1aa786217 100644 --- a/packages/superset-ui-legacy-plugin-chart-rose/package.json +++ b/packages/superset-ui-legacy-plugin-chart-rose/package.json @@ -33,10 +33,10 @@ "prop-types": "^15.6.2" }, "peerDependencies": { - "@superset-ui/chart": "^0.10.0 || ^0.11.0", - "@superset-ui/color": "^0.10.0 || ^0.11.0", - "@superset-ui/number-format": "^0.10.0 || ^0.11.0", - "@superset-ui/time-format": "^0.10.0 || ^0.11.0", - "@superset-ui/translation": "^0.10.0 || ^0.11.0" + "@superset-ui/chart": "^0.12.0", + "@superset-ui/color": "^0.12.0", + "@superset-ui/number-format": "^0.12.0", + "@superset-ui/time-format": "^0.12.0", + "@superset-ui/translation": "^0.12.0" } } diff --git a/packages/superset-ui-legacy-plugin-chart-sankey-loop/package.json b/packages/superset-ui-legacy-plugin-chart-sankey-loop/package.json index ba9115354..12f1438d7 100644 --- a/packages/superset-ui-legacy-plugin-chart-sankey-loop/package.json +++ b/packages/superset-ui-legacy-plugin-chart-sankey-loop/package.json @@ -33,9 +33,9 @@ "prop-types": "^15.6.2" }, "peerDependencies": { - "@superset-ui/chart": "^0.10.0 || ^0.11.0", - "@superset-ui/color": "^0.10.0 || ^0.11.0", - "@superset-ui/number-format": "^0.10.0 || ^0.11.0", - "@superset-ui/translation": "^0.10.0 || ^0.11.0" + "@superset-ui/chart": "^0.12.0", + "@superset-ui/color": "^0.12.0", + "@superset-ui/number-format": "^0.12.0", + "@superset-ui/translation": "^0.12.0" } } diff --git a/packages/superset-ui-legacy-plugin-chart-sankey/package.json b/packages/superset-ui-legacy-plugin-chart-sankey/package.json index e64b47cbd..7d8c5abf2 100644 --- a/packages/superset-ui-legacy-plugin-chart-sankey/package.json +++ b/packages/superset-ui-legacy-plugin-chart-sankey/package.json @@ -33,9 +33,9 @@ "prop-types": "^15.6.2" }, "peerDependencies": { - "@superset-ui/chart": "^0.10.0 || ^0.11.0", - "@superset-ui/color": "^0.10.0 || ^0.11.0", - "@superset-ui/number-format": "^0.10.0 || ^0.11.0", - "@superset-ui/translation": "^0.10.0 || ^0.11.0" + "@superset-ui/chart": "^0.12.0", + "@superset-ui/color": "^0.12.0", + "@superset-ui/number-format": "^0.12.0", + "@superset-ui/translation": "^0.12.0" } } diff --git a/packages/superset-ui-legacy-plugin-chart-sunburst/package.json b/packages/superset-ui-legacy-plugin-chart-sunburst/package.json index 882e65b21..83532521c 100644 --- a/packages/superset-ui-legacy-plugin-chart-sunburst/package.json +++ b/packages/superset-ui-legacy-plugin-chart-sunburst/package.json @@ -32,9 +32,9 @@ "prop-types": "^15.6.2" }, "peerDependencies": { - "@superset-ui/chart": "^0.10.0 || ^0.11.0", - "@superset-ui/color": "^0.10.0 || ^0.11.0", - "@superset-ui/number-format": "^0.10.0 || ^0.11.0", - "@superset-ui/translation": "^0.10.0 || ^0.11.0" + "@superset-ui/chart": "^0.12.0", + "@superset-ui/color": "^0.12.0", + "@superset-ui/number-format": "^0.12.0", + "@superset-ui/translation": "^0.12.0" } } diff --git a/packages/superset-ui-legacy-plugin-chart-table/package.json b/packages/superset-ui-legacy-plugin-chart-table/package.json index 5b588634d..772dd378a 100644 --- a/packages/superset-ui-legacy-plugin-chart-table/package.json +++ b/packages/superset-ui-legacy-plugin-chart-table/package.json @@ -34,9 +34,9 @@ "prop-types": "^15.6.2" }, "peerDependencies": { - "@superset-ui/chart": "^0.10.0 || ^0.11.0", - "@superset-ui/number-format": "^0.10.0 || ^0.11.0", - "@superset-ui/time-format": "^0.10.0 || ^0.11.0", - "@superset-ui/translation": "^0.10.0 || ^0.11.0" + "@superset-ui/chart": "^0.12.0", + "@superset-ui/number-format": "^0.12.0", + "@superset-ui/time-format": "^0.12.0", + "@superset-ui/translation": "^0.12.0" } } diff --git a/packages/superset-ui-legacy-plugin-chart-treemap/package.json b/packages/superset-ui-legacy-plugin-chart-treemap/package.json index b457e278e..7170b70ec 100644 --- a/packages/superset-ui-legacy-plugin-chart-treemap/package.json +++ b/packages/superset-ui-legacy-plugin-chart-treemap/package.json @@ -33,9 +33,9 @@ "prop-types": "^15.6.2" }, "peerDependencies": { - "@superset-ui/chart": "^0.10.0 || ^0.11.0", - "@superset-ui/color": "^0.10.0 || ^0.11.0", - "@superset-ui/number-format": "^0.10.0 || ^0.11.0", - "@superset-ui/translation": "^0.10.0 || ^0.11.0" + "@superset-ui/chart": "^0.12.0", + "@superset-ui/color": "^0.12.0", + "@superset-ui/number-format": "^0.12.0", + "@superset-ui/translation": "^0.12.0" } } diff --git a/packages/superset-ui-legacy-plugin-chart-word-cloud/package.json b/packages/superset-ui-legacy-plugin-chart-word-cloud/package.json index 064f67903..1f1a2775c 100644 --- a/packages/superset-ui-legacy-plugin-chart-word-cloud/package.json +++ b/packages/superset-ui-legacy-plugin-chart-word-cloud/package.json @@ -33,8 +33,8 @@ "prop-types": "^15.6.2" }, "peerDependencies": { - "@superset-ui/chart": "^0.10.0 || ^0.11.0", - "@superset-ui/color": "^0.10.0 || ^0.11.0", - "@superset-ui/translation": "^0.10.0 || ^0.11.0" + "@superset-ui/chart": "^0.12.0", + "@superset-ui/color": "^0.12.0", + "@superset-ui/translation": "^0.12.0" } } diff --git a/packages/superset-ui-legacy-plugin-chart-world-map/package.json b/packages/superset-ui-legacy-plugin-chart-world-map/package.json index bfe97c9dd..ba2ecf4d0 100644 --- a/packages/superset-ui-legacy-plugin-chart-world-map/package.json +++ b/packages/superset-ui-legacy-plugin-chart-world-map/package.json @@ -33,8 +33,8 @@ "prop-types": "^15.6.2" }, "peerDependencies": { - "@superset-ui/chart": "^0.10.0 || ^0.11.0", - "@superset-ui/number-format": "^0.10.0 || ^0.11.0", - "@superset-ui/translation": "^0.10.0 || ^0.11.0" + "@superset-ui/chart": "^0.12.0", + "@superset-ui/number-format": "^0.12.0", + "@superset-ui/translation": "^0.12.0" } } diff --git a/packages/superset-ui-legacy-preset-chart-big-number/package.json b/packages/superset-ui-legacy-preset-chart-big-number/package.json index c861c0adf..ef2d830c0 100644 --- a/packages/superset-ui-legacy-preset-chart-big-number/package.json +++ b/packages/superset-ui-legacy-preset-chart-big-number/package.json @@ -34,13 +34,13 @@ "shortid": "^2.2.14" }, "peerDependencies": { - "@superset-ui/chart": "^0.10.0 || ^0.11.0", - "@superset-ui/color": "^0.10.0 || ^0.11.0", - "@superset-ui/core": "^0.10.0 || ^0.11.0", - "@superset-ui/dimension": "^0.10.0 || ^0.11.0", - "@superset-ui/number-format": "^0.10.0 || ^0.11.0", - "@superset-ui/time-format": "^0.10.0 || ^0.11.0", - "@superset-ui/translation": "^0.10.0 || ^0.11.0", + "@superset-ui/chart": "^0.12.0", + "@superset-ui/color": "^0.12.0", + "@superset-ui/core": "^0.12.0", + "@superset-ui/dimension": "^0.12.0", + "@superset-ui/number-format": "^0.12.0", + "@superset-ui/time-format": "^0.12.0", + "@superset-ui/translation": "^0.12.0", "react": "^15 || ^16" } } diff --git a/packages/superset-ui-legacy-preset-chart-nvd3/package.json b/packages/superset-ui-legacy-preset-chart-nvd3/package.json index def9b82c0..5d81c701c 100644 --- a/packages/superset-ui-legacy-preset-chart-nvd3/package.json +++ b/packages/superset-ui-legacy-preset-chart-nvd3/package.json @@ -41,13 +41,13 @@ "urijs": "^1.18.10" }, "peerDependencies": { - "@superset-ui/chart": "^0.10.0 || ^0.11.0", - "@superset-ui/color": "^0.10.0 || ^0.11.0", - "@superset-ui/core": "^0.10.0 || ^0.11.0", - "@superset-ui/dimension": "^0.10.0 || ^0.11.0", - "@superset-ui/number-format": "^0.10.0 || ^0.11.0", - "@superset-ui/time-format": "^0.10.0 || ^0.11.0", - "@superset-ui/translation": "^0.10.0 || ^0.11.0", + "@superset-ui/chart": "^0.12.0", + "@superset-ui/color": "^0.12.0", + "@superset-ui/core": "^0.12.0", + "@superset-ui/dimension": "^0.12.0", + "@superset-ui/number-format": "^0.12.0", + "@superset-ui/time-format": "^0.12.0", + "@superset-ui/translation": "^0.12.0", "react": "^15 || ^16" } } diff --git a/packages/superset-ui-plugin-chart-icicle-event/package.json b/packages/superset-ui-plugin-chart-icicle-event/package.json index b059673c1..c595f7977 100644 --- a/packages/superset-ui-plugin-chart-icicle-event/package.json +++ b/packages/superset-ui-plugin-chart-icicle-event/package.json @@ -41,10 +41,10 @@ "prop-types": "^15.6.2" }, "peerDependencies": { - "@superset-ui/chart": "^0.11.6", - "@superset-ui/color": "^0.11.0", - "@superset-ui/core": "^0.11.0", - "@superset-ui/translation": "^0.11.0", + "@superset-ui/chart": "^0.12.0", + "@superset-ui/color": "^0.12.0", + "@superset-ui/core": "^0.12.0", + "@superset-ui/translation": "^0.12.0", "react": "^16.2" } } diff --git a/packages/superset-ui-plugin-chart-table/package.json b/packages/superset-ui-plugin-chart-table/package.json index 45f365b8e..eaeee79ea 100644 --- a/packages/superset-ui-plugin-chart-table/package.json +++ b/packages/superset-ui-plugin-chart-table/package.json @@ -30,10 +30,10 @@ "@airbnb/lunar-icons": "^2.1.4" }, "peerDependencies": { - "@superset-ui/chart": "^0.11.14", - "@superset-ui/number-format": "^0.11.14", - "@superset-ui/time-format": "^0.11.14", - "@superset-ui/translation": "^0.11.9", + "@superset-ui/chart": "^0.12.0", + "@superset-ui/number-format": "^0.12.0", + "@superset-ui/time-format": "^0.12.0", + "@superset-ui/translation": "^0.12.0", "react": "^16.8.6" } } diff --git a/packages/superset-ui-plugin-chart-word-cloud/package.json b/packages/superset-ui-plugin-chart-word-cloud/package.json index 516ef034e..bdbba2f99 100644 --- a/packages/superset-ui-plugin-chart-word-cloud/package.json +++ b/packages/superset-ui-plugin-chart-word-cloud/package.json @@ -39,8 +39,8 @@ "prop-types": "^15.6.2" }, "peerDependencies": { - "@superset-ui/chart": "^0.10.0 || ^0.11.0", - "@superset-ui/color": "^0.10.0 || ^0.11.0", - "@superset-ui/translation": "^0.10.0 || ^0.11.0" + "@superset-ui/chart": "^0.12.0", + "@superset-ui/color": "^0.12.0", + "@superset-ui/translation": "^0.12.0" } } diff --git a/packages/superset-ui-plugins-demo/package.json b/packages/superset-ui-plugins-demo/package.json index f82d669ed..37e4ad245 100644 --- a/packages/superset-ui-plugins-demo/package.json +++ b/packages/superset-ui-plugins-demo/package.json @@ -50,11 +50,11 @@ "terser-webpack-plugin": "1.4.1" }, "peerDependencies": { - "@superset-ui/chart": "^0.11.13", - "@superset-ui/chart-composition": "^0.11.9", - "@superset-ui/color": "^0.11.9", - "@superset-ui/connection": "^0.11.0", - "@superset-ui/time-format": "^0.11.0", - "@superset-ui/translation": "^0.11.4" + "@superset-ui/chart": "^0.12.0", + "@superset-ui/chart-composition": "^0.12.0", + "@superset-ui/color": "^0.12.0", + "@superset-ui/connection": "^0.12.0", + "@superset-ui/time-format": "^0.12.0", + "@superset-ui/translation": "^0.12.0" } } diff --git a/packages/superset-ui-preset-chart-xy/package.json b/packages/superset-ui-preset-chart-xy/package.json index 3641fe762..7b23091b6 100644 --- a/packages/superset-ui-preset-chart-xy/package.json +++ b/packages/superset-ui-preset-chart-xy/package.json @@ -48,14 +48,15 @@ "vega-lite": "^3.1.0" }, "peerDependencies": { - "@superset-ui/chart": "^0.11.6", - "@superset-ui/chart-composition": "^0.11.5", - "@superset-ui/color": "^0.11.0", - "@superset-ui/core": "^0.11.0", - "@superset-ui/dimension": "^0.11.0", - "@superset-ui/number-format": "^0.11.0", - "@superset-ui/time-format": "^0.11.0", - "@superset-ui/translation": "^0.11.0", + "@superset-ui/chart": "^0.12.0", + "@superset-ui/chart-composition": "^0.12.0", + "@superset-ui/color": "^0.12.0", + "@superset-ui/core": "^0.12.0", + "@superset-ui/dimension": "^0.12.0", + "@superset-ui/number-format": "^0.12.0", + "@superset-ui/query": "^0.12.0", + "@superset-ui/time-format": "^0.12.0", + "@superset-ui/translation": "^0.12.0", "react": "^16.2" } } From e01eb42a3ebcb4040fbabe8716e732da26a5753b Mon Sep 17 00:00:00 2001 From: Krist Wongsuphasawat Date: Sat, 24 Aug 2019 21:46:58 -0700 Subject: [PATCH 02/10] feat: replace payload with queryData --- packages/superset-ui-legacy-plugin-chart-calendar/README.md | 2 +- packages/superset-ui-legacy-plugin-chart-chord/README.md | 2 +- .../superset-ui-legacy-plugin-chart-country-map/README.md | 2 +- .../superset-ui-legacy-plugin-chart-event-flow/README.md | 2 +- .../README.md | 2 +- packages/superset-ui-legacy-plugin-chart-heatmap/README.md | 2 +- .../superset-ui-legacy-plugin-chart-histogram/README.md | 2 +- packages/superset-ui-legacy-plugin-chart-horizon/README.md | 2 +- packages/superset-ui-legacy-plugin-chart-iframe/README.md | 2 +- packages/superset-ui-legacy-plugin-chart-map-box/README.md | 2 +- packages/superset-ui-legacy-plugin-chart-markup/README.md | 2 +- .../superset-ui-legacy-plugin-chart-paired-t-test/README.md | 2 +- .../README.md | 2 +- .../superset-ui-legacy-plugin-chart-partition/README.md | 2 +- .../superset-ui-legacy-plugin-chart-pivot-table/README.md | 2 +- packages/superset-ui-legacy-plugin-chart-rose/README.md | 2 +- .../superset-ui-legacy-plugin-chart-sankey-loop/README.md | 2 +- packages/superset-ui-legacy-plugin-chart-sankey/README.md | 2 +- packages/superset-ui-legacy-plugin-chart-sunburst/README.md | 2 +- packages/superset-ui-legacy-plugin-chart-table/README.md | 2 +- packages/superset-ui-legacy-plugin-chart-treemap/README.md | 2 +- .../superset-ui-legacy-plugin-chart-word-cloud/README.md | 2 +- .../superset-ui-legacy-plugin-chart-world-map/README.md | 2 +- .../superset-ui-legacy-preset-chart-big-number/README.md | 2 +- packages/superset-ui-legacy-preset-chart-nvd3/README.md | 2 +- packages/superset-ui-plugin-chart-icicle-event/README.md | 2 +- .../src/transformProps.ts | 4 ++-- packages/superset-ui-plugin-chart-table/README.md | 2 +- .../src/legacy/transformProps.ts | 4 ++-- .../superset-ui-plugin-chart-table/src/transformProps.ts | 4 ++-- packages/superset-ui-plugin-chart-word-cloud/README.md | 2 +- .../src/transformProps.ts | 6 +++--- packages/superset-ui-preset-chart-xy/README.md | 2 +- .../src/BoxPlot/legacy/transformProps.ts | 4 ++-- .../src/BoxPlot/transformProps.ts | 4 ++-- .../src/Line/legacy/transformProps.ts | 4 ++-- .../superset-ui-preset-chart-xy/src/Line/transformProps.ts | 4 ++-- .../src/ScatterPlot/legacy/transformProps.ts | 4 ++-- .../src/ScatterPlot/transformProps.ts | 4 ++-- 39 files changed, 50 insertions(+), 50 deletions(-) diff --git a/packages/superset-ui-legacy-plugin-chart-calendar/README.md b/packages/superset-ui-legacy-plugin-chart-calendar/README.md index ac2e349ed..51f0fc3b9 100644 --- a/packages/superset-ui-legacy-plugin-chart-calendar/README.md +++ b/packages/superset-ui-legacy-plugin-chart-calendar/README.md @@ -26,7 +26,7 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ width: 600, height: 600, formData: {...}, - payload: { + queryData: { data: {...}, }, }} diff --git a/packages/superset-ui-legacy-plugin-chart-chord/README.md b/packages/superset-ui-legacy-plugin-chart-chord/README.md index cefd92d59..0aaaf0879 100644 --- a/packages/superset-ui-legacy-plugin-chart-chord/README.md +++ b/packages/superset-ui-legacy-plugin-chart-chord/README.md @@ -26,7 +26,7 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ width: 600, height: 600, formData: {...}, - payload: { + queryData: { data: {...}, }, }} diff --git a/packages/superset-ui-legacy-plugin-chart-country-map/README.md b/packages/superset-ui-legacy-plugin-chart-country-map/README.md index 0b795c134..8a8f0fbed 100644 --- a/packages/superset-ui-legacy-plugin-chart-country-map/README.md +++ b/packages/superset-ui-legacy-plugin-chart-country-map/README.md @@ -26,7 +26,7 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ width: 600, height: 600, formData: {...}, - payload: { + queryData: { data: {...}, }, }} diff --git a/packages/superset-ui-legacy-plugin-chart-event-flow/README.md b/packages/superset-ui-legacy-plugin-chart-event-flow/README.md index 3b6fc9a32..7c57a717a 100644 --- a/packages/superset-ui-legacy-plugin-chart-event-flow/README.md +++ b/packages/superset-ui-legacy-plugin-chart-event-flow/README.md @@ -26,7 +26,7 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ width: 600, height: 600, formData: {...}, - payload: { + queryData: { data: {...}, }, }} diff --git a/packages/superset-ui-legacy-plugin-chart-force-directed/README.md b/packages/superset-ui-legacy-plugin-chart-force-directed/README.md index e113e84b8..4b712ddc7 100644 --- a/packages/superset-ui-legacy-plugin-chart-force-directed/README.md +++ b/packages/superset-ui-legacy-plugin-chart-force-directed/README.md @@ -26,7 +26,7 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ width: 600, height: 600, formData: {...}, - payload: { + queryData: { data: {...}, }, }} diff --git a/packages/superset-ui-legacy-plugin-chart-heatmap/README.md b/packages/superset-ui-legacy-plugin-chart-heatmap/README.md index 498542106..331f8d32f 100644 --- a/packages/superset-ui-legacy-plugin-chart-heatmap/README.md +++ b/packages/superset-ui-legacy-plugin-chart-heatmap/README.md @@ -26,7 +26,7 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ width: 600, height: 600, formData: {...}, - payload: { + queryData: { data: {...}, }, }} diff --git a/packages/superset-ui-legacy-plugin-chart-histogram/README.md b/packages/superset-ui-legacy-plugin-chart-histogram/README.md index efd09db2a..7adaa1a75 100644 --- a/packages/superset-ui-legacy-plugin-chart-histogram/README.md +++ b/packages/superset-ui-legacy-plugin-chart-histogram/README.md @@ -26,7 +26,7 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ width: 600, height: 600, formData: {...}, - payload: { + queryData: { data: {...}, }, }} diff --git a/packages/superset-ui-legacy-plugin-chart-horizon/README.md b/packages/superset-ui-legacy-plugin-chart-horizon/README.md index fc46e372d..f3b6ee6a5 100644 --- a/packages/superset-ui-legacy-plugin-chart-horizon/README.md +++ b/packages/superset-ui-legacy-plugin-chart-horizon/README.md @@ -26,7 +26,7 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ width: 600, height: 600, formData: {...}, - payload: { + queryData: { data: {...}, }, }} diff --git a/packages/superset-ui-legacy-plugin-chart-iframe/README.md b/packages/superset-ui-legacy-plugin-chart-iframe/README.md index 500beef4c..25823f12a 100644 --- a/packages/superset-ui-legacy-plugin-chart-iframe/README.md +++ b/packages/superset-ui-legacy-plugin-chart-iframe/README.md @@ -26,7 +26,7 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ width: 600, height: 600, formData: {...}, - payload: { + queryData: { data: {...}, }, }} diff --git a/packages/superset-ui-legacy-plugin-chart-map-box/README.md b/packages/superset-ui-legacy-plugin-chart-map-box/README.md index 7a4986c31..c778d7e13 100644 --- a/packages/superset-ui-legacy-plugin-chart-map-box/README.md +++ b/packages/superset-ui-legacy-plugin-chart-map-box/README.md @@ -26,7 +26,7 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ width: 600, height: 600, formData: {...}, - payload: { + queryData: { data: {...}, }, }} diff --git a/packages/superset-ui-legacy-plugin-chart-markup/README.md b/packages/superset-ui-legacy-plugin-chart-markup/README.md index 0b087e74c..041150f03 100644 --- a/packages/superset-ui-legacy-plugin-chart-markup/README.md +++ b/packages/superset-ui-legacy-plugin-chart-markup/README.md @@ -26,7 +26,7 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ width: 600, height: 600, formData: {...}, - payload: { + queryData: { data: {...}, }, }} diff --git a/packages/superset-ui-legacy-plugin-chart-paired-t-test/README.md b/packages/superset-ui-legacy-plugin-chart-paired-t-test/README.md index 8a4d16cdb..3d002cd17 100644 --- a/packages/superset-ui-legacy-plugin-chart-paired-t-test/README.md +++ b/packages/superset-ui-legacy-plugin-chart-paired-t-test/README.md @@ -26,7 +26,7 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ width: 600, height: 600, formData: {...}, - payload: { + queryData: { data: {...}, }, }} diff --git a/packages/superset-ui-legacy-plugin-chart-parallel-coordinates/README.md b/packages/superset-ui-legacy-plugin-chart-parallel-coordinates/README.md index 7823c9faa..adcef114c 100644 --- a/packages/superset-ui-legacy-plugin-chart-parallel-coordinates/README.md +++ b/packages/superset-ui-legacy-plugin-chart-parallel-coordinates/README.md @@ -26,7 +26,7 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ width: 600, height: 600, formData: {...}, - payload: { + queryData: { data: {...}, }, }} diff --git a/packages/superset-ui-legacy-plugin-chart-partition/README.md b/packages/superset-ui-legacy-plugin-chart-partition/README.md index da2bd5774..4f5beb759 100644 --- a/packages/superset-ui-legacy-plugin-chart-partition/README.md +++ b/packages/superset-ui-legacy-plugin-chart-partition/README.md @@ -26,7 +26,7 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ width: 600, height: 600, formData: {...}, - payload: { + queryData: { data: {...}, }, }} diff --git a/packages/superset-ui-legacy-plugin-chart-pivot-table/README.md b/packages/superset-ui-legacy-plugin-chart-pivot-table/README.md index e3a5b27dc..3bea32e54 100644 --- a/packages/superset-ui-legacy-plugin-chart-pivot-table/README.md +++ b/packages/superset-ui-legacy-plugin-chart-pivot-table/README.md @@ -26,7 +26,7 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ width: 600, height: 600, formData: {...}, - payload: { + queryData: { data: {...}, }, }} diff --git a/packages/superset-ui-legacy-plugin-chart-rose/README.md b/packages/superset-ui-legacy-plugin-chart-rose/README.md index f9cc103a7..373574f19 100644 --- a/packages/superset-ui-legacy-plugin-chart-rose/README.md +++ b/packages/superset-ui-legacy-plugin-chart-rose/README.md @@ -26,7 +26,7 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ width: 600, height: 600, formData: {...}, - payload: { + queryData: { data: {...}, }, }} diff --git a/packages/superset-ui-legacy-plugin-chart-sankey-loop/README.md b/packages/superset-ui-legacy-plugin-chart-sankey-loop/README.md index 03f881ecb..c84bbaeae 100644 --- a/packages/superset-ui-legacy-plugin-chart-sankey-loop/README.md +++ b/packages/superset-ui-legacy-plugin-chart-sankey-loop/README.md @@ -26,7 +26,7 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ width: 600, height: 600, formData: {...}, - payload: { + queryData: { data: {...}, }, }} diff --git a/packages/superset-ui-legacy-plugin-chart-sankey/README.md b/packages/superset-ui-legacy-plugin-chart-sankey/README.md index 02ae971dd..e1217f451 100644 --- a/packages/superset-ui-legacy-plugin-chart-sankey/README.md +++ b/packages/superset-ui-legacy-plugin-chart-sankey/README.md @@ -26,7 +26,7 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ width: 600, height: 600, formData: {...}, - payload: { + queryData: { data: {...}, }, }} diff --git a/packages/superset-ui-legacy-plugin-chart-sunburst/README.md b/packages/superset-ui-legacy-plugin-chart-sunburst/README.md index 0a6c1148a..20396330b 100644 --- a/packages/superset-ui-legacy-plugin-chart-sunburst/README.md +++ b/packages/superset-ui-legacy-plugin-chart-sunburst/README.md @@ -26,7 +26,7 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ width: 600, height: 600, formData: {...}, - payload: { + queryData: { data: {...}, }, }} diff --git a/packages/superset-ui-legacy-plugin-chart-table/README.md b/packages/superset-ui-legacy-plugin-chart-table/README.md index b4ab505b4..937c0278a 100644 --- a/packages/superset-ui-legacy-plugin-chart-table/README.md +++ b/packages/superset-ui-legacy-plugin-chart-table/README.md @@ -26,7 +26,7 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ width: 600, height: 600, formData: {...}, - payload: { + queryData: { data: {...}, }, }} diff --git a/packages/superset-ui-legacy-plugin-chart-treemap/README.md b/packages/superset-ui-legacy-plugin-chart-treemap/README.md index c002cfdf7..6333120fc 100644 --- a/packages/superset-ui-legacy-plugin-chart-treemap/README.md +++ b/packages/superset-ui-legacy-plugin-chart-treemap/README.md @@ -26,7 +26,7 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ width: 600, height: 600, formData: {...}, - payload: { + queryData: { data: {...}, }, }} diff --git a/packages/superset-ui-legacy-plugin-chart-word-cloud/README.md b/packages/superset-ui-legacy-plugin-chart-word-cloud/README.md index e3f9b3edb..d04a17615 100644 --- a/packages/superset-ui-legacy-plugin-chart-word-cloud/README.md +++ b/packages/superset-ui-legacy-plugin-chart-word-cloud/README.md @@ -26,7 +26,7 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ width: 600, height: 600, formData: {...}, - payload: { + queryData: { data: {...}, }, }} diff --git a/packages/superset-ui-legacy-plugin-chart-world-map/README.md b/packages/superset-ui-legacy-plugin-chart-world-map/README.md index 492b2f6c7..84b932885 100644 --- a/packages/superset-ui-legacy-plugin-chart-world-map/README.md +++ b/packages/superset-ui-legacy-plugin-chart-world-map/README.md @@ -26,7 +26,7 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ width: 600, height: 600, formData: {...}, - payload: { + queryData: { data: {...}, }, }} diff --git a/packages/superset-ui-legacy-preset-chart-big-number/README.md b/packages/superset-ui-legacy-preset-chart-big-number/README.md index 93309104b..f60f1f8da 100644 --- a/packages/superset-ui-legacy-preset-chart-big-number/README.md +++ b/packages/superset-ui-legacy-preset-chart-big-number/README.md @@ -37,7 +37,7 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ width: 600, height: 600, formData: {...}, - payload: { + queryData: { data: {...}, }, }} diff --git a/packages/superset-ui-legacy-preset-chart-nvd3/README.md b/packages/superset-ui-legacy-preset-chart-nvd3/README.md index 557bec8ec..3a4e75fe1 100644 --- a/packages/superset-ui-legacy-preset-chart-nvd3/README.md +++ b/packages/superset-ui-legacy-preset-chart-nvd3/README.md @@ -37,7 +37,7 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ width: 600, height: 600, formData: {...}, - payload: { + queryData: { data: {...}, }, }} diff --git a/packages/superset-ui-plugin-chart-icicle-event/README.md b/packages/superset-ui-plugin-chart-icicle-event/README.md index fcddb4f3a..2df4d6a7a 100644 --- a/packages/superset-ui-plugin-chart-icicle-event/README.md +++ b/packages/superset-ui-plugin-chart-icicle-event/README.md @@ -27,7 +27,7 @@ Then use it via `SuperChart`. A link to Storybook for the Icicle Event Chart wil width: 600, height: 600, formData: {...}, - payload: { + queryData: { data: {...}, }, }} diff --git a/packages/superset-ui-plugin-chart-icicle-event/src/transformProps.ts b/packages/superset-ui-plugin-chart-icicle-event/src/transformProps.ts index 9f05f61b7..b283929c5 100644 --- a/packages/superset-ui-plugin-chart-icicle-event/src/transformProps.ts +++ b/packages/superset-ui-plugin-chart-icicle-event/src/transformProps.ts @@ -20,10 +20,10 @@ import { ChartProps } from '@superset-ui/chart'; import { findDepth } from './utils/IcicleEventTreeHelpers'; export default function transformProps(chartProps: ChartProps) { - const { formData, payload, width } = chartProps; + const { formData, queryData, width } = chartProps; // Need to double check if actually part of formData const { color, isVertical, rounding, transitionDuration } = formData; - const { data } = payload; + const { data } = queryData; const chartPropsHeight = chartProps.height; const rectHeight = 30; diff --git a/packages/superset-ui-plugin-chart-table/README.md b/packages/superset-ui-plugin-chart-table/README.md index 533068e1d..81d0f36f8 100644 --- a/packages/superset-ui-plugin-chart-table/README.md +++ b/packages/superset-ui-plugin-chart-table/README.md @@ -26,7 +26,7 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ width: 600, height: 600, formData: {...}, - payload: { + queryData: { data: {...}, }, }} diff --git a/packages/superset-ui-plugin-chart-table/src/legacy/transformProps.ts b/packages/superset-ui-plugin-chart-table/src/legacy/transformProps.ts index 3ee0d7c6d..b1ed502d5 100644 --- a/packages/superset-ui-plugin-chart-table/src/legacy/transformProps.ts +++ b/packages/superset-ui-plugin-chart-table/src/legacy/transformProps.ts @@ -24,7 +24,7 @@ import processMetrics from '../processMetrics'; import processData from '../processData'; export default function transformProps(chartProps: ChartProps) { - const { height, datasource, filters, formData, onAddFilter, payload } = chartProps; + const { height, datasource, filters, formData, onAddFilter, queryData } = chartProps; const { alignPn, colorPn, @@ -37,7 +37,7 @@ export default function transformProps(chartProps: ChartProps) { tableTimestampFormat, timeseriesLimitMetric, } = formData; - const { records, columns } = payload.data; + const { records, columns } = queryData.data; const metrics = processMetrics({ metrics: rawMetrics, diff --git a/packages/superset-ui-plugin-chart-table/src/transformProps.ts b/packages/superset-ui-plugin-chart-table/src/transformProps.ts index 2fb2faa50..56bceeb03 100644 --- a/packages/superset-ui-plugin-chart-table/src/transformProps.ts +++ b/packages/superset-ui-plugin-chart-table/src/transformProps.ts @@ -83,7 +83,7 @@ function transformData(data: PlainObject[], formData: PlainObject) { } export default function transformProps(chartProps: ChartProps) { - const { height, datasource, filters, formData, onAddFilter, payload } = chartProps; + const { height, datasource, filters, formData, onAddFilter, queryData } = chartProps; const { alignPn, colorPn, @@ -96,7 +96,7 @@ export default function transformProps(chartProps: ChartProps) { tableTimestampFormat, timeseriesLimitMetric, } = formData; - const { records, columns } = transformData(payload.data, formData); + const { records, columns } = transformData(queryData.data, formData); const metrics = processMetrics({ metrics: rawMetrics, diff --git a/packages/superset-ui-plugin-chart-word-cloud/README.md b/packages/superset-ui-plugin-chart-word-cloud/README.md index bb3dbbc9f..567e47d1e 100644 --- a/packages/superset-ui-plugin-chart-word-cloud/README.md +++ b/packages/superset-ui-plugin-chart-word-cloud/README.md @@ -26,7 +26,7 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ width: 600, height: 600, formData: {...}, - payload: { + queryData: { data: {...}, }, }} diff --git a/packages/superset-ui-plugin-chart-word-cloud/src/transformProps.ts b/packages/superset-ui-plugin-chart-word-cloud/src/transformProps.ts index 0186322cd..930b4972e 100644 --- a/packages/superset-ui-plugin-chart-word-cloud/src/transformProps.ts +++ b/packages/superset-ui-plugin-chart-word-cloud/src/transformProps.ts @@ -1,6 +1,6 @@ import { ChartProps } from '@superset-ui/chart'; -function transformData(data: ChartProps['payload'][], formData: ChartProps['formData']) { +function transformData(data: ChartProps['queryData'][], formData: ChartProps['formData']) { const { metric, series } = formData; const transformedData = data.map(datum => ({ @@ -12,12 +12,12 @@ function transformData(data: ChartProps['payload'][], formData: ChartProps['form } export default function transformProps(chartProps: ChartProps) { - const { width, height, formData, payload } = chartProps; + const { width, height, formData, queryData } = chartProps; const { colorScheme, rotation, sizeTo, sizeFrom } = formData; return { colorScheme, - data: transformData(payload.data, formData), + data: transformData(queryData.data, formData), height, rotation, sizeRange: [sizeFrom, sizeTo], diff --git a/packages/superset-ui-preset-chart-xy/README.md b/packages/superset-ui-preset-chart-xy/README.md index 3b15b180c..f3e039ccb 100644 --- a/packages/superset-ui-preset-chart-xy/README.md +++ b/packages/superset-ui-preset-chart-xy/README.md @@ -28,7 +28,7 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ width: 600, height: 600, formData: {...}, - payload: { + queryData: { data: {...}, }, }} diff --git a/packages/superset-ui-preset-chart-xy/src/BoxPlot/legacy/transformProps.ts b/packages/superset-ui-preset-chart-xy/src/BoxPlot/legacy/transformProps.ts index 183230c94..9129803d0 100644 --- a/packages/superset-ui-preset-chart-xy/src/BoxPlot/legacy/transformProps.ts +++ b/packages/superset-ui-preset-chart-xy/src/BoxPlot/legacy/transformProps.ts @@ -21,11 +21,11 @@ import { ChartProps } from '@superset-ui/chart'; import { RawBoxPlotDataRow, BoxPlotDataRow } from '../types'; export default function transformProps(chartProps: ChartProps) { - const { width, height, datasource = {}, formData, payload } = chartProps; + const { width, height, datasource = {}, formData, queryData } = chartProps; const { verboseMap = {} } = datasource; const { colorScheme, groupby, metrics } = formData; - const data = (payload.data as RawBoxPlotDataRow[]).map(({ label, values }) => ({ + const data = (queryData.data as RawBoxPlotDataRow[]).map(({ label, values }) => ({ label, min: values.whisker_low, max: values.whisker_high, diff --git a/packages/superset-ui-preset-chart-xy/src/BoxPlot/transformProps.ts b/packages/superset-ui-preset-chart-xy/src/BoxPlot/transformProps.ts index b6e13daeb..a1bfad9d4 100644 --- a/packages/superset-ui-preset-chart-xy/src/BoxPlot/transformProps.ts +++ b/packages/superset-ui-preset-chart-xy/src/BoxPlot/transformProps.ts @@ -6,10 +6,10 @@ import { BoxPlotDataRow, RawBoxPlotDataRow } from './types'; import { HookProps } from './BoxPlot'; export default function transformProps(chartProps: ChartProps) { - const { width, height, formData, payload } = chartProps; + const { width, height, formData, queryData } = chartProps; const { encoding, margin, theme } = formData; - const data = (payload.data as RawBoxPlotDataRow[]).map(({ label, values }) => ({ + const data = (queryData.data as RawBoxPlotDataRow[]).map(({ label, values }) => ({ label, min: values.whisker_low, max: values.whisker_high, diff --git a/packages/superset-ui-preset-chart-xy/src/Line/legacy/transformProps.ts b/packages/superset-ui-preset-chart-xy/src/Line/legacy/transformProps.ts index 512657c11..eb8b0807f 100644 --- a/packages/superset-ui-preset-chart-xy/src/Line/legacy/transformProps.ts +++ b/packages/superset-ui-preset-chart-xy/src/Line/legacy/transformProps.ts @@ -11,9 +11,9 @@ interface DataRow { } export default function transformProps(chartProps: ChartProps) { - const { width, height, formData, payload } = chartProps; + const { width, height, formData, queryData } = chartProps; const { colorScheme, xAxisLabel, xAxisFormat, yAxisLabel, yAxisFormat } = formData; - const data = payload.data as DataRow[]; + const data = queryData.data as DataRow[]; return { data: flatMap( diff --git a/packages/superset-ui-preset-chart-xy/src/Line/transformProps.ts b/packages/superset-ui-preset-chart-xy/src/Line/transformProps.ts index 2bfa62dac..4d4472468 100644 --- a/packages/superset-ui-preset-chart-xy/src/Line/transformProps.ts +++ b/packages/superset-ui-preset-chart-xy/src/Line/transformProps.ts @@ -5,8 +5,8 @@ import { HookProps, FormDataProps } from './Line'; /* eslint-disable sort-keys */ export default function transformProps(chartProps: ChartProps) { - const { width, height, payload } = chartProps; - const { data } = payload; + const { width, height, queryData } = chartProps; + const { data } = queryData; const formData = chartProps.formData as FormDataProps; const hooks = chartProps.hooks as HookProps; diff --git a/packages/superset-ui-preset-chart-xy/src/ScatterPlot/legacy/transformProps.ts b/packages/superset-ui-preset-chart-xy/src/ScatterPlot/legacy/transformProps.ts index a580bd4aa..588718ab2 100644 --- a/packages/superset-ui-preset-chart-xy/src/ScatterPlot/legacy/transformProps.ts +++ b/packages/superset-ui-preset-chart-xy/src/ScatterPlot/legacy/transformProps.ts @@ -10,7 +10,7 @@ interface DataRow { } export default function transformProps(chartProps: ChartProps) { - const { width, height, formData, payload } = chartProps; + const { width, height, formData, queryData } = chartProps; const { colorScheme, entity, @@ -31,7 +31,7 @@ export default function transformProps(chartProps: ChartProps) { // yAxisShowminmax, // yLogScale, } = formData; - const data = payload.data as DataRow[]; + const data = queryData.data as DataRow[]; return { data: flatMap( diff --git a/packages/superset-ui-preset-chart-xy/src/ScatterPlot/transformProps.ts b/packages/superset-ui-preset-chart-xy/src/ScatterPlot/transformProps.ts index 6eddb0938..90bf16a3f 100644 --- a/packages/superset-ui-preset-chart-xy/src/ScatterPlot/transformProps.ts +++ b/packages/superset-ui-preset-chart-xy/src/ScatterPlot/transformProps.ts @@ -5,9 +5,9 @@ import { ChartProps } from '@superset-ui/chart'; import { HookProps } from './ScatterPlot'; export default function transformProps(chartProps: ChartProps) { - const { width, height, formData, payload } = chartProps; + const { width, height, formData, queryData } = chartProps; const { encoding, margin, theme } = formData; - const { data } = payload; + const { data } = queryData; const hooks = chartProps.hooks as HookProps; const fieldsFromHooks: (keyof HookProps)[] = [ From aa9535608e55510134012947575abd92c50d7d40 Mon Sep 17 00:00:00 2001 From: Krist Wongsuphasawat Date: Sat, 24 Aug 2019 21:52:24 -0700 Subject: [PATCH 03/10] feat: replace payload with queryData --- .../src/transformProps.js | 4 ++-- .../src/transformProps.js | 4 ++-- .../src/transformProps.js | 4 ++-- .../src/transformProps.js | 4 ++-- .../src/transformProps.js | 4 ++-- .../src/transformProps.js | 4 ++-- .../src/transformProps.js | 4 ++-- .../src/transformProps.js | 4 ++-- .../src/transformProps.js | 4 ++-- .../src/transformProps.js | 4 ++-- .../src/transformProps.js | 4 ++-- .../src/transformProps.js | 4 ++-- .../src/transformProps.js | 4 ++-- .../src/PivotTable.js | 2 +- .../src/transformProps.js | 4 ++-- .../src/transformProps.js | 4 ++-- .../src/transformProps.js | 4 ++-- .../src/transformProps.js | 4 ++-- .../src/transformProps.js | 4 ++-- .../src/transformProps.js | 4 ++-- .../src/transformProps.js | 4 ++-- .../src/transformProps.js | 4 ++-- .../src/transformProps.js | 4 ++-- .../src/BigNumber/transformProps.js | 4 ++-- .../src/LineMulti/LineMulti.jsx | 24 +++++++++---------- .../src/transformProps.js | 4 ++-- .../test/transformProps.test.ts | 2 +- .../shared/components/createQueryStory.tsx | 4 ++-- .../legacy-plugin-chart-calendar/Stories.tsx | 2 +- .../legacy-plugin-chart-chord/Stories.tsx | 2 +- .../Stories.tsx | 2 +- .../Stories.jsx | 2 +- .../Stories.tsx | 2 +- .../legacy-plugin-chart-heatmap/Stories.tsx | 4 ++-- .../legacy-plugin-chart-histogram/Stories.tsx | 2 +- .../legacy-plugin-chart-horizon/Stories.tsx | 2 +- .../legacy-plugin-chart-map-box/Stories.tsx | 2 +- .../legacy-plugin-chart-markup/Stories.tsx | 2 +- .../Stories.tsx | 2 +- .../Stories.tsx | 2 +- .../legacy-plugin-chart-partition/Stories.tsx | 2 +- .../Stories.tsx | 4 ++-- .../legacy-plugin-chart-rose/Stories.tsx | 2 +- .../Stories.tsx | 2 +- .../legacy-plugin-chart-sankey/Stories.tsx | 2 +- .../legacy-plugin-chart-sunburst/Stories.tsx | 2 +- .../legacy-plugin-chart-table/Stories.tsx | 2 +- .../legacy-plugin-chart-treemap/Stories.tsx | 2 +- .../Stories.tsx | 2 +- .../legacy-plugin-chart-world-map/Stories.tsx | 2 +- .../BigNumber/Stories.tsx | 2 +- .../BigNumberTotal/Stories.tsx | 2 +- .../legacy-preset-chart-nvd3/Area/Stories.tsx | 10 ++++---- .../legacy-preset-chart-nvd3/Bar/Stories.tsx | 8 +++---- .../BoxPlot/Stories.tsx | 2 +- .../Bubble/Stories.tsx | 2 +- .../Bullet/Stories.tsx | 2 +- .../Compare/Stories.tsx | 2 +- .../DistBar/ManyBarStories.tsx | 2 +- .../DistBar/Stories.tsx | 2 +- .../DualLine/Stories.tsx | 6 ++--- .../Line/LogStories.tsx | 2 +- .../legacy-preset-chart-nvd3/Line/Stories.tsx | 4 ++-- .../Line/YAxisStories.tsx | 10 ++++---- .../legacy-preset-chart-nvd3/Pie/Stories.tsx | 2 +- .../stories/plugin-chart-table/Stories.jsx | 6 ++--- .../preset-chart-xy/BoxPlot/stories/Basic.tsx | 4 ++-- .../BoxPlot/stories/Legacy.tsx | 2 +- .../preset-chart-xy/Line/stories/basic.tsx | 2 +- .../preset-chart-xy/Line/stories/flush.tsx | 4 ++-- .../preset-chart-xy/Line/stories/legacy.tsx | 4 ++-- .../preset-chart-xy/Line/stories/missing.tsx | 2 +- .../Line/stories/timeShift.tsx | 2 +- .../ScatterPlot/stories/basic.jsx | 2 +- .../ScatterPlot/stories/bubble.jsx | 2 +- .../ScatterPlot/stories/legacy.tsx | 2 +- 76 files changed, 133 insertions(+), 133 deletions(-) diff --git a/packages/superset-ui-legacy-plugin-chart-calendar/src/transformProps.js b/packages/superset-ui-legacy-plugin-chart-calendar/src/transformProps.js index 2f91e6899..c5d7ec54d 100644 --- a/packages/superset-ui-legacy-plugin-chart-calendar/src/transformProps.js +++ b/packages/superset-ui-legacy-plugin-chart-calendar/src/transformProps.js @@ -18,7 +18,7 @@ */ /* eslint-disable sort-keys */ export default function transformProps(chartProps) { - const { height, formData, payload, datasource } = chartProps; + const { height, formData, queryData, datasource } = chartProps; const { cellPadding, cellRadius, @@ -36,7 +36,7 @@ export default function transformProps(chartProps) { return { height, - data: payload.data, + data: queryData.data, cellPadding, cellRadius, cellSize, diff --git a/packages/superset-ui-legacy-plugin-chart-chord/src/transformProps.js b/packages/superset-ui-legacy-plugin-chart-chord/src/transformProps.js index 7418fa8ca..ad2bf5452 100644 --- a/packages/superset-ui-legacy-plugin-chart-chord/src/transformProps.js +++ b/packages/superset-ui-legacy-plugin-chart-chord/src/transformProps.js @@ -17,12 +17,12 @@ * under the License. */ export default function transformProps(chartProps) { - const { width, height, formData, payload } = chartProps; + const { width, height, formData, queryData } = chartProps; const { yAxisFormat, colorScheme } = formData; return { colorScheme, - data: payload.data, + data: queryData.data, height, numberFormat: yAxisFormat, width, diff --git a/packages/superset-ui-legacy-plugin-chart-country-map/src/transformProps.js b/packages/superset-ui-legacy-plugin-chart-country-map/src/transformProps.js index 1bb553529..5499e90e3 100644 --- a/packages/superset-ui-legacy-plugin-chart-country-map/src/transformProps.js +++ b/packages/superset-ui-legacy-plugin-chart-country-map/src/transformProps.js @@ -18,13 +18,13 @@ */ /* eslint-disable sort-keys */ export default function transformProps(chartProps) { - const { width, height, formData, payload } = chartProps; + const { width, height, formData, queryData } = chartProps; const { linearColorScheme, numberFormat, selectCountry } = formData; return { width, height, - data: payload.data, + data: queryData.data, country: selectCountry, linearColorScheme, numberFormat, diff --git a/packages/superset-ui-legacy-plugin-chart-event-flow/src/transformProps.js b/packages/superset-ui-legacy-plugin-chart-event-flow/src/transformProps.js index 9eebad10c..d0fe07135 100644 --- a/packages/superset-ui-legacy-plugin-chart-event-flow/src/transformProps.js +++ b/packages/superset-ui-legacy-plugin-chart-event-flow/src/transformProps.js @@ -19,9 +19,9 @@ import { cleanEvents, TS, EVENT_NAME, ENTITY_ID } from '@data-ui/event-flow'; export default function transformProps(chartProps) { - const { formData, payload, width, height } = chartProps; + const { formData, queryData, width, height } = chartProps; const { allColumnsX, entity, minLeafNodeEventCount } = formData; - const { data } = payload; + const { data } = queryData; const hasData = data && data.length > 0; if (hasData) { diff --git a/packages/superset-ui-legacy-plugin-chart-force-directed/src/transformProps.js b/packages/superset-ui-legacy-plugin-chart-force-directed/src/transformProps.js index 4f11b64e9..fe47f0188 100644 --- a/packages/superset-ui-legacy-plugin-chart-force-directed/src/transformProps.js +++ b/packages/superset-ui-legacy-plugin-chart-force-directed/src/transformProps.js @@ -17,12 +17,12 @@ * under the License. */ export default function transformProps(chartProps) { - const { width, height, formData, payload } = chartProps; + const { width, height, formData, queryData } = chartProps; const { charge, linkLength } = formData; return { charge, - data: payload.data, + data: queryData.data, height, linkLength, width, diff --git a/packages/superset-ui-legacy-plugin-chart-heatmap/src/transformProps.js b/packages/superset-ui-legacy-plugin-chart-heatmap/src/transformProps.js index 7cb963c66..35df6e0b2 100644 --- a/packages/superset-ui-legacy-plugin-chart-heatmap/src/transformProps.js +++ b/packages/superset-ui-legacy-plugin-chart-heatmap/src/transformProps.js @@ -18,7 +18,7 @@ */ /* eslint-disable sort-keys */ export default function transformProps(chartProps) { - const { width, height, formData, payload } = chartProps; + const { width, height, formData, queryData } = chartProps; const { bottomMargin, canvasImageRendering, @@ -42,7 +42,7 @@ export default function transformProps(chartProps) { return { width, height, - data: payload.data, + data: queryData.data, bottomMargin, canvasImageRendering, colorScheme: linearColorScheme, diff --git a/packages/superset-ui-legacy-plugin-chart-histogram/src/transformProps.js b/packages/superset-ui-legacy-plugin-chart-histogram/src/transformProps.js index 5c92cc318..c80df5d37 100644 --- a/packages/superset-ui-legacy-plugin-chart-histogram/src/transformProps.js +++ b/packages/superset-ui-legacy-plugin-chart-histogram/src/transformProps.js @@ -18,13 +18,13 @@ */ /* eslint-disable sort-keys */ export default function transformProps(chartProps) { - const { width, height, formData, payload } = chartProps; + const { width, height, formData, queryData } = chartProps; const { colorScheme, linkLength, normalized, globalOpacity, xAxisLabel, yAxisLabel } = formData; return { width, height, - data: payload.data, + data: queryData.data, binCount: parseInt(linkLength, 10), colorScheme, normalized, diff --git a/packages/superset-ui-legacy-plugin-chart-horizon/src/transformProps.js b/packages/superset-ui-legacy-plugin-chart-horizon/src/transformProps.js index a26b7757b..cb6cb06bf 100644 --- a/packages/superset-ui-legacy-plugin-chart-horizon/src/transformProps.js +++ b/packages/superset-ui-legacy-plugin-chart-horizon/src/transformProps.js @@ -17,12 +17,12 @@ * under the License. */ export default function transformProps(chartProps) { - const { width, formData, payload } = chartProps; + const { width, formData, queryData } = chartProps; const { horizonColorScale, seriesHeight } = formData; return { colorScale: horizonColorScale, - data: payload.data, + data: queryData.data, seriesHeight: parseInt(seriesHeight, 10), width, }; diff --git a/packages/superset-ui-legacy-plugin-chart-map-box/src/transformProps.js b/packages/superset-ui-legacy-plugin-chart-map-box/src/transformProps.js index 3a78fd853..6226ae69d 100644 --- a/packages/superset-ui-legacy-plugin-chart-map-box/src/transformProps.js +++ b/packages/superset-ui-legacy-plugin-chart-map-box/src/transformProps.js @@ -21,8 +21,8 @@ import supercluster from 'supercluster'; import { DEFAULT_POINT_RADIUS, DEFAULT_MAX_ZOOM } from './MapBox'; export default function transformProps(chartProps) { - const { width, height, formData, onError, payload, setControlValue = () => {} } = chartProps; - const { bounds, geoJSON, hasCustomMetric, mapboxApiKey } = payload.data; + const { width, height, formData, onError, queryData, setControlValue = () => {} } = chartProps; + const { bounds, geoJSON, hasCustomMetric, mapboxApiKey } = queryData.data; const { clusteringRadius, globalOpacity, diff --git a/packages/superset-ui-legacy-plugin-chart-markup/src/transformProps.js b/packages/superset-ui-legacy-plugin-chart-markup/src/transformProps.js index f21efa8c3..324b02ebb 100644 --- a/packages/superset-ui-legacy-plugin-chart-markup/src/transformProps.js +++ b/packages/superset-ui-legacy-plugin-chart-markup/src/transformProps.js @@ -17,9 +17,9 @@ * under the License. */ export default function transformProps(chartProps) { - const { height, payload, formData } = chartProps; + const { height, queryData, formData } = chartProps; const { vizType } = formData; - const { theme_css: cssFiles, html } = payload.data; + const { theme_css: cssFiles, html } = queryData.data; return { cssFiles, diff --git a/packages/superset-ui-legacy-plugin-chart-paired-t-test/src/transformProps.js b/packages/superset-ui-legacy-plugin-chart-paired-t-test/src/transformProps.js index a1b50d3f4..748540a4e 100644 --- a/packages/superset-ui-legacy-plugin-chart-paired-t-test/src/transformProps.js +++ b/packages/superset-ui-legacy-plugin-chart-paired-t-test/src/transformProps.js @@ -17,12 +17,12 @@ * under the License. */ export default function transformProps(chartProps) { - const { formData, payload } = chartProps; + const { formData, queryData } = chartProps; const { groupby, liftvaluePrecision, metrics, pvaluePrecision, significanceLevel } = formData; return { alpha: significanceLevel, - data: payload.data, + data: queryData.data, groups: groupby, liftValPrec: parseInt(liftvaluePrecision, 10), metrics, diff --git a/packages/superset-ui-legacy-plugin-chart-parallel-coordinates/src/transformProps.js b/packages/superset-ui-legacy-plugin-chart-parallel-coordinates/src/transformProps.js index 7c8ddbd07..14d710f95 100644 --- a/packages/superset-ui-legacy-plugin-chart-parallel-coordinates/src/transformProps.js +++ b/packages/superset-ui-legacy-plugin-chart-parallel-coordinates/src/transformProps.js @@ -18,7 +18,7 @@ */ /* eslint-disable sort-keys */ export default function transformProps(chartProps) { - const { width, height, formData, payload } = chartProps; + const { width, height, formData, queryData } = chartProps; const { includeSeries, linearColorScheme, @@ -31,7 +31,7 @@ export default function transformProps(chartProps) { return { width, height, - data: payload.data, + data: queryData.data, includeSeries, linearColorScheme, metrics: metrics.map(m => m.label || m), diff --git a/packages/superset-ui-legacy-plugin-chart-partition/src/transformProps.js b/packages/superset-ui-legacy-plugin-chart-partition/src/transformProps.js index a07f49476..ecdfc731e 100644 --- a/packages/superset-ui-legacy-plugin-chart-partition/src/transformProps.js +++ b/packages/superset-ui-legacy-plugin-chart-partition/src/transformProps.js @@ -18,7 +18,7 @@ */ /* eslint-disable sort-keys */ export default function transformProps(chartProps) { - const { width, height, datasource, formData, payload } = chartProps; + const { width, height, datasource, formData, queryData } = chartProps; const { colorScheme, dateTimeFormat, @@ -37,7 +37,7 @@ export default function transformProps(chartProps) { return { width, height, - data: payload.data, + data: queryData.data, colorScheme, dateTimeFormat, equalDateSize, diff --git a/packages/superset-ui-legacy-plugin-chart-pivot-table/src/PivotTable.js b/packages/superset-ui-legacy-plugin-chart-pivot-table/src/PivotTable.js index f2a445793..90b15beaa 100644 --- a/packages/superset-ui-legacy-plugin-chart-pivot-table/src/PivotTable.js +++ b/packages/superset-ui-legacy-plugin-chart-pivot-table/src/PivotTable.js @@ -50,7 +50,7 @@ function PivotTable(element, props) { const container = element; const $container = $(element); - // payload data is a string of html with a single table element + // queryData data is a string of html with a single table element container.innerHTML = html; const cols = Array.isArray(columns[0]) ? columns.map(col => col[0]) : columns; diff --git a/packages/superset-ui-legacy-plugin-chart-pivot-table/src/transformProps.js b/packages/superset-ui-legacy-plugin-chart-pivot-table/src/transformProps.js index 0e8fa9577..8da786a55 100644 --- a/packages/superset-ui-legacy-plugin-chart-pivot-table/src/transformProps.js +++ b/packages/superset-ui-legacy-plugin-chart-pivot-table/src/transformProps.js @@ -18,13 +18,13 @@ */ /* eslint-disable sort-keys */ export default function transformProps(chartProps) { - const { height, datasource, formData, payload } = chartProps; + const { height, datasource, formData, queryData } = chartProps; const { groupby, numberFormat } = formData; const { columnFormats, verboseMap } = datasource; return { height, - data: payload.data, + data: queryData.data, columnFormats, numGroups: groupby.length, numberFormat, diff --git a/packages/superset-ui-legacy-plugin-chart-rose/src/transformProps.js b/packages/superset-ui-legacy-plugin-chart-rose/src/transformProps.js index 44ef77cc9..4f862f2e0 100644 --- a/packages/superset-ui-legacy-plugin-chart-rose/src/transformProps.js +++ b/packages/superset-ui-legacy-plugin-chart-rose/src/transformProps.js @@ -18,13 +18,13 @@ */ /* eslint-disable sort-keys */ export default function transformProps(chartProps) { - const { width, height, formData, payload } = chartProps; + const { width, height, formData, queryData } = chartProps; const { colorScheme, dateTimeFormat, numberFormat, richTooltip, roseAreaProportion } = formData; return { width, height, - data: payload.data, + data: queryData.data, colorScheme, dateTimeFormat, numberFormat, diff --git a/packages/superset-ui-legacy-plugin-chart-sankey-loop/src/transformProps.js b/packages/superset-ui-legacy-plugin-chart-sankey-loop/src/transformProps.js index 8de5cb9f8..8b46b7e87 100644 --- a/packages/superset-ui-legacy-plugin-chart-sankey-loop/src/transformProps.js +++ b/packages/superset-ui-legacy-plugin-chart-sankey-loop/src/transformProps.js @@ -18,13 +18,13 @@ */ /* eslint-disable sort-keys */ export default function transformProps(chartProps) { - const { width, height, formData, payload, margin } = chartProps; + const { width, height, formData, queryData, margin } = chartProps; const { colorScheme } = formData; return { width, height, - data: payload.data, + data: queryData.data, colorScheme, margin, }; diff --git a/packages/superset-ui-legacy-plugin-chart-sankey/src/transformProps.js b/packages/superset-ui-legacy-plugin-chart-sankey/src/transformProps.js index e3cff6d37..fb367d1d6 100644 --- a/packages/superset-ui-legacy-plugin-chart-sankey/src/transformProps.js +++ b/packages/superset-ui-legacy-plugin-chart-sankey/src/transformProps.js @@ -18,13 +18,13 @@ */ /* eslint-disable sort-keys */ export default function transformProps(chartProps) { - const { width, height, formData, payload } = chartProps; + const { width, height, formData, queryData } = chartProps; const { colorScheme } = formData; return { width, height, - data: payload.data, + data: queryData.data, colorScheme, }; } diff --git a/packages/superset-ui-legacy-plugin-chart-sunburst/src/transformProps.js b/packages/superset-ui-legacy-plugin-chart-sunburst/src/transformProps.js index 510c8e45b..63c8ca0d1 100644 --- a/packages/superset-ui-legacy-plugin-chart-sunburst/src/transformProps.js +++ b/packages/superset-ui-legacy-plugin-chart-sunburst/src/transformProps.js @@ -18,13 +18,13 @@ */ /* eslint-disable sort-keys */ export default function transformProps(chartProps) { - const { width, height, formData, payload } = chartProps; + const { width, height, formData, queryData } = chartProps; const { colorScheme, metric, secondaryMetric } = formData; return { width, height, - data: payload.data, + data: queryData.data, colorScheme, metrics: [metric, secondaryMetric], }; diff --git a/packages/superset-ui-legacy-plugin-chart-table/src/transformProps.js b/packages/superset-ui-legacy-plugin-chart-table/src/transformProps.js index 437f8d85f..495663f44 100644 --- a/packages/superset-ui-legacy-plugin-chart-table/src/transformProps.js +++ b/packages/superset-ui-legacy-plugin-chart-table/src/transformProps.js @@ -18,7 +18,7 @@ */ /* eslint-disable sort-keys */ export default function transformProps(chartProps) { - const { height, datasource, filters, formData, onAddFilter, payload } = chartProps; + const { height, datasource, filters, formData, onAddFilter, queryData } = chartProps; const { alignPn, colorPn, @@ -32,7 +32,7 @@ export default function transformProps(chartProps) { timeseriesLimitMetric, } = formData; const { columnFormats, verboseMap } = datasource; - const { records, columns } = payload.data; + const { records, columns } = queryData.data; const processedColumns = columns.map(key => { let label = verboseMap[key]; diff --git a/packages/superset-ui-legacy-plugin-chart-treemap/src/transformProps.js b/packages/superset-ui-legacy-plugin-chart-treemap/src/transformProps.js index aa5172d77..1b29b754f 100644 --- a/packages/superset-ui-legacy-plugin-chart-treemap/src/transformProps.js +++ b/packages/superset-ui-legacy-plugin-chart-treemap/src/transformProps.js @@ -18,13 +18,13 @@ */ /* eslint-disable sort-keys */ export default function transformProps(chartProps) { - const { width, height, formData, payload } = chartProps; + const { width, height, formData, queryData } = chartProps; const { colorScheme, numberFormat, treemapRatio } = formData; return { width, height, - data: payload.data, + data: queryData.data, colorScheme, numberFormat, treemapRatio, diff --git a/packages/superset-ui-legacy-plugin-chart-word-cloud/src/transformProps.js b/packages/superset-ui-legacy-plugin-chart-word-cloud/src/transformProps.js index 4a52bdd06..1254f1602 100644 --- a/packages/superset-ui-legacy-plugin-chart-word-cloud/src/transformProps.js +++ b/packages/superset-ui-legacy-plugin-chart-word-cloud/src/transformProps.js @@ -29,13 +29,13 @@ function transformData(data, formData) { } export default function transformProps(chartProps) { - const { width, height, formData, payload } = chartProps; + const { width, height, formData, queryData } = chartProps; const { colorScheme, rotation, sizeTo, sizeFrom } = formData; return { width, height, - data: transformData(payload.data, formData), + data: transformData(queryData.data, formData), colorScheme, rotation, sizeRange: [sizeFrom, sizeTo], diff --git a/packages/superset-ui-legacy-plugin-chart-world-map/src/transformProps.js b/packages/superset-ui-legacy-plugin-chart-world-map/src/transformProps.js index aa55b9013..39a16b57b 100644 --- a/packages/superset-ui-legacy-plugin-chart-world-map/src/transformProps.js +++ b/packages/superset-ui-legacy-plugin-chart-world-map/src/transformProps.js @@ -17,11 +17,11 @@ * under the License. */ export default function transformProps(chartProps) { - const { height, formData, payload } = chartProps; + const { height, formData, queryData } = chartProps; const { maxBubbleSize, showBubbles } = formData; return { - data: payload.data, + data: queryData.data, height, maxBubbleSize: parseInt(maxBubbleSize, 10), showBubbles, diff --git a/packages/superset-ui-legacy-preset-chart-big-number/src/BigNumber/transformProps.js b/packages/superset-ui-legacy-preset-chart-big-number/src/BigNumber/transformProps.js index b576fcbb1..4b5547ef0 100644 --- a/packages/superset-ui-legacy-preset-chart-big-number/src/BigNumber/transformProps.js +++ b/packages/superset-ui-legacy-preset-chart-big-number/src/BigNumber/transformProps.js @@ -24,7 +24,7 @@ import { renderTooltipFactory } from './BigNumber'; const TIME_COLUMN = '__timestamp'; export default function transformProps(chartProps) { - const { width, height, formData, payload } = chartProps; + const { width, height, formData, queryData } = chartProps; const { colorPicker, compareLag: compareLagInput, @@ -38,7 +38,7 @@ export default function transformProps(chartProps) { vizType, yAxisFormat, } = formData; - const { data } = payload; + const { data } = queryData; let mainColor; if (colorPicker) { diff --git a/packages/superset-ui-legacy-preset-chart-nvd3/src/LineMulti/LineMulti.jsx b/packages/superset-ui-legacy-preset-chart-nvd3/src/LineMulti/LineMulti.jsx index 14d6bdcc8..189882be6 100644 --- a/packages/superset-ui-legacy-preset-chart-nvd3/src/LineMulti/LineMulti.jsx +++ b/packages/superset-ui-legacy-preset-chart-nvd3/src/LineMulti/LineMulti.jsx @@ -55,12 +55,12 @@ function getJson(url) { * Show multiple line charts * * This visualization works by fetching the data from each of the saved - * charts, building the payload data and passing it along to nvd3Vis. + * charts, building the queryData data and passing it along to nvd3Vis. */ class LineMulti extends React.Component { constructor(props) { super(props); - this.state = { payload: [] }; + this.state = { queryData: [] }; } componentDidMount() { @@ -72,8 +72,8 @@ class LineMulti extends React.Component { } loadData(props) { - const { formData, payload } = props; - const { slices } = payload.data; + const { formData, queryData } = props; + const { slices } = queryData.data; const { extraFilters, filters, @@ -83,7 +83,7 @@ class LineMulti extends React.Component { timeRange, } = formData; - this.setState({ payload: [] }); + this.setState({ queryData: [] }); // fetch data from all the charts const subslices = [ @@ -112,26 +112,26 @@ class LineMulti extends React.Component { }); Promise.all(promises).then(data => { - const payloadCopy = { ...payload }; - payloadCopy.data = [].concat(...data); + const queryDataCopy = { ...queryData }; + queryDataCopy.data = [].concat(...data); // add null values at the edges to fix multiChart bug when series with // different x values use different y axes if (lineCharts.length && lineCharts2.length) { let minX = Infinity; let maxX = -Infinity; - payloadCopy.data.forEach(datum => { + queryDataCopy.data.forEach(datum => { minX = Math.min(minX, ...datum.values.map(v => v.x)); maxX = Math.max(maxX, ...datum.values.map(v => v.x)); }); // add null values at the edges - payloadCopy.data.forEach(datum => { + queryDataCopy.data.forEach(datum => { datum.values.push({ x: minX, y: null }); datum.values.push({ x: maxX, y: null }); }); } - this.setState({ payload: payloadCopy }); + this.setState({ queryData: queryDataCopy }); }); } @@ -145,7 +145,7 @@ class LineMulti extends React.Component { onAddFilter, onError, } = this.props; - const { payload } = this.state; + const { queryData } = this.state; return ( ); diff --git a/packages/superset-ui-legacy-preset-chart-nvd3/src/transformProps.js b/packages/superset-ui-legacy-preset-chart-nvd3/src/transformProps.js index 94c157b14..75df12f8f 100644 --- a/packages/superset-ui-legacy-preset-chart-nvd3/src/transformProps.js +++ b/packages/superset-ui-legacy-preset-chart-nvd3/src/transformProps.js @@ -29,7 +29,7 @@ export default function transformProps(chartProps) { formData, onError, onAddFilter, - payload, + queryData, } = chartProps; const { @@ -76,7 +76,7 @@ export default function transformProps(chartProps) { yLogScale, } = formData; - const rawData = payload.data || []; + const rawData = queryData.data || []; const data = Array.isArray(rawData) ? rawData.map(row => ({ ...row, diff --git a/packages/superset-ui-plugin-chart-word-cloud/test/transformProps.test.ts b/packages/superset-ui-plugin-chart-word-cloud/test/transformProps.test.ts index 2e953ef90..22483a7be 100644 --- a/packages/superset-ui-plugin-chart-word-cloud/test/transformProps.test.ts +++ b/packages/superset-ui-plugin-chart-word-cloud/test/transformProps.test.ts @@ -17,7 +17,7 @@ describe('WordCloud tranformProps', () => { formData, width: 800, height: 600, - payload: { + queryData: { data: [{ name: 'Hulk', sum__num: 1 }], }, }); diff --git a/packages/superset-ui-plugins-demo/storybook/shared/components/createQueryStory.tsx b/packages/superset-ui-plugins-demo/storybook/shared/components/createQueryStory.tsx index 6fd79efe6..7372b9c4d 100644 --- a/packages/superset-ui-plugins-demo/storybook/shared/components/createQueryStory.tsx +++ b/packages/superset-ui-plugins-demo/storybook/shared/components/createQueryStory.tsx @@ -55,7 +55,7 @@ export default function createQueryStory({ formData={payload.formData} // @TODO fix typing // all vis's now expect objects but api/v1/ returns an array - payload={ + queryData={ Array.isArray(payload.queryData) ? payload.queryData[0] : payload.queryData @@ -63,7 +63,7 @@ export default function createQueryStory({ />
- 
{JSON.stringify(payload, null, 2)}
+ 
{JSON.stringify(queryData, null, 2)}
 ); diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-calendar/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-calendar/Stories.tsx index fc3c17a9c..403d09ae5 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-calendar/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-calendar/Stories.tsx @@ -12,7 +12,7 @@ export default [ width={400} height={400} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ cellSize: 10, cellPadding: 2, diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-chord/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-chord/Stories.tsx index 7e552fda2..f7f0ed9d3 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-chord/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-chord/Stories.tsx @@ -10,7 +10,7 @@ export default [ chartType="chord" width={400} height={400} - payload={{ data }} + queryData={{ data }} formData={{ colorScheme: 'd3Category10', yAxisFormat: '.2f', diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-country-map/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-country-map/Stories.tsx index 12a7dda29..ce91dc392 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-country-map/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-country-map/Stories.tsx @@ -12,7 +12,7 @@ export default [ chartType="country-map" width={400} height={400} - payload={{ data }} + queryData={{ data }} formData={{ linearColorScheme: 'schemeRdYlBu', numberFormat: '.3s', diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-event-flow/Stories.jsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-event-flow/Stories.jsx index a6d89ce3e..f98eae0a5 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-event-flow/Stories.jsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-event-flow/Stories.jsx @@ -16,7 +16,7 @@ export default [ chartType="event-flow" width={400} height={400} - payload={{ data }} + queryData={{ data }} formData={{ allColumnsX: 'eventName', entity: 'userId', diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-force-directed/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-force-directed/Stories.tsx index 55a7bfd1f..50e013b5b 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-force-directed/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-force-directed/Stories.tsx @@ -6,7 +6,7 @@ import data from './data'; export default [ { renderStory: () => ( - + ), storyName: 'Basic', storyPath: 'legacy-|plugin-chart-force-directed|ForceDirectedChartPlugin', diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-heatmap/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-heatmap/Stories.tsx index b844f64cb..20d57680a 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-heatmap/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-heatmap/Stories.tsx @@ -29,7 +29,7 @@ export default [ yAxisFormat: '.3s', yscaleInterval: '1', }} - payload={{ + queryData={{ data: { records: data, extents: [0.1, 24.9], @@ -65,7 +65,7 @@ export default [ yAxisFormat: '.3s', yscaleInterval: '1', }} - payload={{ + queryData={{ data: { records: [ ...data, diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-histogram/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-histogram/Stories.tsx index e660d7f19..dca7a5ed6 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-histogram/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-histogram/Stories.tsx @@ -10,7 +10,7 @@ export default [ chartType="histogram" width={400} height={400} - payload={{ data }} + queryData={{ data }} formData={{ colorScheme: 'd3Category10', globalOpacity: 1, diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-horizon/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-horizon/Stories.tsx index f469c4c39..efedc32da 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-horizon/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-horizon/Stories.tsx @@ -10,7 +10,7 @@ export default [ chartType="horizon" width={400} height={400} - payload={{ data }} + queryData={{ data }} formData={{ horizonColorScale: 'series', seriesHeight: '25', diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-map-box/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-map-box/Stories.tsx index e9715a689..028481712 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-map-box/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-map-box/Stories.tsx @@ -10,7 +10,7 @@ export default [ chartType="map-box" width={400} height={400} - payload={{ data }} + queryData={{ data }} formData={{ allColumnsX: 'LON', allColumnsY: 'LAT', diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-markup/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-markup/Stories.tsx index af59f2af4..c1ad7c155 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-markup/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-markup/Stories.tsx @@ -8,7 +8,7 @@ export default [ chartType="markup" width={400} height={400} - payload={{ + queryData={{ data: { html: '
hello world
', diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-paired-t-test/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-paired-t-test/Stories.tsx index 42d1b3acb..ffc1b63a9 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-paired-t-test/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-paired-t-test/Stories.tsx @@ -10,7 +10,7 @@ export default [ chartType="paired-t-test" width={400} height={400} - payload={{ data }} + queryData={{ data }} formData={{ groupby: ['name'], liftvaluePrecision: 4, diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-parallel-coordinates/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-parallel-coordinates/Stories.tsx index fd94397cd..8b39a5c4e 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-parallel-coordinates/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-parallel-coordinates/Stories.tsx @@ -10,7 +10,7 @@ export default [ chartType="parallel-coordinates" width={400} height={400} - payload={{ data }} + queryData={{ data }} formData={{ includeSeries: false, linearColorScheme: 'schemeRdYlBu', diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-partition/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-partition/Stories.tsx index f6e234f57..bb951da3c 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-partition/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-partition/Stories.tsx @@ -12,7 +12,7 @@ export default [ width={400} height={400} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ colorScheme: 'd3Category10', dateTimeFormat: '%Y-%m-%d', diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-pivot-table/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-pivot-table/Stories.tsx index b98cef523..0c3ca2221 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-pivot-table/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-pivot-table/Stories.tsx @@ -18,7 +18,7 @@ export default [ width={400} height={400} datasource={datasource} - payload={{ + queryData={{ data: { columns: [['sum__num', 'other'], ['sum__num', 'All']], html: @@ -41,7 +41,7 @@ export default [ width={400} height={400} datasource={datasource} - payload={{ + queryData={{ data: { columns: [['sum__num', 'other'], ['sum__num', 'All']], html: diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-rose/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-rose/Stories.tsx index 0b3266ce8..47523ceeb 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-rose/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-rose/Stories.tsx @@ -10,7 +10,7 @@ export default [ chartType="rose" width={400} height={400} - payload={{ data }} + queryData={{ data }} formData={{ colorScheme: 'd3Category10', dateTimeFormat: '%Y-%m-%d', diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-sankey-loop/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-sankey-loop/Stories.tsx index 94c7e75fb..fd15f0879 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-sankey-loop/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-sankey-loop/Stories.tsx @@ -10,7 +10,7 @@ export default [ chartType="sankey-loop" width={400} height={400} - payload={{ data }} + queryData={{ data }} formData={{ colorScheme: 'd3Category10', }} diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-sankey/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-sankey/Stories.tsx index 087323216..72f5163ba 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-sankey/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-sankey/Stories.tsx @@ -10,7 +10,7 @@ export default [ chartType="sankey" width={400} height={400} - payload={{ data }} + queryData={{ data }} formData={{ colorScheme: 'd3Category10', }} diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-sunburst/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-sunburst/Stories.tsx index 019ff046b..d37e16010 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-sunburst/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-sunburst/Stories.tsx @@ -10,7 +10,7 @@ export default [ chartType="sunburst" width={400} height={400} - payload={{ data }} + queryData={{ data }} formData={{ colorScheme: 'd3Category10', metric: 'sum__SP_POP_TOTL', diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-table/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-table/Stories.tsx index dd569fdd6..6de26170c 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-table/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-table/Stories.tsx @@ -19,7 +19,7 @@ export default [ }, }} filters={{}} - payload={{ data }} + queryData={{ data }} formData={{ alignPn: false, colorPn: false, diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-treemap/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-treemap/Stories.tsx index 46b169d0b..680b77fb6 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-treemap/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-treemap/Stories.tsx @@ -10,7 +10,7 @@ export default [ chartType="treemap" width={400} height={400} - payload={{ data }} + queryData={{ data }} formData={{ colorScheme: 'd3Category10', numberFormat: '.3s', diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-word-cloud/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-word-cloud/Stories.tsx index 2f430bc70..d50b72e60 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-word-cloud/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-word-cloud/Stories.tsx @@ -10,7 +10,7 @@ export default [ chartType="word-cloud" width={400} height={400} - payload={{ data }} + queryData={{ data }} formData={{ colorScheme: 'd3Category10', metric: 'sum__num', diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-world-map/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-world-map/Stories.tsx index 154251b30..2b5f935df 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-world-map/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-world-map/Stories.tsx @@ -10,7 +10,7 @@ export default [ chartType="world-map" width={400} height={400} - payload={{ data }} + queryData={{ data }} formData={{ maxBubbleSize: '25', showBubbles: true, diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-big-number/BigNumber/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-big-number/BigNumber/Stories.tsx index ff9d89df5..dfe39bc31 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-big-number/BigNumber/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-big-number/BigNumber/Stories.tsx @@ -10,7 +10,7 @@ export default [ chartType="big-number" width={400} height={400} - payload={{ data }} + queryData={{ data }} formData={{ colorPicker: { r: 0, diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-big-number/BigNumberTotal/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-big-number/BigNumberTotal/Stories.tsx index cdd987590..86ecb67e9 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-big-number/BigNumberTotal/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-big-number/BigNumberTotal/Stories.tsx @@ -10,7 +10,7 @@ export default [ chartType="big-number-total" width={400} height={400} - payload={{ data }} + queryData={{ data }} formData={{ metric: 'sum__num', subheader: 'total female participants', diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Area/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Area/Stories.tsx index 86a7816a6..045a222a7 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Area/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Area/Stories.tsx @@ -13,7 +13,7 @@ export default [ datasource={dummyDatasource} width={400} height={400} - payload={{ data }} + queryData={{ data }} formData={{ bottomMargin: 'auto', colorScheme: 'd3Category10', @@ -47,7 +47,7 @@ export default [ datasource={dummyDatasource} width={400} height={400} - payload={{ data }} + queryData={{ data }} formData={{ bottomMargin: 'auto', colorCcheme: 'd3Category10', @@ -81,7 +81,7 @@ export default [ datasource={dummyDatasource} width={400} height={400} - payload={{ data }} + queryData={{ data }} formData={{ bottomMargin: 'auto', colorCcheme: 'd3Category10', @@ -115,7 +115,7 @@ export default [ datasource={dummyDatasource} width={400} height={400} - payload={{ data }} + queryData={{ data }} formData={{ bottomMargin: 'auto', colorCcheme: 'd3Category10', @@ -149,7 +149,7 @@ export default [ datasource={dummyDatasource} width={400} height={400} - payload={{ data }} + queryData={{ data }} formData={{ bottomMargin: 'auto', colorCcheme: 'd3Category10', diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Bar/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Bar/Stories.tsx index 4280da3c5..23f3d3319 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Bar/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Bar/Stories.tsx @@ -12,7 +12,7 @@ export default [ width={400} height={400} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ bottomMargin: 'auto', colorScheme: 'd3Category10', @@ -47,7 +47,7 @@ export default [ width={400} height={400} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ bottomMargin: 'auto', colorCcheme: 'd3Category10', @@ -82,7 +82,7 @@ export default [ width={400} height={400} datasource={dummyDatasource} - payload={{ + queryData={{ data: data.map((group, i) => ({ ...group, values: group.values.map(pair => ({ ...pair, y: (i % 2 === 0 ? 1 : -1) * pair.y })), @@ -122,7 +122,7 @@ export default [ width={400} height={400} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ barStacked: true, bottomMargin: 'auto', diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/BoxPlot/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/BoxPlot/Stories.tsx index f8c7fe433..cdf0b79ce 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/BoxPlot/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/BoxPlot/Stories.tsx @@ -12,7 +12,7 @@ export default [ width={400} height={400} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ colorScheme: 'd3Category10', vizType: 'box_plot', diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Bubble/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Bubble/Stories.tsx index 844f885b6..224334d23 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Bubble/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Bubble/Stories.tsx @@ -12,7 +12,7 @@ export default [ width={400} height={400} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ annotationData: {}, bottomMargin: 'auto', diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Bullet/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Bullet/Stories.tsx index 9107280d5..2a62f4a7c 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Bullet/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Bullet/Stories.tsx @@ -12,7 +12,7 @@ export default [ width={400} height={400} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ markerLabels: '', markerLineLabels: '', diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Compare/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Compare/Stories.tsx index 14bb4745e..06191f100 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Compare/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Compare/Stories.tsx @@ -12,7 +12,7 @@ export default [ width={400} height={400} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ bottomMargin: 'auto', colorScheme: 'd3Category10', diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/DistBar/ManyBarStories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/DistBar/ManyBarStories.tsx index 86400ad5c..9dc2a6d76 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/DistBar/ManyBarStories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/DistBar/ManyBarStories.tsx @@ -28,7 +28,7 @@ export default [ width={400} height={400} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ showBarValue: false, showLegend: true, diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/DistBar/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/DistBar/Stories.tsx index 4294bfe71..123aa6f2e 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/DistBar/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/DistBar/Stories.tsx @@ -12,7 +12,7 @@ export default [ width={400} height={400} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ barstacked: false, bottomMargin: 'auto', diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/DualLine/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/DualLine/Stories.tsx index 3d95d5f33..553b4317f 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/DualLine/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/DualLine/Stories.tsx @@ -17,7 +17,7 @@ export default [ width={400} height={400} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ colorScheme: 'd3Category10', vizType: 'dual_line', @@ -38,7 +38,7 @@ export default [ width={400} height={400} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ colorScheme: 'd3Category10', vizType: 'dual_line', @@ -52,7 +52,7 @@ export default [ width={400} height={400} datasource={dummyDatasource} - payload={{ data: reverseData }} + queryData={{ data: reverseData }} formData={{ colorScheme: 'd3Category10', vizType: 'dual_line', diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Line/LogStories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Line/LogStories.tsx index caaa965e3..3b5d3c371 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Line/LogStories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Line/LogStories.tsx @@ -12,7 +12,7 @@ export default [ width={400} height={400} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ richTooltip: true, vizType: 'line', diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Line/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Line/Stories.tsx index c35d20ece..371630f5a 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Line/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Line/Stories.tsx @@ -12,7 +12,7 @@ export default [ width={400} height={400} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ bottomMargin: 'auto', colorScheme: 'd3Category10', @@ -45,7 +45,7 @@ export default [ width={400} height={400} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ bottomMargin: 'auto', colorScheme: 'd3Category10', diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Line/YAxisStories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Line/YAxisStories.tsx index 40c905a32..2398de6eb 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Line/YAxisStories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Line/YAxisStories.tsx @@ -15,7 +15,7 @@ export default [ width={400} height={200} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ richTooltip: true, showLegend: false, @@ -28,7 +28,7 @@ export default [ width={400} height={200} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ richTooltip: true, showLegend: false, @@ -42,7 +42,7 @@ export default [ width={400} height={200} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ richTooltip: true, showLegend: false, @@ -56,7 +56,7 @@ export default [ width={400} height={200} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ richTooltip: true, showLegend: false, @@ -70,7 +70,7 @@ export default [ width={400} height={200} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ richTooltip: true, showLegend: true, diff --git a/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Pie/Stories.tsx b/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Pie/Stories.tsx index 76fb45a1d..9ed4cdaf2 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Pie/Stories.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Pie/Stories.tsx @@ -12,7 +12,7 @@ export default [ width={400} height={400} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ colorScheme: 'd3Category10', donut: false, diff --git a/packages/superset-ui-plugins-demo/storybook/stories/plugin-chart-table/Stories.jsx b/packages/superset-ui-plugins-demo/storybook/stories/plugin-chart-table/Stories.jsx index b1d0ad8ca..5024f190f 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/plugin-chart-table/Stories.jsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/plugin-chart-table/Stories.jsx @@ -29,7 +29,7 @@ export default [ tableTimestampFormat: '%Y-%m-%d %H:%M:%S', timeseriesLimitMetric: 'trend', }} - payload={{ data: dataLegacy }} + queryData={{ data: dataLegacy }} /> ), storyName: 'Legacy', @@ -59,7 +59,7 @@ export default [ tableTimestampFormat: '%Y-%m-%d %H:%M:%S', timeseriesLimitMetric: 'trend', }} - payload={{ data: dataLegacy }} + queryData={{ data: dataLegacy }} /> ), storyName: 'Legacy-TableFilter', @@ -89,7 +89,7 @@ export default [ tableTimestampFormat: '%Y-%m-%d %H:%M:%S', timeseriesLimitMetric: null, }} - payload={{ data }} + queryData={{ data }} /> ), storyName: 'TableFilter', diff --git a/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/stories/Basic.tsx b/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/stories/Basic.tsx index b5a95b5f8..27a18c8ec 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/stories/Basic.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/stories/Basic.tsx @@ -10,7 +10,7 @@ export default [ chartType="v2-box-plot" width={400} height={400} - payload={{ data }} + queryData={{ data }} formData={{ encoding: { x: { @@ -56,7 +56,7 @@ export default [ chartType="v2-box-plot" width={400} height={400} - payload={{ data }} + queryData={{ data }} formData={{ encoding: { y: { diff --git a/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/stories/Legacy.tsx b/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/stories/Legacy.tsx index df45d362b..32dde5415 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/stories/Legacy.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/stories/Legacy.tsx @@ -12,7 +12,7 @@ export default [ width={400} height={400} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ colorScheme: 'd3Category10', groupby: ['region'], diff --git a/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/basic.tsx b/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/basic.tsx index 3de6d7230..fdc5f3003 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/basic.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/basic.tsx @@ -58,7 +58,7 @@ export default [ }, }} height={400} - payload={{ data }} + queryData={{ data }} width={400} />, ], diff --git a/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/flush.tsx b/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/flush.tsx index 53ac45019..8696d6581 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/flush.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/flush.tsx @@ -19,7 +19,7 @@ export default [ width={400} height={200} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ encoding: { x: { @@ -73,7 +73,7 @@ export default [ width={400} height={200} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ encoding: { x: { diff --git a/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/legacy.tsx b/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/legacy.tsx index 00077f979..48aedcfa8 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/legacy.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/legacy.tsx @@ -14,7 +14,7 @@ export default [ width={400} height={400} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ bottomMargin: 'auto', colorScheme: 'd3Category10', @@ -42,7 +42,7 @@ export default [ width={400} height={400} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ bottomMargin: 'auto', colorScheme: 'd3Category10', diff --git a/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/missing.tsx b/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/missing.tsx index 08b2a9f3f..007b39f9d 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/missing.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/missing.tsx @@ -19,7 +19,7 @@ export default [ width={400} height={400} datasource={dummyDatasource} - payload={{ data: missingData }} + queryData={{ data: missingData }} formData={{ encoding: { x: { diff --git a/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/timeShift.tsx b/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/timeShift.tsx index 41a023267..e39f5eea9 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/timeShift.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/timeShift.tsx @@ -14,7 +14,7 @@ export default [ width={400} height={400} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ encoding: { x: { diff --git a/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/basic.jsx b/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/basic.jsx index cd85819b8..82cf0c69a 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/basic.jsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/basic.jsx @@ -15,7 +15,7 @@ export default [ width={400} height={400} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ encoding: { x: { diff --git a/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/bubble.jsx b/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/bubble.jsx index 02c4f5a62..021af637e 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/bubble.jsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/bubble.jsx @@ -15,7 +15,7 @@ export default [ width={400} height={400} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ encoding: { x: { diff --git a/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/legacy.tsx b/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/legacy.tsx index 747c04605..5b53beeca 100644 --- a/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/legacy.tsx +++ b/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/legacy.tsx @@ -14,7 +14,7 @@ export default [ width={400} height={400} datasource={dummyDatasource} - payload={{ data }} + queryData={{ data }} formData={{ annotationData: {}, bottomMargin: 'auto', From c033c9258416a77135a285f8894d3a3fa4f9adf6 Mon Sep 17 00:00:00 2001 From: Krist Wongsuphasawat Date: Sat, 24 Aug 2019 22:05:03 -0700 Subject: [PATCH 04/10] fix: rename hooks --- .../src/transformProps.js | 5 ++++- .../src/transformProps.js | 6 ++++-- .../src/transformProps.js | 15 +++++---------- .../src/legacy/transformProps.ts | 9 +++++++-- .../src/transformProps.ts | 9 +++++++-- .../shared/components/createQueryStory.tsx | 2 +- 6 files changed, 28 insertions(+), 18 deletions(-) diff --git a/packages/superset-ui-legacy-plugin-chart-map-box/src/transformProps.js b/packages/superset-ui-legacy-plugin-chart-map-box/src/transformProps.js index 6226ae69d..173f37446 100644 --- a/packages/superset-ui-legacy-plugin-chart-map-box/src/transformProps.js +++ b/packages/superset-ui-legacy-plugin-chart-map-box/src/transformProps.js @@ -20,8 +20,11 @@ import supercluster from 'supercluster'; import { DEFAULT_POINT_RADIUS, DEFAULT_MAX_ZOOM } from './MapBox'; +function NOOP() {} + export default function transformProps(chartProps) { - const { width, height, formData, onError, queryData, setControlValue = () => {} } = chartProps; + const { width, height, formData, hooks, queryData } = chartProps; + const { onError = NOOP, setControlValue = NOOP } = hooks; const { bounds, geoJSON, hasCustomMetric, mapboxApiKey } = queryData.data; const { clusteringRadius, diff --git a/packages/superset-ui-legacy-plugin-chart-table/src/transformProps.js b/packages/superset-ui-legacy-plugin-chart-table/src/transformProps.js index 495663f44..7f3b9448f 100644 --- a/packages/superset-ui-legacy-plugin-chart-table/src/transformProps.js +++ b/packages/superset-ui-legacy-plugin-chart-table/src/transformProps.js @@ -18,7 +18,9 @@ */ /* eslint-disable sort-keys */ export default function transformProps(chartProps) { - const { height, datasource, filters, formData, onAddFilter, queryData } = chartProps; + const { height, datasource, initialValues, formData, hooks, queryData } = chartProps; + const { onAddFilter = () => {} } = hooks; + const { alignPn, colorPn, @@ -59,7 +61,7 @@ export default function transformProps(chartProps) { alignPositiveNegative: alignPn, colorPositiveNegative: colorPn, columns: processedColumns, - filters, + filters: initialValues, includeSearch, metrics, onAddFilter, diff --git a/packages/superset-ui-legacy-preset-chart-nvd3/src/transformProps.js b/packages/superset-ui-legacy-preset-chart-nvd3/src/transformProps.js index 75df12f8f..7a0c2359b 100644 --- a/packages/superset-ui-legacy-preset-chart-nvd3/src/transformProps.js +++ b/packages/superset-ui-legacy-preset-chart-nvd3/src/transformProps.js @@ -20,17 +20,12 @@ import isTruthy from './utils/isTruthy'; import { formatLabel } from './utils'; +function NOOP() {} + export default function transformProps(chartProps) { - const { - width, - height, - annotationData, - datasource, - formData, - onError, - onAddFilter, - queryData, - } = chartProps; + const { width, height, annotationData, datasource, formData, hooks, queryData } = chartProps; + + const { onAddFilter = NOOP, onError = NOOP } = hooks; const { annotationLayers, diff --git a/packages/superset-ui-plugin-chart-table/src/legacy/transformProps.ts b/packages/superset-ui-plugin-chart-table/src/legacy/transformProps.ts index b1ed502d5..89340ad0e 100644 --- a/packages/superset-ui-plugin-chart-table/src/legacy/transformProps.ts +++ b/packages/superset-ui-plugin-chart-table/src/legacy/transformProps.ts @@ -23,8 +23,13 @@ import processColumns from '../processColumns'; import processMetrics from '../processMetrics'; import processData from '../processData'; +function NOOP() {} + export default function transformProps(chartProps: ChartProps) { - const { height, datasource, filters, formData, onAddFilter, queryData } = chartProps; + const { height, datasource, initialValues, formData, hooks, queryData } = chartProps; + + const { onAddFilter = NOOP } = hooks; + const { alignPn, colorPn, @@ -66,7 +71,7 @@ export default function transformProps(chartProps: ChartProps) { alignPositiveNegative: alignPn, colorPositiveNegative: colorPn, columns: processedColumns, - filters, + filters: initialValues, includeSearch, onAddFilter, orderDesc, diff --git a/packages/superset-ui-plugin-chart-table/src/transformProps.ts b/packages/superset-ui-plugin-chart-table/src/transformProps.ts index 56bceeb03..0deb4de9b 100644 --- a/packages/superset-ui-plugin-chart-table/src/transformProps.ts +++ b/packages/superset-ui-plugin-chart-table/src/transformProps.ts @@ -82,8 +82,13 @@ function transformData(data: PlainObject[], formData: PlainObject) { }; } +function NOOP() {} + export default function transformProps(chartProps: ChartProps) { - const { height, datasource, filters, formData, onAddFilter, queryData } = chartProps; + const { height, datasource, initialValues, formData, hooks, queryData } = chartProps; + + const { onAddFilter = NOOP } = hooks; + const { alignPn, colorPn, @@ -124,7 +129,7 @@ export default function transformProps(chartProps: ChartProps) { colorPositiveNegative: colorPn, columns: processedColumns, data: processedData, - filters, + filters: initialValues, height, includeSearch, onAddFilter, diff --git a/packages/superset-ui-plugins-demo/storybook/shared/components/createQueryStory.tsx b/packages/superset-ui-plugins-demo/storybook/shared/components/createQueryStory.tsx index 7372b9c4d..eb2bdccf8 100644 --- a/packages/superset-ui-plugins-demo/storybook/shared/components/createQueryStory.tsx +++ b/packages/superset-ui-plugins-demo/storybook/shared/components/createQueryStory.tsx @@ -63,7 +63,7 @@ export default function createQueryStory({ />
- 
{JSON.stringify(queryData, null, 2)}
+ 
{JSON.stringify(payload, null, 2)}
 ); From 91cb366152769425754fe0e858714866eb6261a1 Mon Sep 17 00:00:00 2001 From: Krist Wongsuphasawat Date: Sat, 24 Aug 2019 22:13:35 -0700 Subject: [PATCH 05/10] fix: types from query package --- packages/superset-ui-plugin-chart-table/package.json | 1 + .../src/TableFormData.ts | 6 +++--- .../superset-ui-plugin-chart-table/src/buildQuery.ts | 10 +++++++--- .../src/transformProps.ts | 5 +++-- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/packages/superset-ui-plugin-chart-table/package.json b/packages/superset-ui-plugin-chart-table/package.json index eaeee79ea..6c01f2222 100644 --- a/packages/superset-ui-plugin-chart-table/package.json +++ b/packages/superset-ui-plugin-chart-table/package.json @@ -32,6 +32,7 @@ "peerDependencies": { "@superset-ui/chart": "^0.12.0", "@superset-ui/number-format": "^0.12.0", + "@superset-ui/query": "^0.12.0", "@superset-ui/time-format": "^0.12.0", "@superset-ui/translation": "^0.12.0", "react": "^16.8.6" diff --git a/packages/superset-ui-plugin-chart-table/src/TableFormData.ts b/packages/superset-ui-plugin-chart-table/src/TableFormData.ts index 0c981a90d..611e34d09 100644 --- a/packages/superset-ui-plugin-chart-table/src/TableFormData.ts +++ b/packages/superset-ui-plugin-chart-table/src/TableFormData.ts @@ -1,9 +1,9 @@ /* eslint-disable camelcase */ -import { ChartFormData, ChartFormDataMetric } from '@superset-ui/chart'; +import { QueryFormData, QueryFormDataMetric } from '@superset-ui/query'; -type TableFormData = ChartFormData & { +type TableFormData = QueryFormData & { all_columns: string[]; - percent_metrics: ChartFormDataMetric[]; + percent_metrics: QueryFormDataMetric[]; include_time: boolean; order_by_cols: string[]; }; diff --git a/packages/superset-ui-plugin-chart-table/src/buildQuery.ts b/packages/superset-ui-plugin-chart-table/src/buildQuery.ts index 385a836fd..f3b5daea7 100644 --- a/packages/superset-ui-plugin-chart-table/src/buildQuery.ts +++ b/packages/superset-ui-plugin-chart-table/src/buildQuery.ts @@ -1,5 +1,9 @@ -import { buildQueryContext, ChartFormDataMetric, QueryObjectMetric } from '@superset-ui/chart'; -import convertMetric from '@superset-ui/chart/lib/query/convertMetric'; +import { + buildQueryContext, + convertMetric, + QueryFormDataMetric, + QueryObjectMetric, +} from '@superset-ui/query'; import TableFormData from './TableFormData'; export default function buildQuery(formData: TableFormData) { @@ -14,7 +18,7 @@ export default function buildQuery(formData: TableFormData) { columns = [...formData.all_columns]; const orderByColumns = formData.order_by_cols || []; orderByColumns.forEach(columnOrder => { - const parsedColumnOrder: [ChartFormDataMetric, boolean] = JSON.parse(columnOrder); + const parsedColumnOrder: [QueryFormDataMetric, boolean] = JSON.parse(columnOrder); orderby.push([convertMetric(parsedColumnOrder[0]), parsedColumnOrder[1]]); }); groupby = []; diff --git a/packages/superset-ui-plugin-chart-table/src/transformProps.ts b/packages/superset-ui-plugin-chart-table/src/transformProps.ts index 0deb4de9b..813d32aaa 100644 --- a/packages/superset-ui-plugin-chart-table/src/transformProps.ts +++ b/packages/superset-ui-plugin-chart-table/src/transformProps.ts @@ -17,7 +17,8 @@ * under the License. */ -import { ChartProps, ChartFormDataMetric, AdhocMetric } from '@superset-ui/chart'; +import { ChartProps } from '@superset-ui/chart'; +import { QueryFormDataMetric, AdhocMetric } from '@superset-ui/query'; import processColumns from './processColumns'; import processMetrics from './processMetrics'; import processData from './processData'; @@ -44,7 +45,7 @@ function transformData(data: PlainObject[], formData: PlainObject) { // handle percentage columns. const percentMetrics: string[] = (formData.percentMetrics || []).map( - (metric: ChartFormDataMetric) => (metric as AdhocMetric).label || (metric as string), + (metric: QueryFormDataMetric) => (metric as AdhocMetric).label || (metric as string), ); if (percentMetrics.length > 0) { From 88f95b1c1b45f327779dfdc980c00d2c6e70e1d8 Mon Sep 17 00:00:00 2001 From: Krist Wongsuphasawat Date: Sat, 24 Aug 2019 22:26:34 -0700 Subject: [PATCH 06/10] fix: more typings --- packages/superset-ui-plugin-chart-table/src/processData.ts | 4 ++-- .../superset-ui-plugin-chart-table/src/processMetrics.ts | 6 +++--- packages/superset-ui-plugin-chart-word-cloud/package.json | 1 + .../src/WordCloudFormData.ts | 4 ++-- .../superset-ui-preset-chart-xy/src/Line/ChartFormData.ts | 4 ++-- packages/superset-ui-preset-chart-xy/src/Line/buildQuery.ts | 2 +- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/packages/superset-ui-plugin-chart-table/src/processData.ts b/packages/superset-ui-plugin-chart-table/src/processData.ts index a102c6263..8c0a29589 100644 --- a/packages/superset-ui-plugin-chart-table/src/processData.ts +++ b/packages/superset-ui-plugin-chart-table/src/processData.ts @@ -1,4 +1,4 @@ -import { ChartFormDataMetric, AdhocMetric } from '@superset-ui/chart'; +import { QueryFormDataMetric, AdhocMetric } from '@superset-ui/query'; import { PlainObject } from './types'; export default function processData({ @@ -7,7 +7,7 @@ export default function processData({ records, metrics, }: { - timeseriesLimitMetric: ChartFormDataMetric; + timeseriesLimitMetric: QueryFormDataMetric; orderDesc: boolean; records: PlainObject[]; metrics: string[]; diff --git a/packages/superset-ui-plugin-chart-table/src/processMetrics.ts b/packages/superset-ui-plugin-chart-table/src/processMetrics.ts index 52fa73c58..91f7be2f4 100644 --- a/packages/superset-ui-plugin-chart-table/src/processMetrics.ts +++ b/packages/superset-ui-plugin-chart-table/src/processMetrics.ts @@ -1,4 +1,4 @@ -import { ChartFormDataMetric, AdhocMetric } from '@superset-ui/chart'; +import { QueryFormDataMetric, AdhocMetric } from '@superset-ui/query'; import { PlainObject } from './types'; export default function processMetrics({ @@ -6,8 +6,8 @@ export default function processMetrics({ percentMetrics, records, }: { - metrics: ChartFormDataMetric[]; - percentMetrics: ChartFormDataMetric[]; + metrics: QueryFormDataMetric[]; + percentMetrics: QueryFormDataMetric[]; records: PlainObject[]; }) { const processedMetrics = (metrics || []).map(m => (m as AdhocMetric).label || (m as string)); diff --git a/packages/superset-ui-plugin-chart-word-cloud/package.json b/packages/superset-ui-plugin-chart-word-cloud/package.json index bdbba2f99..13dcb5521 100644 --- a/packages/superset-ui-plugin-chart-word-cloud/package.json +++ b/packages/superset-ui-plugin-chart-word-cloud/package.json @@ -41,6 +41,7 @@ "peerDependencies": { "@superset-ui/chart": "^0.12.0", "@superset-ui/color": "^0.12.0", + "@superset-ui/query": "^0.12.0", "@superset-ui/translation": "^0.12.0" } } diff --git a/packages/superset-ui-plugin-chart-word-cloud/src/WordCloudFormData.ts b/packages/superset-ui-plugin-chart-word-cloud/src/WordCloudFormData.ts index ac2c5ddb9..b3b34bd95 100644 --- a/packages/superset-ui-plugin-chart-word-cloud/src/WordCloudFormData.ts +++ b/packages/superset-ui-plugin-chart-word-cloud/src/WordCloudFormData.ts @@ -1,8 +1,8 @@ -import { ChartFormData } from '@superset-ui/chart'; +import { QueryFormData } from '@superset-ui/query'; // FormData for wordcloud contains both common properties of all form data // and properties specific to wordcloud vizzes -type WordCloudFormData = ChartFormData & { +type WordCloudFormData = QueryFormData & { series: string; }; diff --git a/packages/superset-ui-preset-chart-xy/src/Line/ChartFormData.ts b/packages/superset-ui-preset-chart-xy/src/Line/ChartFormData.ts index 7292a9064..7d8f799f6 100644 --- a/packages/superset-ui-preset-chart-xy/src/Line/ChartFormData.ts +++ b/packages/superset-ui-preset-chart-xy/src/Line/ChartFormData.ts @@ -1,6 +1,6 @@ -import { ChartFormData } from '@superset-ui/chart'; +import { QueryFormData } from '@superset-ui/query'; import { FormDataProps } from './Line'; -type CombinedFormData = ChartFormData & FormDataProps; +type CombinedFormData = QueryFormData & FormDataProps; export default CombinedFormData; diff --git a/packages/superset-ui-preset-chart-xy/src/Line/buildQuery.ts b/packages/superset-ui-preset-chart-xy/src/Line/buildQuery.ts index d7bc98d22..748c1fb81 100644 --- a/packages/superset-ui-preset-chart-xy/src/Line/buildQuery.ts +++ b/packages/superset-ui-preset-chart-xy/src/Line/buildQuery.ts @@ -1,4 +1,4 @@ -import { buildQueryContext } from '@superset-ui/chart'; +import { buildQueryContext } from '@superset-ui/query'; import ChartFormData from './ChartFormData'; import Encoder from './Encoder'; From 7b458be255673083c0578555f48d3d5afea91120 Mon Sep 17 00:00:00 2001 From: Krist Wongsuphasawat Date: Sat, 24 Aug 2019 22:29:03 -0700 Subject: [PATCH 07/10] docs: update readme --- .../README.md | 12 +++++------- .../superset-ui-legacy-plugin-chart-chord/README.md | 12 +++++------- .../README.md | 12 +++++------- .../README.md | 12 +++++------- .../README.md | 12 +++++------- .../README.md | 12 +++++------- .../README.md | 12 +++++------- .../README.md | 12 +++++------- .../superset-ui-legacy-plugin-chart-iframe/README.md | 12 +++++------- .../README.md | 12 +++++------- .../superset-ui-legacy-plugin-chart-markup/README.md | 12 +++++------- .../README.md | 12 +++++------- .../README.md | 12 +++++------- .../README.md | 12 +++++------- .../README.md | 12 +++++------- .../superset-ui-legacy-plugin-chart-rose/README.md | 12 +++++------- .../README.md | 12 +++++------- .../superset-ui-legacy-plugin-chart-sankey/README.md | 12 +++++------- .../README.md | 12 +++++------- .../superset-ui-legacy-plugin-chart-table/README.md | 12 +++++------- .../README.md | 12 +++++------- .../README.md | 12 +++++------- .../README.md | 12 +++++------- .../README.md | 12 +++++------- .../superset-ui-legacy-preset-chart-nvd3/README.md | 12 +++++------- .../superset-ui-plugin-chart-icicle-event/README.md | 12 +++++------- packages/superset-ui-plugin-chart-table/README.md | 12 +++++------- .../superset-ui-plugin-chart-word-cloud/README.md | 12 +++++------- packages/superset-ui-preset-chart-xy/README.md | 12 +++++------- 29 files changed, 145 insertions(+), 203 deletions(-) diff --git a/packages/superset-ui-legacy-plugin-chart-calendar/README.md b/packages/superset-ui-legacy-plugin-chart-calendar/README.md index 51f0fc3b9..76f165730 100644 --- a/packages/superset-ui-legacy-plugin-chart-calendar/README.md +++ b/packages/superset-ui-legacy-plugin-chart-calendar/README.md @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ ```js ``` \ No newline at end of file diff --git a/packages/superset-ui-legacy-plugin-chart-chord/README.md b/packages/superset-ui-legacy-plugin-chart-chord/README.md index 0aaaf0879..eb257a396 100644 --- a/packages/superset-ui-legacy-plugin-chart-chord/README.md +++ b/packages/superset-ui-legacy-plugin-chart-chord/README.md @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ ```js ``` \ No newline at end of file diff --git a/packages/superset-ui-legacy-plugin-chart-country-map/README.md b/packages/superset-ui-legacy-plugin-chart-country-map/README.md index 8a8f0fbed..fe1c70fa0 100644 --- a/packages/superset-ui-legacy-plugin-chart-country-map/README.md +++ b/packages/superset-ui-legacy-plugin-chart-country-map/README.md @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ ```js ``` \ No newline at end of file diff --git a/packages/superset-ui-legacy-plugin-chart-event-flow/README.md b/packages/superset-ui-legacy-plugin-chart-event-flow/README.md index 7c57a717a..a2d7dd628 100644 --- a/packages/superset-ui-legacy-plugin-chart-event-flow/README.md +++ b/packages/superset-ui-legacy-plugin-chart-event-flow/README.md @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ ```js ``` \ No newline at end of file diff --git a/packages/superset-ui-legacy-plugin-chart-force-directed/README.md b/packages/superset-ui-legacy-plugin-chart-force-directed/README.md index 4b712ddc7..c7f490e5a 100644 --- a/packages/superset-ui-legacy-plugin-chart-force-directed/README.md +++ b/packages/superset-ui-legacy-plugin-chart-force-directed/README.md @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ ```js ``` \ No newline at end of file diff --git a/packages/superset-ui-legacy-plugin-chart-heatmap/README.md b/packages/superset-ui-legacy-plugin-chart-heatmap/README.md index 331f8d32f..4351ddca1 100644 --- a/packages/superset-ui-legacy-plugin-chart-heatmap/README.md +++ b/packages/superset-ui-legacy-plugin-chart-heatmap/README.md @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ ```js ``` \ No newline at end of file diff --git a/packages/superset-ui-legacy-plugin-chart-histogram/README.md b/packages/superset-ui-legacy-plugin-chart-histogram/README.md index 7adaa1a75..fe0ec6890 100644 --- a/packages/superset-ui-legacy-plugin-chart-histogram/README.md +++ b/packages/superset-ui-legacy-plugin-chart-histogram/README.md @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ ```js ``` \ No newline at end of file diff --git a/packages/superset-ui-legacy-plugin-chart-horizon/README.md b/packages/superset-ui-legacy-plugin-chart-horizon/README.md index f3b6ee6a5..378dc8217 100644 --- a/packages/superset-ui-legacy-plugin-chart-horizon/README.md +++ b/packages/superset-ui-legacy-plugin-chart-horizon/README.md @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ ```js ``` \ No newline at end of file diff --git a/packages/superset-ui-legacy-plugin-chart-iframe/README.md b/packages/superset-ui-legacy-plugin-chart-iframe/README.md index 25823f12a..ab760db22 100644 --- a/packages/superset-ui-legacy-plugin-chart-iframe/README.md +++ b/packages/superset-ui-legacy-plugin-chart-iframe/README.md @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ ```js ``` \ No newline at end of file diff --git a/packages/superset-ui-legacy-plugin-chart-map-box/README.md b/packages/superset-ui-legacy-plugin-chart-map-box/README.md index c778d7e13..bc5623d4c 100644 --- a/packages/superset-ui-legacy-plugin-chart-map-box/README.md +++ b/packages/superset-ui-legacy-plugin-chart-map-box/README.md @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ ```js ``` \ No newline at end of file diff --git a/packages/superset-ui-legacy-plugin-chart-markup/README.md b/packages/superset-ui-legacy-plugin-chart-markup/README.md index 041150f03..f3d386d6e 100644 --- a/packages/superset-ui-legacy-plugin-chart-markup/README.md +++ b/packages/superset-ui-legacy-plugin-chart-markup/README.md @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ ```js ``` \ No newline at end of file diff --git a/packages/superset-ui-legacy-plugin-chart-paired-t-test/README.md b/packages/superset-ui-legacy-plugin-chart-paired-t-test/README.md index 3d002cd17..a46526e43 100644 --- a/packages/superset-ui-legacy-plugin-chart-paired-t-test/README.md +++ b/packages/superset-ui-legacy-plugin-chart-paired-t-test/README.md @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ ```js ``` \ No newline at end of file diff --git a/packages/superset-ui-legacy-plugin-chart-parallel-coordinates/README.md b/packages/superset-ui-legacy-plugin-chart-parallel-coordinates/README.md index adcef114c..e1996fdfd 100644 --- a/packages/superset-ui-legacy-plugin-chart-parallel-coordinates/README.md +++ b/packages/superset-ui-legacy-plugin-chart-parallel-coordinates/README.md @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ ```js ``` \ No newline at end of file diff --git a/packages/superset-ui-legacy-plugin-chart-partition/README.md b/packages/superset-ui-legacy-plugin-chart-partition/README.md index 4f5beb759..b3b3eaf64 100644 --- a/packages/superset-ui-legacy-plugin-chart-partition/README.md +++ b/packages/superset-ui-legacy-plugin-chart-partition/README.md @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ ```js ``` \ No newline at end of file diff --git a/packages/superset-ui-legacy-plugin-chart-pivot-table/README.md b/packages/superset-ui-legacy-plugin-chart-pivot-table/README.md index 3bea32e54..74a3dee93 100644 --- a/packages/superset-ui-legacy-plugin-chart-pivot-table/README.md +++ b/packages/superset-ui-legacy-plugin-chart-pivot-table/README.md @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ ```js ``` \ No newline at end of file diff --git a/packages/superset-ui-legacy-plugin-chart-rose/README.md b/packages/superset-ui-legacy-plugin-chart-rose/README.md index 373574f19..d257b08b2 100644 --- a/packages/superset-ui-legacy-plugin-chart-rose/README.md +++ b/packages/superset-ui-legacy-plugin-chart-rose/README.md @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ ```js ``` \ No newline at end of file diff --git a/packages/superset-ui-legacy-plugin-chart-sankey-loop/README.md b/packages/superset-ui-legacy-plugin-chart-sankey-loop/README.md index c84bbaeae..93336902d 100644 --- a/packages/superset-ui-legacy-plugin-chart-sankey-loop/README.md +++ b/packages/superset-ui-legacy-plugin-chart-sankey-loop/README.md @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ ```js ``` diff --git a/packages/superset-ui-legacy-plugin-chart-sankey/README.md b/packages/superset-ui-legacy-plugin-chart-sankey/README.md index e1217f451..2410585e7 100644 --- a/packages/superset-ui-legacy-plugin-chart-sankey/README.md +++ b/packages/superset-ui-legacy-plugin-chart-sankey/README.md @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ ```js ``` \ No newline at end of file diff --git a/packages/superset-ui-legacy-plugin-chart-sunburst/README.md b/packages/superset-ui-legacy-plugin-chart-sunburst/README.md index 20396330b..b87b0f819 100644 --- a/packages/superset-ui-legacy-plugin-chart-sunburst/README.md +++ b/packages/superset-ui-legacy-plugin-chart-sunburst/README.md @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ ```js ``` \ No newline at end of file diff --git a/packages/superset-ui-legacy-plugin-chart-table/README.md b/packages/superset-ui-legacy-plugin-chart-table/README.md index 937c0278a..ec598ffb1 100644 --- a/packages/superset-ui-legacy-plugin-chart-table/README.md +++ b/packages/superset-ui-legacy-plugin-chart-table/README.md @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ ```js ``` \ No newline at end of file diff --git a/packages/superset-ui-legacy-plugin-chart-treemap/README.md b/packages/superset-ui-legacy-plugin-chart-treemap/README.md index 6333120fc..628e6d5e4 100644 --- a/packages/superset-ui-legacy-plugin-chart-treemap/README.md +++ b/packages/superset-ui-legacy-plugin-chart-treemap/README.md @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ ```js ``` \ No newline at end of file diff --git a/packages/superset-ui-legacy-plugin-chart-word-cloud/README.md b/packages/superset-ui-legacy-plugin-chart-word-cloud/README.md index d04a17615..0571fb907 100644 --- a/packages/superset-ui-legacy-plugin-chart-word-cloud/README.md +++ b/packages/superset-ui-legacy-plugin-chart-word-cloud/README.md @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ ```js ``` \ No newline at end of file diff --git a/packages/superset-ui-legacy-plugin-chart-world-map/README.md b/packages/superset-ui-legacy-plugin-chart-world-map/README.md index 84b932885..8e0788c38 100644 --- a/packages/superset-ui-legacy-plugin-chart-world-map/README.md +++ b/packages/superset-ui-legacy-plugin-chart-world-map/README.md @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ ```js ``` \ No newline at end of file diff --git a/packages/superset-ui-legacy-preset-chart-big-number/README.md b/packages/superset-ui-legacy-preset-chart-big-number/README.md index f60f1f8da..af87e0ff6 100644 --- a/packages/superset-ui-legacy-preset-chart-big-number/README.md +++ b/packages/superset-ui-legacy-preset-chart-big-number/README.md @@ -33,13 +33,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ ```js ``` \ No newline at end of file diff --git a/packages/superset-ui-legacy-preset-chart-nvd3/README.md b/packages/superset-ui-legacy-preset-chart-nvd3/README.md index 3a4e75fe1..2a0096579 100644 --- a/packages/superset-ui-legacy-preset-chart-nvd3/README.md +++ b/packages/superset-ui-legacy-preset-chart-nvd3/README.md @@ -33,13 +33,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ ```js ``` \ No newline at end of file diff --git a/packages/superset-ui-plugin-chart-icicle-event/README.md b/packages/superset-ui-plugin-chart-icicle-event/README.md index 2df4d6a7a..aadae660d 100644 --- a/packages/superset-ui-plugin-chart-icicle-event/README.md +++ b/packages/superset-ui-plugin-chart-icicle-event/README.md @@ -23,13 +23,11 @@ Then use it via `SuperChart`. A link to Storybook for the Icicle Event Chart wil ```js ``` diff --git a/packages/superset-ui-plugin-chart-table/README.md b/packages/superset-ui-plugin-chart-table/README.md index 81d0f36f8..47abb8fee 100644 --- a/packages/superset-ui-plugin-chart-table/README.md +++ b/packages/superset-ui-plugin-chart-table/README.md @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ ```js ``` \ No newline at end of file diff --git a/packages/superset-ui-plugin-chart-word-cloud/README.md b/packages/superset-ui-plugin-chart-word-cloud/README.md index 567e47d1e..68a51b190 100644 --- a/packages/superset-ui-plugin-chart-word-cloud/README.md +++ b/packages/superset-ui-plugin-chart-word-cloud/README.md @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ ```js ``` \ No newline at end of file diff --git a/packages/superset-ui-preset-chart-xy/README.md b/packages/superset-ui-preset-chart-xy/README.md index f3e039ccb..2b593ec6a 100644 --- a/packages/superset-ui-preset-chart-xy/README.md +++ b/packages/superset-ui-preset-chart-xy/README.md @@ -24,13 +24,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/ ```js ``` \ No newline at end of file From 9b64a42a79408095d74414cdd51d5533ac0bcc64 Mon Sep 17 00:00:00 2001 From: Krist Wongsuphasawat Date: Sat, 24 Aug 2019 22:34:31 -0700 Subject: [PATCH 08/10] fix: import query --- packages/superset-ui-plugin-chart-word-cloud/src/buildQuery.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/superset-ui-plugin-chart-word-cloud/src/buildQuery.ts b/packages/superset-ui-plugin-chart-word-cloud/src/buildQuery.ts index bf3e0fba0..04e034beb 100644 --- a/packages/superset-ui-plugin-chart-word-cloud/src/buildQuery.ts +++ b/packages/superset-ui-plugin-chart-word-cloud/src/buildQuery.ts @@ -1,4 +1,4 @@ -import { buildQueryContext } from '@superset-ui/chart'; +import { buildQueryContext } from '@superset-ui/query'; import WordCloudFormData from './WordCloudFormData'; export default function buildQuery(formData: WordCloudFormData) { From 9b2f7def95b848ff119465a4fd06694081481f44 Mon Sep 17 00:00:00 2001 From: Krist Wongsuphasawat Date: Mon, 26 Aug 2019 11:13:05 -0700 Subject: [PATCH 09/10] fix: change NOOP to const --- .../src/transformProps.js | 2 +- packages/superset-ui-legacy-plugin-chart-table/src/Table.js | 2 +- .../superset-ui-legacy-preset-chart-nvd3/src/transformProps.js | 2 +- packages/superset-ui-plugin-chart-table/src/Table.tsx | 2 +- .../superset-ui-plugin-chart-table/src/legacy/transformProps.ts | 2 +- packages/superset-ui-plugin-chart-table/src/transformProps.ts | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/superset-ui-legacy-plugin-chart-map-box/src/transformProps.js b/packages/superset-ui-legacy-plugin-chart-map-box/src/transformProps.js index 173f37446..95eab00ab 100644 --- a/packages/superset-ui-legacy-plugin-chart-map-box/src/transformProps.js +++ b/packages/superset-ui-legacy-plugin-chart-map-box/src/transformProps.js @@ -20,7 +20,7 @@ import supercluster from 'supercluster'; import { DEFAULT_POINT_RADIUS, DEFAULT_MAX_ZOOM } from './MapBox'; -function NOOP() {} +const NOOP = () => {}; export default function transformProps(chartProps) { const { width, height, formData, hooks, queryData } = chartProps; diff --git a/packages/superset-ui-legacy-plugin-chart-table/src/Table.js b/packages/superset-ui-legacy-plugin-chart-table/src/Table.js index 99f0a600c..141e17050 100644 --- a/packages/superset-ui-legacy-plugin-chart-table/src/Table.js +++ b/packages/superset-ui-legacy-plugin-chart-table/src/Table.js @@ -62,7 +62,7 @@ const propTypes = { const formatValue = getNumberFormatter(NumberFormats.INTEGER); const formatPercent = getNumberFormatter(NumberFormats.PERCENT_3_POINT); -function NOOP() {} +const NOOP = () => {}; function TableVis(element, props) { const { diff --git a/packages/superset-ui-legacy-preset-chart-nvd3/src/transformProps.js b/packages/superset-ui-legacy-preset-chart-nvd3/src/transformProps.js index 7a0c2359b..983388849 100644 --- a/packages/superset-ui-legacy-preset-chart-nvd3/src/transformProps.js +++ b/packages/superset-ui-legacy-preset-chart-nvd3/src/transformProps.js @@ -20,7 +20,7 @@ import isTruthy from './utils/isTruthy'; import { formatLabel } from './utils'; -function NOOP() {} +const NOOP = () => {}; export default function transformProps(chartProps) { const { width, height, annotationData, datasource, formData, hooks, queryData } = chartProps; diff --git a/packages/superset-ui-plugin-chart-table/src/Table.tsx b/packages/superset-ui-plugin-chart-table/src/Table.tsx index bfe577d91..f9d12fb8e 100644 --- a/packages/superset-ui-plugin-chart-table/src/Table.tsx +++ b/packages/superset-ui-plugin-chart-table/src/Table.tsx @@ -21,7 +21,7 @@ type Props = { tableFilter: boolean; }; -function NOOP(_key: string, _value: number[]) {} +const NOOP = () => {}; const defaultProps = { alignPositiveNegative: false, diff --git a/packages/superset-ui-plugin-chart-table/src/legacy/transformProps.ts b/packages/superset-ui-plugin-chart-table/src/legacy/transformProps.ts index 89340ad0e..7ef2b3930 100644 --- a/packages/superset-ui-plugin-chart-table/src/legacy/transformProps.ts +++ b/packages/superset-ui-plugin-chart-table/src/legacy/transformProps.ts @@ -23,7 +23,7 @@ import processColumns from '../processColumns'; import processMetrics from '../processMetrics'; import processData from '../processData'; -function NOOP() {} +const NOOP = () => {}; export default function transformProps(chartProps: ChartProps) { const { height, datasource, initialValues, formData, hooks, queryData } = chartProps; diff --git a/packages/superset-ui-plugin-chart-table/src/transformProps.ts b/packages/superset-ui-plugin-chart-table/src/transformProps.ts index 813d32aaa..191a5d5cb 100644 --- a/packages/superset-ui-plugin-chart-table/src/transformProps.ts +++ b/packages/superset-ui-plugin-chart-table/src/transformProps.ts @@ -83,7 +83,7 @@ function transformData(data: PlainObject[], formData: PlainObject) { }; } -function NOOP() {} +const NOOP = () => {}; export default function transformProps(chartProps: ChartProps) { const { height, datasource, initialValues, formData, hooks, queryData } = chartProps; From 29c098e80d4dbc13a30ef4a4381bf8290e2f44da Mon Sep 17 00:00:00 2001 From: Krist Wongsuphasawat Date: Mon, 26 Aug 2019 11:17:00 -0700 Subject: [PATCH 10/10] fix: update dependency versions --- package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 81cfc6b26..f10175b43 100644 --- a/package.json +++ b/package.json @@ -41,15 +41,15 @@ "devDependencies": { "@superset-ui/build-config": "^0.1.0", "@superset-ui/commit-config": "^0.0.9", - "@superset-ui/chart": "^0.12.0", - "@superset-ui/chart-composition": "^0.12.0", - "@superset-ui/color": "^0.12.0", + "@superset-ui/chart": "^0.12.1", + "@superset-ui/chart-composition": "^0.12.1", + "@superset-ui/color": "^0.12.1", "@superset-ui/connection": "^0.12.0", "@superset-ui/core": "^0.12.0", "@superset-ui/dimension": "^0.12.0", - "@superset-ui/number-format": "^0.12.0", - "@superset-ui/query": "^0.12.0", - "@superset-ui/time-format":"^0.12.0", + "@superset-ui/number-format": "^0.12.1", + "@superset-ui/query": "^0.12.2", + "@superset-ui/time-format": "^0.12.1", "@superset-ui/translation": "^0.12.0", "@types/react": "^16.8.8", "core-js": "^3.0.1",