From 465495c0083aeacc962c4a265fef13ddda40c314 Mon Sep 17 00:00:00 2001 From: Krist Wongsuphasawat Date: Tue, 7 May 2019 19:19:41 -0700 Subject: [PATCH] fix: disable lazy import for line chart and box plot (#82) * fix: disable lazy import * fix: lint --- .../superset-ui-preset-chart-xy/src/BoxPlot/BoxPlot.tsx | 8 ++++---- .../superset-ui-preset-chart-xy/src/BoxPlot/index.ts | 3 ++- .../src/BoxPlot/legacy/index.ts | 3 ++- .../superset-ui-preset-chart-xy/src/Line/index.ts | 3 ++- .../superset-ui-preset-chart-xy/src/Line/legacy/index.ts | 3 ++- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/BoxPlot.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/BoxPlot.tsx index a46036e4a21ab..58676abfb5ef3 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/BoxPlot.tsx +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/BoxPlot.tsx @@ -25,7 +25,7 @@ import { createSelector } from 'reselect'; import createTooltip from './createTooltip'; import XYChartLayout from '../utils/XYChartLayout'; import WithLegend from '../components/WithLegend'; -import ChartLegend from '../components/ChartLegend'; +import ChartLegend from '../components/legend/ChartLegend'; import Encoder, { ChannelTypes, Encoding, Outputs } from './Encoder'; import { Dataset, PlainObject } from '../encodeable/types/Data'; @@ -52,6 +52,9 @@ type Props = { export default class BoxPlot extends React.PureComponent { static defaultProps = defaultProps; + encoder: Encoder; + private createEncoder: () => void; + constructor(props: Props) { super(props); @@ -68,9 +71,6 @@ export default class BoxPlot extends React.PureComponent { this.renderChart = this.renderChart.bind(this); } - encoder: Encoder; - private createEncoder: () => void; - renderChart(dim: Dimension) { const { width, height } = dim; const { data, encoding, margin, theme } = this.props; diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/index.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/index.ts index ee02dbbbe4288..b0c3cdff3a8ab 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/index.ts +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/index.ts @@ -19,11 +19,12 @@ import { ChartPlugin } from '@superset-ui/chart'; import createMetadata from './createMetadata'; import transformProps from './transformProps'; +import Chart from './BoxPlot'; export default class BoxPlotChartPlugin extends ChartPlugin { constructor() { super({ - loadChart: () => import('./BoxPlot'), + Chart, metadata: createMetadata(), transformProps, }); diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/legacy/index.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/legacy/index.ts index 6667d5ccff7d6..6a64bfbce188a 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/legacy/index.ts +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/legacy/index.ts @@ -19,11 +19,12 @@ import { ChartPlugin } from '@superset-ui/chart'; import createMetadata from '../createMetadata'; import transformProps from './transformProps'; +import Chart from '../BoxPlot'; export default class BoxPlotChartPlugin extends ChartPlugin { constructor() { super({ - loadChart: () => import('../BoxPlot'), + Chart, metadata: createMetadata(true), transformProps, }); diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/index.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/index.ts index 9a9681d8fdb01..bee8f8bf1e3ab 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/index.ts +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/index.ts @@ -3,12 +3,13 @@ import transformProps from './transformProps'; import createMetadata from './createMetadata'; import buildQuery from './buildQuery'; import ChartFormData from './ChartFormData'; +import Chart from './Line'; export default class LineChartPlugin extends ChartPlugin { constructor() { super({ buildQuery, - loadChart: () => import('./Line'), + Chart, metadata: createMetadata(), transformProps, }); diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/legacy/index.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/legacy/index.ts index 2fe4dafdbcbd8..a4c14aa5f7ab5 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/legacy/index.ts +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/legacy/index.ts @@ -1,11 +1,12 @@ import { ChartPlugin } from '@superset-ui/chart'; import transformProps from './transformProps'; import createMetadata from '../createMetadata'; +import Chart from '../Line'; export default class LineChartPlugin extends ChartPlugin { constructor() { super({ - loadChart: () => import('../Line'), + Chart, metadata: createMetadata(true), transformProps, });