Add dropdowns to profiles page #1118

hmpf · 2025-01-10T14:05:55Z

Closes #1096

github-actions · 2025-01-10T14:20:34Z

Test results

10 files 1 060 suites 38m 13s ⏱️
536 tests 535 ✅ 1 💤 0 ❌
5 360 runs 5 350 ✅ 10 💤 0 ❌

Results for commit 0177b93.

♻️ This comment has been updated with latest results.

codecov-commenter · 2025-01-10T14:27:23Z

Codecov Report

Attention: Patch coverage is 43.82022% with 50 lines in your changes missing coverage. Please review.

Project coverage is 79.12%. Comparing base (bfa8920) to head (0177b93).

Files with missing lines	Patch %	Lines
src/argus/htmx/notificationprofile/views.py	38.15%	47 Missing ⚠️
src/argus/htmx/incident/filter.py	50.00%	2 Missing ⚠️
src/argus/htmx/widgets.py	88.88%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #1118      +/-   ##
==========================================
- Coverage   79.67%   79.12%   -0.55%     
==========================================
  Files         141      141              
  Lines        5288     5371      +83     
==========================================
+ Hits         4213     4250      +37     
- Misses       1075     1121      +46

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

src/argus/htmx/notificationprofile/views.py

src/argus/htmx/templates/htmx/forms/dropdown_select_multiple.html

johannaengland

This looks quite strange, when I try changing my selection of filters the dropdown and the box usually showing the selected filters disappear and I get the error

