[#901, #902, #903 ] Implemented Action-status toggle and added HTMX to backend #347

Bartvaderkin · 2022-11-23T14:46:55Z

It is quite a lot for a simple button, but this also adds htmx and django-htmx to the project.

Additionally I've added some infrastructure and related tests to be able to render a template-tag to a string.

And then tied that into a base class for a View to handle hx-post requests and respond with a rendered template-tag (this gives convenient partial responses without extra boilerplate templates or hx-select's).

And then expanded on Sven's selenium integration testing.

And then the functionality exists in two flavours (plain Actions and Actions via Plans) so implementation and test cases almost double.

Bartvaderkin · 2022-12-01T10:56:28Z

src/open_inwoner/templates/master.html

@@ -75,5 +75,6 @@ <h2 class="modal__title" id="modal__title"></h2>
        </div>

        <script nonce="{{ request.csp_nonce }}" src="{% static 'bundles/open_inwoner-js.js' %}" type="text/javascript"></script>
+        {% django_htmx_script %}


This tag adds some development features when DEBUG=True

Bartvaderkin · 2022-12-01T13:02:04Z

src/open_inwoner/components/utils.py

@@ -132,3 +135,118 @@ def render(self):
                kwargs,
                self.template_name,
            )
+
+
+class RenderableTag:


This is a bit of a black box but the main part from InclusionTagWebTest has been used for testing for a while.

Sorry, I don't understand why you use it.
Can't we just use django TemplateResponse or render shortcut? It does the same things - resolves the template with it's name and then render the content. In the htmx view we return a piece of HTML, why not to do it the way django usually does it?

Because that would require to create boilerplate template files that would only have a {% load xyz %} and the tag we want to render with a repeat of all the arguments. This class basically creates that on the fly so we need less files and repeating of argument names/values.

annashamray

django-htmx looks interesting,my main question is about the necessity of RenderableTag

src/open_inwoner/htmx/views.py

src/open_inwoner/scss/components/Actions/Actions.scss

annashamray · 2022-12-02T16:16:28Z

src/open_inwoner/components/utils.py

@@ -132,3 +135,118 @@ def render(self):
                kwargs,
                self.template_name,
            )
+
+
+class RenderableTag:


Sorry, I don't understand why you use it.
Can't we just use django TemplateResponse or render shortcut? It does the same things - resolves the template with it's name and then render the content. In the htmx view we return a piece of HTML, why not to do it the way django usually does it?

vaszig

Only one remark, I don't know if it's a problem only on my end. When an action is not mine or it's not for me, the options for toggling the status are enabled so I get a 404.

codecov-commenter · 2022-12-06T15:57:08Z

Codecov Report

Merging #347 (58816f2) into develop (2ae8276) will increase coverage by 0.01%.
The diff coverage is 97.28%.

@@             Coverage Diff             @@
##           develop     #347      +/-   ##
===========================================
+ Coverage    96.48%   96.49%   +0.01%     
===========================================
  Files          450      457       +7     
  Lines        14034    14367     +333     
===========================================
+ Hits         13541    13864     +323     
- Misses         493      503      +10

Impacted Files	Coverage Δ
src/open_inwoner/accounts/urls.py	`100.00% <ø> (ø)`
src/open_inwoner/accounts/views/__init__.py	`100.00% <ø> (ø)`
...pen_inwoner/components/templatetags/button_tags.py	`94.82% <ø> (ø)`
...n_inwoner/components/templatetags/dropdown_tags.py	`100.00% <ø> (ø)`
src/open_inwoner/conf/base.py	`94.90% <ø> (ø)`
src/open_inwoner/plans/urls.py	`100.00% <ø> (ø)`
src/open_inwoner/plans/views.py	`97.18% <80.00%> (-0.85%)`	⬇️
src/open_inwoner/htmx/views.py	`90.32% <90.32%> (ø)`
src/open_inwoner/accounts/choices.py	`97.05% <90.90%> (-2.95%)`	⬇️
src/open_inwoner/components/utils.py	`96.34% <91.66%> (-3.66%)`	⬇️
... and 15 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

…to a dropdown using components

…selenium base code

…untered issues

…ntacts not connected to the Action

Bartvaderkin · 2022-12-07T08:38:26Z

I rebased after merge of the Contact's PR.

