Skip to content

feat: bump superset-ui dependencies to v0.12 and plugins to v0.11 #8115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kristw merged 6 commits into from
Aug 27, 2019
Merged

feat: bump superset-ui dependencies to v0.12 and plugins to v0.11 #8115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8f84405
feat: bump superset-ui dependencies to v0.12 and plugins to v0.11
kristw Aug 26, 2019
845d633
fix: update transformProps
kristw Aug 26, 2019
f2b5d46
fix: update hooks
kristw Aug 26, 2019
1e56df2
fix: pin lunar version
kristw Aug 26, 2019
efa17bc
fix: lint
kristw Aug 26, 2019
5abe936
fix: revert table
kristw Aug 27, 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
1,142 changes: 482 additions & 660 deletions superset/assets/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

71 changes: 36 additions & 35 deletions superset/assets/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,41 +47,42 @@
"homepage": "https://superset.apache.org/",
"dependencies": {
"@data-ui/sparkline": "^0.0.54",
"@superset-ui/chart": "^0.11.14",
"@superset-ui/chart-composition": "^0.11.14",
"@superset-ui/color": "^0.11.9",
"@superset-ui/connection": "^0.11.14",
"@superset-ui/core": "^0.11.10",
"@superset-ui/dimension": "^0.11.15",
"@superset-ui/legacy-plugin-chart-calendar": "^0.10.11",
"@superset-ui/legacy-plugin-chart-chord": "^0.10.11",
"@superset-ui/legacy-plugin-chart-country-map": "^0.10.11",
"@superset-ui/legacy-plugin-chart-event-flow": "^0.10.11",
"@superset-ui/legacy-plugin-chart-force-directed": "^0.10.11",
"@superset-ui/legacy-plugin-chart-heatmap": "^0.10.34",
"@superset-ui/legacy-plugin-chart-histogram": "^0.10.11",
"@superset-ui/legacy-plugin-chart-horizon": "^0.10.11",
"@superset-ui/legacy-plugin-chart-iframe": "^0.10.11",
"@superset-ui/legacy-plugin-chart-map-box": "^0.10.11",
"@superset-ui/legacy-plugin-chart-markup": "^0.10.11",
"@superset-ui/legacy-plugin-chart-paired-t-test": "^0.10.11",
"@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.10.11",
"@superset-ui/legacy-plugin-chart-partition": "^0.10.11",
"@superset-ui/legacy-plugin-chart-pivot-table": "^0.10.11",
"@superset-ui/legacy-plugin-chart-rose": "^0.10.11",
"@superset-ui/legacy-plugin-chart-sankey": "^0.10.11",
"@superset-ui/legacy-plugin-chart-sunburst": "^0.10.11",
"@superset-ui/legacy-plugin-chart-table": "^0.10.11",
"@superset-ui/legacy-plugin-chart-treemap": "^0.10.11",
"@superset-ui/legacy-plugin-chart-word-cloud": "^0.10.11",
"@superset-ui/legacy-plugin-chart-world-map": "^0.10.11",
"@superset-ui/legacy-preset-chart-big-number": "^0.10.11",
"@superset-ui/legacy-preset-chart-nvd3": "^0.10.39",
"@superset-ui/number-format": "^0.11.14",
"@superset-ui/plugin-chart-table": "^0.10.46",
"@superset-ui/preset-chart-xy": "^0.10.43",
"@superset-ui/time-format": "^0.11.14",
"@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/legacy-plugin-chart-calendar": "^0.11.0",
"@superset-ui/legacy-plugin-chart-chord": "^0.11.0",
"@superset-ui/legacy-plugin-chart-country-map": "^0.11.0",
"@superset-ui/legacy-plugin-chart-event-flow": "^0.11.0",
"@superset-ui/legacy-plugin-chart-force-directed": "^0.11.0",
"@superset-ui/legacy-plugin-chart-heatmap": "^0.11.0",
"@superset-ui/legacy-plugin-chart-histogram": "^0.11.0",
"@superset-ui/legacy-plugin-chart-horizon": "^0.11.0",
"@superset-ui/legacy-plugin-chart-iframe": "^0.11.0",
"@superset-ui/legacy-plugin-chart-map-box": "^0.11.0",
"@superset-ui/legacy-plugin-chart-markup": "^0.11.0",
"@superset-ui/legacy-plugin-chart-paired-t-test": "^0.11.0",
"@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.11.0",
"@superset-ui/legacy-plugin-chart-partition": "^0.11.0",
"@superset-ui/legacy-plugin-chart-pivot-table": "^0.11.0",
"@superset-ui/legacy-plugin-chart-rose": "^0.11.0",
"@superset-ui/legacy-plugin-chart-sankey": "^0.11.0",
"@superset-ui/legacy-plugin-chart-sunburst": "^0.11.0",
"@superset-ui/legacy-plugin-chart-table": "^0.11.0",
"@superset-ui/legacy-plugin-chart-treemap": "^0.11.0",
"@superset-ui/legacy-plugin-chart-word-cloud": "^0.11.0",
"@superset-ui/legacy-plugin-chart-world-map": "^0.11.0",
"@superset-ui/legacy-preset-chart-big-number": "^0.11.0",
"@superset-ui/legacy-preset-chart-nvd3": "^0.11.0",
"@superset-ui/number-format": "^0.12.1",
"@superset-ui/query": "^0.12.2",
"@superset-ui/plugin-chart-table": "^0.11.0",
"@superset-ui/preset-chart-xy": "^0.11.0",
"@superset-ui/time-format": "^0.12.1",
"@superset-ui/translation": "^0.12.0",
"@types/react-json-tree": "^0.6.11",
"@vx/responsive": "0.0.172",
"abortcontroller-polyfill": "^1.1.9",
Expand Down
4 changes: 1 addition & 3 deletions superset/assets/src/chart/Chart.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,7 @@ class Chart extends React.PureComponent {
/>
)}
<div className={`slice_container ${isFaded ? ' faded' : ''}`}>
<ChartRenderer
{...this.props}
/>
<ChartRenderer {...this.props} />
</div>
</div>
</ErrorBoundary>
Expand Down
25 changes: 18 additions & 7 deletions superset/assets/src/chart/ChartRenderer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,14 @@ class ChartRenderer extends React.Component {
this.handleAddFilter = this.handleAddFilter.bind(this);
this.handleRenderSuccess = this.handleRenderSuccess.bind(this);
this.handleRenderFailure = this.handleRenderFailure.bind(this);
this.handleSetControlValue = this.handleSetControlValue.bind(this);

this.hooks = {
onAddFilter: this.handleAddFilter,
onError: this.handleRenderFailure,
setControlValue: this.handleSetControlValue,
setTooltip: this.setTooltip,
};
}

