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: Returns 404 instead of 500 for unknown dashboard filter state keys #17878

Merged
merged 6 commits into from
Jan 10, 2022
Merged

fix: Returns 404 instead of 500 for unknown dashboard filter state keys #17878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
030d322
fix: Returns 404 instead of 500 for unknown dashboard filter state keys
michael-s-molina Dec 27, 2021
3e3c7bb
Reduces hierarchies of if-expression
michael-s-molina Jan 10, 2022
52b8b5b
Removes unnecessary check
michael-s-molina Jan 10, 2022
68e47aa
Removes unused variable
michael-s-molina Jan 10, 2022
5c7bd90
Fixes type error
michael-s-molina Jan 10, 2022
13d61b1
Removes unused import
michael-s-molina Jan 10, 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
15 changes: 5 additions & 10 deletions superset/dashboards/filter_state/commands/get.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,15 @@
from typing import Optional

from superset.dashboards.dao import DashboardDAO
from superset.dashboards.filter_state.commands.entry import Entry
from superset.extensions import cache_manager
from superset.key_value.commands.get import GetKeyValueCommand
from superset.key_value.utils import cache_key


class GetFilterStateCommand(GetKeyValueCommand):
def get(self, resource_id: int, key: str, refresh_timeout: bool) -> Optional[str]:
dashboard = DashboardDAO.get_by_id_or_slug(str(resource_id))
if dashboard:
entry: Entry = cache_manager.filter_state_cache.get(
cache_key(resource_id, key)
)
if refresh_timeout:
cache_manager.filter_state_cache.set(key, entry)
return entry["value"]
return None
DashboardDAO.get_by_id_or_slug(str(resource_id))
entry = cache_manager.filter_state_cache.get(cache_key(resource_id, key)) or {}
if entry and refresh_timeout:
cache_manager.filter_state_cache.set(key, entry)
return entry.get("value")
4 changes: 2 additions & 2 deletions tests/integration_tests/dashboards/filter_state/api_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,9 @@ def test_put_not_owner(client, dashboard_id: int):
assert resp.status_code == 403


def test_get_key_not_found(client):
def test_get_key_not_found(client, dashboard_id: int):
login(client, "admin")
resp = client.get("unknown-key")
resp = client.get(f"api/v1/dashboard/{dashboard_id}/filter_state/unknown-key/")
assert resp.status_code == 404


Expand Down