File "/home/johanna/Argus/.venv/lib/python3.12/site-packages/django/template/base.py", line 903, in _resolve_lookup
    raise VariableDoesNotExist(
django.template.base.VariableDoesNotExist: Failed lookup for key [class] in {'placeholder': 'select destination...', 'id': 'id_destinations'}

Screenshots:
Before:

After selecting:

After clicking outside of the dropdown

hmpf · 2025-01-16T11:34:26Z

This looks quite strange, when I try changing my selection of filters the dropdown and the box usually showing the selected filters disappear /../

This should have been fixed.

hmpf · 2025-01-16T11:40:22Z

Lesson relearnt:

A ModelForm always has self.instance set. On create (before first save), pk is None (id does not always exist, pk always does)
A classy CreateView does not have self.object until after form_valid()
ModelChoiceFields (what you get with ModelForms for foreign keys and many2many fields) uses the queryset to validate the selection. If you change the queryset manually in the form __init__ as we do (eg. to limit it to user), choices must also be recomputed.

johannaengland

Why does this PR have a timeslot polish in it? That seems like it should be a separate PR

And I'm not sure if this is a polish or it is fine that is behaving like this, but if on an existing profile I (un)select filters/destinations and then not click on Save, but reload the page instead, then what the filter/destination field says is reset back to what the profile correctly has, but the checkboxes are still selected, which might trick the user into thinking it has been updated

Screenshots:
Before:

Selecting another filter:

Not clicking on Save, but reloading the page instead:

johannaengland · 2025-01-16T14:19:22Z

src/argus/htmx/templates/htmx/timeslot/_timeslot_form.html

+    {{ form.as_div }}
+    {{ formset.as_div }}
+    <div class="card-actions justify-end">
+      {% if form.instance %}


For some reason if I click the Create button it still shows me Save and Delete

hmpf · 2025-01-17T11:59:00Z

Why does this PR have a timeslot polish in it? That seems like it should be a separate PR

So that's where those patches disappeared to! Thx.

hmpf · 2025-01-17T12:06:01Z

I have removed the timeslots changes.

hmpf · 2025-01-17T12:07:10Z

And I'm not sure if this is a polish or it is fine that is behaving like this, but if on an existing profile I (un)select filters/destinations and then not click on Save, but reload the page instead, then what the filter/destination field says is reset back to what the profile correctly has, but the checkboxes are still selected, which might trick the user into thinking it has been updated

I have seen that myself but don't know how to fix it.

sonarqubecloud · 2025-01-17T12:48:36Z

Quality Gate passed

Issues
2 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

johannaengland · 2025-01-17T14:07:35Z

And I'm not sure if this is a polish or it is fine that is behaving like this, but if on an existing profile I (un)select filters/destinations and then not click on Save, but reload the page instead, then what the filter/destination field says is reset back to what the profile correctly has, but the checkboxes are still selected, which might trick the user into thinking it has been updated

I have seen that myself but don't know how to fix it.

We can make it a polish issue and see, if we figure it out at some point

podliashanyk

What about complaints from sonarqube? Also styles.css needs to be updated.

Works otherwise. We need to start looking at #1138 soon after this one is merged, otherwise the UX on error is quite poor

podliashanyk · 2025-01-20T11:23:27Z

src/argus/htmx/templates/htmx/forms/dropdown_select_multiple.html

     {% endblock field_control %}>
  <div tabindex="0"
       role="button"
       class="show-selected-box input input-accent input-bordered input-md border overflow-y-auto min-h-8 h-auto max-h-16 max-w-xs leading-tight flex flex-wrap items-center gap-0.5">
-    <p class="text-base-content/50">{{ widget.attrs.placeholder }}</p>
+    {% if not widget.has_selected %}<p class="text-base-content/50">{{ widget.attrs.placeholder }}</p>{% endif %}


This is out of scope for this PR. If we keep it here, we should close #1100.
I also don't like how "jumpy" the width of the dropdown multiselect field becomes, we need a separate issue to fix it. We need both a minimum width and some transitions to smooth out the changes in width.

The height is also fixed in the current dropdown: specialized for the filter box. It looks better with a higher min-height elsewhere.

hmpf · 2025-01-20T11:43:27Z

/../ if on an existing profile I (un)select filters/destinations and then not click on Save, but reload the page instead, then what the filter/destination field says is reset back to what the profile correctly has, but the checkboxes are still selected, /../

I have seen that myself but don't know how to fix it.

We can make it a polish issue and see, if we figure it out at some point

Does the "autocomplete" commit fix this for you? Also, it is apparently a firefox only feature/problem.

podliashanyk · 2025-01-20T11:47:56Z

There is another thing I noticed: both "Filters" and "Destinations" multiselects on profiles page are wrapped with fieldset tag. I don't see any place where it comes from explicitly. Is it some class based views thing? I would like to drop wrapping those fields with fieldset, since they are not actually fieldsets so it becomes confusing. But it is a nice-to-have.

hmpf · 2025-01-20T11:56:16Z

There is another thing I noticed: both "Filters" and "Destinations" multiselects on profiles page are wrapped with fieldset tag. I don't see any place where it comes from explicitly. Is it some class based views thing? I would like to drop wrapping those fields with fieldset, since they are not actually fieldsets so it becomes confusing. But it is a nice-to-have.

It's in the default diango template for as_div and with the merge of #1142 it can be altered by changing the file src/argus/htmx/templates/django/forms/div.html. It has already been altered a little, I've moved the "errors"-block for a specific field below that field. Compare with the django 4.2 source code: django/forms/templates/django/forms/div.html.

hmpf requested a review from podliashanyk January 10, 2025 14:05

hmpf self-assigned this Jan 10, 2025

hmpf added the frontend Affects frontend label Jan 10, 2025

hmpf force-pushed the dropdowns-profiles-page branch 3 times, most recently from 9c7466b to 63dd879 Compare January 14, 2025 09:13

hmpf marked this pull request as ready for review January 14, 2025 09:14

johannaengland requested changes Jan 14, 2025

View reviewed changes

src/argus/htmx/notificationprofile/views.py Show resolved Hide resolved

src/argus/htmx/templates/htmx/forms/dropdown_select_multiple.html Show resolved Hide resolved

johannaengland linked an issue Jan 14, 2025 that may be closed by this pull request

Use <button> instead of <p><a>...<a/><p/> #1092

Closed

johannaengland requested changes Jan 15, 2025

View reviewed changes

hmpf mentioned this pull request Jan 15, 2025

Move common functionality to destination base class #936

Open

hmpf force-pushed the dropdowns-profiles-page branch from 547d727 to a882c6b Compare January 15, 2025 13:26

hmpf requested a review from johannaengland January 16, 2025 11:33

hmpf added the nonews No news fragment is necessary for this PR (e.g. refactoring, cleanups, workflow/development changes) label Jan 16, 2025

hmpf force-pushed the dropdowns-profiles-page branch from fb1720e to 2429e13 Compare January 16, 2025 11:35

hmpf mentioned this pull request Jan 16, 2025

Only update affected media list when updating destination in HTMX frontend #1121

Merged

johannaengland requested changes Jan 16, 2025

View reviewed changes

johannaengland mentioned this pull request Jan 16, 2025

Add validation for not adding a profile with the same name #1139

Open

hmpf added 2 commits January 17, 2025 13:03

Add dropdowns for filter and destination

5c34afd

Fix dropdown overlap for filter, destinations

9286009

hmpf force-pushed the dropdowns-profiles-page branch from 102d0f5 to 9286009 Compare January 17, 2025 12:04

hmpf added 2 commits January 17, 2025 13:09

hide delete button on create page

22f0b60

turn off autocomplete for active

14c3ee1

turn off autocomplete for checkbox

0177b93

hmpf requested a review from johannaengland January 17, 2025 12:59

johannaengland approved these changes Jan 17, 2025

View reviewed changes

podliashanyk requested changes Jan 20, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add dropdowns to profiles page #1118

Add dropdowns to profiles page #1118

hmpf commented Jan 10, 2025

github-actions bot commented Jan 10, 2025 •

edited

Loading

codecov-commenter commented Jan 10, 2025 •

edited

Loading

johannaengland left a comment

hmpf commented Jan 16, 2025 •

edited

Loading

hmpf commented Jan 16, 2025

johannaengland left a comment

johannaengland Jan 16, 2025

hmpf Jan 17, 2025

hmpf commented Jan 17, 2025

hmpf commented Jan 17, 2025

hmpf commented Jan 17, 2025

sonarqubecloud bot commented Jan 17, 2025

johannaengland commented Jan 17, 2025

podliashanyk left a comment

podliashanyk Jan 20, 2025

hmpf Jan 20, 2025

hmpf commented Jan 20, 2025

podliashanyk commented Jan 20, 2025 •

edited

Loading

hmpf commented Jan 20, 2025

Add dropdowns to profiles page #1118

Are you sure you want to change the base?

Add dropdowns to profiles page #1118

Conversation

hmpf commented Jan 10, 2025

github-actions bot commented Jan 10, 2025 • edited Loading

Test results

codecov-commenter commented Jan 10, 2025 • edited Loading

Codecov Report

johannaengland left a comment

Choose a reason for hiding this comment

hmpf commented Jan 16, 2025 • edited Loading

hmpf commented Jan 16, 2025

johannaengland left a comment

Choose a reason for hiding this comment

johannaengland Jan 16, 2025

Choose a reason for hiding this comment

hmpf Jan 17, 2025

Choose a reason for hiding this comment

hmpf commented Jan 17, 2025

hmpf commented Jan 17, 2025

hmpf commented Jan 17, 2025

sonarqubecloud bot commented Jan 17, 2025

Quality Gate passed

johannaengland commented Jan 17, 2025

podliashanyk left a comment

Choose a reason for hiding this comment

podliashanyk Jan 20, 2025

Choose a reason for hiding this comment

hmpf Jan 20, 2025

Choose a reason for hiding this comment

hmpf commented Jan 20, 2025

podliashanyk commented Jan 20, 2025 • edited Loading

hmpf commented Jan 20, 2025

github-actions bot commented Jan 10, 2025 •

edited

Loading

codecov-commenter commented Jan 10, 2025 •

edited

Loading

hmpf commented Jan 16, 2025 •

edited

Loading

podliashanyk commented Jan 20, 2025 •

edited

Loading