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.

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

fix(viz): update nesting logic to handle multiple dimensions in PartitionViz #32290

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
8 changes: 6 additions & 2 deletions superset/viz.py
Original file line number Diff line number Diff line change
Expand Up @@ -2293,10 +2293,14 @@
]
if level >= len(levels):
return []
dim_level = levels[level][metric][[dims[0]]]

dim_level = levels[level][metric]
for d in dims:
dim_level = dim_level[d]

Check warning on line 2299 in superset/viz.py

View check run for this annotation

Codecov / codecov/patch

superset/viz.py#L2297-L2299

Added lines #L2297 - L2299 were not covered by tests

return [
{
"name": i,
"name": dims + [i],
"val": dim_level[i],
"children": self.nest_values(levels, level + 1, metric, dims + [i]),
}
Expand Down
21 changes: 21 additions & 0 deletions tests/integration_tests/viz_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,27 @@ def test_nest_values_returns_hierarchy(self):
assert 1 == len(nest[0]["children"][0]["children"])
assert 1 == len(nest[0]["children"][0]["children"][0]["children"])

def test_nest_values_returns_hierarchy_when_more_dimensions(self):
raw = {}
raw["category"] = ["a", "a", "a"]
raw["subcategory"] = ["a.2", "a.1", "a.2"]
raw["sub_subcategory"] = ["a.2.1", "a.1.1", "a.2.2"]
raw["metric1"] = [5, 10, 15]
raw["metric2"] = [50, 100, 150]
raw["metric3"] = [500, 1000, 1500]
df = pd.DataFrame(raw)
test_viz = viz.PartitionViz(Mock(), {})
groups = ["category", "subcategory", "sub_subcategory"]
levels = test_viz.levels_for("agg_sum", groups, df)
nest = test_viz.nest_values(levels)
assert 3 == len(nest)
for i in range(0, 3):
assert "metric" + str(i + 1) == nest[i]["name"]
assert 1 == len(nest[0]["children"])
assert 2 == len(nest[0]["children"][0]["children"])
assert 1 == len(nest[0]["children"][0]["children"][0]["children"])
assert 2 == len(nest[0]["children"][0]["children"][1]["children"])

def test_nest_procs_returns_hierarchy(self):
raw = {}
raw[DTTM_ALIAS] = [100, 200, 300, 100, 200, 300, 100, 200, 300]
Expand Down
Loading