pt/superset
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2024-09-19 20:19:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(plugin-chart-echarts): fix incorrect groupby in buildQuery (#800)

Browse Source
This commit is contained in:
Ville Brofeldt 2020-09-29 10:47:17 +03:00 committed by Yongjie Zhao
parent 3c7320eb10
commit 5d70fd3946
4 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/buildQuery.ts
View File

@ -40,7 +40,7 @@ export default function buildQuery(formData: QueryFormData) {
return [ return [
{ {
...baseQueryObject, ...baseQueryObject,
groupby: formData.series, groupby: formData.groupby || [],
is_timeseries: true, is_timeseries: true,
post_processing: [ post_processing: [
{ {

11
superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.ts
View File

@ -16,12 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
import { import { t, legacyValidateInteger, legacyValidateNumber } from '@superset-ui/core';
t,
validateNonEmpty,
legacyValidateInteger,
legacyValidateNumber,
} from '@superset-ui/core';
import { ControlPanelConfig } from '@superset-ui/chart-controls'; import { ControlPanelConfig } from '@superset-ui/chart-controls';
const config: ControlPanelConfig = { const config: ControlPanelConfig = {
@ -295,10 +290,6 @@ const config: ControlPanelConfig = {
}, },
}, },
controlOverrides: { controlOverrides: {
series: {
validators: [validateNonEmpty],
clearable: false,
},
row_limit: { row_limit: {
default: 100, default: 100,
}, },

2
superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/test/Timeseries/buildQuery.test.ts
View File

@ -22,7 +22,7 @@ describe('Timeseries buildQuery', () => {
const formData = { const formData = {
datasource: '5__table', datasource: '5__table',
granularity_sqla: 'ds', granularity_sqla: 'ds',
series: ['foo'], groupby: ['foo'],
metrics: ['bar', 'baz'], metrics: ['bar', 'baz'],
viz_type: 'my_chart', viz_type: 'my_chart',
}; };

2
superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/test/Timeseries/transformProps.test.ts
View File

@ -26,7 +26,7 @@ describe('EchartsTimeseries tranformProps', () => {
datasource: '3__table', datasource: '3__table',
granularity_sqla: 'ds', granularity_sqla: 'ds',
metric: 'sum__num', metric: 'sum__num',
series: ['foo', 'bar'], groupby: ['foo', 'bar'],
}; };
const chartProps = new ChartProps({ const chartProps = new ChartProps({
formData, formData,