From 7358291a4a6cb4672f7b68ee302397e5005e0b8d Mon Sep 17 00:00:00 2001
From: Austin Riba <austin@m51.io>
Date: Thu, 19 Mar 2026 11:21:06 -0700
Subject: [PATCH 1/7] Initial htmx swap

---
 .../tom_targets/partials/observation_table.html       |  2 ++
 tom_targets/templates/tom_targets/target_detail.html  |  6 +++++-
 tom_targets/urls.py                                   |  3 ++-
 tom_targets/views.py                                  | 11 +++++++++++
 4 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 tom_targets/templates/tom_targets/partials/observation_table.html

diff --git a/tom_targets/templates/tom_targets/partials/observation_table.html b/tom_targets/templates/tom_targets/partials/observation_table.html
new file mode 100644
index 000000000..042342f36
--- /dev/null
+++ b/tom_targets/templates/tom_targets/partials/observation_table.html
@@ -0,0 +1,2 @@
+{% load observation_extras %}
+{% observation_list object %}
diff --git a/tom_targets/templates/tom_targets/target_detail.html b/tom_targets/templates/tom_targets/target_detail.html
index 9c3ca35c6..67888dcc0 100644
--- a/tom_targets/templates/tom_targets/target_detail.html
+++ b/tom_targets/templates/tom_targets/target_detail.html
@@ -91,8 +91,12 @@ <h4>Plan</h4>
       <div class="tab-pane" id="observations">
         {% existing_observation_form object %}
         <h4>Observations</h4>
+        <!-- htmx loading -->
         <a href="{% url 'targets:detail' pk=target.id %}?update_status=True" title="Update status of observations for target" class="btn btn-primary">Update Observations Status</a>
-        {% observation_list object %}
+        <a hx-get="{% url 'targets:render-observation-table' pk=target.id %}" hx-target="#observation-table" class="btn btn-secondary">Refresh Observation List</a>
+        <div id="observation-table">
+        {% include 'tom_targets/partials/observation_table.html' %}
+        </div>
       </div>
       <div class="tab-pane" id="manage-data">
         {% if user.is_authenticated %}
diff --git a/tom_targets/urls.py b/tom_targets/urls.py
index e364a0a30..4086bb6b5 100644
--- a/tom_targets/urls.py
+++ b/tom_targets/urls.py
@@ -1,6 +1,6 @@
 from django.urls import path
 
