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(Filters): Apply native & cross filters on common columns #30438

Merged
merged 21 commits into from
Oct 15, 2024
Merged

fix(Filters): Apply native & cross filters on common columns #30438

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift click to select a range
bc85d17
fix(Filters): Apply native & cross filters on common columns
geido Sep 30, 2024
0f661c6
chore(Dashboard): Implement affected logic to highlight
geido Oct 3, 2024
8091a09
Merge branch 'master' of https://github.com/apache/superset into geid…
geido Oct 3, 2024
08ea4be
Merge branch 'master' of https://github.com/apache/superset into geid…
geido Oct 4, 2024
d2314e3
fix(Scope): Only include charts in scope
geido Oct 4, 2024
7fbb688
fix(CrossFilters): Check for deleted filter
geido Oct 4, 2024
2f180ae
fix(Scopes): Check for scopes array
geido Oct 7, 2024
2b6dd47
chore(Tests): Align tests with best practices
geido Oct 7, 2024
8fffbec
fix(Filters): Apply filters on underlying dataset columns
geido Oct 8, 2024
2106416
fix(Columns): Include all column names
geido Oct 8, 2024
bdef07f
fix(Dataset): Combine all columns
geido Oct 8, 2024
433ae8e
fix(Dataset): Remove unnecessary ref to column names
geido Oct 8, 2024
b5a69dd
Merge branch 'master' of https://github.com/apache/superset into geid…
geido Oct 8, 2024
03ebe9c
fix(CrossFilters): Check for actual cross filter target
geido Oct 8, 2024
b2e0b38
fix(CrossFilter): Relaunch query for removed cross-filter
geido Oct 8, 2024
f293ae1
Merge branch 'master' of https://github.com/apache/superset into geid…
geido Oct 10, 2024
e45da52
fix(Filters): Let backend handle jinja and adhoc cols
geido Oct 10, 2024
8de9cd6
chore(Todo): Remove todo comment
geido Oct 10, 2024
a18cddb
chore(Tests): Enhance tests
geido Oct 11, 2024
0d750b5
fix(Expression): Defult to array for non-array expression
geido Oct 14, 2024
1e471fc
chore(Type): Improve AppliedNativeFilterType
geido Oct 15, 2024
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
Prev Previous commit
Next Next commit
fix(Dataset): Combine all columns
  • Loading branch information
@geido
geido committed Oct 8, 2024
commit bdef07f36b144b00c903476fa4f6da453286bee4
14 changes: 6 additions & 8 deletions superset/connectors/sqla/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,22 490,20 @@ def data_for_slices( # pylint: disable=too-many-locals
data.update({"metrics": filtered_metrics})
data.update({"columns": filtered_columns})

all_columns = {
column_["column_name"]: column_["verbose_name"] or column_["column_name"]
for column_ in filtered_columns
}
verbose_map = {"__timestamp": "Time"}
verbose_map.update(
{
metric["metric_name"]: metric["verbose_name"] or metric["metric_name"]
for metric in filtered_metrics
}
)
verbose_map.update(
{
column_["column_name"]: column_["verbose_name"]
or column_["column_name"]
for column_ in filtered_columns
}
)
verbose_map.update(all_columns)
data["verbose_map"] = verbose_map
data["column_names"] = set(column_names)
data["column_names"] = set(all_columns.values()) | set(self.column_names)

return data

Expand Down
Loading