working data passing

Author: JasonGrace2282

manager/director/apps/sites/consumers.py

@@ -2,15 +2,16 @@
 
 from __future__ import annotations
 
+import json
 from collections.abc import AsyncIterator
 from contextlib import asynccontextmanager
-from typing import TYPE_CHECKING, override
+from typing import TYPE_CHECKING, Any, override
 
 from channels.db import database_sync_to_async
 from channels.generic.websocket import AsyncWebsocketConsumer
 from django.urls import path
 
-from .models import Site
+from .models import Operation, Site
 
 if TYPE_CHECKING:
     from ..users.models import User
@@ -33,13 +34,65 @@ async def connect(self):
         async with self.close_on_error():
             site_id = int(self.scope["url_route"]["kwargs"]["site_id"])
             site = await find_site(site_id, user)
+
+        # Listen for events for this site
         await self.channel_layer.group_add(
             site.channels_group_name(),
             self.channel_name,
         )
 
         await self.accept()
-        await self.send(text_data=f'<p id="foo">site name: {site.name}</p>')
+        info = await self.gather_site_info(site)
+        await self.send(text_data=f"<code id='site-info'>\n{json.dumps(info, indent=4)}</code>")
+
+    @database_sync_to_async
+    def gather_site_info(self, site: Site) -> dict[str, Any]:
+        """Returns a dictionary with information about the site."""
+        site.refresh_from_db()
+        info = {
+            "name": site.name,
+            "url": site.sites_url,
+            "description": site.description,
+            "purpose": site.purpose,
+            "mode": site.mode,
+            "users": list(site.users.values_list("username", flat=True)),
+            "is_being_served": site.is_served,
+        }
+
+        if site.database is not None:
+            # TODO
+            pass
+
+        op = Operation.objects.filter(site=site).first()
+        if op is not None:
+            operation_info = {
+                "type": op.ty,
+                "created_time": op.created_time.isoformat(),
+                "started_time": (
+                    op.started_time.isoformat() if op.started_time is not None else None
+                ),
+                "actions": [],
+            }
+            for action in op.list_actions_in_order():
+                operation_info["actions"].append(
+                    {
+                        "slug": action.slug,
+                        "name": action.name,
+                        "started_time": (
+                            action.started_time.isoformat()
+                            if action.started_time is not None
+                            else None
+                        ),
+                        "result": action.result,
+                        "user_message": action.user_message,
+                    }
+                )
+                if self.scope["user"].is_superuser:
+                    operation_info["actions"][-1]["message"] = action.message
+
+            info["operation"] = operation_info
+
+        return info
 
     @asynccontextmanager
     async def close_on_error(

manager/director/apps/sites/models.py

@@ -117,6 +117,7 @@ class Site(models.Model):
 
     id: int
     domain_set: models.QuerySet[Domain]
+    operation: Operation
 
     def __str__(self):
         return self.name
@@ -335,6 +336,9 @@ def __str__(self) -> str:
     def has_started(self) -> bool:
         return self.started_time is not None
 
+    def list_actions_in_order(self) -> models.QuerySet[Action]:
+        return self.action_set.order_by("id")
+
 
 class Action(models.Model):
     """An individual task in an operation.

manager/director/apps/sites/views.py

@@ -12,7 +12,7 @@
 
 from . import tasks
 from .forms import CreateSiteForm
-from .models import Site
+from .models import Operation, Site
 
 if TYPE_CHECKING:
     from director.djtypes import AuthenticatedHttpRequest
@@ -70,8 +70,7 @@ def delete_site(request: AuthenticatedHttpRequest, site_id: int) -> HttpResponse
 
 @require_POST
 @superuser_required
-@login_required
 def clear_operations(request: AuthenticatedHttpRequest, site_id: int) -> HttpResponse:
     site = get_object_or_404(Site, id=site_id)
-    site.operation_set.all().delete()
+    Operation.objects.filter(site=site).delete()
     return JsonResponse({})

manager/director/templates/sites/dashboard.html

@@ -11,7 +11,10 @@
   <!-- <h1 class="p-2 text-large">{{ site.name }}</h1> -->
   <div hx-ext="ws" ws-connect="/sites/{{ site.id }}/"
     class="p-2 mb-4" hx-swap-oob='true'>
-    <p id="foo"></p>
+    <pre>
+    <code id="site-info">
+    </code>
+    </pre>
   </div>
   {% comment %}
   <button htmx-post="{% url 'sites:clear' site.id %}"