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(assets api): import replaces dashboard #22208

Merged
merged 5 commits into from
Dec 21, 2022
Merged

fix(assets api): import replaces dashboard #22208

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c53e8e2
delete and replace dashboard slices for imported dashboard
Nov 23, 2022
9c47201
fix pylint errors
Nov 29, 2022
6558d4c
add tests for assets import
Dec 2, 2022
c9ff9fb
add licence headers
Dec 6, 2022
92df588
add typing to fixture
Dec 7, 2022
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
39 changes: 23 additions & 16 deletions superset/commands/importers/v1/assets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from marshmallow import Schema
from marshmallow.exceptions import ValidationError
from sqlalchemy.orm import Session
from sqlalchemy.sql import select
from sqlalchemy.sql import delete, insert, select

from superset import db
from superset.charts.commands.importers.v1.utils import import_chart
Expand Down Expand Up @@ -106,30 +106,37 @@ def _import(session: Session, configs: Dict[str, Any]) -> None:
chart = import_chart(session, config, overwrite=True)
chart_ids[str(chart.uuid)] = chart.id

# store the existing relationship between dashboards and charts
existing_relationships = session.execute(
select([dashboard_slices.c.dashboard_id, dashboard_slices.c.slice_id])
).fetchall()

# import dashboards
dashboard_chart_ids: List[Tuple[int, int]] = []
for file_name, config in configs.items():
if file_name.startswith("dashboards/"):
config = update_id_refs(config, chart_ids, dataset_info)
dashboard = import_dashboard(session, config, overwrite=True)

# set ref in the dashboard_slices table
dashboard_chart_ids: List[Dict[str, int]] = []
for uuid in find_chart_uuids(config["position"]):
if uuid not in chart_ids:
break
chart_id = chart_ids[uuid]
if (dashboard.id, chart_id) not in existing_relationships:
dashboard_chart_ids.append((dashboard.id, chart_id))

# set ref in the dashboard_slices table
values = [
{"dashboard_id": dashboard_id, "slice_id": chart_id}
for (dashboard_id, chart_id) in dashboard_chart_ids
]
session.execute(dashboard_slices.insert(), values)
dashboard_chart_id = {
"dashboard_id": dashboard.id,
"slice_id": chart_id,
}
dashboard_chart_ids.append(dashboard_chart_id)

try:
session.execute(
delete(dashboard_slices).where(
dashboard_slices.c.dashboard_id == dashboard.id
)
)
session.execute(
insert(dashboard_slices).values(dashboard_chart_ids)
)
session.commit()
except Exception:
session.rollback()
raise Exception

def run(self) -> None:
self.validate()
Expand Down