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

Add options for Query Based Parameter for a query with parameters #4648

Draft
wants to merge 31 commits into
base: master
Choose a base branch
from
+679 −152
Draft

Add options for Query Based Parameter for a query with parameters #4648

Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
5e3613d
Start experiements with a 'search' parameter
gabrieldutra Feb 13, 2020
b70f0fa
Iterate over backend verification
gabrieldutra Feb 16, 2020
9cf3965
Parameter Mapping UI (1/2)
gabrieldutra Feb 18, 2020
137aa22
Parameter Mapping UI (2/2)
gabrieldutra Feb 18, 2020
bb0d783
Fixes + temp remove validation for Query param
gabrieldutra Feb 20, 2020
b7478de
Don't validade query params with params
gabrieldutra Feb 20, 2020
bdd7b14
Change stored mapping attributes
gabrieldutra Feb 21, 2020
e555642
Add is_safe check for parameterized query based
gabrieldutra Feb 21, 2020
df755fb
Add try except for NoResultFound
gabrieldutra Feb 21, 2020
90023ac
Make sure Table updates correctly
gabrieldutra Feb 21, 2020
264fb57
Merge branch 'master' into query-based-dropdown--parameters
gabrieldutra Feb 21, 2020
f128b4b
Only allow search for Text Parameters
gabrieldutra Feb 21, 2020
d40edb8
Fix backend tests
gabrieldutra Feb 21, 2020
6eeb3b3
Separate UI components
gabrieldutra Feb 21, 2020
6c27619
Make Parameter Mapping required in UI
gabrieldutra Feb 22, 2020
6aa0ea7
Invert tooltip messages order
gabrieldutra Feb 22, 2020
cc34e78
Small updates
gabrieldutra Feb 22, 2020
a37e7f9
Add is_safe test for queries with params
gabrieldutra Feb 22, 2020
8a1640c
Separate InputPopover component
gabrieldutra Feb 24, 2020
8bfcbf2
Remove redundant import
gabrieldutra Feb 24, 2020
f396c96
Merge branch 'master' into query-based-dropdown--parameters
gabrieldutra Feb 25, 2020
53385fa
Merge branch 'master' into query-based-dropdown--parameters
gabrieldutra Nov 10, 2020
a741341
Oops
gabrieldutra Nov 10, 2020
d0a787c
Make NoResultFound invalid parameters
gabrieldutra Nov 11, 2020
aa2064b
Fix other dropdown_values usages to use query obj
gabrieldutra Nov 11, 2020
08bcdf7
Mock query instead of query_has_parameters
gabrieldutra Nov 12, 2020
0c0b62a
Remove searchTerm from structure
gabrieldutra Nov 20, 2020
bd9ce68
Don't filter out values when param has search
gabrieldutra Nov 20, 2020
b40070d
Use LabeledValues for parameterized queries
gabrieldutra Nov 23, 2020
c1ed884
Merge branch 'master' into query-based-dropdown--parameters
gabrieldutra Nov 23, 2020
19343a0
Clear QueryBasedParameterInput
gabrieldutra Nov 23, 2020
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
13 changes: 8 additions & 5 deletions redash/models/parameterized_query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,11 +191,14 @@ def is_safe(self):
if param["type"] == "text":
return False
if param["type"] == "query":
query_id = param.get("queryId")
query = models.Query.get_by_id_and_org(query_id, self.org)

if query.parameters:
return False
try:
query_id = param.get("queryId")
query = models.Query.get_by_id_and_org(query_id, self.org)

if query.parameters:
return False
except (models.NoResultFound):
Copy link
Member Author

Choose a reason for hiding this comment

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

Should this be used in other get_by_id_and_org uses too?

pass
return True

@property
Expand Down