From 5987777696778be466a0373343b3a52df25ee0d6 Mon Sep 17 00:00:00 2001
From: Wes Appler <145372368+wes-otf@users.noreply.github.com>
Date: Fri, 11 Jul 2025 10:21:46 +0200
Subject: [PATCH] Removed nested htmx call causing triggering of submission
 export.

---
 .../funds/templates/submissions/all.html      | 246 +++++++++---------
 1 file changed, 124 insertions(+), 122 deletions(-)

diff --git a/hypha/apply/funds/templates/submissions/all.html b/hypha/apply/funds/templates/submissions/all.html
index 04db3f5a7c..1557d609a7 100644
--- a/hypha/apply/funds/templates/submissions/all.html
+++ b/hypha/apply/funds/templates/submissions/all.html
@@ -38,134 +38,136 @@
 
 
 {% block content %}{% spaceless %}
-    <form
-        class="flex gap-2 justify-between items-center mt-4 md:gap-4"
-        hx-trigger="change"
-        hx-get="./"
-        hx-target="#main"
-        hx-push-url="true"
-        hx-swap="outerHTML transition:true"
-    >
+    <div class="flex gap-2 justify-between items-center mt-4 md:gap-4">
+        <form
+            class="flex gap-2 justify-between items-center w-full md:gap-4"
+            hx-trigger="change"
+            hx-get="./"
+            hx-target="#main"
+            hx-push-url="true"
+            hx-swap="outerHTML transition:true"
+        >
 
