QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-08-05 21:42:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(charts): show non-filterable columns in metric section for table … (#39524)

Browse Source
This commit is contained in:
Jean Massucatto
2026-06-02 13:31:42 -03:00
committed by GitHub
parent 7275116f4c
commit fc0245bdb0
6 changed files with 146 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,8 +20,6 @@ import {
ControlSetItem,
ExtraControlProps,
sharedControls,
Dataset,
ColumnMeta,
} from '@superset-ui/chart-controls';
import { t } from '@apache-superset/core/translation';
import { ensureIsArray } from '@superset-ui/core';
@@ -35,11 +33,7 @@ const dndAllColumns: typeof sharedControls.groupby = {
mapStateToProps({ datasource, controls }, controlState) {
const newState: ExtraControlProps = {};
if (datasource) {
if (datasource?.columns[0]?.hasOwnProperty('filterable')) {
newState.options = (datasource as Dataset)?.columns?.filter(
(c: ColumnMeta) => c.filterable,
);
} else newState.options = datasource.columns;
newState.options = datasource.columns || [];
}
newState.queryMode = getQueryMode(controls);
newState.externalValidationErrors =

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

@@ -21,8 +21,6 @@ import {
ControlSetItem,
ControlState,
sharedControls,
Dataset,
ColumnMeta,
defineSavedMetrics,
} from '@superset-ui/chart-controls';
import { t } from '@apache-superset/core/translation';
@@ -77,11 +75,7 @@ export const metricsControlSetItem: ControlSetItem = {
{ controls, datasource, form_data }: ControlPanelState,
controlState: ControlState,
) => ({
columns: datasource?.columns[0]?.hasOwnProperty('filterable')
? (datasource as Dataset)?.columns?.filter(
(c: ColumnMeta) => c.filterable,
)
: datasource?.columns,
columns: datasource?.columns || [],
savedMetrics: defineSavedMetrics(datasource),
// current active adhoc metrics
selectedMetrics: