Try unifying 3 different element interfaces

games/views/session.py

@@ -11,12 +11,12 @@ from django.utils import timezone
 from django.utils.safestring import SafeText, mark_safe
 
 from common.components import (
-    Fragment,
     A,
     AddForm,
     Button,
     ButtonGroup,
     Div,
+    Fragment,
     Icon,
     ModuleScript,
     NameWithIcon,
@@ -27,6 +27,7 @@ from common.components import (
     SessionDeviceSelector,
     paginated_table_content,
 )
+from common.components import SessionTimestampButtons
 from common.components.primitives import Span, Td, Tr
 from common.layout import render_page
 from common.time import (
@@ -208,32 +209,20 @@ def _session_fields(form) -> Fragment:
             this_side = "start" if field.name == "timestamp_start" else "end"
             other_side = "end" if field.name == "timestamp_start" else "start"
             children.append(
-                Span(
-                    attributes=[
-                        (
-                            "class",
-                            "form-row-button-group flex-row gap-3 justify-start mt-3",
-                        ),
-                        ("hx-boost", "false"),
+                SessionTimestampButtons(
+                    class_="form-row-button-group flex-row gap-3 justify-start mt-3",
+                    hx_boost="false",
+                )[
+                    Button(data_target=field.name, data_type="now", size="xs")[
+                        "Set to now"
                     ],
-                    children=[
-                        Button(
-                            [("data-target", field.name), ("data-type", "now")],
-                            "Set to now",
-                            size="xs",
-                        ),
-                        Button(
-                            [("data-target", field.name), ("data-type", "toggle")],
-                            "Toggle text",
-                            size="xs",
-                        ),
-                        Button(
-                            [("data-target", field.name), ("data-type", "copy")],
-                            f"Copy {this_side} value to {other_side}",
-                            size="xs",
-                        ),
+                    Button(data_target=field.name, data_type="toggle", size="xs")[
+                        "Toggle text"
                     ],
-                )
+                    Button(data_target=field.name, data_type="copy", size="xs")[
+                        f"Copy {this_side} value to {other_side}"
+                    ],
+                ]
             )
         rows.append(Div(children=children))
     return Fragment(*rows, separator="\n")
@@ -265,9 +254,7 @@ def add_session(request: HttpRequest, game_id: int = 0) -> HttpResponse:
         request,
         AddForm(form, request=request, fields=_session_fields(form), submit_class=""),
         title="Add New Session",
-        scripts=mark_safe(
-            ModuleScript("search_select.js") + ModuleScript("add_session.js")
-        ),
+        scripts=mark_safe(ModuleScript("search_select.js")),
     )
 
 
@@ -282,9 +269,7 @@ def edit_session(request: HttpRequest, session_id: int) -> HttpResponse:
         request,
         AddForm(form, request=request, fields=_session_fields(form), submit_class=""),
         title="Edit Session",
-        scripts=mark_safe(
-            ModuleScript("search_select.js") + ModuleScript("add_session.js")
-        ),
+        scripts=mark_safe(ModuleScript("search_select.js")),
     )