Skip to content

fix:#22127 #23489

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

Closed
Naveench131 wants to merge 1 commit into from
Closed

fix:#22127 #23489

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
19 changes: 13 additions & 6 deletions superset/dashboards/commands/importers/v1/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
Expand Down Expand Up @@ -38,6 +39,7 @@
from superset.datasets.commands.importers.v1.utils import import_dataset
from superset.datasets.schemas import ImportV1DatasetSchema
from superset.models.dashboard import dashboard_slices
from superset.models.dashboard import Dashboard


class ImportDashboardsCommand(ImportModelsCommand):
Expand Down Expand Up @@ -66,6 +68,8 @@ def _import(
dataset_uuids: Set[str] = set()
for file_name, config in configs.items():
if file_name.startswith("dashboards/"):
if overwrite:
dashboard_id=session.query(Dashboard).filter_by(uuid=config['uuid']).first().id
chart_uuids.update(find_chart_uuids(config["position"]))
dataset_uuids.update(
find_native_filter_datasets(config.get("metadata", {}))
Expand All @@ -83,10 +87,11 @@ def _import(
database_uuids.add(config["database_uuid"])

# import related databases

database_ids: Dict[str, int] = {}
for file_name, config in configs.items():
if file_name.startswith("databases/") and config["uuid"] in database_uuids:
database = import_database(session, config, overwrite=False)
database = import_database(session, config, overwrite=overwrite)
database_ids[str(database.uuid)] = database.id

# import datasets with the correct parent ref
Expand All @@ -97,7 +102,7 @@ def _import(
and config["database_uuid"] in database_ids
):
config["database_id"] = database_ids[config["database_uuid"]]
dataset = import_dataset(session, config, overwrite=False)
dataset = import_dataset(session, config, overwrite=overwrite)
dataset_info[str(dataset.uuid)] = {
"datasource_id": dataset.id,
"datasource_type": dataset.datasource_type,
Expand All @@ -113,13 +118,15 @@ def _import(
):
# update datasource id, type, and name
config.update(dataset_info[config["dataset_uuid"]])
chart = import_chart(session, config, overwrite=False)
chart = import_chart(session, config, overwrite=overwrite)
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()
existing_relationships = session.execute(select([dashboard_slices.c.dashboard_id, dashboard_slices.c.slice_id])).fetchall()

# delete charts that are not in imported data.
if overwrite:
non = session.query(dashboard_slices).filter(dashboard_slices.c.dashboard_id==dashboard_id, dashboard_slices.c.slice_id.not_in(list(chart_ids.values()))).delete()

# import dashboards
dashboard_chart_ids: List[Tuple[int, int]] = []
Expand Down