Skip to content

[cli] Fix, import datasources exported by UI #8477

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

Merged
dpgaspar merged 5 commits into from
Nov 10, 2019
Merged

[cli] Fix, import datasources exported by UI #8477

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cbb2e97
[cli] Fix, import datasources exported by UI
dpgaspar Oct 30, 2019
c085a3e
[cli] Fix, change severity of error log to error
dpgaspar Oct 30, 2019
f20a70a
[databases] Fix, Druid and databases view export cli compatible YAML
dpgaspar Nov 5, 2019
735ded6
[databases] Fix, added type annotation
dpgaspar Nov 5, 2019
69cd2d2
[databases] Fix, added type annotation
dpgaspar Nov 10, 2019
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
2 changes: 2 additions & 0 deletions superset/connectors/druid/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,8 @@ class DruidClusterModelView(SupersetModelView, DeleteMixin, YamlExportMixin):
),
}

yaml_dict_key = "databases"

edit_form_extra_fields = {
"cluster_name": QuerySelectField(
"Cluster",
Expand Down
10 changes: 9 additions & 1 deletion superset/views/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import logging
import traceback
from datetime import datetime
from typing import Any, Dict
from typing import Any, Dict, Optional

import simplejson as json
import yaml
Expand Down Expand Up @@ -208,12 +208,20 @@ def validate_json(form, field):


class YamlExportMixin(object):
yaml_dict_key: Optional[str] = None
"""
Override this if you a dict response instead, with a certain key.

@villebro villebro Nov 5, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: ..if you want a dict response..

Used on DatabaseView for cli compatibility
"""

@action("yaml_export", __("Export to YAML"), __("Export to YAML?"), "fa-download")
def yaml_export(self, items):
if not isinstance(items, list):
items = [items]

data = [t.export_to_dict() for t in items]
if self.yaml_dict_key:
data = {self.yaml_dict_key: data}
return Response(
yaml.safe_dump(data),
headers=generate_download_headers("yaml"),
Expand Down
2 changes: 2 additions & 0 deletions superset/views/database/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ class DatabaseView(DatabaseMixin, SupersetModelView, DeleteMixin, YamlExportMixi
edit_template = "superset/models/database/edit.html"
validators_columns = {"sqlalchemy_uri": [sqlalchemy_uri_form_validator]}

yaml_dict_key = "databases"

def _delete(self, pk):
DeleteMixin._delete(self, pk)

Expand Down