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.

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

Make it possible to create and select incident filters #1122

Merged
merged 29 commits into from
Jan 22, 2025
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
6f68d87
Add basic logic to render filter select component
podliashanyk Jan 7, 2025
48dbe1c
Move filter selector HTML to a separate file
podliashanyk Jan 7, 2025
b3bbcbb
Make it possible to select existing filter
podliashanyk Jan 7, 2025
a6f9de2
Persist selected filter in session
podliashanyk Jan 8, 2025
08fbf21
Unselect filter on manual filter params update
podliashanyk Jan 8, 2025
68ef51d
Initialize filter params with chosen filter if selected
podliashanyk Jan 8, 2025
781b8b9
Rename sources field
podliashanyk Jan 13, 2025
ad8423c
Add logic to create filter
podliashanyk Jan 13, 2025
ac42088
Make tristates logic compatible with Filter object
podliashanyk Jan 13, 2025
ebbb149
update styles
podliashanyk Jan 13, 2025
f2de849
fix formatting
podliashanyk Jan 13, 2025
01de5c3
Align filter selector and filter control button
podliashanyk Jan 14, 2025
beba7b2
Align contents of filter-incidents-tab
podliashanyk Jan 14, 2025
9ab86d4
Merge branch 'master' into incidents-filter-selector
podliashanyk Jan 15, 2025
5625987
update changelog
podliashanyk Jan 15, 2025
73c59d8
fix formatting
podliashanyk Jan 15, 2025
55b6cf0
fix imports
podliashanyk Jan 15, 2025
06c8652
rename variable that shadows builtin
podliashanyk Jan 15, 2025
e6d3ad7
fixup
podliashanyk Jan 15, 2025
6034cd8
remove label with no input
podliashanyk Jan 15, 2025
b6311a0
move import
podliashanyk Jan 15, 2025
91a5b79
update tests
podliashanyk Jan 15, 2025
c0a1e83
initialize filter form with selected filter inside filter function
podliashanyk Jan 15, 2025
42dceca
Merge branch 'master' into incidents-filter-selector
podliashanyk Jan 15, 2025
52cd007
move import
podliashanyk Jan 20, 2025
62be934
rename variable
podliashanyk Jan 20, 2025
b1c45b5
fix button border radius
podliashanyk Jan 20, 2025
c9c7b36
persist only existing filter ids in session
podliashanyk Jan 20, 2025
0cd72b9
Merge branch 'master' into incidents-filter-selector
podliashanyk Jan 22, 2025
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
3 changes: 2 additions & 1 deletion src/argus/htmx/incident/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
from argus.incident.models import Incident
from argus.notificationprofile.models import Filter
from argus.util.datetime_utils import make_aware
from argus.htmx.incident.filter import create_named_filter

from ..request import HtmxHttpRequest

Expand Down Expand Up @@ -107,6 +106,8 @@ def create_filter(request: HtmxHttpRequest):
filter_form, _ = incident_list_filter(request, None)
if filter_name and filter_form.is_valid():
filterblob = filter_form.to_filterblob()
from argus.htmx.incident.filter import create_named_filter

_, filter_obj = create_named_filter(request, filter_name, filterblob)
if filter_obj:
request.session["selected_filter"] = str(filter_obj.id)
Expand Down
Loading