shouldComponentUpdate(nextProps, nextState) {
Expand Down Expand Up @@ -137,6 +145,13 @@ class ChartRenderer extends React.Component {
}
}

handleSetControlValue(...args) {
const { setControlValue } = this.props;
if (setControlValue) {
setControlValue(...args);
}
}

renderTooltip() {
const { tooltip } = this.state;
if (tooltip && tooltip.content) {
Expand Down Expand Up @@ -184,7 +199,6 @@ class ChartRenderer extends React.Component {
initialValues,
formData,
queryResponse,
setControlValue,
} = this.props;

return (
Expand All @@ -199,13 +213,10 @@ class ChartRenderer extends React.Component {
height={height}
annotationData={annotationData}
datasource={datasource}
filters={initialValues}
initialValues={initialValues}
formData={formData}
payload={queryResponse}
onAddFilter={this.handleAddFilter}
onError={this.handleRenderFailure}
setControlValue={setControlValue}
setTooltip={this.setTooltip}
hooks={this.hooks}
queryData={queryResponse}
onRenderSuccess={this.handleRenderSuccess}
onRenderFailure={this.handleRenderFailure}
/>
Expand Down
13 changes: 8 additions & 5 deletions superset/assets/src/visualizations/FilterBox/transformProps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
const NOOP = () => {};

export default function transformProps(chartProps) {
const {
datasource,
filters,
formData,
onAddFilter,
payload,
hooks,
initialValues,
queryData,
rawDatasource,
} = chartProps;
const { onAddFilter = NOOP } = hooks;
const {
sliceId,
dateFilter,
Expand All @@ -46,11 +49,11 @@ export default function transformProps(chartProps) {
return {
chartId: sliceId,
datasource: rawDatasource,
filtersChoices: queryData.data,
filtersFields,
filtersChoices: payload.data,
instantFiltering,
onChange: onAddFilter,
origSelectedValues: filters || {},
origSelectedValues: initialValues || {},
showDateFilter: dateFilter,
showDruidTimeGrain: showDruidTimeGranularity,
showDruidTimeOrigin,
Expand Down
4 changes: 2 additions & 2 deletions superset/assets/src/visualizations/TimeTable/transformProps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
* under the License.
*/
export default function transformProps(chartProps) {
const { height, datasource, formData, payload } = chartProps;
const { height, datasource, formData, queryData } = chartProps;
const {
columnCollection = [],
groupby,
metrics,
url,
} = formData;
const { records, columns } = payload.data;
const { records, columns } = queryData.data;
const isGroupBy = groupby.length > 0;

// When there is a "group by",
Expand Down
11 changes: 6 additions & 5 deletions superset/assets/src/visualizations/deckgl/transformProps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,21 @@
* specific language governing permissions and limitations
* under the License.
*/
const NOOP = () => {};

export default function transformProps(chartProps) {
const {
width,
height,
rawFormData,
payload,
setControlValue,
onAddFilter,
setTooltip,
queryData,
hooks,
} = chartProps;
const { onAddFilter = NOOP, setControlValue = NOOP, setTooltip = NOOP } = hooks;

return {
formData: rawFormData,
payload,
payload: queryData,
setControlValue,
viewport: {
...rawFormData.viewport,
Expand Down
2 changes: 1 addition & 1 deletion superset/assets/src/visualizations/presets/MainPreset.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import PivotTableChartPlugin from '@superset-ui/legacy-plugin-chart-pivot-table'
import RoseChartPlugin from '@superset-ui/legacy-plugin-chart-rose';
import SankeyChartPlugin from '@superset-ui/legacy-plugin-chart-sankey';
import SunburstChartPlugin from '@superset-ui/legacy-plugin-chart-sunburst';
import TableChartPlugin from '@superset-ui/plugin-chart-table/esm/legacy';
import TableChartPlugin from '@superset-ui/legacy-plugin-chart-table';
import TreemapChartPlugin from '@superset-ui/legacy-plugin-chart-treemap';
import WordCloudChartPlugin from '@superset-ui/legacy-plugin-chart-word-cloud';
import WorldMapChartPlugin from '@superset-ui/legacy-plugin-chart-world-map';
Expand Down