-        {% dropdown_menu title="Filters" heading="Filter submissions" %}
-            <a
-                href="{% url "apply:submissions:list" %}?query=is:open"
-                hx-get="{% url "apply:submissions:list" %}?query=is:open"
-                hx-push-url="true"
-                hx-target="#main"
-                hx-swap="outerHTML transition:true"
-                class="flex {% if request.GET.query == "is:open" %}ps-2 font-medium bg-base-200{% else %}ps-8 font-normal{% endif %} pe-3 py-2 text-base-content/80 border-b items-center hover:bg-base-200 focus:bg-base-200">
-                {% if request.GET.query == "is:open" %}
-                    {% heroicon_mini "check" aria_hidden="true" size=16 class="stroke-2 me-1" %}
-                {% endif %}
-                {% trans "Open submissions" %} {{ request.GET.lead }}
-            </a>
-            <a
-                href="{% url "apply:submissions:list" %}?query=lead:@me"
-                hx-get="{% url "apply:submissions:list" %}?query=lead:@me"
-                hx-push-url="true"
-                hx-target="#main"
-                hx-swap="outerHTML transition:true"
-                class="flex {% if request.GET.query == "lead:@me" %}ps-2 font-medium bg-base-200{% else %}ps-8 font-normal{% endif %} pe-3 py-2 text-base-content/80 border-b items-center hover:bg-base-200 focus:bg-base-200">
-                {% if request.GET.query == "lead:@me" %}
-                    {% heroicon_mini "check" aria_hidden="true" size=16 class="stroke-2 me-1" %}
-                {% endif %}
-                {% trans "Your assigned submissions (lead)" %} {{ request.GET.lead }}
-            </a>
-            <a
-                href="{% url "apply:submissions:list" %}?query=flagged:@me"
-                hx-get="{% url "apply:submissions:list" %}?query=flagged:@me"
-                hx-push-url="true"
-                hx-target="#main"
-                hx-swap="outerHTML transition:true"
-                class="flex {% if request.GET.query == "flagged:@me" %}ps-2 font-medium bg-base-200{% else %}ps-8 font-normal{% endif %} pe-3 py-2 text-base-content/80 border-b items-center hover:bg-base-200 focus:bg-base-200">
-                {% if request.GET.query == "flagged:@me" %}
-                    {% heroicon_mini "check" aria_hidden="true" size=16 class="stroke-2 me-1" %}
-                {% endif %}
-                {% trans "Your flagged submissions" %}
-            </a>
-            <a
-                href="{% url "apply:submissions:list" %}?query=flagged:@staff"
-                hx-get="{% url "apply:submissions:list" %}?query=flagged:@staff"
-                hx-push-url="true"
-                hx-target="#main"
-                hx-swap="outerHTML transition:true"
-                class="flex {% if request.GET.query == "flagged:@staff" %}ps-2 font-medium bg-base-200{% else %}ps-8 font-normal{% endif %} pe-3 py-2 text-base-content/80 border-b items-center hover:bg-base-200 focus:bg-base-200">
-                {% if request.GET.query == "flagged:@staff" %}
-                    {% heroicon_mini "check" aria_hidden="true" size=16 class="stroke-2 me-1" %}
-                {% endif %}
-                {% trans "Staff flagged submissions" %}
-            </a>
-            <a
-                href="{% url "apply:submissions:list" %}?query=reviewer:@me"
-                hx-get="{% url "apply:submissions:list" %}?query=reviewer:@me"
-                hx-push-url="true"
-                hx-target="#main"
-                hx-swap="outerHTML transition:true"
-                class="flex {% if request.GET.query == "reviewer:@me" %}ps-2 font-medium bg-base-200{% else %}ps-8 font-normal{% endif %} pe-3 py-2 text-base-content/80 border-b items-center hover:bg-base-200 focus:bg-base-200">
-                {% if request.GET.query == "reviewer:@me" %}
-                    {% heroicon_mini "check" aria_hidden="true" size=16 class="stroke-2 me-1" %}
-                {% endif %}
-                {% trans "Awaiting your review" %}
-            </a>
-            <a
-                href="{% url "apply:submissions:list" %}?query=reviewed-by:@me"
-                hx-get="{% url "apply:submissions:list" %}?query=reviewed-by:@me"
-                hx-push-url="true"
-                hx-target="#main"
-                hx-swap="outerHTML transition:true"
-                class="flex {% if request.GET.query == "reviewed-by:@me" %}ps-2 font-medium bg-base-200{% else %}ps-8 font-normal{% endif %} pe-3 py-2 text-base-content/80 border-b items-center hover:bg-base-200 focus:bg-base-200">
-                {% if request.GET.query == "reviewed-by:@me" %}
-                    {% heroicon_mini "check" aria_hidden="true" size=16 class="stroke-2 me-1" %}
+            {% dropdown_menu title="Filters" heading="Filter submissions" %}
+                <a
+                    href="{% url "apply:submissions:list" %}?query=is:open"
+                    hx-get="{% url "apply:submissions:list" %}?query=is:open"
+                    hx-push-url="true"
+                    hx-target="#main"
+                    hx-swap="outerHTML transition:true"
+                    class="flex {% if request.GET.query == "is:open" %}ps-2 font-medium bg-base-200{% else %}ps-8 font-normal{% endif %} pe-3 py-2 text-base-content/80 border-b items-center hover:bg-base-200 focus:bg-base-200">
+                    {% if request.GET.query == "is:open" %}
+                        {% heroicon_mini "check" aria_hidden="true" size=16 class="stroke-2 me-1" %}
+                    {% endif %}
+                    {% trans "Open submissions" %} {{ request.GET.lead }}
+                </a>
+                <a
+                    href="{% url "apply:submissions:list" %}?query=lead:@me"
+                    hx-get="{% url "apply:submissions:list" %}?query=lead:@me"
+                    hx-push-url="true"
+                    hx-target="#main"
+                    hx-swap="outerHTML transition:true"
+                    class="flex {% if request.GET.query == "lead:@me" %}ps-2 font-medium bg-base-200{% else %}ps-8 font-normal{% endif %} pe-3 py-2 text-base-content/80 border-b items-center hover:bg-base-200 focus:bg-base-200">
+                    {% if request.GET.query == "lead:@me" %}
+                        {% heroicon_mini "check" aria_hidden="true" size=16 class="stroke-2 me-1" %}
+                    {% endif %}
+                    {% trans "Your assigned submissions (lead)" %} {{ request.GET.lead }}
+                </a>
+                <a
+                    href="{% url "apply:submissions:list" %}?query=flagged:@me"
+                    hx-get="{% url "apply:submissions:list" %}?query=flagged:@me"
+                    hx-push-url="true"
+                    hx-target="#main"
+                    hx-swap="outerHTML transition:true"
+                    class="flex {% if request.GET.query == "flagged:@me" %}ps-2 font-medium bg-base-200{% else %}ps-8 font-normal{% endif %} pe-3 py-2 text-base-content/80 border-b items-center hover:bg-base-200 focus:bg-base-200">
+                    {% if request.GET.query == "flagged:@me" %}
+                        {% heroicon_mini "check" aria_hidden="true" size=16 class="stroke-2 me-1" %}
+                    {% endif %}
+                    {% trans "Your flagged submissions" %}
+                </a>
+                <a
+                    href="{% url "apply:submissions:list" %}?query=flagged:@staff"
+                    hx-get="{% url "apply:submissions:list" %}?query=flagged:@staff"
+                    hx-push-url="true"
+                    hx-target="#main"
+                    hx-swap="outerHTML transition:true"
+                    class="flex {% if request.GET.query == "flagged:@staff" %}ps-2 font-medium bg-base-200{% else %}ps-8 font-normal{% endif %} pe-3 py-2 text-base-content/80 border-b items-center hover:bg-base-200 focus:bg-base-200">
+                    {% if request.GET.query == "flagged:@staff" %}
+                        {% heroicon_mini "check" aria_hidden="true" size=16 class="stroke-2 me-1" %}
+                    {% endif %}
+                    {% trans "Staff flagged submissions" %}
+                </a>
+                <a
+                    href="{% url "apply:submissions:list" %}?query=reviewer:@me"
+                    hx-get="{% url "apply:submissions:list" %}?query=reviewer:@me"
+                    hx-push-url="true"
+                    hx-target="#main"
+                    hx-swap="outerHTML transition:true"
+                    class="flex {% if request.GET.query == "reviewer:@me" %}ps-2 font-medium bg-base-200{% else %}ps-8 font-normal{% endif %} pe-3 py-2 text-base-content/80 border-b items-center hover:bg-base-200 focus:bg-base-200">
+                    {% if request.GET.query == "reviewer:@me" %}
+                        {% heroicon_mini "check" aria_hidden="true" size=16 class="stroke-2 me-1" %}
+                    {% endif %}
+                    {% trans "Awaiting your review" %}
+                </a>
+                <a
+                    href="{% url "apply:submissions:list" %}?query=reviewed-by:@me"
+                    hx-get="{% url "apply:submissions:list" %}?query=reviewed-by:@me"
+                    hx-push-url="true"
+                    hx-target="#main"
+                    hx-swap="outerHTML transition:true"
+                    class="flex {% if request.GET.query == "reviewed-by:@me" %}ps-2 font-medium bg-base-200{% else %}ps-8 font-normal{% endif %} pe-3 py-2 text-base-content/80 border-b items-center hover:bg-base-200 focus:bg-base-200">
+                    {% if request.GET.query == "reviewed-by:@me" %}
+                        {% heroicon_mini "check" aria_hidden="true" size=16 class="stroke-2 me-1" %}
+                    {% endif %}
+                    {% trans "Reviewed by you" %}
+                </a>
+            {% enddropdown_menu %}
+
+            {% for key, value in request.GET.items %}
+                {% if key != 'page' and key != 'drafts' and key != 'query' and key != 'archived' %}
+                    <input type="hidden" name="{{ key }}" value="{{ value }}">
                 {% endif %}
