Skip to content

Commit 5dd1d49

Browse files
committed
fix(charts): show non-filterable columns in metric section for table charts
1 parent 230b25d commit 5dd1d49

4 files changed

Lines changed: 4 additions & 24 deletions

File tree

superset-frontend/plugins/plugin-chart-ag-grid-table/src/controlPanel.tsx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -281,11 +281,7 @@ const config: ControlPanelConfig = {
281281
{ controls, datasource, form_data }: ControlPanelState,
282282
controlState: ControlState,
283283
) => ({
284-
columns: datasource?.columns[0]?.hasOwnProperty('filterable')
285-
? (datasource as Dataset)?.columns?.filter(
286-
(c: ColumnMeta) => c.filterable,
287-
)
288-
: datasource?.columns,
284+
columns: datasource?.columns,
289285
savedMetrics: defineSavedMetrics(datasource),
290286
// current active adhoc metrics
291287
selectedMetrics:

superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/columns.tsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ import {
2020
ControlSetItem,
2121
ExtraControlProps,
2222
sharedControls,
23-
Dataset,
24-
ColumnMeta,
2523
} from '@superset-ui/chart-controls';
2624
import { t } from '@apache-superset/core/translation';
2725
import { ensureIsArray } from '@superset-ui/core';
@@ -35,11 +33,7 @@ const dndAllColumns: typeof sharedControls.groupby = {
3533
mapStateToProps({ datasource, controls }, controlState) {
3634
const newState: ExtraControlProps = {};
3735
if (datasource) {
38-
if (datasource?.columns[0]?.hasOwnProperty('filterable')) {
39-
newState.options = (datasource as Dataset)?.columns?.filter(
40-
(c: ColumnMeta) => c.filterable,
41-
);
42-
} else newState.options = datasource.columns;
36+
newState.options = datasource.columns;
4337
}
4438
newState.queryMode = getQueryMode(controls);
4539
newState.externalValidationErrors =

superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/metrics.tsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ import {
2121
ControlSetItem,
2222
ControlState,
2323
sharedControls,
24-
Dataset,
25-
ColumnMeta,
2624
defineSavedMetrics,
2725
} from '@superset-ui/chart-controls';
2826
import { t } from '@apache-superset/core/translation';
@@ -77,11 +75,7 @@ export const metricsControlSetItem: ControlSetItem = {
7775
{ controls, datasource, form_data }: ControlPanelState,
7876
controlState: ControlState,
7977
) => ({
80-
columns: datasource?.columns[0]?.hasOwnProperty('filterable')
81-
? (datasource as Dataset)?.columns?.filter(
82-
(c: ColumnMeta) => c.filterable,
83-
)
84-
: datasource?.columns,
78+
columns: datasource?.columns,
8579
savedMetrics: defineSavedMetrics(datasource),
8680
// current active adhoc metrics
8781
selectedMetrics:

superset-frontend/plugins/plugin-chart-table/src/controlPanel.tsx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -304,11 +304,7 @@ const config: ControlPanelConfig = {
304304
{ controls, datasource, form_data }: ControlPanelState,
305305
controlState: ControlState,
306306
) => ({
307-
columns: datasource?.columns[0]?.hasOwnProperty('filterable')
308-
? (datasource as Dataset)?.columns?.filter(
309-
(c: ColumnMeta) => c.filterable,
310-
)
311-
: datasource?.columns,
307+
columns: datasource?.columns,
312308
savedMetrics: defineSavedMetrics(datasource),
313309
// current active adhoc metrics
314310
selectedMetrics:

0 commit comments

Comments
 (0)