Note Vasileios had a good spot on his last comment (#347 (review)), but I fixed it in 954a891

Bartvaderkin · 2022-12-07T09:56:02Z

@svenvandescheur Can you sign-off on this so we can get it merged? Afterwards we need a little style update on the dropdown and button style, see Anna's comment: #347 (comment)

alextreme · 2022-12-07T11:02:06Z

Happy to merge after Anna or Vasileios approves. Create a separate Taiga task for any styling still necessary

vaszig

The status toggle works as expected concerning the shared plans now. If Anna is also ok this can be merged.

annashamray

If other developers are ok with this approach, I approve.
I'm curious where this approach would be developing, but it looks like worth experimenting

Bartvaderkin force-pushed the feature/901-action-status-toggle branch from 091bb37 to 5390496 Compare November 24, 2022 15:33

Bartvaderkin changed the title ~~WIP [#901] Implemented Action-status toggle and added HTMX to backend~~ WIP [#901, #902, #903 ] Implemented Action-status toggle and added HTMX to backend Nov 24, 2022

Bartvaderkin force-pushed the feature/901-action-status-toggle branch from 5390496 to cd4a91a Compare November 24, 2022 15:59

alextreme requested a review from svenvandescheur November 28, 2022 09:59

Bartvaderkin force-pushed the feature/901-action-status-toggle branch 5 times, most recently from a535b07 to bc1560f Compare December 1, 2022 09:58

Bartvaderkin commented Dec 1, 2022

View reviewed changes

Bartvaderkin changed the title ~~WIP [#901, #902, #903 ] Implemented Action-status toggle and added HTMX to backend~~ [#901, #902, #903 ] Implemented Action-status toggle and added HTMX to backend Dec 1, 2022

Bartvaderkin force-pushed the feature/901-action-status-toggle branch from 9b41287 to 229efa0 Compare December 1, 2022 11:14

Bartvaderkin marked this pull request as ready for review December 1, 2022 12:56

Bartvaderkin requested review from annashamray and vaszig December 1, 2022 12:58

Bartvaderkin commented Dec 1, 2022

View reviewed changes

annashamray reviewed Dec 2, 2022

View reviewed changes

vaszig reviewed Dec 5, 2022

View reviewed changes

Bart van der Schoor added 11 commits December 7, 2022 09:07

[#901] Implemented Action-status toggle and added HTMX to backend

e3a81aa

[#902] Added 'approval' status to Action, changed htmx status-button …

429b184

…to a dropdown using components

Moved selenium tests base-class code to mixins

69c6561

[#901 #902] Implemented selenium tests for action-status, refactored …

a5ad58d

…selenium base code

[#901 #902] Added selenium test for action-status in plan-detail page

3f58ab5

[#901 #902] Added comments to the Selenium test case documenting enco…

4ff3422

…untered issues

[#901] Added missing migration, tuned Action admin

2f305a5

[#901] Fixed problem with Action-status-button showing up for Plan co…

954a891

…ntacts not connected to the Action

Boost obnoxious Selenium timeouts

fa7e646

Added a merge migration to accounts app after rebase

2a5fba6

[#901] Fixed issue with new Plan tests and updated contacts structure

58816f2

Bartvaderkin force-pushed the feature/901-action-status-toggle branch from a4d7e01 to 58816f2 Compare December 7, 2022 08:37

vaszig approved these changes Dec 7, 2022

View reviewed changes

annashamray approved these changes Dec 7, 2022

View reviewed changes

alextreme merged commit 32f04c3 into develop Dec 7, 2022

alextreme deleted the feature/901-action-status-toggle branch December 7, 2022 15:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[#901, #902, #903 ] Implemented Action-status toggle and added HTMX to backend #347

[#901, #902, #903 ] Implemented Action-status toggle and added HTMX to backend #347

Bartvaderkin commented Nov 23, 2022 •

edited

Loading

Bartvaderkin Dec 1, 2022

Bartvaderkin Dec 1, 2022

annashamray Dec 2, 2022

Bartvaderkin Dec 5, 2022

annashamray left a comment

annashamray Dec 2, 2022

vaszig left a comment

codecov-commenter commented Dec 6, 2022 •

edited

Loading

Bartvaderkin commented Dec 7, 2022 •

edited

Loading

Bartvaderkin commented Dec 7, 2022

alextreme commented Dec 7, 2022

vaszig left a comment

annashamray left a comment

[#901, #902, #903 ] Implemented Action-status toggle and added HTMX to backend #347

[#901, #902, #903 ] Implemented Action-status toggle and added HTMX to backend #347

Conversation

Bartvaderkin commented Nov 23, 2022 • edited Loading

Bartvaderkin Dec 1, 2022

Choose a reason for hiding this comment

Bartvaderkin Dec 1, 2022

Choose a reason for hiding this comment

annashamray Dec 2, 2022

Choose a reason for hiding this comment

Bartvaderkin Dec 5, 2022

Choose a reason for hiding this comment

annashamray left a comment

Choose a reason for hiding this comment

annashamray Dec 2, 2022

Choose a reason for hiding this comment

vaszig left a comment

Choose a reason for hiding this comment

codecov-commenter commented Dec 6, 2022 • edited Loading

Codecov Report

Bartvaderkin commented Dec 7, 2022 • edited Loading

Bartvaderkin commented Dec 7, 2022

alextreme commented Dec 7, 2022

vaszig left a comment

Choose a reason for hiding this comment

annashamray left a comment

Choose a reason for hiding this comment

Bartvaderkin commented Nov 23, 2022 •

edited

Loading

codecov-commenter commented Dec 6, 2022 •

edited

Loading

Bartvaderkin commented Dec 7, 2022 •

edited

Loading