-                {% trans "Reviewed by you" %}
-            </a>
-        {% enddropdown_menu %}
-
-        {% for key, value in request.GET.items %}
-            {% if key != 'page' and key != 'drafts' and key != 'query' and key != 'archived' %}
-                <input type="hidden" name="{{ key }}" value="{{ value }}">
-            {% endif %}
-        {% endfor %}
-
-        <label class="inline-flex relative flex-auto items-center">
-            <span class="flex absolute inset-y-0 items-center pointer-events-none start-0 ps-3">
-                {% heroicon_mini "magnifying-glass" size=20 class="text-fg-muted" aria_hidden=true %}
-            </span>
-            <input
-                type="text"
-                id="search-navbar"
-                class="w-full input"
-                placeholder="{% trans 'Search…' %}"
-                name="query"
-                aria-label="{% trans 'Search submissions' %}"
-                value="{{ search_query|default_if_none:'' }}" {% if search_query %}autofocus{% endif %}
-            >
-        </label>
+            {% endfor %}
 
-        {% if can_view_archive %}
-            <label class="label">
+            <label class="inline-flex relative flex-auto items-center">
+                <span class="flex absolute inset-y-0 items-center pointer-events-none start-0 ps-3">
+                    {% heroicon_mini "magnifying-glass" size=20 class="text-fg-muted" aria_hidden=true %}
+                </span>
                 <input
-                    type="checkbox"
-                    name="archived"
-                    {% if show_archived %}checked{% endif %}
-                    class="toggle toggle-sm toggle-primary"
+                    type="text"
+                    id="search-navbar"
+                    class="w-full input"
+                    placeholder="{% trans 'Search…' %}"
+                    name="query"
+                    aria-label="{% trans 'Search submissions' %}"
+                    value="{{ search_query|default_if_none:'' }}" {% if search_query %}autofocus{% endif %}
                 >
-                {% trans "Archived" %}
             </label>
-        {% endif %}
 
-        {% if can_access_drafts %}
-            <label class="label">
-                <input
-                    type="checkbox"
-                    name="drafts"
-                    {% if show_drafts %}checked{% endif %}
-                    class="toggle toggle-sm toggle-primary"
-                >
-                {% trans "Drafts" %}
-            </label>
-        {% endif %}
+            {% if can_view_archive %}
+                <label class="label">
+                    <input
+                        type="checkbox"
+                        name="archived"
+                        {% if show_archived %}checked{% endif %}
+                        class="toggle toggle-sm toggle-primary"
+                    >
+                    {% trans "Archived" %}
+                </label>
+            {% endif %}
+
+            {% if can_access_drafts %}
+                <label class="label">
+                    <input
+                        type="checkbox"
+                        name="drafts"
+                        {% if show_drafts %}checked{% endif %}
+                        class="toggle toggle-sm toggle-primary"
+                    >
+                    {% trans "Drafts" %}
+                </label>
+            {% endif %}
+        </form>
 
         {% if can_export_submissions %}
             <a
@@ -179,7 +181,7 @@
                 {% heroicon_mini "arrow-down-tray" %}
             </a>
         {% endif %}
-    </form>
+    </div>
 
     {% if is_filtered %}
         {% comment %} Display option to clear all the filters {% endcomment %}