From d79fcd3c5d9a6e46fed7cb2222cd117bdfb6c782 Mon Sep 17 00:00:00 2001
From: "madjid.asa" <madjid.asa@gmail.com>
Date: Wed, 21 Feb 2024 10:06:37 +0100
Subject: [PATCH 1/2] =?UTF-8?q?fix(dashboard=5Fsiae)=20:=20fix=20du=20bug?=
 =?UTF-8?q?=20d'affichage=20des=20tabs=20pour=20compl=C3=A9ter=20les=20don?=
 =?UTF-8?q?n=C3=A9es=20des=20siaes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lemarche/static/js/utils.js                 | 4 ++--
 lemarche/templates/dashboard/home_siae.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lemarche/static/js/utils.js b/lemarche/static/js/utils.js
index 4c4560ad1..e78531062 100644
--- a/lemarche/static/js/utils.js
+++ b/lemarche/static/js/utils.js
@@ -23,7 +23,7 @@ window.addEventListener('DOMContentLoaded', function () {
     initModalMessages();
 
     // reload click events and tooltip after htmx content loading as in semantic search
-    document.addEventListener('htmx:afterSwap', function(event) {
+    document.addEventListener('htmx:afterSwap', function (event) {
         initSuperBadges();
     });
     initSuperBadges();
@@ -79,7 +79,7 @@ const initSuperBadges = () => {
 
         });
     });
-    $('.s-tabs-01__nav .nav-item').on('click', function (event) {
+    $('#siaes_tabs .nav-item').on('click', function (event) {
         event.preventDefault()
         let tabContent = this.parentElement.parentElement.querySelector(".tab-content");
         let hasSuperBadgeTab = this.children[0].classList.contains("super-badge-tab");
diff --git a/lemarche/templates/dashboard/home_siae.html b/lemarche/templates/dashboard/home_siae.html
index 0af26e529..a3f89c2d7 100644
--- a/lemarche/templates/dashboard/home_siae.html
+++ b/lemarche/templates/dashboard/home_siae.html
@@ -35,7 +35,7 @@ <h1 class="s-title-01__title h1"><strong>Tableau de bord</strong></h1>
 {% if user.siaeuser_set.count %}
     <section class="s-tabs-01 mb-3 mb-lg-5">
         <div class="s-tabs-01__container container">
-            <div class="s-tabs-01__row row">
+            <div id="siaes_tabs" class="s-tabs-01__row row">
                 <div class="s-tabs-01__col col-12">
                     <ul class="s-tabs-01__nav nav nav-tabs" role="tablist">
                         {% for siaeuser in user.siaeuser_set.all %}

From 785b8c9e5cf4f2ef8ae8c76f6f539a2ecad751d7 Mon Sep 17 00:00:00 2001
From: "madjid.asa" <madjid.asa@gmail.com>
Date: Wed, 21 Feb 2024 10:24:08 +0100
Subject: [PATCH 2/2] fix edge case of external link

---
 lemarche/static/js/utils.js                 | 15 ++++++++++-----
 lemarche/templates/dashboard/home_siae.html |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/lemarche/static/js/utils.js b/lemarche/static/js/utils.js
index e78531062..76ee7c76e 100644
--- a/lemarche/static/js/utils.js
+++ b/lemarche/static/js/utils.js
@@ -82,14 +82,19 @@ const initSuperBadges = () => {
     $('#siaes_tabs .nav-item').on('click', function (event) {
         event.preventDefault()
         let tabContent = this.parentElement.parentElement.querySelector(".tab-content");
-        let hasSuperBadgeTab = this.children[0].classList.contains("super-badge-tab");
+        let childLink = this.children[0];
 
-        if (hasSuperBadgeTab) {
-            tabContent.classList.add("super-badge-tab");
+        if (childLink.classList.contains("nav-link-external")) { //edge case for external links
+            window.location = childLink.href;
         } else {
-            tabContent.classList.remove("super-badge-tab");
+            let hasSuperBadgeTab = childLink.classList.contains("super-badge-tab");
+
+            if (hasSuperBadgeTab) {
+                tabContent.classList.add("super-badge-tab");
+            } else {
+                tabContent.classList.remove("super-badge-tab");
+            }
         }
-        $(this).tab('show');
     })
 }
 
diff --git a/lemarche/templates/dashboard/home_siae.html b/lemarche/templates/dashboard/home_siae.html
index a3f89c2d7..400c739f8 100644
--- a/lemarche/templates/dashboard/home_siae.html
+++ b/lemarche/templates/dashboard/home_siae.html
@@ -53,7 +53,7 @@ <h1 class="s-title-01__title h1"><strong>Tableau de bord</strong></h1>
                             </li>
                         {% endfor %}
                         <li class="nav-item" role="presentation">
-                            <a class="nav-link" id="add-siae-btn" href="{% url 'dashboard_siaes:siae_search_by_siret' %}" aria-selected="false">
+                            <a class="nav-link nav-link-external" id="add-siae-btn" href="{% url 'dashboard_siaes:siae_search_by_siret' %}" aria-selected="false">
                                 <i class="ri-add-line"></i>
                                 <span>Ajouter une structure</span>
                             </a>