Skip to content
This repository was archived by the owner on Jun 25, 2020. It is now read-only.

feat: upgrade @superset-ui to v0.12 #183

Merged
kristw merged 10 commits into from
Aug 26, 2019
Merged

feat: upgrade @superset-ui to v0.12 #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bb39ee7
build: update dependencies
kristw Aug 25, 2019
e01eb42
feat: replace payload with queryData
kristw Aug 25, 2019
aa95356
feat: replace payload with queryData
kristw Aug 25, 2019
c033c92
fix: rename hooks
kristw Aug 25, 2019
91cb366
fix: types from query package
kristw Aug 25, 2019
88f95b1
fix: more typings
kristw Aug 25, 2019
7b458be
docs: update readme
kristw Aug 25, 2019
9b64a42
fix: import query
kristw Aug 25, 2019
9b2f7de
fix: change NOOP to const
kristw Aug 26, 2019
29c098e
fix: update dependency versions
kristw Aug 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
12 changes: 5 additions & 7 deletions packages/superset-ui-legacy-plugin-chart-calendar/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/
```js
<SuperChart
chartType="calendar"
chartProps={{
width: 600,
height: 600,
formData: {...},
payload: {
data: {...},
},
width={600}
height={600}
formData={...}
queryData={{
data: {...},
}}
/>
```
10 changes: 5 additions & 5 deletions packages/superset-ui-legacy-plugin-chart-calendar/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
4 changes: 2 additions & 2 deletions packages/superset-ui-legacy-plugin-chart-calendar/src/transformProps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -36,7 +36,7 @@ export default function transformProps(chartProps) {

return {
height,
data: payload.data,
data: queryData.data,
cellPadding,
cellRadius,
cellSize,
Expand Down
12 changes: 5 additions & 7 deletions packages/superset-ui-legacy-plugin-chart-chord/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/
```js
<SuperChart
chartType="chord"
chartProps={{
width: 600,
height: 600,
formData: {...},
payload: {
data: {...},
},
width={600}
height={600}
formData={...}
queryData={{
data: {...},
}}
/>
```
8 changes: 4 additions & 4 deletions packages/superset-ui-legacy-plugin-chart-chord/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
4 changes: 2 additions & 2 deletions packages/superset-ui-legacy-plugin-chart-chord/src/transformProps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
12 changes: 5 additions & 7 deletions packages/superset-ui-legacy-plugin-chart-country-map/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/
```js
<SuperChart
chartType="country-map"
chartProps={{
width: 600,
height: 600,
formData: {...},
payload: {
data: {...},
},
width={600}
height={600}
formData={...}
queryData={{
data: {...},
}}
/>
```
8 changes: 4 additions & 4 deletions packages/superset-ui-legacy-plugin-chart-country-map/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
4 changes: 2 additions & 2 deletions packages/superset-ui-legacy-plugin-chart-country-map/src/transformProps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
12 changes: 5 additions & 7 deletions packages/superset-ui-legacy-plugin-chart-event-flow/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/
```js
<SuperChart
chartType="event-flow"
chartProps={{
width: 600,
height: 600,
formData: {...},
payload: {
data: {...},
},
width={600}
height={600}
formData={...}
queryData={{
data: {...},
}}
/>
```
4 changes: 2 additions & 2 deletions packages/superset-ui-legacy-plugin-chart-event-flow/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
4 changes: 2 additions & 2 deletions packages/superset-ui-legacy-plugin-chart-event-flow/src/transformProps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
12 changes: 5 additions & 7 deletions packages/superset-ui-legacy-plugin-chart-force-directed/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/
```js
<SuperChart
chartType="force-directed"
chartProps={{
width: 600,
height: 600,
formData: {...},
payload: {
data: {...},
},
width={600}
height={600}
formData={...}
queryData={{
data: {...},
}}
/>
```
4 changes: 2 additions & 2 deletions packages/superset-ui-legacy-plugin-chart-force-directed/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
4 changes: 2 additions & 2 deletions packages/superset-ui-legacy-plugin-chart-force-directed/src/transformProps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
12 changes: 5 additions & 7 deletions packages/superset-ui-legacy-plugin-chart-heatmap/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/
```js
<SuperChart
chartType="heatmap"
chartProps={{
width: 600,
height: 600,
formData: {...},
payload: {
data: {...},
},
width={600}
height={600}
formData={...}
queryData={{
data: {...},
}}
/>
```
8 changes: 4 additions & 4 deletions packages/superset-ui-legacy-plugin-chart-heatmap/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
4 changes: 2 additions & 2 deletions packages/superset-ui-legacy-plugin-chart-heatmap/src/transformProps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -42,7 +42,7 @@ export default function transformProps(chartProps) {
return {
width,
height,
data: payload.data,
data: queryData.data,
bottomMargin,
canvasImageRendering,
colorScheme: linearColorScheme,
Expand Down
12 changes: 5 additions & 7 deletions packages/superset-ui-legacy-plugin-chart-histogram/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/
```js
<SuperChart
chartType="histogram"
chartProps={{
width: 600,
height: 600,
formData: {...},
payload: {
data: {...},
},
width={600}
height={600}
formData={...}
queryData={{
data: {...},
}}
/>
```
6 changes: 3 additions & 3 deletions packages/superset-ui-legacy-plugin-chart-histogram/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
4 changes: 2 additions & 2 deletions packages/superset-ui-legacy-plugin-chart-histogram/src/transformProps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
12 changes: 5 additions & 7 deletions packages/superset-ui-legacy-plugin-chart-horizon/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/
```js
<SuperChart
chartType="horizon"
chartProps={{
width: 600,
height: 600,
formData: {...},
payload: {
data: {...},
},
width={600}
height={600}
formData={...}
queryData={{
data: {...},
}}
/>
```
4 changes: 2 additions & 2 deletions packages/superset-ui-legacy-plugin-chart-horizon/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Loading