diff --git a/superset/migrations/shared/migrate_viz/base.py b/superset/migrations/shared/migrate_viz/base.py index d3b2efa7a0cca..e277fcd208e81 100644 --- a/superset/migrations/shared/migrate_viz/base.py +++ b/superset/migrations/shared/migrate_viz/base.py @@ -25,6 +25,7 @@ from sqlalchemy.ext.declarative import declarative_base from superset import conf, db, is_feature_enabled +from superset.constants import TimeGrain from superset.migrations.shared.utils import paginated_update, try_load_json Base = declarative_base() @@ -95,6 +96,7 @@ def _migrate_temporal_filter(self, rv_data: dict[str, Any]) -> None: if self.has_x_axis_control: rv_data["x_axis"] = granularity_sqla + rv_data["time_grain_sqla"] = rv_data.get("time_grain_sqla") or TimeGrain.DAY temporal_filter = { "clause": "WHERE", diff --git a/superset/migrations/shared/migrate_viz/processors.py b/superset/migrations/shared/migrate_viz/processors.py index 1616154bf20a9..4044d9f4bcdff 100644 --- a/superset/migrations/shared/migrate_viz/processors.py +++ b/superset/migrations/shared/migrate_viz/processors.py @@ -80,13 +80,15 @@ class MigratePivotTable(MigrateViz): def _pre_action(self) -> None: if pivot_margins := self.data.get("pivot_margins"): self.data["colTotals"] = pivot_margins - self.data["rowTotals"] = pivot_margins if pandas_aggfunc := self.data.get("pandas_aggfunc"): self.data["pandas_aggfunc"] = self.aggregation_mapping[pandas_aggfunc] + self.data["rowOrder"] = "value_z_to_a" + class MigrateDualLine(MigrateViz): + has_x_axis_control = True source_viz_type = "dual_line" target_viz_type = "mixed_timeseries" rename_keys = { diff --git a/tests/unit_tests/migrations/viz/pivot_table_v1_v2_test.py b/tests/unit_tests/migrations/viz/pivot_table_v1_v2_test.py index e7640f2b5e82e..ab357b62c34be 100644 --- a/tests/unit_tests/migrations/viz/pivot_table_v1_v2_test.py +++ b/tests/unit_tests/migrations/viz/pivot_table_v1_v2_test.py @@ -45,7 +45,7 @@ "granularity_sqla": "ds", "groupbyColumns": ["state"], "groupbyRows": ["name"], - "rowTotals": True, + "rowOrder": "value_z_to_a", "series_limit_metric": "count", "time_range": "100 years ago : now", "transposePivot": True,