-from .views import TargetCreateView, TargetUpdateView, TargetDetailView, TargetNameSearchView
+from .views import TargetCreateView, TargetUpdateView, TargetDetailView, TargetNameSearchView, render_observation_table
 from .views import TargetDeleteView, TargetListView, TargetImportView, TargetExportView, TargetShareView
 from .views import (TargetGroupingView, TargetGroupingDeleteView, TargetGroupingCreateView,
                     TargetAddRemoveGroupingView, TargetMergeView, TargetPersistentShareManageFormView,
@@ -36,6 +36,7 @@
     path('<int:pk>/share/', TargetShareView.as_view(), name='share'),
     path('<int:pk>/hermes-preload/', TargetHermesPreloadView.as_view(), name='hermes-preload'),
     path('<int:pk>/', TargetDetailView.as_view(), name='detail'),
+    path('<int:pk>/observation-list/', render_observation_table, name='render-observation-table'),
     path('targetgrouping/<int:pk>/delete/', TargetGroupingDeleteView.as_view(), name='delete-group'),
     path('targetgrouping/create/', TargetGroupingCreateView.as_view(), name='create-group'),
     path('targetgrouping/<int:pk>/share/', TargetGroupingShareView.as_view(), name='share-group'),
diff --git a/tom_targets/views.py b/tom_targets/views.py
index af913937f..d61d82e03 100644
--- a/tom_targets/views.py
+++ b/tom_targets/views.py
@@ -498,6 +498,7 @@ def get(self, request, *args, **kwargs):
         :type request: HTTPRequest
         """
         update_status = request.GET.get('update_status', False)
+        print("Updating target", update_status)
         if update_status:
             if not request.user.is_authenticated:
                 return redirect(reverse('login'))
@@ -525,6 +526,16 @@ def get(self, request, *args, **kwargs):
         return super().get(request, *args, **kwargs)
 
 
+def render_observation_table(request, pk):
+    # target_id = request.GET.get('target_id')
+    if not request.user.is_authenticated:
+        return redirect(reverse('login'))
+    out = StringIO()
+    call_command('updatestatus', target_id=pk, stdout=out)
+    # todo display command output
+    return render(request, 'tom_targets/partials/observation_table.html', context={'object': Target.objects.get(id=pk)})
+
+
 class TargetHermesPreloadView(SingleObjectMixin, View):
     model = Target
     # Set app_name for Django-Guardian Permissions in case of Custom Target Model

From a5ee0d86609dd83b79b35cb9ad55188dd919c1c7 Mon Sep 17 00:00:00 2001
From: Austin Riba <austin@m51.io>
Date: Thu, 19 Mar 2026 13:28:50 -0700
Subject: [PATCH 2/7] Add loading spinner to observation table

---
 .../templates/tom_targets/partials/observation_table.html | 1 +
 tom_targets/templates/tom_targets/target_detail.html      | 8 ++++++--
 tom_targets/views.py                                      | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/tom_targets/templates/tom_targets/partials/observation_table.html b/tom_targets/templates/tom_targets/partials/observation_table.html
index 042342f36..177f020b8 100644
--- a/tom_targets/templates/tom_targets/partials/observation_table.html
+++ b/tom_targets/templates/tom_targets/partials/observation_table.html
@@ -1,2 +1,3 @@
 {% load observation_extras %}
+<div class="progress"><div class="indeterminate"></div></div>
 {% observation_list object %}
diff --git a/tom_targets/templates/tom_targets/target_detail.html b/tom_targets/templates/tom_targets/target_detail.html
index 67888dcc0..e084a4478 100644
--- a/tom_targets/templates/tom_targets/target_detail.html
+++ b/tom_targets/templates/tom_targets/target_detail.html
@@ -92,8 +92,12 @@ <h4>Plan</h4>
         {% existing_observation_form object %}
         <h4>Observations</h4>
         <!-- htmx loading -->
-        <a href="{% url 'targets:detail' pk=target.id %}?update_status=True" title="Update status of observations for target" class="btn btn-primary">Update Observations Status</a>
-        <a hx-get="{% url 'targets:render-observation-table' pk=target.id %}" hx-target="#observation-table" class="btn btn-secondary">Refresh Observation List</a>
+        <button hx-get="{% url 'targets:render-observation-table' pk=target.id %}"
+                hx-target="#observation-table"
+                hx-indicator=".progress"
+                hx-disabled-elt="this"
+                class="btn btn-secondary mb-3">Refresh Observation List
+        </button>
         <div id="observation-table">
         {% include 'tom_targets/partials/observation_table.html' %}
         </div>
diff --git a/tom_targets/views.py b/tom_targets/views.py
index d61d82e03..0be602d1d 100644
--- a/tom_targets/views.py
+++ b/tom_targets/views.py
@@ -1,3 +1,4 @@
+from django.contrib.auth.decorators import login_required
 import logging
 
 from datetime import datetime, timedelta
@@ -526,6 +527,7 @@ def get(self, request, *args, **kwargs):
         return super().get(request, *args, **kwargs)
 
 
+@login_required
 def render_observation_table(request, pk):
     # target_id = request.GET.get('target_id')
     if not request.user.is_authenticated:

From 45e8df82adea8a9f562c9710026958895e96dfcb Mon Sep 17 00:00:00 2001
From: Austin Riba <austin@m51.io>
Date: Thu, 19 Mar 2026 13:53:24 -0700
Subject: [PATCH 3/7] Add message framework support for htmx swaps

---
 tom_common/templates/tom_common/base.html                     | 2 +-
 tom_common/templates/tom_common/partials/messages.html        | 4 ++++
 .../templates/tom_targets/partials/observation_table.html     | 1 +
 tom_targets/views.py                                          | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 tom_common/templates/tom_common/partials/messages.html

diff --git a/tom_common/templates/tom_common/base.html b/tom_common/templates/tom_common/base.html
index 06ac6faae..8c1a2aa95 100644
--- a/tom_common/templates/tom_common/base.html
+++ b/tom_common/templates/tom_common/base.html
@@ -60,7 +60,7 @@
     </nav>
 
     <main role="main" class="container">
-      {% bootstrap_messages %}
+      {% include 'tom_common/partials/messages.html' %}
       <div class="content">
         {% block content %}
         {% endblock %}
diff --git a/tom_common/templates/tom_common/partials/messages.html b/tom_common/templates/tom_common/partials/messages.html
new file mode 100644
index 000000000..e7420a39b
--- /dev/null
+++ b/tom_common/templates/tom_common/partials/messages.html
@@ -0,0 +1,4 @@
+{% load bootstrap4 %}
+<div id="messages" hx-swap-oob="true">
+  {% bootstrap_messages %}
+</div>
diff --git a/tom_targets/templates/tom_targets/partials/observation_table.html b/tom_targets/templates/tom_targets/partials/observation_table.html
index 177f020b8..535d1b31b 100644
--- a/tom_targets/templates/tom_targets/partials/observation_table.html
+++ b/tom_targets/templates/tom_targets/partials/observation_table.html
@@ -1,3 +1,4 @@
 {% load observation_extras %}
 <div class="progress"><div class="indeterminate"></div></div>
 {% observation_list object %}
+{% include 'tom_common/partials/messages.html' %}
diff --git a/tom_targets/views.py b/tom_targets/views.py
index 0be602d1d..031c81d7b 100644
--- a/tom_targets/views.py
+++ b/tom_targets/views.py
@@ -534,7 +534,7 @@ def render_observation_table(request, pk):
         return redirect(reverse('login'))
     out = StringIO()
     call_command('updatestatus', target_id=pk, stdout=out)
-    # todo display command output
+    messages.info(request, out.getvalue())
     return render(request, 'tom_targets/partials/observation_table.html', context={'object': Target.objects.get(id=pk)})
 
 

From d56fb617e268fb4835513813eb859b5eae7d2b20 Mon Sep 17 00:00:00 2001
From: Austin Riba <austin@m51.io>
Date: Thu, 19 Mar 2026 14:13:04 -0700
Subject: [PATCH 4/7] Add a css transition for HTMX messages

Co-authored-by: Dan Avner <dan.avner@noirlab.edu>
---
 tom_common/static/tom_common/css/main.css | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tom_common/static/tom_common/css/main.css b/tom_common/static/tom_common/css/main.css
index adaf225c8..5b2b5691b 100644
--- a/tom_common/static/tom_common/css/main.css
+++ b/tom_common/static/tom_common/css/main.css
@@ -309,3 +309,13 @@ td, th {
         right: -8%;
     }
 }
+
+#messages.htmx-added {
+    opacity: 0;
+}
+
+#messages {
+    opacity: 1;
+    transition: opacity 0.5s ease-out;
+}
+

From a5b1453114bccbfb8f57dba44e12b2de7245ef6d Mon Sep 17 00:00:00 2001
From: Austin Riba <austin@m51.io>
Date: Thu, 19 Mar 2026 14:30:56 -0700
Subject: [PATCH 5/7] Remove debugging statements

Co-authored-by: Dan Avner <dan.avner@noirlab.edu>
---
 tom_targets/views.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tom_targets/views.py b/tom_targets/views.py
index 031c81d7b..75b3af155 100644
--- a/tom_targets/views.py
+++ b/tom_targets/views.py
@@ -499,7 +499,6 @@ def get(self, request, *args, **kwargs):
         :type request: HTTPRequest
         """
         update_status = request.GET.get('update_status', False)
-        print("Updating target", update_status)
         if update_status:
             if not request.user.is_authenticated:
                 return redirect(reverse('login'))
@@ -529,7 +528,6 @@ def get(self, request, *args, **kwargs):
 
 @login_required
 def render_observation_table(request, pk):
-    # target_id = request.GET.get('target_id')
     if not request.user.is_authenticated:
         return redirect(reverse('login'))
     out = StringIO()

From e3b7be66fe8c87f642c3cb8641a56adbdd52669d Mon Sep 17 00:00:00 2001
From: Austin Riba <austin@m51.io>
Date: Thu, 19 Mar 2026 14:39:25 -0700
Subject: [PATCH 6/7] Remove unecessary auth check

---
 tom_targets/views.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tom_targets/views.py b/tom_targets/views.py
index 75b3af155..18c0b2024 100644
--- a/tom_targets/views.py
+++ b/tom_targets/views.py
@@ -528,8 +528,6 @@ def get(self, request, *args, **kwargs):
 
 @login_required
 def render_observation_table(request, pk):
-    if not request.user.is_authenticated:
-        return redirect(reverse('login'))
     out = StringIO()
     call_command('updatestatus', target_id=pk, stdout=out)
     messages.info(request, out.getvalue())

From cda18952e9dc4f9734ea20ee92a3faa308b7e172 Mon Sep 17 00:00:00 2001
From: Austin Riba <austin@m51.io>
Date: Thu, 19 Mar 2026 14:45:08 -0700
Subject: [PATCH 7/7] Review feedback

---
 tom_targets/templates/tom_targets/target_detail.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tom_targets/templates/tom_targets/target_detail.html b/tom_targets/templates/tom_targets/target_detail.html
index e084a4478..f2950af7d 100644
--- a/tom_targets/templates/tom_targets/target_detail.html
+++ b/tom_targets/templates/tom_targets/target_detail.html
@@ -91,7 +91,6 @@ <h4>Plan</h4>
       <div class="tab-pane" id="observations">
         {% existing_observation_form object %}
         <h4>Observations</h4>
-        <!-- htmx loading -->
         <button hx-get="{% url 'targets:render-observation-table' pk=target.id %}"
                 hx-target="#observation-table"
                 hx-indicator=".progress"