From 9d57d03cbb5cc0ac7e453619b2e8365a2dc5a14c Mon Sep 17 00:00:00 2001
From: Ross <ross@xkjq.uk>
Date: Thu, 20 Nov 2025 21:59:50 +0000
Subject: [PATCH] Refactor synonym management: extract synonyms list and add
 forms for adding synonyms with HTMX support

---
 atlas/templates/atlas/condition_detail.html   | 30 ++---------
 .../atlas/partials/_synonyms_list.html        | 54 +++++++++++++++++++
 atlas/views.py                                | 14 +++++
 3 files changed, 71 insertions(+), 27 deletions(-)
 create mode 100644 atlas/templates/atlas/partials/_synonyms_list.html

diff --git a/atlas/templates/atlas/condition_detail.html b/atlas/templates/atlas/condition_detail.html
index b56332d3..24b03640 100755
--- a/atlas/templates/atlas/condition_detail.html
+++ b/atlas/templates/atlas/condition_detail.html
@@ -31,33 +31,9 @@
 
                         <dt class="col-sm-4">Synonyms</dt>
                         <dd class="col-sm-8">
-                            {% for syn in condition.synonym.all %}
-                                <a class="badge bg-secondary text-decoration-none text-white me-1" href="{{ syn.get_absolute_url }}">{{ syn }}</a>
-                            {% empty %}
-                                &mdash;
-                            {% endfor %}
-                            {% if request.user.is_authenticated and can_merge %}
-                                <div class="mt-2">
-                                    <a class="btn btn-sm btn-outline-primary" data-bs-toggle="collapse" href="#addSynonymCollapse" role="button" aria-expanded="false" aria-controls="addSynonymCollapse">Add synonym</a>
-                                </div>
-                                <div class="collapse mt-2" id="addSynonymCollapse">
-                                    <div class="card card-body">
-                                        <form method="POST">
-                                            {% csrf_token %}
-                                            <input type="hidden" name="action" value="add_synonym" />
-                                            <div class="mb-2">
-                                                <label class="form-label small">Select existing condition</label>
-                                                {{ synonym_form.condition }}
-                                            </div>
-                                            <div class="mb-2">
-                                                <label class="form-label small">Or create new synonym name</label>
-                                                <input class="form-control" type="text" name="synonym_name" placeholder="e.g. Granulomatosis with Polyangiitis" />
-                                            </div>
-                                            <button class="btn btn-primary btn-sm" type="submit">Add</button>
-                                        </form>
-                                    </div>
-                                </div>
-                            {% endif %}
+                            <div id="synonyms-container">
+                                {% include 'atlas/partials/_synonyms_list.html' %}
+                            </div>
                         </dd>
 
                         <dt class="col-sm-4">Parent</dt>
diff --git a/atlas/templates/atlas/partials/_synonyms_list.html b/atlas/templates/atlas/partials/_synonyms_list.html
new file mode 100644
index 00000000..c3a99c84
--- /dev/null
+++ b/atlas/templates/atlas/partials/_synonyms_list.html
@@ -0,0 +1,54 @@
+{% comment %}Partial that renders the synonyms list + add form. Used by condition_detail and HTMX responses.{% endcomment %}
+{% load static %}
+
+{% if condition.synonym.all %}
+    {% for syn in condition.synonym.all %}
+        <a class="badge bg-secondary text-decoration-none text-white me-1" href="{{ syn.get_absolute_url }}">{{ syn }}</a>
+    {% endfor %}
+{% else %}
+    &mdash;
+{% endif %}
+
+{% if request.user.is_authenticated and can_merge %}
+    <div class="mt-2 d-flex gap-2">
+        <!-- Button to add an existing condition as a synonym -->
+        <a class="btn btn-sm btn-outline-primary" data-bs-toggle="collapse" href="#addSynonymCollapse" role="button" aria-expanded="false" aria-controls="addSynonymCollapse">Add synonym</a>
+
+        <!-- Button to create a new condition and add it as a synonym -->
+        <a class="btn btn-sm btn-outline-success" data-bs-toggle="collapse" href="#createSynonymCollapse" role="button" aria-expanded="false" aria-controls="createSynonymCollapse">Create synonym</a>
+    </div>
+
+    <!-- Collapse: add existing condition -->
+    <div class="collapse mt-2" id="addSynonymCollapse">
+        <div class="card card-body">
+            <form method="POST"
+                  hx-post="{% url 'atlas:condition_detail' condition.pk %}"
+                  hx-target="#synonyms-container" hx-swap="innerHTML">
+                {% csrf_token %}
+                <input type="hidden" name="action" value="add_synonym" />
+                <div class="mb-2">
+                    <label class="form-label small">Select existing condition</label>
+                    {{ synonym_form.condition }}
+                </div>
+                <button class="btn btn-primary btn-sm" type="submit">Add</button>
+            </form>
+        </div>
+    </div>
+
+    <!-- Collapse: create new condition -->
+    <div class="collapse mt-2" id="createSynonymCollapse">
+        <div class="card card-body">
+            <form method="POST"
+                  hx-post="{% url 'atlas:condition_detail' condition.pk %}"
+                  hx-target="#synonyms-container" hx-swap="innerHTML">
+                {% csrf_token %}
+                <input type="hidden" name="action" value="add_synonym" />
+                <div class="mb-2">
+                    <label class="form-label small">Create new synonym name</label>
+                    <input class="form-control" type="text" name="synonym_name" placeholder="e.g. Granulomatosis with Polyangitis" required />
+                </div>
+                <button class="btn btn-success btn-sm" type="submit">Create</button>
+            </form>
+        </div>
+    </div>
+{% endif %}
diff --git a/atlas/views.py b/atlas/views.py
index 9f92498c..7bb09520 100755
--- a/atlas/views.py
+++ b/atlas/views.py
@@ -860,6 +860,9 @@ def condition_detail(request, pk):
         if form.is_valid():
             other = form.cleaned_data.get("condition")
 
+        # keep the form (possibly with errors) to render back in HTMX responses
+        synonym_form = form
+
         # If no autocomplete selection, accept a free-text name
         synonym_name = request.POST.get("synonym_name")
         if not other and synonym_name:
@@ -874,6 +877,17 @@ def condition_detail(request, pk):
             condition.synonym.add(other)
             other.synonym.add(condition)
 
+        # If this was an HTMX request return the updated synonyms partial so the
+        # page can be updated without a full redirect. Otherwise perform the
+        # existing redirect back to the detail page.
+        if request.htmx:
+            html = render_to_string(
+                "atlas/partials/_synonyms_list.html",
+                {"condition": condition, "synonym_form": synonym_form, "can_merge": can_merge},
+                request=request,
+            )
+            return HttpResponse(html)
+
         return redirect("atlas:condition_detail", pk=condition.pk)
 
     # logging.debug(atlas.subspecialty.first().name.all())