Skip to content

Commit 4eb17f2

Browse files
committed
fix linting
1 parent 263b290 commit 4eb17f2

File tree

3 files changed

+44
-19
lines changed

3 files changed

+44
-19
lines changed

superset/dashboards/permalink/types.py

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ class DashboardPermalinkState(TypedDict):
2222
activeTabs: Optional[list[str]]
2323
anchor: Optional[str]
2424
urlParams: Optional[list[tuple[str, str]]]
25+
nativeFilters: Optional[list[dict[str, Any]]]
2526

2627

2728
class DashboardPermalinkValue(TypedDict):

superset/reports/models.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# under the License.
1717
"""A collection of ORM sqlalchemy models for Superset"""
1818

19-
from typing import Optional
19+
from typing import Any, Optional
2020

2121
import prison
2222
from cron_descriptor import get_description
@@ -187,7 +187,7 @@ def crontab_humanized(self) -> str:
187187
return get_description(self.crontab)
188188

189189
def get_native_filters_params(self) -> Optional[str]:
190-
params = {}
190+
params: dict[str, Any] = {}
191191
dashboard = self.extra.get("dashboard")
192192
if dashboard and dashboard.get("nativeFilters"):
193193
for filter in dashboard.get("nativeFilters", []):

tests/unit_tests/reports/model_test.py

+41-17
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
2-
31
from superset.reports.models import ReportSchedule
42

53

@@ -21,9 +19,10 @@ def test_get_native_filters_params():
2119
}
2220

2321
assert report_schedule.get_native_filters_params() == (
24-
'(filter_id:(extraFormData:(filters:!((col:column_name,op:IN,val:!(value1,value2)))),filterState:(label:column_name,validateStatus:!f,value:!(value1,value2)),id:filter_id,ownState:()))'
22+
"(filter_id:(extraFormData:(filters:!((col:column_name,op:IN,val:!(value1,value2)))),filterState:(label:column_name,validateStatus:!f,value:!(value1,value2)),id:filter_id,ownState:()))"
2523
)
2624

25+
2726
def test_get_native_filters_params_multiple_filters():
2827
"""
2928
Test the ``get_native_filters_params`` method with multiple native filters.
@@ -41,15 +40,16 @@ def test_get_native_filters_params_multiple_filters():
4140
"nativeFilterId": "filter_id_2",
4241
"columnName": "column_name_2",
4342
"filterValues": ["value3", "value4"],
44-
}
43+
},
4544
]
4645
}
4746
}
4847

4948
assert report_schedule.get_native_filters_params() == (
50-
'(filter_id_1:(extraFormData:(filters:!((col:column_name_1,op:IN,val:!(value1,value2)))),filterState:(label:column_name_1,validateStatus:!f,value:!(value1,value2)),id:filter_id_1,ownState:()),filter_id_2:(extraFormData:(filters:!((col:column_name_2,op:IN,val:!(value3,value4)))),filterState:(label:column_name_2,validateStatus:!f,value:!(value3,value4)),id:filter_id_2,ownState:()))'
49+
"(filter_id_1:(extraFormData:(filters:!((col:column_name_1,op:IN,val:!(value1,value2)))),filterState:(label:column_name_1,validateStatus:!f,value:!(value1,value2)),id:filter_id_1,ownState:()),filter_id_2:(extraFormData:(filters:!((col:column_name_2,op:IN,val:!(value3,value4)))),filterState:(label:column_name_2,validateStatus:!f,value:!(value3,value4)),id:filter_id_2,ownState:()))"
5150
)
5251

52+
5353
def test_report_generate_native_filter_no_values():
5454
"""
5555
Test the ``_generate_native_filter`` method with no values.
@@ -61,7 +61,21 @@ def test_report_generate_native_filter_no_values():
6161

