Make it possible to create and select incident filters #1122
Conversation
No functionality
Both filter params and the incidents table are updated accordingly to a selected filter
In order to match expected FilterKey
podliashanyk
added
enhancement
Test results 10 files 1 060 suites 38m 8s ⏱️ Results for commit c9c7b36. ♻️ This comment has been updated with latest results. |
|
Tested, works. is there any way to make it fit on the same line as the rest or otherwise make it take up less space?
|
|
We could also make open/closed and acked/unacked take up less space. |
|
We have a condensed multi-checkbox filter like this: Now, this is for a MultipleChoiceField form, but I think you should be able to make it work for the tristate fields |
podliashanyk
force-pushed
the
incidents-filter-selector
branch
from
68dd3e8 to
beba7b2
Compare
src/argus/htmx/incident/views.py
Outdated
| filter_pk, filter_obj = request.session.get("selected_filter", None), None | ||
| if filter_pk: | ||
| filter_obj = get_object_or_404(Filter, pk=filter_pk) |
There was a problem hiding this comment.
I would suggest placing this inside incident_list_filter instead of in the view. This keeps both the view and the filter-plugin interface clean
There was a problem hiding this comment.
Unclear. The session stuff or raising the 404 or both?
I'm not too fond of raising 404 directly in incident_list_filter.
src/argus/htmx/incident/views.py
Outdated
| def create_filter(request: HtmxHttpRequest): | ||
| filter_name = request.POST.get("filter_name", None) | ||
| incident_list_filter = get_filter_function() | ||
| filter_form, _ = incident_list_filter(request, None) | ||
| if filter_name and filter_form.is_valid(): | ||
| filterblob = filter_form.to_filterblob() | ||
| _, filter_obj = create_named_filter(request, filter_name, filterblob) | ||
| if filter_obj: | ||
| request.session["selected_filter"] = str(filter_obj.id) | ||
| return HttpResponseClientRefresh() | ||
| messages.error(request, "Failed to create filter") | ||
| return HttpResponseBadRequest() |
There was a problem hiding this comment.
I think this is a nice candidate for extending the filter plugin system (which is currently only get_filter_function). If we can override filter validation and creation of Filters, we can also make use of this endpoint (and others concerning filters). Don't think it'll have to be this pr though
There was a problem hiding this comment.
Out of scope now, yes, let's make it work first. Also we should have update and delete filter working first I suspect!
podliashanyk
force-pushed
the
incidents-filter-selector
branch
from
14e7ed6 to
91a5b79
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #1122 +/- ##
==========================================
- Coverage 79.71% 79.05% -0.67%
==========================================
Files 141 141
Lines 5285 5356 +71
==========================================
+ Hits 4213 4234 +21
- Misses 1072 1122 +50 ☔ View full report in Codecov by Sentry. |
| @@ -93,6 +93,7 @@ def incident_update(request: HtmxHttpRequest, action: str): | |||
|
|
|||
| @require_GET | |||
| def filter_form(request: HtmxHttpRequest): | |||
| request.session["selected_filter"] = None | |||
There was a problem hiding this comment.
Why are you setting the selected_filter here to None? It probably has a good reason, I just don't understand it fully
There was a problem hiding this comment.
It is actually the name (and purpose) of filter_form that adds to confusion here. It is only used to return form after user manually updates the value of sources-selector. The reason why we set the selected_filter to None here is because we need to reset the selected filter on any manual filter params update (by user).
|
Closes #1045