Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(dashboard): not filterable column now not emitting cross-filters in table charts #30827

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −1
Open

fix(dashboard): not filterable column now not emitting cross-filters in table charts #30827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,8 +846,11 @@ export default function TableChart<D extends DataRecord = DataRecord>(
onClick:
emitCrossFilters && !valueRange && !isMetric
? () => {
const isFilterable = columnsMeta.find(
cm => cm.key === key,
)?.isFilterable;
// allow selecting text in a cell
if (!getSelectedText()) {
if (!getSelectedText() && isFilterable) {
toggleFilter(key, value);
}
}
Expand Down
3 changes: 3 additions & 0 deletions superset-frontend/plugins/plugin-chart-table/src/transformProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ const processColumns = memoizeOne(function processColumns(
const metricsSet = new Set(metrics);
const percentMetricsSet = new Set(percentMetrics);
const rawPercentMetricsSet = new Set(rawPercentMetrics);
const columnConfigs = props.datasource.columns;

const columns: DataColumnMeta[] = (colnames || [])
.filter(
Expand All @@ -222,6 +223,7 @@ const processColumns = memoizeOne(function processColumns(
const config = columnConfig[key] || {};
// for the purpose of presentation, only numeric values are treated as metrics
// because users can also add things like `MAX(str_col)` as a metric.
const isFilterable = columnConfigs.find(c => c.column_name === key)?.filterable;
const isMetric = metricsSet.has(key) && isNumeric(key, records);
const isPercentMetric = percentMetricsSet.has(key);
const label =
Expand Down Expand Up @@ -283,6 +285,7 @@ const processColumns = memoizeOne(function processColumns(
isPercentMetric,
formatter,
config,
isFilterable,
};
});
return [metrics, percentMetrics, columns] as [
Expand Down
1 change: 1 addition & 0 deletions superset-frontend/plugins/plugin-chart-table/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ export interface DataColumnMeta {
isPercentMetric?: boolean;
isNumeric?: boolean;
config?: TableColumnConfig;
isFilterable?: boolean;
}

export interface TableChartData {
Expand Down
Loading