diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/package.json
index 841e99cbc987..f10175b43448 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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.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.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",
"csstype": "^2.6.3",
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-calendar/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-calendar/README.md
index ac2e349ede77..76f165730edf 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-calendar/README.md
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-calendar/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-calendar/package.json
index 85f8e0fc298b..5171dcfb875f 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-calendar/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-calendar/src/transformProps.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-calendar/src/transformProps.js
index 2f91e6899f42..c5d7ec54de0c 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-calendar/src/transformProps.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-chord/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-chord/README.md
index cefd92d594fb..eb257a39669b 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-chord/README.md
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-chord/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-chord/package.json
index 95bdc17e9044..f0afef938799 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-chord/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-chord/src/transformProps.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-chord/src/transformProps.js
index 7418fa8ca6f2..ad2bf54520d0 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-chord/src/transformProps.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-country-map/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-country-map/README.md
index 0b795c1343da..fe1c70fa0ff6 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-country-map/README.md
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-country-map/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-country-map/package.json
index cafc79677232..076b2be9641c 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-country-map/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-country-map/src/transformProps.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-country-map/src/transformProps.js
index 1bb553529f30..5499e90e374e 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-country-map/src/transformProps.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-event-flow/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-event-flow/README.md
index 3b6fc9a3282c..a2d7dd6284d2 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-event-flow/README.md
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-event-flow/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-event-flow/package.json
index 515743f4163f..23adaedeef35 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-event-flow/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-event-flow/src/transformProps.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-event-flow/src/transformProps.js
index 9eebad10c0c3..d0fe07135805 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-event-flow/src/transformProps.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-force-directed/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-force-directed/README.md
index e113e84b8eb9..c7f490e5a058 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-force-directed/README.md
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-force-directed/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-force-directed/package.json
index db1284797ea2..9b3e359c1984 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-force-directed/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-force-directed/src/transformProps.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-force-directed/src/transformProps.js
index 4f11b64e92b3..fe47f0188c11 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-force-directed/src/transformProps.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-heatmap/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-heatmap/README.md
index 498542106856..4351ddca18c1 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-heatmap/README.md
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-heatmap/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-heatmap/package.json
index 94c1abf79734..2a082624bc4b 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-heatmap/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-heatmap/src/transformProps.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-heatmap/src/transformProps.js
index 7cb963c66803..35df6e0b27f1 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-heatmap/src/transformProps.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-histogram/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-histogram/README.md
index efd09db2a7e7..fe0ec68909fe 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-histogram/README.md
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-histogram/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-histogram/package.json
index a6eccb08b650..9fcbcd75028b 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-histogram/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-histogram/src/transformProps.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-histogram/src/transformProps.js
index 5c92cc318e6a..c80df5d373c9 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-histogram/src/transformProps.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-horizon/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-horizon/README.md
index fc46e372d21d..378dc8217264 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-horizon/README.md
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-horizon/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-horizon/package.json
index 4e2c9045947c..1b283fb17bcb 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-horizon/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-horizon/src/transformProps.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-horizon/src/transformProps.js
index a26b7757b986..cb6cb06bf14a 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-horizon/src/transformProps.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-iframe/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-iframe/README.md
index 500beef4c140..ab760db22b71 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-iframe/README.md
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-iframe/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-iframe/package.json
index 5ed508f27787..f6a89a288771 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-iframe/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-map-box/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-map-box/README.md
index 7a4986c3107f..bc5623d4c060 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-map-box/README.md
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-map-box/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-map-box/package.json
index ddea0ee62cfb..582628533018 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-map-box/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-map-box/src/transformProps.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-map-box/src/transformProps.js
index 3a78fd8537f1..95eab00ab49f 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-map-box/src/transformProps.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-map-box/src/transformProps.js
@@ -20,9 +20,12 @@
import supercluster from 'supercluster';
import { DEFAULT_POINT_RADIUS, DEFAULT_MAX_ZOOM } from './MapBox';
+const NOOP = () => {};
+
export default function transformProps(chartProps) {
- const { width, height, formData, onError, payload, setControlValue = () => {} } = chartProps;
- const { bounds, geoJSON, hasCustomMetric, mapboxApiKey } = payload.data;
+ const { width, height, formData, hooks, queryData } = chartProps;
+ const { onError = NOOP, setControlValue = NOOP } = hooks;
+ const { bounds, geoJSON, hasCustomMetric, mapboxApiKey } = queryData.data;
const {
clusteringRadius,
globalOpacity,
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-markup/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-markup/README.md
index 0b087e74cc19..f3d386d6e969 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-markup/README.md
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-markup/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-markup/package.json
index 948d597933a0..39f49d4190f9 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-markup/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-markup/src/transformProps.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-markup/src/transformProps.js
index f21efa8c3820..324b02ebbaae 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-markup/src/transformProps.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-paired-t-test/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-paired-t-test/README.md
index 8a4d16cdbf20..a46526e43128 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-paired-t-test/README.md
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-paired-t-test/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-paired-t-test/package.json
index 9018357b8378..1ef2b2f16a59 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-paired-t-test/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-paired-t-test/src/transformProps.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-paired-t-test/src/transformProps.js
index a1b50d3f4626..748540a4e6a7 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-paired-t-test/src/transformProps.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-parallel-coordinates/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-parallel-coordinates/README.md
index 7823c9faa4b0..e1996fdfd919 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-parallel-coordinates/README.md
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-parallel-coordinates/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-parallel-coordinates/package.json
index c7dfcc4a5074..95a13d2d57fd 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-parallel-coordinates/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-parallel-coordinates/src/transformProps.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-parallel-coordinates/src/transformProps.js
index 7c8ddbd072e1..14d710f95f88 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-parallel-coordinates/src/transformProps.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-partition/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-partition/README.md
index da2bd577414f..b3b3eaf64c3b 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-partition/README.md
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-partition/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-partition/package.json
index 5399d96b5d7f..96f4b158adad 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-partition/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-partition/src/transformProps.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-partition/src/transformProps.js
index a07f49476762..ecdfc731eaa1 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-partition/src/transformProps.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-pivot-table/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-pivot-table/README.md
index e3a5b27dc007..74a3dee933c5 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-pivot-table/README.md
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-pivot-table/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-pivot-table/package.json
index 7ffb5ca9ceb2..7af895339860 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-pivot-table/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-pivot-table/src/PivotTable.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-pivot-table/src/PivotTable.js
index f2a445793b04..90b15beaac17 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-pivot-table/src/PivotTable.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-pivot-table/src/transformProps.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-pivot-table/src/transformProps.js
index 0e8fa95772bd..8da786a55b80 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-pivot-table/src/transformProps.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-rose/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-rose/README.md
index f9cc103a7ddf..d257b08b28c6 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-rose/README.md
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-rose/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-rose/package.json
index ca17750ccb25..1aa786217d5d 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-rose/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-rose/src/transformProps.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-rose/src/transformProps.js
index 44ef77cc98a8..4f862f2e0c53 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-rose/src/transformProps.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-sankey-loop/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-sankey-loop/README.md
index 03f881ecb85c..93336902dffc 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-sankey-loop/README.md
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-sankey-loop/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-sankey-loop/package.json
index ba911535483b..12f1438d73eb 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-sankey-loop/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-sankey-loop/src/transformProps.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-sankey-loop/src/transformProps.js
index 8de5cb9f8d7c..8b46b7e87a1b 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-sankey-loop/src/transformProps.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-sankey/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-sankey/README.md
index 02ae971dd955..2410585e7dda 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-sankey/README.md
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-sankey/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-sankey/package.json
index e64b47cbd2d5..7d8c5abf2af8 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-sankey/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-sankey/src/transformProps.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-sankey/src/transformProps.js
index e3cff6d370c3..fb367d1d6b0b 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-sankey/src/transformProps.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-sunburst/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-sunburst/README.md
index 0a6c1148a8f1..b87b0f81937e 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-sunburst/README.md
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-sunburst/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-sunburst/package.json
index 882e65b21cb8..83532521c3a9 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-sunburst/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-sunburst/src/transformProps.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-sunburst/src/transformProps.js
index 510c8e45bfe0..63c8ca0d1ded 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-sunburst/src/transformProps.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-table/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-table/README.md
index b4ab505b4d9b..ec598ffb1ad8 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-table/README.md
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-table/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-table/package.json
index 5b588634d404..772dd378a3c4 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-table/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-table/src/Table.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-table/src/Table.js
index 99f0a600c352..141e17050a32 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-table/src/Table.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-table/src/transformProps.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-table/src/transformProps.js
index 437f8d85f805..7f3b9448f8ee 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-table/src/transformProps.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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, payload } = chartProps;
+ const { height, datasource, initialValues, formData, hooks, queryData } = chartProps;
+ const { onAddFilter = () => {} } = hooks;
+
const {
alignPn,
colorPn,
@@ -32,7 +34,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];
@@ -59,7 +61,7 @@ export default function transformProps(chartProps) {
alignPositiveNegative: alignPn,
colorPositiveNegative: colorPn,
columns: processedColumns,
- filters,
+ filters: initialValues,
includeSearch,
metrics,
onAddFilter,
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-treemap/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-treemap/README.md
index c002cfdf725e..628e6d5e4969 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-treemap/README.md
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-treemap/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-treemap/package.json
index b457e278eef4..7170b70ec87e 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-treemap/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-treemap/src/transformProps.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-treemap/src/transformProps.js
index aa5172d774a4..1b29b754f763 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-treemap/src/transformProps.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-word-cloud/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-word-cloud/README.md
index e3f9b3edb6b7..0571fb907794 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-word-cloud/README.md
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-word-cloud/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-word-cloud/package.json
index 064f67903103..1f1a2775c8ad 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-word-cloud/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-word-cloud/src/transformProps.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-word-cloud/src/transformProps.js
index 4a52bdd06851..1254f160258e 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-word-cloud/src/transformProps.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-world-map/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-world-map/README.md
index 492b2f6c7199..8e0788c38f8b 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-world-map/README.md
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-world-map/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-world-map/package.json
index bfe97c9dd75d..ba2ecf4d0cec 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-world-map/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-world-map/src/transformProps.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-world-map/src/transformProps.js
index aa55b9013bbe..39a16b57b0b3 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-world-map/src/transformProps.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-preset-chart-big-number/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-preset-chart-big-number/README.md
index 93309104bd86..af87e0ff6836 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-preset-chart-big-number/README.md
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-preset-chart-big-number/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-preset-chart-big-number/package.json
index c861c0adfed5..ef2d830c0031 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-preset-chart-big-number/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-preset-chart-big-number/src/BigNumber/transformProps.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-preset-chart-big-number/src/BigNumber/transformProps.js
index b576fcbb17b6..4b5547ef02dc 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-preset-chart-big-number/src/BigNumber/transformProps.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-preset-chart-nvd3/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-preset-chart-nvd3/README.md
index 557bec8ecb1f..2a009657924e 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-preset-chart-nvd3/README.md
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-preset-chart-nvd3/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-preset-chart-nvd3/package.json
index def9b82c0168..5d81c701c12d 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-preset-chart-nvd3/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-preset-chart-nvd3/src/LineMulti/LineMulti.jsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-preset-chart-nvd3/src/LineMulti/LineMulti.jsx
index 14d6bdcc82a2..189882be6591 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-preset-chart-nvd3/src/LineMulti/LineMulti.jsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-preset-chart-nvd3/src/transformProps.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-preset-chart-nvd3/src/transformProps.js
index 94c157b1446b..983388849976 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-preset-chart-nvd3/src/transformProps.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-preset-chart-nvd3/src/transformProps.js
@@ -20,17 +20,12 @@
import isTruthy from './utils/isTruthy';
import { formatLabel } from './utils';
+const NOOP = () => {};
+
export default function transformProps(chartProps) {
- const {
- width,
- height,
- annotationData,
- datasource,
- formData,
- onError,
- onAddFilter,
- payload,
- } = chartProps;
+ const { width, height, annotationData, datasource, formData, hooks, queryData } = chartProps;
+
+ const { onAddFilter = NOOP, onError = NOOP } = hooks;
const {
annotationLayers,
@@ -76,7 +71,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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-icicle-event/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-icicle-event/README.md
index fcddb4f3aa65..aadae660dd8d 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-icicle-event/README.md
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-icicle-event/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-icicle-event/package.json
index b059673c1362..c595f797734f 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-icicle-event/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-icicle-event/src/transformProps.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-icicle-event/src/transformProps.ts
index 9f05f61b7bdc..b283929c5448 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-icicle-event/src/transformProps.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/README.md
index 533068e1d247..47abb8fee789 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/README.md
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/package.json
index 45f365b8e236..6c01f22222c8 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/package.json
@@ -30,10 +30,11 @@
"@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/query": "^0.12.0",
+ "@superset-ui/time-format": "^0.12.0",
+ "@superset-ui/translation": "^0.12.0",
"react": "^16.8.6"
}
}
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/src/Table.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/src/Table.tsx
index bfe577d91000..f9d12fb8e85b 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/src/Table.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/src/TableFormData.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/src/TableFormData.ts
index 0c981a90d7aa..611e34d09134 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/src/TableFormData.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/src/buildQuery.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/src/buildQuery.ts
index 385a836fdab9..f3b5daea7092 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/src/buildQuery.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/src/legacy/transformProps.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/src/legacy/transformProps.ts
index 3ee0d7c6d1a1..7ef2b3930d0e 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/src/legacy/transformProps.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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';
+const NOOP = () => {};
+
export default function transformProps(chartProps: ChartProps) {
- const { height, datasource, filters, formData, onAddFilter, payload } = chartProps;
+ const { height, datasource, initialValues, formData, hooks, queryData } = chartProps;
+
+ const { onAddFilter = NOOP } = hooks;
+
const {
alignPn,
colorPn,
@@ -37,7 +42,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,
@@ -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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/src/processData.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/src/processData.ts
index a102c626303a..8c0a29589699 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/src/processData.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/src/processMetrics.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/src/processMetrics.ts
index 52fa73c58771..91f7be2f4d89 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/src/processMetrics.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/src/transformProps.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/src/transformProps.ts
index 2fb2faa50fc3..191a5d5cb348 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/src/transformProps.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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) {
@@ -82,8 +83,13 @@ function transformData(data: PlainObject[], formData: PlainObject) {
};
}
+const NOOP = () => {};
+
export default function transformProps(chartProps: ChartProps) {
- const { height, datasource, filters, formData, onAddFilter, payload } = chartProps;
+ const { height, datasource, initialValues, formData, hooks, queryData } = chartProps;
+
+ const { onAddFilter = NOOP } = hooks;
+
const {
alignPn,
colorPn,
@@ -96,7 +102,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,
@@ -124,7 +130,7 @@ export default function transformProps(chartProps: ChartProps) {
colorPositiveNegative: colorPn,
columns: processedColumns,
data: processedData,
- filters,
+ filters: initialValues,
height,
includeSearch,
onAddFilter,
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-word-cloud/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-word-cloud/README.md
index bb3dbbc9fddf..68a51b190b63 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-word-cloud/README.md
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-word-cloud/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-word-cloud/package.json
index 516ef034edc5..13dcb552168b 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-word-cloud/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-word-cloud/package.json
@@ -39,8 +39,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/query": "^0.12.0",
+ "@superset-ui/translation": "^0.12.0"
}
}
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-word-cloud/src/WordCloudFormData.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-word-cloud/src/WordCloudFormData.ts
index ac2c5ddb9d96..b3b34bd95615 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-word-cloud/src/WordCloudFormData.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-word-cloud/src/buildQuery.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-word-cloud/src/buildQuery.ts
index bf3e0fba09fa..04e034beb1fd 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-word-cloud/src/buildQuery.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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) {
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-word-cloud/src/transformProps.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-word-cloud/src/transformProps.ts
index 0186322cd4a2..930b4972eb18 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-word-cloud/src/transformProps.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-word-cloud/test/transformProps.test.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-word-cloud/test/transformProps.test.ts
index 2e953ef90207..22483a7be200 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-word-cloud/test/transformProps.test.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/package.json
index f82d669ede9d..37e4ad245d55 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/shared/components/createQueryStory.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/shared/components/createQueryStory.tsx
index 6fd79efe69b4..eb2bdccf84b2 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/shared/components/createQueryStory.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-calendar/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-calendar/Stories.tsx
index fc3c17a9c9dc..403d09ae5dc6 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-calendar/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-chord/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-chord/Stories.tsx
index 7e552fda266f..f7f0ed9d382f 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-chord/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-country-map/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-country-map/Stories.tsx
index 12a7dda29309..ce91dc3926ff 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-country-map/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-event-flow/Stories.jsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-event-flow/Stories.jsx
index a6d89ce3ea29..f98eae0a5cd6 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-event-flow/Stories.jsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-force-directed/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-force-directed/Stories.tsx
index 55a7bfd1ff24..50e013b5b06f 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-force-directed/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-heatmap/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-heatmap/Stories.tsx
index b844f64cbbc3..20d57680a81c 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-heatmap/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-histogram/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-histogram/Stories.tsx
index e660d7f1903e..dca7a5ed69cf 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-histogram/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-horizon/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-horizon/Stories.tsx
index f469c4c3927c..efedc32da825 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-horizon/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-map-box/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-map-box/Stories.tsx
index e9715a689871..028481712f21 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-map-box/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-markup/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-markup/Stories.tsx
index af59f2af4a30..c1ad7c155c3f 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-markup/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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![](https://avatars3.githubusercontent.com/u/42724554?s=200&v=4)
',
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-paired-t-test/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-paired-t-test/Stories.tsx
index 42d1b3acbc59..ffc1b63a9e36 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-paired-t-test/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-parallel-coordinates/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-parallel-coordinates/Stories.tsx
index fd94397cd6eb..8b39a5c4e127 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-parallel-coordinates/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-partition/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-partition/Stories.tsx
index f6e234f5735c..bb951da3c13b 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-partition/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-pivot-table/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-pivot-table/Stories.tsx
index b98cef523ba8..0c3ca2221319 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-pivot-table/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-rose/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-rose/Stories.tsx
index 0b3266ce8da3..47523ceebb47 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-rose/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-sankey-loop/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-sankey-loop/Stories.tsx
index 94c7e75fb0f3..fd15f0879b00 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-sankey-loop/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-sankey/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-sankey/Stories.tsx
index 0873232167ed..72f5163ba185 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-sankey/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-sunburst/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-sunburst/Stories.tsx
index 019ff046bc7a..d37e160102f1 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-sunburst/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-table/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-table/Stories.tsx
index dd569fdd6780..6de26170ce8b 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-table/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-treemap/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-treemap/Stories.tsx
index 46b169d0b3e0..680b77fb63cb 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-treemap/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-word-cloud/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-word-cloud/Stories.tsx
index 2f430bc70b0e..d50b72e600d6 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-word-cloud/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-world-map/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-world-map/Stories.tsx
index 154251b30c1c..2b5f935df140 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-world-map/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-big-number/BigNumber/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-big-number/BigNumber/Stories.tsx
index ff9d89df536f..dfe39bc31a45 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-big-number/BigNumber/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-big-number/BigNumberTotal/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-big-number/BigNumberTotal/Stories.tsx
index cdd987590358..86ecb67e9bcc 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-big-number/BigNumberTotal/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Area/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Area/Stories.tsx
index 86a7816a64c4..045a222a7d90 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Area/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Bar/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Bar/Stories.tsx
index 4280da3c5e90..23f3d3319fb0 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Bar/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/BoxPlot/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/BoxPlot/Stories.tsx
index f8c7fe43318b..cdf0b79ce8d1 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/BoxPlot/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Bubble/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Bubble/Stories.tsx
index 844f885b6fb1..224334d230ae 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Bubble/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Bullet/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Bullet/Stories.tsx
index 9107280d5d81..2a62f4a7c3f1 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Bullet/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Compare/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Compare/Stories.tsx
index 14bb4745e8a2..06191f100eed 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Compare/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/DistBar/ManyBarStories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/DistBar/ManyBarStories.tsx
index 86400ad5c3d3..9dc2a6d76b56 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/DistBar/ManyBarStories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/DistBar/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/DistBar/Stories.tsx
index 4294bfe71efd..123aa6f2e363 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/DistBar/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/DualLine/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/DualLine/Stories.tsx
index 3d95d5f33108..553b4317fca3 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/DualLine/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Line/LogStories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Line/LogStories.tsx
index caaa965e3b4b..3b5d3c3711fa 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Line/LogStories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Line/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Line/Stories.tsx
index c35d20eceb00..371630f5a766 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Line/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Line/YAxisStories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Line/YAxisStories.tsx
index 40c905a32546..2398de6eb3df 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Line/YAxisStories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Pie/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Pie/Stories.tsx
index 76fb45a1d570..9ed4cdaf27e4 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-nvd3/Pie/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/plugin-chart-table/Stories.jsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/plugin-chart-table/Stories.jsx
index b1d0ad8ca128..5024f190f130 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/plugin-chart-table/Stories.jsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/stories/Basic.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/stories/Basic.tsx
index b5a95b5f82df..27a18c8ec276 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/stories/Basic.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/stories/Legacy.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/stories/Legacy.tsx
index df45d362b667..32dde5415cd7 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/stories/Legacy.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/basic.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/basic.tsx
index 3de6d7230662..fdc5f3003e24 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/basic.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/flush.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/flush.tsx
index 53ac450191ac..8696d65815a9 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/flush.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/legacy.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/legacy.tsx
index 00077f979010..48aedcfa8f78 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/legacy.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/missing.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/missing.tsx
index 08b2a9f3f173..007b39f9de47 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/missing.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/timeShift.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/timeShift.tsx
index 41a023267d1b..e39f5eea9fe8 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/timeShift.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/basic.jsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/basic.jsx
index cd85819b826a..82cf0c69a62c 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/basic.jsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/bubble.jsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/bubble.jsx
index 02c4f5a62456..021af637e7cf 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/bubble.jsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/legacy.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/legacy.tsx
index 747c046057e0..5b53beeca62f 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/legacy.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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',
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/README.md
index 3b15b180c811..2b593ec6ace5 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/README.md
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/package.json
index 3641fe7625e6..7b23091b6536 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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"
}
}
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/legacy/transformProps.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/legacy/transformProps.ts
index 183230c94639..9129803d056c 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/legacy/transformProps.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/transformProps.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/transformProps.ts
index b6e13daeb961..a1bfad9d4eef 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/transformProps.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/ChartFormData.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/ChartFormData.ts
index 7292a90647db..7d8f799f607f 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/ChartFormData.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/buildQuery.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/buildQuery.ts
index d7bc98d22d89..748c1fb8119f 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/buildQuery.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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';
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/legacy/transformProps.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/legacy/transformProps.ts
index 512657c11fd5..eb8b0807f9c5 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/legacy/transformProps.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/transformProps.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/transformProps.ts
index 2bfa62dacfcc..4d447246864e 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/transformProps.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/ScatterPlot/legacy/transformProps.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/ScatterPlot/legacy/transformProps.ts
index a580bd4aadd7..588718ab277c 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/ScatterPlot/legacy/transformProps.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/ScatterPlot/transformProps.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/ScatterPlot/transformProps.ts
index 6eddb093889f..90bf16a3fc0c 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/ScatterPlot/transformProps.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/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)[] = [