6262
assert report_schedule._generate_native_filter(
6363
native_filter_id, column_name, values
64-
) == {'filter_id': {'id': 'filter_id', 'extraFormData': {'filters': [{'col': 'column_name', 'op': 'IN', 'val': None}]}, 'filterState': {'label': 'column_name', 'validateStatus': False, 'value': None}, 'ownState': {}}}
64+
) == {
65+
"filter_id": {
66+
"id": "filter_id",
67+
"extraFormData": {
68+
"filters": [{"col": "column_name", "op": "IN", "val": None}]
69+
},
70+
"filterState": {
71+
"label": "column_name",
72+
"validateStatus": False,
73+
"value": None,
74+
},
75+
"ownState": {},
76+
}
77+
}
78+
6579

6680
def test_get_native_filters_params_invalid_structure():
6781
"""
@@ -79,8 +93,13 @@ def test_get_native_filters_params_invalid_structure():
7993
]
8094
}
8195
}
82-
83-
assert report_schedule.get_native_filters_params() == '(filter_id:(extraFormData:(filters:!((col:column_name,op:IN,val:!n))),filterState:(label:column_name,validateStatus:!f,value:!n),id:filter_id,ownState:()))'
96+
97+
assert (
98+
report_schedule.get_native_filters_params()
99+
== "(filter_id:(extraFormData:(filters:!((col:column_name,op:IN,val:!n))),"
100+
"filterState:(label:column_name,validateStatus:!f,value:!n),id:filter_id,ownState:()))"
101+
)
102+
84103

85104
# todo(hugh): how do we want to handle this case?
86105
# def test_report_generate_native_filter_invalid_filter_id():
@@ -96,6 +115,7 @@ def test_get_native_filters_params_invalid_structure():
96115
# native_filter_id, column_name, values
97116
# ) == {}
98117

118+
99119
def test_report_generate_native_filter():
100120
"""
101121
Test the ``_generate_native_filter`` method.
@@ -105,13 +125,17 @@ def test_report_generate_native_filter():
105125
column_name = "column_name"
106126
values = ["value1", "value2"]
107127

108-
print(report_schedule._generate_native_filter(native_filter_id, column_name, values))
128+
print(
129+
report_schedule._generate_native_filter(native_filter_id, column_name, values)
130+
)
109131
assert report_schedule._generate_native_filter(
110132
native_filter_id, column_name, values
111133
) == {
112134
"filter_id": {
113135
"extraFormData": {
114-
"filters": [{"col": "column_name", "op": "IN", "val": ["value1", "value2"]}]
136+
"filters": [
137+
{"col": "column_name", "op": "IN", "val": ["value1", "value2"]}
138+
]
115139
},
116140
"filterState": {
117141
"label": "column_name",
@@ -123,27 +147,26 @@ def test_report_generate_native_filter():
123147
}
124148
}
125149

150+
126151
def test_get_native_filters_params_empty():
127152
"""
128153
Test the ``get_native_filters_params`` method with empty extra.
129154
"""
130155
report_schedule = ReportSchedule()
131156
report_schedule.extra = {}
132157

133-
assert report_schedule.get_native_filters_params() == '()'
158+
assert report_schedule.get_native_filters_params() == "()"
159+
134160

135161
def test_get_native_filters_params_no_native_filters():
136162
"""
137163
Test the ``get_native_filters_params`` method with no native filters.
138164
"""
139165
report_schedule = ReportSchedule()
140-
report_schedule.extra = {
141-
"dashboard": {
142-
"nativeFilters": []
143-
}
144-
}
166+
report_schedule.extra = {"dashboard": {"nativeFilters": []}}
167+
168+
assert report_schedule.get_native_filters_params() == "()"
145169

146-
assert report_schedule.get_native_filters_params() == '()'
147170

148171
def test_report_generate_native_filter_empty_values():
149172
"""
@@ -171,6 +194,7 @@ def test_report_generate_native_filter_empty_values():
171194
}
172195
}
173196

197+
174198
def test_report_generate_native_filter_no_column_name():
175199
"""
176200
Test the ``_generate_native_filter`` method with no column name.

0 commit comments

Comments
 (0)