Use a TemplateColumn to render action buttons

UW-GAC · Feb 26, 2024 · 0c6eea3 · 0c6eea3
1 parent a108f9d
commit 0c6eea3
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 33 deletions.
diff --git a/primed/collaborative_analysis/audit.py b/primed/collaborative_analysis/audit.py
@@ -9,7 +9,6 @@
     ManagedGroup,
 )
 from django.urls import reverse
-from django.utils.safestring import mark_safe
 
 from primed.primed_anvil.tables import BooleanIconColumn
 
@@ -98,18 +97,13 @@ class AccessAuditResultsTable(tables.Table):
     member = tables.Column(linkify=True)
     has_access = BooleanIconColumn(show_false_icon=True)
     note = tables.Column()
-    action = tables.Column()
+    action = tables.TemplateColumn(
+        template_name="snippets/collaborativeanalysis_audit_action_button.html"
+    )
 
     class Meta:
         attrs = {"class": "table align-middle"}
 
-    def render_action(self, record, value):
-        return mark_safe(
-            """<a href="{}" class="btn btn-primary btn-sm">{}</a>""".format(
-                record["action_url"], value
-            )
-        )
-
 
 class CollaborativeAnalysisWorkspaceAccessAudit:
     """Class to audit access to a CollaborativeAnalysisWorkspace."""

diff --git a/primed/collaborative_analysis/tests/test_audit.py b/primed/collaborative_analysis/tests/test_audit.py
@@ -1155,23 +1155,3 @@ def test_two_rows(self):
         table = audit.AccessAuditResultsTable(data)
         self.assertIsInstance(table, audit.AccessAuditResultsTable)
         self.assertEqual(len(table.rows), 2)
-
-    def test_render_action(self):
-        """Render action works as expected for grant access types."""
-        workspace = factories.CollaborativeAnalysisWorkspaceFactory.create()
-        member_group = ManagedGroupFactory.create()
-        data = [
-            {
-                "workspace": workspace,
-                "member": member_group,
-                "note": "a note",
-                "action": "Grant",
-                "action_url": "foo",
-            }
-        ]
-
-        table = audit.AccessAuditResultsTable(data)
-        self.assertIsInstance(table, audit.AccessAuditResultsTable)
-        self.assertEqual(len(table.rows), 1)
-        self.assertIn("foo", table.rows[0].get_cell("action"))
-        self.assertIn("Grant", table.rows[0].get_cell("action"))
diff --git a/primed/collaborative_analysis/tests/test_views.py b/primed/collaborative_analysis/tests/test_views.py
@@ -553,7 +553,7 @@ def test_context_verified_table_access(self):
             table.rows[0].get_cell_value("note"),
             audit.CollaborativeAnalysisWorkspaceAccessAudit.IN_SOURCE_AUTH_DOMAINS,
         )
-        self.assertIsNone(table.rows[0].get_cell_value("action"))
+        self.assertEqual(table.rows[0].get_cell_value("action"), "&mdash;")
 
     def test_context_verified_table_no_access(self):
         """verified_table shows a record when audit has one account with verified no access."""
@@ -601,7 +601,7 @@ def test_context_verified_table_no_access(self):
             table.rows[0].get_cell_value("note"),
             audit.CollaborativeAnalysisWorkspaceAccessAudit.NOT_IN_SOURCE_AUTH_DOMAINS,
         )
-        self.assertIsNone(table.rows[0].get_cell_value("action"))
+        self.assertEqual(table.rows[0].get_cell_value("action"), "&mdash;")
 
     def test_context_needs_action_table_grant(self):
         """needs_action_table shows a record when audit finds that access needs to be granted."""
@@ -872,7 +872,7 @@ def test_context_verified_table_access(self):
             table.rows[0].get_cell_value("note"),
             audit.CollaborativeAnalysisWorkspaceAccessAudit.IN_SOURCE_AUTH_DOMAINS,
         )
-        self.assertIsNone(table.rows[0].get_cell_value("action"))
+        self.assertEqual(table.rows[0].get_cell_value("action"), "&mdash;")
 
     def test_context_verified_table_no_access(self):
         """verified_table shows a record when audit has one account with verified no access."""
@@ -914,7 +914,7 @@ def test_context_verified_table_no_access(self):
             table.rows[0].get_cell_value("note"),
             audit.CollaborativeAnalysisWorkspaceAccessAudit.NOT_IN_SOURCE_AUTH_DOMAINS,
         )
-        self.assertIsNone(table.rows[0].get_cell_value("action"))
+        self.assertEqual(table.rows[0].get_cell_value("action"), "&mdash;")
 
     def test_context_needs_action_table_grant(self):
         """needs_action_table shows a record when audit finds that access needs to be granted."""

diff --git a/primed/templates/snippets/collaborativeanalysis_audit_action_button.html b/primed/templates/snippets/collaborativeanalysis_audit_action_button.html
@@ -0,0 +1,22 @@
+<div>
+    {% if record.action %}
+    <form
+        method="post"
+        action="{% url 'collaborative_analysis:audit:resolve' record.workspace.workspace.billing_project.name record.workspace.workspace.name record.member.email %}">
+
+        {% csrf_token %}
+        <button
+            type="submit"
+            class="btn btn-primary btn-sm"
+            hx-post="{% url 'collaborative_analysis:audit:resolve' record.workspace.workspace.billing_project.name record.workspace.workspace.name record.member.email %}"
+            hx-disabled-elt="this"
+            hx-target="closest div"
+            hx-swap="innerHTML">
+            {{ record.action }}
+        </button>
+      </form>
+
+    {% else %}
+    &mdash;
+    {% endif %}
+</div>