chore: rename drop missing columns to show empty columns (#20602)

This commit is contained in:
Yongjie Zhao 2022-07-05 16:09:16 +08:00 committed by GitHub
parent 309327dcbd
commit 59491f5396
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 8 deletions

View File

@ -44,7 +44,7 @@ export const pivotOperator: PostProcessingFactory<PostProcessingPivot> = (
aggregates: Object.fromEntries( aggregates: Object.fromEntries(
metricLabels.map(metric => [metric, { operator: 'mean' }]), metricLabels.map(metric => [metric, { operator: 'mean' }]),
), ),
drop_missing_columns: !!formData?.drop_missing_columns, drop_missing_columns: !formData?.show_empty_columns,
}, },
}; };
} }

View File

@ -46,7 +46,7 @@ export const timeComparePivotOperator: PostProcessingFactory<PostProcessingPivot
options: { options: {
index, index,
columns: ensureIsArray(queryObject.columns).map(getColumnLabel), columns: ensureIsArray(queryObject.columns).map(getColumnLabel),
drop_missing_columns: !!formData?.drop_missing_columns, drop_missing_columns: !formData?.show_empty_columns,
aggregates, aggregates,
}, },
}; };

View File

@ -55,6 +55,6 @@ export const echartsTimeSeriesQuery: ControlPanelSectionConfig = {
['order_desc'], ['order_desc'],
['row_limit'], ['row_limit'],
['truncate_metric'], ['truncate_metric'],
['drop_missing_columns'], ['show_empty_columns'],
], ],
}; };

View File

@ -542,11 +542,11 @@ const truncate_metric: SharedControlConfig<'CheckboxControl'> = {
description: t('Whether to truncate metrics'), description: t('Whether to truncate metrics'),
}; };
const drop_missing_columns: SharedControlConfig<'CheckboxControl'> = { const show_empty_columns: SharedControlConfig<'CheckboxControl'> = {
type: 'CheckboxControl', type: 'CheckboxControl',
label: t('Drop Missing Columns'), label: t('Show empty columns'),
default: false, default: true,
description: t('Drop a column if all values are null'), description: t('Show empty columns'),
}; };
const x_axis: SharedControlConfig<'SelectControl', ColumnMeta> = { const x_axis: SharedControlConfig<'SelectControl', ColumnMeta> = {
@ -594,7 +594,7 @@ const sharedControls = {
legacy_order_by: enableExploreDnd ? dnd_sort_by : sort_by, legacy_order_by: enableExploreDnd ? dnd_sort_by : sort_by,
truncate_metric, truncate_metric,
x_axis: enableExploreDnd ? dnd_x_axis : x_axis, x_axis: enableExploreDnd ? dnd_x_axis : x_axis,
drop_missing_columns, show_empty_columns,
}; };
export { sharedControls, dndEntity, dndColumnsControl }; export { sharedControls, dndEntity, dndColumnsControl };

View File

@ -28,6 +28,7 @@ const formData: SqlaFormData = {
granularity: 'month', granularity: 'month',
datasource: 'foo', datasource: 'foo',
viz_type: 'table', viz_type: 'table',
show_empty_columns: true,
}; };
const queryObject: QueryObject = { const queryObject: QueryObject = {
metrics: [ metrics: [

View File

@ -31,6 +31,7 @@ const formData: SqlaFormData = {
granularity: 'month', granularity: 'month',
datasource: 'foo', datasource: 'foo',
viz_type: 'table', viz_type: 'table',
show_empty_columns: true,
}; };
const queryObject: QueryObject = { const queryObject: QueryObject = {
metrics: [ metrics: [

View File

@ -48,6 +48,7 @@ const formDataMixedChart = {
order_desc: true, order_desc: true,
emit_filter: true, emit_filter: true,
truncate_metric: true, truncate_metric: true,
show_empty_columns: true,
// -- query b // -- query b
groupby_b: [], groupby_b: [],
metrics_b: ['count'], metrics_b: ['count'],
@ -64,6 +65,7 @@ const formDataMixedChart = {
order_desc_b: false, order_desc_b: false,
emit_filter_b: undefined, emit_filter_b: undefined,
truncate_metric_b: true, truncate_metric_b: true,
show_empty_columns_b: true,
// chart configs // chart configs
show_value: false, show_value: false,
show_valueB: undefined, show_valueB: undefined,