From f338d1193500cf3145249cec8b70a0d4c4d8c538 Mon Sep 17 00:00:00 2001
From: vincent porte <vincent@neuralia.co>
Date: Thu, 21 Sep 2023 11:31:16 +0200
Subject: [PATCH 1/3] linter

---
 .../partials/posts_list.html                  |  2 +-
 .../partials/topic_detail_actions.html        | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lacommunaute/templates/forum_conversation/partials/posts_list.html b/lacommunaute/templates/forum_conversation/partials/posts_list.html
index 3abd1681c..4b989c80f 100644
--- a/lacommunaute/templates/forum_conversation/partials/posts_list.html
+++ b/lacommunaute/templates/forum_conversation/partials/posts_list.html
@@ -9,7 +9,7 @@
 <div id="showmorepostsarea{{topic.pk}}">
     {% for post in posts %}
         <div class="card post mb-3 {% if post.is_certified %}bg-communaute-lighter border-communaute {% else %}bg-light {% endif %} has-links-inside ms-3"
-            id="certifiedpostsarea{{post.pk}}">
+             id="certifiedpostsarea{{post.pk}}">
             <div class="card-body">
                 <div class="row">
                     <div class="col-12 post-content-wrapper">
diff --git a/lacommunaute/templates/forum_conversation/partials/topic_detail_actions.html b/lacommunaute/templates/forum_conversation/partials/topic_detail_actions.html
index 295eff281..b6fe094bd 100644
--- a/lacommunaute/templates/forum_conversation/partials/topic_detail_actions.html
+++ b/lacommunaute/templates/forum_conversation/partials/topic_detail_actions.html
@@ -19,16 +19,16 @@
 
 {% if posts_count > 1 %}
     <a hx-get="{% url 'forum_conversation_extension:showmore_posts' topic.forum.slug topic.forum.pk topic.slug topic.pk %}"
-        id="showmoreposts-button{{topic.pk}}"
-        hx-target="#showmorepostsarea{{topic.pk}}"
-        hx-swap="outerHTML"
-        class="btn btn-secondary btn-sm btn-ico matomo-event justify-content-center w-100 w-sm-auto me-sm-1 mb-2 mb-sm-0"
-        data-matomo-category="engagement"
-        data-matomo-action="showmore"
-        data-matomo-option="post"
-        onclick=DisabledMe("showmoreposts-button{{topic.pk}}")
-        aria-label="{% trans "Show me the comment" %}"
-        role="button"
+       id="showmoreposts-button{{topic.pk}}"
+       hx-target="#showmorepostsarea{{topic.pk}}"
+       hx-swap="outerHTML"
+       class="btn btn-secondary btn-sm btn-ico matomo-event justify-content-center w-100 w-sm-auto me-sm-1 mb-2 mb-sm-0 showmoreposts-button"
+       data-matomo-category="engagement"
+       data-matomo-action="showmore"
+       data-matomo-option="post"
+       onclick=DisabledMe("showmoreposts-button{{topic.pk}}")
+       aria-label="{% trans "Show me the comment" %}"
+       role="button"
     >
         <i class="ri-eye-line font-weight-normal" aria-hidden="true"></i>
         <span>

From d04f312f17fb9e1fa0335cfa3b3cf7be148bb9ba Mon Sep 17 00:00:00 2001
From: vincent porte <vincent@neuralia.co>
Date: Thu, 21 Sep 2023 11:32:35 +0200
Subject: [PATCH 2/3] fix(forum_conversation): remove onclick DisabledMe cause
 it has no effect

---
 .../forum_conversation/partials/topic_detail_actions.html | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/lacommunaute/templates/forum_conversation/partials/topic_detail_actions.html b/lacommunaute/templates/forum_conversation/partials/topic_detail_actions.html
index b6fe094bd..52ba7d2f8 100644
--- a/lacommunaute/templates/forum_conversation/partials/topic_detail_actions.html
+++ b/lacommunaute/templates/forum_conversation/partials/topic_detail_actions.html
@@ -26,7 +26,6 @@
        data-matomo-category="engagement"
        data-matomo-action="showmore"
        data-matomo-option="post"
-       onclick=DisabledMe("showmoreposts-button{{topic.pk}}")
        aria-label="{% trans "Show me the comment" %}"
        role="button"
     >
@@ -64,10 +63,3 @@
         {% endif %}
     </div>
 {% endif %}
-
-
-<script>
-    function DisabledMe(id) {
-        document.getElementById(id).classList.add('disabled');
-    }
-</script>

From 99256b735e3200a2889b01d4a067c39923d6aef0 Mon Sep 17 00:00:00 2001
From: vincent porte <vincent@neuralia.co>
Date: Thu, 21 Sep 2023 11:33:44 +0200
Subject: [PATCH 3/3] fix(forum_conversation): move script which add d-none
 class at topic_list level instead of posts_list level to prevent duplicate

---
 .../templates/forum_conversation/partials/posts_list.html  | 5 -----
 lacommunaute/templates/forum_conversation/topic_list.html  | 7 +++++++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lacommunaute/templates/forum_conversation/partials/posts_list.html b/lacommunaute/templates/forum_conversation/partials/posts_list.html
index 4b989c80f..866dd1936 100644
--- a/lacommunaute/templates/forum_conversation/partials/posts_list.html
+++ b/lacommunaute/templates/forum_conversation/partials/posts_list.html
@@ -37,8 +37,3 @@
         {% include "forum_conversation/partials/post_feed_form_collapsable.html" with post_form=form inline=1 %}
     </div>
 </div>
-
-<script>
-    document.getElementById(`collapseButtonPost{{topic.pk}}`).setAttribute('aria-expanded', 'false');
-    document.getElementById(`showmoreposts-button{{topic.pk}}`).className = 'd-none';
-</script>
diff --git a/lacommunaute/templates/forum_conversation/topic_list.html b/lacommunaute/templates/forum_conversation/topic_list.html
index 013746f8f..a395134b1 100644
--- a/lacommunaute/templates/forum_conversation/topic_list.html
+++ b/lacommunaute/templates/forum_conversation/topic_list.html
@@ -136,3 +136,10 @@
         {% endif %}
     {% endif %}
 </div>
+
+<script nonce="{{ request.csp_nonce }}">
+    var showmorepostsButtons = document.querySelectorAll('.showmoreposts-button')
+    showmorepostsButtons.forEach((button) => button.addEventListener('click', function () {
+        button.classList.add('d-none');
+    }));
+</script>